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

Author: yelahin-serhiy

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;
+    }
+}

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;
     }

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>

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;
                 }