Merge branch 'develop'

Repository/Product/ProductFamilyStore.php

@@ -54,10 +54,11 @@ class ProductFamilyStore extends AbstractStore
 
     public function isReductionCatalogDisplayed(ProductFamilyInterface $productFamily): bool
     {
-        $reductionCatalog = $this->reductionCatalogStore->setMerchant($this->merchant)
-                ->getByProductFamily($productFamily);
+        //TODO à discuter
+//        $reductionCatalog = $this->reductionCatalogStore->setMerchant($this->merchant)
+//                ->getByProductFamily($productFamily);
 
-        return $this->hasReductionCatalog($productFamily) && $reductionCatalog->isDisplayed();
+        return $this->hasReductionCatalog($productFamily) && $productFamily->getReductionCatalog()->isDisplayed();
     }
 
     public function hasReductionCatalog(ProductFamilyInterface $productFamily): bool
@@ -65,7 +66,7 @@ class ProductFamilyStore extends AbstractStore
         $reductionCatalog = $this->reductionCatalogStore->setMerchant($this->merchant)
                 ->getByProductFamily($productFamily);
 
-        return (bool)$reductionCatalog;
+        return (bool)$productFamily->getReductionCatalog();
     }
 
     public function getByParentCategory(

Solver/Price/OrderShopPriceSolver.php

@@ -145,7 +145,8 @@ class OrderShopPriceSolver
     {
         $total = 0;
         foreach ($orderProducts as $orderProduct) {
-            $total += $this->orderProductPriceResolver->getTotalWithTaxAndReduction($orderProduct, false);
+            //TODO : ici c'est pas possibble d'arrondir sinon ça fou une merde du tonnerre de de dieu !!!!
+            $total += $this->orderProductPriceResolver->getTotalWithTaxAndReduction($orderProduct);
         }
 
         return  $this->round($total);