Merge branch 'develop'

ShopBundle/Repository/ProductRepository.php

@@ -26,6 +26,7 @@ class ProductRepository extends BaseRepository implements DefaultRepositoryInter
                 $qb->innerJoin('e.productFamily', 'productFamily');
                 $qb->addSelect('productFamily');
                 $qb->where('productFamily.merchant = :currentMerchant');
+                $qb->andWhere('productFamily.status = 1');
                 $qb->setParameter('currentMerchant', $this->merchantUtils->getMerchantCurrent()->getId());
 
                 $qb->andWhere(

ShopBundle/Resources/views/backend/default/menu.html.twig

@@ -24,7 +24,7 @@
             {% if item.icon is not empty %}<i class="fa fa-fw {{ item.icon }}"></i>{% endif %}
             <p>{{ item.label|trans(domain = translation_domain) }}
                 {% if item.children|default([]) is not empty %}<i class="right fas fa-angle-left"></i>{% endif %}
-                {% if item.params.count_menu_item is defined %}<span class="badge badge-{{ item.params.alert is defined ? 'danger' : 'info' }} right">{{ count_menu_items(item.params.count_menu_item) }}</span>{% endif %}
+                {% if item.params.count_menu_item is defined and count_menu_items(item.params.count_menu_item) > 0 %}<span class="badge badge-{{ item.params.alert is defined ? 'danger' : 'info' }} right">{{ count_menu_items(item.params.count_menu_item) }}</span>{% endif %}
             </p>
         </a>
     {% endif %}