Merge remote-tracking branch 'origin/MAGETWO-93286' into 2.3-develop

Author: serhii-balko

app/code/Magento/GiftMessage/Observer/SalesEventQuoteMerge.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessage\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Gift Message Observer Model
+ */
+class SalesEventQuoteMerge implements ObserverInterface
+{
+    /**
+     * Sets gift message to customer quote from guest quote.
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return $this
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        /** @var  Quote $targetQuote */
+        $targetQuote = $observer->getData('quote');
+        /** @var  Quote $sourceQuote */
+        $sourceQuote = $observer->getData('source');
+
+        $targetQuote->setGiftMessageId($sourceQuote->getGiftMessageId());
+
+        return $this;
+    }
+}

app/code/Magento/GiftMessage/etc/frontend/events.xml

@@ -12,6 +12,9 @@
     <event name="sales_convert_order_to_quote">
         <observer name="giftmessage" instance="Magento\GiftMessage\Observer\SalesEventOrderToQuoteObserver" shared="false" />
     </event>
+    <event name="sales_quote_merge_after">
+        <observer name="giftmessage" instance="Magento\GiftMessage\Observer\SalesEventQuoteMerge" shared="false" />
+    </event>
     <event name="checkout_type_multishipping_create_orders_single">
         <observer name="giftmessage" instance="Magento\GiftMessage\Observer\MultishippingEventCreateOrdersObserver" shared="false" />
     </event>