Merge branch 'master' into dev

producer/controllers/SiteController.php

@@ -127,6 +127,7 @@ class SiteController extends ProducerBaseController
                         ->andWhere([
                                 'id_producer' => $this->getProducer()->id,
                                 'active' => true,
+                                'id_product_category' => null,
                         ])
                         ->orderBy('order ASC') ;