Merge remote-tracking branch 'origin/MAGETWO-57862' into 2.0-develop-pr6

Author: zakdma

app/code/Magento/Checkout/Model/TotalsInformationManagement.php

@@ -56,6 +56,10 @@ public function calculate(
                 $addressInformation->getShippingCarrierCode() . '_' . $addressInformation->getShippingMethodCode()
             );
         }
+
+        if ($quote->getShippingAddress()->dataHasChangedFor('shipping_method')) {
+            $quote->setTotalsCollectedFlag(false);
+        }
         $quote->collectTotals();
 
         return $this->cartTotalRepository->get($cartId);

app/code/Magento/Quote/Model/Product/Plugin/UpdateQuoteItems.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Model\Product\Plugin;
+
+/**
+ * BeforeSave plugin for product resource model to update quote items prices if product price is changed
+ */
+class UpdateQuoteItems
+{
+    /**
+     * @var \Magento\Quote\Model\ResourceModel\Quote
+     */
+    private $resource;
+
+    /**
+     * @param \Magento\Quote\Model\ResourceModel\Quote $resource
+     */
+    public function __construct(
+        \Magento\Quote\Model\ResourceModel\Quote $resource
+    ) {
+        $this->resource = $resource;
+    }
+
+    /**
+     * @param \Magento\Catalog\Model\ResourceModel\Product $subject
+     * @param \Magento\Framework\Model\AbstractModel $product
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(
+        \Magento\Catalog\Model\ResourceModel\Product $subject,
+        \Magento\Framework\Model\AbstractModel $product
+    ) {
+        $originalPrice = $product->getOrigData('price');
+        if (!empty($originalPrice) && ($originalPrice != $product->getPrice())) {
+            $this->resource->markQuotesRecollect($product->getId());
+        }
+    }
+}

app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Test\Unit\Model\Product\Plugin;
+
+use Magento\Catalog\Model\Product;
+
+class UpdateQuoteItemsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Quote\Model\Product\Plugin\UpdateQuoteItems
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\ResourceModel\Quote
+     */
+    private $quoteResource ;
+
+    protected function setUp()
+    {
+        $this->quoteResource = $this->getMockBuilder(\Magento\Quote\Model\ResourceModel\Quote::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = new \Magento\Quote\Model\Product\Plugin\UpdateQuoteItems($this->quoteResource);
+    }
+
+    /**
+     * @dataProvider aroundUpdateDataProvider
+     * @param int $originalPrice
+     * @param int $newPrice
+     * @param bool $callMethod
+     */
+    public function testBeforeUpdate($originalPrice, $newPrice, $callMethod)
+    {
+        $productResourceMock = $this->getMock(\Magento\Catalog\Model\ResourceModel\Product::class, [], [], '', false);
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productId = 1;
+        $productMock->expects($this->any())->method('getOrigData')->with('price')->willReturn($originalPrice);
+        $productMock->expects($this->any())->method('getPrice')->willReturn($newPrice);
+        $productMock->expects($this->any())->method('getId')->willReturn($productId);
+        $this->quoteResource->expects($this->$callMethod())->method('markQuotesRecollect')->with($productId);
+        $result = $this->model->beforeSave($productResourceMock, $productMock);
+        $this->assertEquals($result, NULL);
+    }
+
+    public function aroundUpdateDataProvider()
+    {
+        return [
+            [10, 20, 'once'],
+            [null, 10, 'never'],
+            [10, 10, 'never']
+        ];
+    }
+}

app/code/Magento/Quote/etc/di.xml

@@ -89,4 +89,7 @@
     <preference for="Magento\Quote\Model\Quote\Address\FreeShippingInterface" type="Magento\Quote\Model\Quote\Address\FreeShipping" />
     <preference for="Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface" type="Magento\Quote\Model\GuestCart\GuestShippingMethodManagement" />
     <preference for="Magento\Quote\Model\ShippingMethodManagementInterface" type="Magento\Quote\Model\ShippingMethodManagement" />
+    <type name="Magento\Catalog\Model\ResourceModel\Product">
+        <plugin name="update_quote_items_before_product_save" type="Magento\Quote\Model\Product\Plugin\UpdateQuoteItems"/>
+    </type>
 </config>