Correctif PriceUtils

ShopBundle/Services/PriceUtils.php

@@ -52,7 +52,7 @@ class PriceUtils
         {
                 if($entity instanceof ProductPropertyInterface) {
                         if($entity->getBehaviorPriceInherited() == 'by-piece') {
-                                return ($this->getPriceInherited($entity) * $entity->getUnitInherited()->getCoefficient()) / $entity->getQuantityInherited() ;
+                                return ($this->getPrice($entity) * $entity->getUnitInherited()->getCoefficient()) / $entity->getQuantityInherited() ;
                         }
                         elseif($entity->getBehaviorPriceInherited() == 'by-reference-unit') {
                                 return $entity->getPriceByRefUnitInherited() ;
@@ -113,21 +113,28 @@ class PriceUtils
                 }
         }
 
-        private function getPriceWithTaxAndReductionCatalog($entity, $price, $priceWithTax): ?float
+        public function getPriceWithTaxAndReductionCatalog($entity, $price, $priceWithTax, $reductionCatalog = null): ?float
         {
-                if($entity instanceof ProductPropertyInterface) {
-                        $reductionCatalog = $entity->getReductionCatalogInherited() ;
-
-                        if($reductionCatalog) {
-                                $reductionCatalogValue = $reductionCatalog->getValue() ;
-                                $reductionCatalogUnit = $reductionCatalog->getUnit() ;
-                                $reductionCatalogBehaviorTaxRate = $reductionCatalog->getBehaviorTaxRate() ;
-                        }
+                if($reductionCatalog) {
+                        $reductionCatalogValue = $reductionCatalog->getValue() ;
+                        $reductionCatalogUnit = $reductionCatalog->getUnit() ;
+                        $reductionCatalogBehaviorTaxRate = $reductionCatalog->getBehaviorTaxRate() ;
                 }
+                else {
+                        if($entity instanceof ProductPropertyInterface) {
+                                $reductionCatalog = $entity->getReductionCatalogInherited() ;
+
+                                if($reductionCatalog) {
+                                        $reductionCatalogValue = $reductionCatalog->getValue() ;
+                                        $reductionCatalogUnit = $reductionCatalog->getUnit() ;
+                                        $reductionCatalogBehaviorTaxRate = $reductionCatalog->getBehaviorTaxRate() ;
+                                }
+                        }
 
-                if($entity instanceof OrderProductInterface) {
-                        // OrderProductReductionCatalog
-                        $reductionCatalog = null ;
+                        if($entity instanceof OrderProductInterface) {
+                                // OrderProductReductionCatalog
+                                $reductionCatalog = null ;
+                        }
                 }
 
                 if(isset($reductionCatalogValue) && isset($reductionCatalogUnit) && isset($reductionCatalogBehaviorTaxRate)) {