Merge branch 'develop' of https://forge.laclic.fr/Laclic/CaracoleBundle into develop

Controller/AbstractController.php

@@ -4,7 +4,7 @@ namespace Lc\CaracoleBundle\Controller;
 
 use Lc\SovBundle\Controller\AbstractController as SovAbstractController;
 
-class AbstractController extends SovAbstractController
+abstract class AbstractController extends SovAbstractController
 {
     use ControllerTrait;
 }

Controller/ControllerTrait.php

@@ -6,6 +6,7 @@ use Lc\CaracoleBundle\Container\Address\AddressContainer;
 use Lc\CaracoleBundle\Container\Config\TaxRateContainer;
 use Lc\CaracoleBundle\Container\Config\UnitContainer;
 use Lc\CaracoleBundle\Container\Credit\CreditHistoryContainer;
+use Lc\CaracoleBundle\Container\Distribution\DistributionContainer;
 use Lc\CaracoleBundle\Container\File\DocumentContainer;
 use Lc\CaracoleBundle\Container\Merchant\MerchantContainer;
 use Lc\CaracoleBundle\Container\Order\OrderPaymentContainer;
@@ -85,6 +86,7 @@ trait ControllerTrait
                         UserMerchantContainer::class => UserMerchantContainer::class,
                         UserPointSaleContainer::class => UserPointSaleContainer::class,
                         VisitorContainer::class => VisitorContainer::class,
+                        DistributionContainer::class => DistributionContainer::class,
                 ]
         );
     }

Generator/OrderReferenceGenerator.php

@@ -78,3 +78,7 @@ class OrderReferenceGenerator
     }
 
 }
+
+
+
+

Repository/Distribution/DistributionStore.php

@@ -48,4 +48,5 @@ class DistributionStore extends AbstractStore
 
         return $query->findOne();
     }
+
 }

Resources/views/admin/product/field/product_family_sales.html.twig

@@ -1,3 +1,6 @@
 {% import '@LcCaracole/admin/product/macro/product_family_macro.html.twig' as pfm %}
 {% set section_current = section_container.resolver.getCurrent() %}
-{{ pfm.product_family_sales_statistic(order_shop_container.builder.getProductsSalesStatistic(section_current, entity.instance, 2), entity.instance) }}
+{% set distribution = distribution_container.builder.guessCurrentDistributionDelivery(section_current) %}
+
+{#
+{{ pfm.product_family_sales_statistic(order_shop_container.builder.getProductsSalesStatistic(section_current, entity.instance, 2), entity.instance) }}#}

Solver/Merchant/MerchantSolver.php

@@ -18,4 +18,16 @@ class MerchantSolver
 
         return $newsletterArray;
     }
-}
+
+    public function getSectionsOnline(MerchantInterface $merchant):array{
+        $sectionArray = [];
+
+        foreach($merchant->getSections() as $section) {
+             if($section->getStatus() === 1){
+                 $sectionArray[] = $section;
+            }
+        }
+
+        return $sectionArray;
+    }
+}