MAGETWO-56018: [GitHub] Fail to import custom options #5573

Author: xmav

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -7,6 +7,13 @@
 
 class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
+    /**
+     * Whether to use main or temporary index table
+     *
+     * @var bool
+     */
+    protected $useTempTable = false;
+
     /**
      * Refresh entities index
      *

app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\ResourceConnection;
 
+/**
+ * @deprecated
+ */
 class MaxHeapTableSizeProcessor
 {
     /**

app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php

@@ -10,6 +10,9 @@
 use Magento\Catalog\Model\ResourceModel\MaxHeapTableSizeProcessor;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @deprecated
+ */
 class MaxHeapTableSizeProcessorOnFullReindex
 {
     /**

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -66,7 +66,6 @@
     </type>
     <type name="Magento\Catalog\Model\Indexer\Category\Product\Action\Full">
         <plugin name="invalidate_pagecache_after_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute" />
-        <plugin name="max_heap_tablse_size_processor_on_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\MaxHeapTableSizeProcessorOnFullReindex"/>
     </type>
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

@@ -313,8 +313,13 @@
                         },
 
                         save : function() {
+                            var block;
+
                             if ($('messages')) {
                                 $('messages').update();
+                            } else {
+                                block = jQuery('<div/>').attr('id', 'messages');
+                                jQuery('.page-main-actions').after(block);
                             }
                             TreePanels.rebuildTrees();
                             if(!jQuery('#set-prop-form').valid()) {

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -1284,7 +1284,7 @@ protected function _createCustomerForm(\Magento\Customer\Api\Data\CustomerInterf
             'adminhtml_checkout',
             $this->customerMapper->toFlatArray($customer),
             false,
-            CustomerForm::DONT_IGNORE_INVISIBLE
+            CustomerForm::IGNORE_INVISIBLE
         );
 
         return $customerForm;
@@ -1559,13 +1559,11 @@ public function setAccountData($accountData)
     {
         $customer = $this->getQuote()->getCustomer();
         $form = $this->_createCustomerForm($customer);
-        $customerData = $this->customerMapper->toFlatArray($customer);
 
         // emulate request
         $request = $form->prepareRequest($accountData);
         $data = $form->extractData($request);
         $data = $form->restoreData($data);
-        $data = array_merge($customerData, array_filter($data));
         $customer = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customer,
@@ -1575,6 +1573,7 @@ public function setAccountData($accountData)
         $this->getQuote()->updateCustomerData($customer);
         $data = [];
 
+        $customerData = $this->customerMapper->toFlatArray($customer);
         foreach ($form->getAttributes() as $attribute) {
             $code = sprintf('customer_%s', $attribute->getAttributeCode());
             $data[$code] = isset($customerData[$attribute->getAttributeCode()])

app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php

@@ -243,9 +243,11 @@ public function testSetAccountData()
         );
         $customerGroupMock->expects($this->once())->method('getTaxClassId')->will($this->returnValue($taxClassId));
         $customerFormMock = $this->getMock('Magento\Customer\Model\Metadata\Form', [], [], '', false);
-        $customerFormMock->expects($this->any())->method('getAttributes')->will($this->returnValue($attributeMocks));
+        $customerFormMock->expects($this->any())
+            ->method('getAttributes')
+            ->will($this->returnValue([$attributeMocks[1]]));
         $customerFormMock->expects($this->any())->method('extractData')->will($this->returnValue([]));
-        $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue([]));
+        $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue(['group_id' => 1]));
 
         $customerFormMock->expects($this->any())
             ->method('prepareRequest')
@@ -254,7 +256,7 @@ public function testSetAccountData()
         $customerMock = $this->getMock('Magento\Customer\Api\Data\CustomerInterface', [], [], '', false);
         $this->customerMapper->expects($this->atLeastOnce())
             ->method('toFlatArray')
-            ->willReturn(['email' => '[email protected]', 'group_id' => 1, 'gender' => 1]);
+            ->willReturn(['group_id' => 1]);
 
 
         $quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
@@ -263,7 +265,6 @@ public function testSetAccountData()
             ->method('addData')
             ->with(
             [
-                'customer_email' => $attributes[0][1],
                 'customer_group_id' => $attributes[1][1],
                 'customer_tax_class_id' => $taxClassId
             ]
@@ -272,7 +273,7 @@ public function testSetAccountData()
             ->method('populateWithArray')
             ->with(
                 $customerMock,
-                ['email' => '[email protected]', 'group_id' => 1, 'gender' => 1],
+                ['group_id' => 1],
                 '\Magento\Customer\Api\Data\CustomerInterface'
             );
 
@@ -284,7 +285,7 @@ public function testSetAccountData()
             ->method('getById')
             ->will($this->returnValue($customerGroupMock));
 
-        $this->adminOrderCreate->setAccountData([]);
+        $this->adminOrderCreate->setAccountData(['group_id' => 1]);
     }
 
     public function testUpdateQuoteItemsNotArray()

app/code/Magento/Sales/view/frontend/email/order_new.html

@@ -12,7 +12,7 @@
 "layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description"
+"var order.getShippingDescription()":"Shipping Description",
 "var shipping_msg":"Shipping message"
 } @-->
 

app/code/Magento/Sales/view/frontend/email/order_new_guest.html

@@ -14,7 +14,7 @@
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description"
+"var order.getShippingDescription()":"Shipping Description",
 "var shipping_msg":"Shipping message"
 } @-->
 {{template config_path="design/email/header_template"}}

app/code/Magento/Theme/view/frontend/web/js/view/messages.js

@@ -5,22 +5,35 @@
 define([
     'jquery',
     'uiComponent',
+    'underscore',
     'Magento_Customer/js/customer-data',
     'jquery/jquery-storageapi'
-], function ($, Component, customerData) {
+], function ($, Component, _, customerData) {
     'use strict';
 
     return Component.extend({
         defaults: {
             cookieMessages: [],
             messages: []
         },
+
+        /** @inheritdoc */
         initialize: function () {
             this._super();
 
             this.cookieMessages = $.cookieStorage.get('mage-messages');
-            this.messages = customerData.get('messages').extend({disposableCustomerData: 'messages'});
-            $.cookieStorage.setConf({path: '/', expires: -1}).set('mage-messages', null);
+            this.messages = customerData.get('messages').extend({
+                disposableCustomerData: 'messages'
+            });
+
+            if (!_.isEmpty(this.messages().messages)) {
+                customerData.set('messages', {});
+            }
+
+            $.cookieStorage.setConf({
+                path: '/',
+                expires: -1
+            }).set('mage-messages', null);
         }
     });
 });

app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html

@@ -12,7 +12,7 @@
 "layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description"
+"var order.getShippingDescription()":"Shipping Description",
 "var shipping_msg":"Shipping message"
 } @-->
 

app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html

@@ -14,7 +14,7 @@
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description"
+"var order.getShippingDescription()":"Shipping Description",
 "var shipping_msg":"Shipping message"
 } @-->
 {{template config_path="design/email/header_template"}}

lib/web/fotorama/fotorama.js

@@ -1433,8 +1433,14 @@ fotoramaVersion = '4.6.4';
                 xWin = (tail.go || tail.x || xyDiff >= 0) && !tail.noSwipe,
                 yWin = xyDiff < 0;
 
-            stopEvent(e);
-            (options.onMove || noop).call(el, e, {touch: touchFLAG});
+            if (touchFLAG && !tail.checked) {
+                if (touchEnabledFLAG = xWin) {
+                    stopEvent(e);
+                }
+            } else {
+                stopEvent(e);
+                (options.onMove || noop).call(el, e, {touch: touchFLAG});
+            }
 
             if (!moved && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance) {
                 moved = true;