Merge pull request #813 from dpfaffenbauer/quantity-rules-part2

[QuantityRules] merge ItemQuantityRangePriceProcessor with CartItemsProcessor

src/CoreShop/Bundle/CoreBundle/Resources/config/services/cart-processor.yml

@@ -17,6 +17,7 @@ services:
         class: CoreShop\Component\Core\Order\Processor\CartItemsProcessor
         arguments:
             - '@coreshop.order.purchasable.calculator'
+            - '@coreshop.product_quantity_price_rules.detector.quantity_reference'
             - '@coreshop.cart_item.processor'
         tags:
             - { name: coreshop.cart_processor, priority: 600 }

src/CoreShop/Bundle/CoreBundle/Resources/config/services/product-quantity-price-rules.yml

@@ -1,16 +1,4 @@
 services:
-    coreshop.cart_processor.items_quantity_range_price:
-        class: CoreShop\Component\Core\Order\Processor\CartItemQuantityRangePriceProcessor
-        decorates: coreshop.cart_processor.items
-        decoration_inner_name: coreshop.cart_processor.items.inner
-        arguments:
-            - '@coreshop.cart_processor.items.inner'
-            - '@coreshop.order.purchasable.calculator'
-            - '@coreshop.product_quantity_price_rules.detector.quantity_reference'
-            - '@coreshop.cart_item.processor'
-        tags:
-            - { name: coreshop.cart_processor, priority: 580 }
-
     coreshop.product_quantity_price_rules.rule.condition.customers:
         class: CoreShop\Component\Core\Product\Rule\Condition\CustomersConditionChecker
         tags:

src/CoreShop/Component/Core/Order/Processor/CartItemsProcessor.php

@@ -18,6 +18,9 @@
 use CoreShop\Component\Order\Model\CartInterface;
 use CoreShop\Component\Order\Processor\CartItemProcessorInterface;
 use CoreShop\Component\Order\Processor\CartProcessorInterface;
+use CoreShop\Component\ProductQuantityPriceRules\Detector\QuantityReferenceDetectorInterface;
+use CoreShop\Component\ProductQuantityPriceRules\Exception\NoPriceFoundException;
+use CoreShop\Component\ProductQuantityPriceRules\Exception\NoRuleFoundException;
 use Webmozart\Assert\Assert;
 
 final class CartItemsProcessor implements CartProcessorInterface
@@ -27,20 +30,28 @@ final class CartItemsProcessor implements CartProcessorInterface
      */
     private $productPriceCalculator;
 
+    /**
+     * @var QuantityReferenceDetectorInterface
+     */
+    private $quantityReferenceDetector;
+
     /**
      * @var CartItemProcessorInterface
      */
     private $cartItemProcessor;
 
     /**
      * @param PurchasableCalculatorInterface $productPriceCalculator
+     * @param QuantityReferenceDetectorInterface $quantityReferenceDetector
      * @param CartItemProcessorInterface     $cartItemProcessor
      */
     public function __construct(
         PurchasableCalculatorInterface $productPriceCalculator,
+        QuantityReferenceDetectorInterface $quantityReferenceDetector,
         CartItemProcessorInterface $cartItemProcessor
     ) {
         $this->productPriceCalculator = $productPriceCalculator;
+        $this->quantityReferenceDetector = $quantityReferenceDetector;
         $this->cartItemProcessor = $cartItemProcessor;
     }
 
@@ -84,6 +95,15 @@ public function process(CartInterface $cart)
             $product = $item->getProduct();
 
             $itemPrice = $this->productPriceCalculator->getPrice($product, $context, true);
+
+            try {
+                $itemPrice = $this->quantityReferenceDetector->detectQuantityPrice($item->getProduct(), $item->getQuantity(), $itemPrice, $context);
+            } catch (NoRuleFoundException $exception) {
+
+            } catch (NoPriceFoundException $exception) {
+
+            }
+
             $itemPriceWithoutDiscount = $this->productPriceCalculator->getPrice($product, $context);
             $itemRetailPrice = $this->productPriceCalculator->getRetailPrice($product, $context);
             $itemDiscountPrice = $this->productPriceCalculator->getDiscountPrice($product, $context);