Merge branch 'develop'

ShopBundle/Controller/Backend/ProductFamilyController.php

@@ -414,7 +414,7 @@ class ProductFamilyController extends AdminController
         {
                 $orderShopRepo = $this->em->getRepository(OrderShopInterface::class);
                 $totalProductOrdered = array();
-                $currentWeekNumber = $this->orderUtils->getWeekNumberCurrent();
+                $currentWeekNumber = $this->orderUtils->getWeekNumberCurrentOrder();
                 $totalProductOrdered['total'][$currentWeekNumber +1] = 0;
                 $totalProductOrdered['total'][$currentWeekNumber ] = 0;
 

ShopBundle/Repository/ProductCategoryRepository.php

@@ -42,8 +42,6 @@ class ProductCategoryRepository extends BaseRepository implements DefaultReposit
 
                 if ($withOffline) $query->andWhere('e.status >= 0');
                 else $query->andWhere('e.status = 1');
-                
-                $query->leftJoin('e.productFamilies','productFamilies') ;
 
                 $query->orderBy('e.position', 'ASC');
 

ShopBundle/Resources/public/js/backend/script/default/init-common.js

@@ -66,7 +66,6 @@ function initAdminLtePlugin() {
     $('form button[type="submit"]').on('click', function (e) {
 
         checkForm();
-        log('ncihe')
     })
 
     if ($('.select2, select.form-control').length) {