MAGETWO-35262: It's impossible to update Gift Message from backend

Author: Ievgen Shakhsuvarov

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

@@ -98,11 +98,9 @@ public function saveAllInOrder()
             return $this;
         }
 
-        // types are 'quote', 'quote_item', etc
-        foreach ($giftMessages as $type => $giftMessageEntities) {
-            foreach ($giftMessageEntities as $entityId => $giftmessage) {
-                $this->_saveOne($entityId, $giftmessage, $type);
-            }
+        foreach ($giftMessages as $entityId => $giftMessage) {
+            $entityType = $this->getMappedType($giftMessage['type']);
+            $this->_saveOne($entityId, $giftMessage, $entityType);
         }
 
         return $this;

app/code/Magento/GiftMessage/Test/Unit/Model/SaveTest.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\GiftMessage\Test\Unit\Model;
+
+class SaveTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $messageFactoryMock;
+
+    /**
+     * @var \Magento\GiftMessage\Model\Save
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $productRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductRepositoryInterface', [], [], '', false);
+        $this->messageFactoryMock = $this->getMock('\Magento\GiftMessage\Model\MessageFactory', [], [], '', false);
+        $sessionMock = $this->getMock('\Magento\Backend\Model\Session\Quote', [], [], '', false);
+        $giftMessageHelperMock = $this->getMock('\Magento\GiftMessage\Helper\Message', [], [], '', false);
+        $this->model = new \Magento\GiftMessage\Model\Save(
+            $productRepositoryMock,
+            $this->messageFactoryMock,
+            $sessionMock,
+            $giftMessageHelperMock
+        );
+    }
+
+    public function testSaveAllInOrder()
+    {
+        $message = [1 =>
+            [
+                'from' => 'John Doe',
+                'to' => 'Jane Doe',
+                'message' => 'I love Magento',
+                'type' => 'order'
+            ]
+        ];
+        $this->model->setGiftmessages($message);
+
+        $messageMock = $this->getMock('\Magento\GiftMessage\Model\Message', [], [], '', false);
+        $entityModelMock = $this->getMock('\Magento\Sales\Model\Order', [], [], '', false);
+
+        $this->messageFactoryMock->expects($this->once())->method('create')->willReturn($messageMock);
+        $messageMock->expects($this->once())->method('getEntityModelByType')->with('order')->willReturnSelf();
+        $messageMock->expects($this->once())->method('load')->with(1)->willReturn($entityModelMock);
+        $messageMock->expects($this->atLeastOnce())->method('isMessageEmpty')->willReturn(false);
+        $messageMock->expects($this->once())->method('save');
+        $entityModelMock->expects($this->once())->method('save');
+        $this->assertEquals($this->model, $this->model->saveAllInOrder());
+    }
+}

app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js

@@ -100,7 +100,14 @@ window.giftMessagesController = {
 
         new Ajax.Request($(this.getFieldId(container, 'form')).action, {
             parameters: Form.serialize($(this.getFieldId(container, 'form')), true),
-            loaderArea: container
+            loaderArea: container,
+            onSuccess: function(response) {
+                var message = '<div class="messages"><div class="message message-success success">'
+                    + response.responseText
+                    + '<div data-ui-id="messages-message-success"></div></div></div>';
+                jQuery('#messages').html(message);
+                jQuery(document).scrollTop(0);
+            }
         });
     },
     getFieldId: function(container, name) {