MAGETWO-33079: Gift Message information for Order level is not presented on frontend/backend orders

Author: Ievgen Shakhsuvarov

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

@@ -39,10 +39,10 @@ public function __construct(
     /**
      * Set gift messages to order from quote address
      *
-     * @param \Magento\Framework\Object $observer
+     * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      */
-    public function salesEventConvertQuoteToOrder($observer)
+    public function salesEventQuoteSubmitBefore($observer)
     {
         $observer->getEvent()->getOrder()->setGiftMessageId($observer->getEvent()->getQuote()->getGiftMessageId());
         return $this;

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

@@ -6,8 +6,8 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
-    <event name="sales_convert_quote_to_order">
-        <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventConvertQuoteToOrder" shared="false" />
+    <event name="sales_model_service_quote_submit_before">
+        <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventQuoteSubmitBefore" shared="false" />
     </event>
     <event name="sales_convert_order_to_quote">
         <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventOrderToQuote" shared="false" />