Merge branch 'MAGETWO-93962' into 2.3-develop-pr5

yelahin-serhiy · yelahin-serhiy · commit 9d6ae1515ba4 · 2018-08-22T13:40:42.000+03:00
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php b/app/code/Magento/GiftMessage/Model/Plugin/MergeQuoteItems.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Model\Plugin;
+
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\Processor;
+
+class MergeQuoteItems
+{
+    /**
+     * Resolves gift message to be
+     * applied to merged quote items.
+     *
+     * @param Processor $subject
+     * @param Item $result
+     * @param Item $source
+     * @return Item
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterMerge(Processor $subject, Item $result, Item $source): Item
+    {
+        $giftMessageId = $source->getGiftMessageId();
+
+        if ($giftMessageId) {
+            $result->setGiftMessageId($giftMessageId);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php b/app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php
@@ -28,7 +28,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         /** @var  Quote $sourceQuote */
         $sourceQuote = $observer->getData('source');
 
-        $targetQuote->setGiftMessageId($sourceQuote->getGiftMessageId());
+        $giftMessageId = $sourceQuote->getGiftMessageId();
+        if ($giftMessageId) {
+            $targetQuote->setGiftMessageId($giftMessageId);
+        }
 
         return $this;
     }
diff --git a/app/code/Magento/GiftMessage/etc/frontend/di.xml b/app/code/Magento/GiftMessage/etc/frontend/di.xml
@@ -43,4 +43,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item\Processor">
+        <plugin name="mergeQuoteItems" type="Magento\GiftMessage\Model\Plugin\MergeQuoteItems"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -526,207 +526,207 @@ public function getCurrency()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency = null)
     {
         return $this->setData(self::KEY_CURRENCY, $currency);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems()
     {
         return $this->_getData(self::KEY_ITEMS);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItems(array $items = null)
     {
         return $this->setData(self::KEY_ITEMS, $items);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCreatedAt()
     {
         return $this->_getData(self::KEY_CREATED_AT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCreatedAt($createdAt)
     {
         return $this->setData(self::KEY_CREATED_AT, $createdAt);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUpdatedAt()
     {
         return $this->_getData(self::KEY_UPDATED_AT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setUpdatedAt($updatedAt)
     {
         return $this->setData(self::KEY_UPDATED_AT, $updatedAt);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConvertedAt()
     {
         return $this->_getData(self::KEY_CONVERTED_AT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setConvertedAt($convertedAt)
     {
         return $this->setData(self::KEY_CONVERTED_AT, $convertedAt);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIsActive()
     {
         return $this->_getData(self::KEY_IS_ACTIVE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsActive($isActive)
     {
         return $this->setData(self::KEY_IS_ACTIVE, $isActive);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setIsVirtual($isVirtual)
     {
         return $this->setData(self::KEY_IS_VIRTUAL, $isVirtual);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItemsCount()
     {
         return $this->_getData(self::KEY_ITEMS_COUNT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItemsCount($itemsCount)
     {
         return $this->setData(self::KEY_ITEMS_COUNT, $itemsCount);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItemsQty()
     {
         return $this->_getData(self::KEY_ITEMS_QTY);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setItemsQty($itemsQty)
     {
         return $this->setData(self::KEY_ITEMS_QTY, $itemsQty);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOrigOrderId()
     {
         return $this->_getData(self::KEY_ORIG_ORDER_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrigOrderId($origOrderId)
     {
         return $this->setData(self::KEY_ORIG_ORDER_ID, $origOrderId);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getReservedOrderId()
     {
         return $this->_getData(self::KEY_RESERVED_ORDER_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setReservedOrderId($reservedOrderId)
     {
         return $this->setData(self::KEY_RESERVED_ORDER_ID, $reservedOrderId);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerIsGuest()
     {
         return $this->_getData(self::KEY_CUSTOMER_IS_GUEST);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerIsGuest($customerIsGuest)
     {
         return $this->setData(self::KEY_CUSTOMER_IS_GUEST, $customerIsGuest);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerNote()
     {
         return $this->_getData(self::KEY_CUSTOMER_NOTE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerNote($customerNote)
     {
         return $this->setData(self::KEY_CUSTOMER_NOTE, $customerNote);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerNoteNotify()
     {
         return $this->_getData(self::KEY_CUSTOMER_NOTE_NOTIFY);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerNoteNotify($customerNoteNotify)
     {
@@ -736,7 +736,7 @@ public function setCustomerNoteNotify($customerNoteNotify)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStoreId()
     {
@@ -747,7 +747,7 @@ public function getStoreId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreId($storeId)
     {
@@ -1078,7 +1078,7 @@ public function getCustomerGroupId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerTaxClassId()
     {
@@ -1097,7 +1097,7 @@ public function getCustomerTaxClassId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerTaxClassId($customerTaxClassId)
     {
@@ -2341,6 +2341,7 @@ public function merge(Quote $quote)
             foreach ($this->getAllItems() as $quoteItem) {
                 if ($quoteItem->compare($item)) {
                     $quoteItem->setQty($quoteItem->getQty() + $item->getQty());
+                    $this->itemProcessor->merge($item, $quoteItem);
                     $found = true;
                     break;
                 }
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

Original file line number	Diff line number	Diff line change
`@@ -526,207 +526,207 @@ public function getCurrency()`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`/**`
`529`		`- * {@inheritdoc}`
	`529`	`+ * @inheritdoc`
`530`	`530`	`*/`
`531`	`531`	`public function setCurrency(\Magento\Quote\Api\Data\CurrencyInterface $currency = null)`
`532`	`532`	`{`
`533`	`533`	`return $this->setData(self::KEY_CURRENCY, $currency);`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`/**`
`537`		`- * {@inheritdoc}`
	`537`	`+ * @inheritdoc`
`538`	`538`	`*/`
`539`	`539`	`public function getItems()`
`540`	`540`	`{`
`541`	`541`	`return $this->_getData(self::KEY_ITEMS);`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`/**`
`545`		`- * {@inheritdoc}`
	`545`	`+ * @inheritdoc`
`546`	`546`	`*/`
`547`	`547`	`public function setItems(array $items = null)`
`548`	`548`	`{`
`549`	`549`	`return $this->setData(self::KEY_ITEMS, $items);`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`/**`
`553`		`- * {@inheritdoc}`
	`553`	`+ * @inheritdoc`
`554`	`554`	`*/`
`555`	`555`	`public function getCreatedAt()`
`556`	`556`	`{`
`557`	`557`	`return $this->_getData(self::KEY_CREATED_AT);`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`/**`
`561`		`- * {@inheritdoc}`
	`561`	`+ * @inheritdoc`
`562`	`562`	`*/`
`563`	`563`	`public function setCreatedAt($createdAt)`
`564`	`564`	`{`
`565`	`565`	`return $this->setData(self::KEY_CREATED_AT, $createdAt);`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`/**`
`569`		`- * {@inheritdoc}`
	`569`	`+ * @inheritdoc`
`570`	`570`	`*/`
`571`	`571`	`public function getUpdatedAt()`
`572`	`572`	`{`
`573`	`573`	`return $this->_getData(self::KEY_UPDATED_AT);`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`/**`
`577`		`- * {@inheritdoc}`
	`577`	`+ * @inheritdoc`
`578`	`578`	`*/`
`579`	`579`	`public function setUpdatedAt($updatedAt)`
`580`	`580`	`{`
`581`	`581`	`return $this->setData(self::KEY_UPDATED_AT, $updatedAt);`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`/**`
`585`		`- * {@inheritdoc}`
	`585`	`+ * @inheritdoc`
`586`	`586`	`*/`
`587`	`587`	`public function getConvertedAt()`
`588`	`588`	`{`
`589`	`589`	`return $this->_getData(self::KEY_CONVERTED_AT);`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`/**`
`593`		`- * {@inheritdoc}`
	`593`	`+ * @inheritdoc`
`594`	`594`	`*/`
`595`	`595`	`public function setConvertedAt($convertedAt)`
`596`	`596`	`{`
`597`	`597`	`return $this->setData(self::KEY_CONVERTED_AT, $convertedAt);`
`598`	`598`	`}`
`599`	`599`
`600`	`600`	`/**`
`601`		`- * {@inheritdoc}`
	`601`	`+ * @inheritdoc`
`602`	`602`	`*/`
`603`	`603`	`public function getIsActive()`
`604`	`604`	`{`
`605`	`605`	`return $this->_getData(self::KEY_IS_ACTIVE);`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`/**`
`609`		`- * {@inheritdoc}`
	`609`	`+ * @inheritdoc`
`610`	`610`	`*/`
`611`	`611`	`public function setIsActive($isActive)`
`612`	`612`	`{`
`613`	`613`	`return $this->setData(self::KEY_IS_ACTIVE, $isActive);`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`/**`
`617`		`- * {@inheritdoc}`
	`617`	`+ * @inheritdoc`
`618`	`618`	`*/`
`619`	`619`	`public function setIsVirtual($isVirtual)`
`620`	`620`	`{`
`621`	`621`	`return $this->setData(self::KEY_IS_VIRTUAL, $isVirtual);`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`/**`
`625`		`- * {@inheritdoc}`
	`625`	`+ * @inheritdoc`
`626`	`626`	`*/`
`627`	`627`	`public function getItemsCount()`
`628`	`628`	`{`
`629`	`629`	`return $this->_getData(self::KEY_ITEMS_COUNT);`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`/**`
`633`		`- * {@inheritdoc}`
	`633`	`+ * @inheritdoc`
`634`	`634`	`*/`
`635`	`635`	`public function setItemsCount($itemsCount)`
`636`	`636`	`{`
`637`	`637`	`return $this->setData(self::KEY_ITEMS_COUNT, $itemsCount);`
`638`	`638`	`}`
`639`	`639`
`640`	`640`	`/**`
`641`		`- * {@inheritdoc}`
	`641`	`+ * @inheritdoc`
`642`	`642`	`*/`
`643`	`643`	`public function getItemsQty()`
`644`	`644`	`{`
`645`	`645`	`return $this->_getData(self::KEY_ITEMS_QTY);`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`/**`
`649`		`- * {@inheritdoc}`
	`649`	`+ * @inheritdoc`
`650`	`650`	`*/`
`651`	`651`	`public function setItemsQty($itemsQty)`
`652`	`652`	`{`
`653`	`653`	`return $this->setData(self::KEY_ITEMS_QTY, $itemsQty);`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`/**`
`657`		`- * {@inheritdoc}`
	`657`	`+ * @inheritdoc`
`658`	`658`	`*/`
`659`	`659`	`public function getOrigOrderId()`
`660`	`660`	`{`
`661`	`661`	`return $this->_getData(self::KEY_ORIG_ORDER_ID);`
`662`	`662`	`}`
`663`	`663`
`664`	`664`	`/**`
`665`		`- * {@inheritdoc}`
	`665`	`+ * @inheritdoc`
`666`	`666`	`*/`
`667`	`667`	`public function setOrigOrderId($origOrderId)`
`668`	`668`	`{`
`669`	`669`	`return $this->setData(self::KEY_ORIG_ORDER_ID, $origOrderId);`
`670`	`670`	`}`
`671`	`671`
`672`	`672`	`/**`
`673`		`- * {@inheritdoc}`
	`673`	`+ * @inheritdoc`
`674`	`674`	`*/`
`675`	`675`	`public function getReservedOrderId()`
`676`	`676`	`{`
`677`	`677`	`return $this->_getData(self::KEY_RESERVED_ORDER_ID);`
`678`	`678`	`}`
`679`	`679`
`680`	`680`	`/**`
`681`		`- * {@inheritdoc}`
	`681`	`+ * @inheritdoc`
`682`	`682`	`*/`
`683`	`683`	`public function setReservedOrderId($reservedOrderId)`
`684`	`684`	`{`
`685`	`685`	`return $this->setData(self::KEY_RESERVED_ORDER_ID, $reservedOrderId);`
`686`	`686`	`}`
`687`	`687`
`688`	`688`	`/**`
`689`		`- * {@inheritdoc}`
	`689`	`+ * @inheritdoc`
`690`	`690`	`*/`
`691`	`691`	`public function getCustomerIsGuest()`
`692`	`692`	`{`
`693`	`693`	`return $this->_getData(self::KEY_CUSTOMER_IS_GUEST);`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`/**`
`697`		`- * {@inheritdoc}`
	`697`	`+ * @inheritdoc`
`698`	`698`	`*/`
`699`	`699`	`public function setCustomerIsGuest($customerIsGuest)`
`700`	`700`	`{`
`701`	`701`	`return $this->setData(self::KEY_CUSTOMER_IS_GUEST, $customerIsGuest);`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`/**`
`705`		`- * {@inheritdoc}`
	`705`	`+ * @inheritdoc`
`706`	`706`	`*/`
`707`	`707`	`public function getCustomerNote()`
`708`	`708`	`{`
`709`	`709`	`return $this->_getData(self::KEY_CUSTOMER_NOTE);`
`710`	`710`	`}`
`711`	`711`
`712`	`712`	`/**`
`713`		`- * {@inheritdoc}`
	`713`	`+ * @inheritdoc`
`714`	`714`	`*/`
`715`	`715`	`public function setCustomerNote($customerNote)`
`716`	`716`	`{`
`717`	`717`	`return $this->setData(self::KEY_CUSTOMER_NOTE, $customerNote);`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`/**`
`721`		`- * {@inheritdoc}`
	`721`	`+ * @inheritdoc`
`722`	`722`	`*/`
`723`	`723`	`public function getCustomerNoteNotify()`
`724`	`724`	`{`
`725`	`725`	`return $this->_getData(self::KEY_CUSTOMER_NOTE_NOTIFY);`
`726`	`726`	`}`
`727`	`727`
`728`	`728`	`/**`
`729`		`- * {@inheritdoc}`
	`729`	`+ * @inheritdoc`
`730`	`730`	`*/`
`731`	`731`	`public function setCustomerNoteNotify($customerNoteNotify)`
`732`	`732`	`{`
`@@ -736,7 +736,7 @@ public function setCustomerNoteNotify($customerNoteNotify)`
`736`	`736`	`//@codeCoverageIgnoreEnd`
`737`	`737`
`738`	`738`	`/**`
`739`		`- * {@inheritdoc}`
	`739`	`+ * @inheritdoc`
`740`	`740`	`*/`
`741`	`741`	`public function getStoreId()`
`742`	`742`	`{`
`@@ -747,7 +747,7 @@ public function getStoreId()`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`/**`
`750`		`- * {@inheritdoc}`
	`750`	`+ * @inheritdoc`
`751`	`751`	`*/`
`752`	`752`	`public function setStoreId($storeId)`
`753`	`753`	`{`
`@@ -1078,7 +1078,7 @@ public function getCustomerGroupId()`
`1078`	`1078`	`}`
`1079`	`1079`
`1080`	`1080`	`/**`
`1081`		`- * {@inheritdoc}`
	`1081`	`+ * @inheritdoc`
`1082`	`1082`	`*/`
`1083`	`1083`	`public function getCustomerTaxClassId()`
`1084`	`1084`	`{`
`@@ -1097,7 +1097,7 @@ public function getCustomerTaxClassId()`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`	`1099`	`/**`
`1100`		`- * {@inheritdoc}`
	`1100`	`+ * @inheritdoc`
`1101`	`1101`	`*/`
`1102`	`1102`	`public function setCustomerTaxClassId($customerTaxClassId)`
`1103`	`1103`	`{`
`@@ -2341,6 +2341,7 @@ public function merge(Quote $quote)`
`2341`	`2341`	`foreach ($this->getAllItems() as $quoteItem) {`
`2342`	`2342`	`if ($quoteItem->compare($item)) {`
`2343`	`2343`	`$quoteItem->setQty($quoteItem->getQty() + $item->getQty());`
	`2344`	`+ $this->itemProcessor->merge($item, $quoteItem);`
`2344`	`2345`	`$found = true;`
`2345`	`2346`	`break;`
`2346`	`2347`	`}`