Calcul des montants de commande (hors avoirs)

ShopBundle/Services/Price/OrderShopPriceUtils.php

@@ -91,38 +91,67 @@ class OrderShopPriceUtils implements OrderShopPriceUtilsInterface
         public function getTotalOrderProductsWithReductions(OrderShopInterface $orderShop)
         {
                 $total = $this->getTotalOrderProducts($orderShop) ;
+                $total -= $this->getTotalReductionCartsAmount($orderShop) ;
+                $total -= $this->getTotalReductionCreditsAmount($orderShop) ;
+                return $total ;
+        }
+
+        public function getTotalOrderProductsWithReductionCarts(OrderShopInterface $orderShop)
+        {
+                $total = $this->getTotalOrderProducts($orderShop) ;
+                $total -= $this->getTotalReductionCartsAmount($orderShop) ;
+                return $total ;
+        }
 
+        public function getTotalReductionCartsAmount(OrderShopInterface $orderShop)
+        {
                 $totalReductionAmount = 0 ;
                 foreach ($orderShop->getOrderReductionCarts() as $orderReductionCart) {
                         $totalReductionAmount += $this->getOrderProductsReductionCartAmountWithoutTax($orderShop,$orderReductionCart);
                 }
+                return $totalReductionAmount ;
+        }
 
+        public function getTotalReductionCreditsAmount(OrderShopInterface $orderShop)
+        {
+                $totalReductionAmount = 0 ;
                 foreach ($orderShop->getOrderReductionCredits() as $orderReductionCredit) {
                         $totalReductionAmount += $this->getOrderProductsReductionCreditAmountWithoutTax($orderShop,$orderReductionCredit);
                 }
+                return $totalReductionAmount ;
+        }
 
-                $total -= $totalReductionAmount ;
-
+        public function getTotalOrderProductsWithTaxAndReductions(OrderShopInterface $orderShop)
+        {
+                $total = $this->getTotalOrderProductsWithTax($orderShop) ;
+                $total -= $this->getTotalReductionCartsAmountWithTax($orderShop) ;
+                $total -= $this->getTotalReductionCreditsAmountWithTax($orderShop) ;
                 return $total ;
         }
 
-
-        public function getTotalOrderProductsWithTaxAndReductions(OrderShopInterface $orderShop)
+        public function getTotalOrderProductsWithTaxAndReductionCarts(OrderShopInterface $orderShop)
         {
                 $total = $this->getTotalOrderProductsWithTax($orderShop) ;
+                $total -= $this->getTotalReductionCartsAmountWithTax($orderShop) ;
+                return $total ;
+        }
 
+        public function getTotalReductionCartsAmountWithTax(OrderShopInterface $orderShop)
+        {
                 $totalReductionAmount = 0 ;
                 foreach ($orderShop->getOrderReductionCarts() as $orderReductionCart) {
                         $totalReductionAmount += $this->getOrderProductsReductionCartAmountWithTax($orderShop,$orderReductionCart);
                 }
+                return $totalReductionAmount ;
+        }
 
+        public function getTotalReductionCreditsAmountWithTax(OrderShopInterface $orderShop)
+        {
+                $totalReductionAmount = 0 ;
                 foreach ($orderShop->getOrderReductionCredits() as $orderReductionCredit) {
                         $totalReductionAmount += $this->getOrderProductsReductionCreditAmountWithTax($orderShop,$orderReductionCredit);
                 }
-
-                $total -= $totalReductionAmount ;
-
-                return $total ;
+                return $totalReductionAmount ;
         }
 
         public function getOrderProductsReductionCartAmountWithoutTax(OrderShopInterface $order, $orderReductionCart)