🔃 [EngCom] Public Pull Requests - 2.2-develop

VladimirZaets · web-flow · commit 8405bd2f449b · 2018-06-21T14:02:41.000+03:00
Accepted Public Pull Requests: - #16230: Correct spelling mistakes in Model and library files. (by @namratachangani) - #16216: 15863: [Forwardport] Refactored javascript code of admin notification modal popup (by @IvanPletnyov) - #16220: Incorrect value NULL was passed to DataObject constructor. It caused � (by @Jakhotiya) - #16213: Fix for #8222 (by @0m3r) - #16211: Setting deploy mode to production with --skip-compilation flag should not clear generated code (by @platformvaimo) - #16206: Declare module namespace before template path name(Magento_Sales::order/info.phtml). (by @ronak2ram) - #16192: Trim email address in customer account create and login form (by @dankhrapiyush) - #16194: #16184: Fix type error in payment void method (by @xpoback) Fixed GitHub Issues: - #8222: Estimate Shipping and Tax Form not works due to js error in collapsible.js [proposed fix] (reported by @Dart18) has been fixed in #16213 by @0m3r in 2.2-develop branch Related commits: 1. 4952d50 - #6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in #16192 by @dankhrapiyush in 2.2-develop branch Related commits: 1. 3cf1d74 2. bd7d3b4 3. 8a17d2c - #16184: Argument 1 passed to Magento\Sales\Model\Order\Payment must be an instance of Magento\Framework\DataObject, none given (reported by @Jakhotiya) has been fixed in #16194 by @xpoback in 2.2-develop branch Related commits: 1. a7839e2
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -23,7 +23,7 @@
     {
         "[data-role=system_messages_list]": {
             "Magento_AdminNotification/js/system/messages/popup": {
-                class: 'modal-system-messages ui-popup-message'
+                "class":"modal-system-messages ui-popup-message"
             }
         }
     }
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js b/app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js
@@ -1,24 +1,26 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
-*/
+ */
 
 define([
     'jquery',
     'Magento_Ui/js/modal/modal'
-], function ($) {
+], function ($, modal) {
     'use strict';
 
     return function (data, element) {
-        if (this.modal) {
-            this.modal.html($(element).html());
+
+        if (modal.modal) {
+            modal.modal.html($(element).html());
         } else {
-            this.modal = $(element).modal({
+            modal.modal = $(element).modal({
                 modalClass: data.class,
                 type: 'popup',
                 buttons: []
             });
         }
-        this.modal.modal('openModal');
+
+        modal.modal.modal('openModal');
     };
 });
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -814,10 +814,14 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
     {
         try {
             $response = $this->getResponse();
-            if ($voidPayment && $response->getXTransId() && strtoupper($response->getXType())
-                == self::REQUEST_TYPE_AUTH_ONLY
+            if ($voidPayment
+                && $response->getXTransId()
+                && strtoupper($response->getXType()) == self::REQUEST_TYPE_AUTH_ONLY
             ) {
-                $order->getPayment()->setTransactionId(null)->setParentTransactionId($response->getXTransId())->void();
+                $order->getPayment()
+                      ->setTransactionId(null)
+                      ->setParentTransactionId($response->getXTransId())
+                      ->void($response);
             }
             $order->registerCancellation($message)->save();
         } catch (\Exception $e) {
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -340,9 +340,9 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi
         $mediaAttributeCodes = $this->mediaConfig->getMediaAttributeCodes();
 
         if (is_array($mediaAttribute)) {
-            foreach ($mediaAttribute as $atttribute) {
-                if (in_array($atttribute, $mediaAttributeCodes)) {
-                    $product->setData($atttribute, $value);
+            foreach ($mediaAttribute as $attribute) {
+                if (in_array($attribute, $mediaAttributeCodes)) {
+                    $product->setData($attribute, $value);
                 }
             }
         } elseif (in_array($mediaAttribute, $mediaAttributeCodes)) {
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -24,7 +24,7 @@
                 <div class="field email required">
                     <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
                     <div class="control">
-                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-validate="{required:true, 'validate-email':true}">
+                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
                     </div>
                 </div>
                 <div class="field password required">
@@ -43,12 +43,3 @@
     </div>
 </div>
 
-<script type="text/x-magento-init">
-    {
-        ".field.email": {
-            "Magento_Customer/js/trim-username": {
-                "formSelector": "form.form-login"
-            }
-        }
-    }
-</script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -131,7 +131,7 @@
         <div class="field required">
             <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' class="input-text" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <div class="field password required">
diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js b/app/code/Magento/Customer/view/frontend/web/js/model/authentication-popup.js
@@ -34,7 +34,7 @@ define([
 
         /** Show login popup window */
         showModal: function () {
-            $(this.modalWindow).modal('openModal');
+            $(this.modalWindow).modal('openModal').trigger('contentUpdated');
         }
     };
 });
diff --git a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js
diff --git a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
@@ -60,6 +60,7 @@
                                    id="customer-email"
                                    type="email"
                                    class="input-text"
+                                   data-mage-init='{"mage/trim-input":{}}'
                                    data-bind="attr: {autocomplete: autocomplete}"
                                    data-validate="{required:true, 'validate-email':true}">
                         </div>
diff --git a/app/code/Magento/Sales/Block/Order/Info.php b/app/code/Magento/Sales/Block/Order/Info.php
@@ -23,7 +23,7 @@ class Info extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/info.phtml';
+    protected $_template = 'Magento_Sales::order/info.phtml';
 
     /**
      * Core registry
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
@@ -473,7 +473,7 @@ public function getProductUrl()
     public function getBuyRequest()
     {
         $option = $this->getOptionByCode('info_buyRequest');
-        $initialData = $option ? $this->serializer->unserialize($option->getValue()) : null;
+        $initialData = $option ? $this->serializer->unserialize($option->getValue()) : [];
 
         if ($initialData instanceof \Magento\Framework\DataObject) {
             $initialData = $initialData->getData();
diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -180,7 +180,7 @@ private function disableAllCacheTypes()
     }
 
     /**
-     * Enables apppropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
+     * Enables appropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
      * TODO: to be removed in scope of MAGETWO-53476
      *
      * @param string[] $cacheTypes
diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
@@ -110,7 +110,7 @@ define([
         _processState: function () {
             var anchor = window.location.hash,
                 isValid = $.mage.isValidSelector(anchor),
-                urlPath = window.location.pathname.replace('.', ''),
+                urlPath = window.location.pathname.replace(/\./g, ''),
                 state;
 
             this.stateKey = encodeURIComponent(urlPath + this.element.attr('id'));
diff --git a/lib/web/mage/trim-input.js b/lib/web/mage/trim-input.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.trimInput', {
+        options: {
+            cache: {}
+        },
+
+        /**
+         * Widget initialization
+         * @private
+         */
+        _create: function () {
+            this.options.cache.input = $(this.element);
+            this._bind();
+        },
+
+        /**
+         * Event binding, will monitor change, keyup and paste events.
+         * @private
+         */
+        _bind: function () {
+            if (this.options.cache.input.length) {
+                this._on(this.options.cache.input, {
+                    'change': this._trimInput,
+                    'keyup': this._trimInput,
+                    'paste': this._trimInput
+                });
+            }
+        },
+
+        /**
+         * Trim value
+         * @private
+         */
+        _trimInput: function () {
+            var input = this._getInputValue().trim();
+
+            this.options.cache.input.val(input);
+        },
+
+        /**
+         * Get input value
+         * @returns {*}
+         * @private
+         */
+        _getInputValue: function () {
+            return this.options.cache.input.val();
+        }
+    });
+
+    return $.mage.trimInput;
+});
diff --git a/lib/web/modernizr/modernizr.js b/lib/web/modernizr/modernizr.js
@@ -169,7 +169,7 @@ window.Modernizr = (function( window, document, undefined ) {
     // isEventSupported determines if a given element supports the given event
     // kangax.github.com/iseventsupported/
     //
-    // The following results are known incorrects:
+    // The following results are known incorrect:
     //   Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative
     //   Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333
     //   ...
diff --git a/setup/src/Magento/Setup/Console/CompilerPreparation.php b/setup/src/Magento/Setup/Console/CompilerPreparation.php
@@ -105,7 +105,6 @@ private function getCompilerInvalidationCommands()
             'module:disable',
             'module:enable',
             'module:uninstall',
-            'deploy:mode:set'
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`{`
`24`	`24`	`"[data-role=system_messages_list]": {`
`25`	`25`	`"Magento_AdminNotification/js/system/messages/popup": {`
`26`		`- class: 'modal-system-messages ui-popup-message'`
	`26`	`+ "class":"modal-system-messages ui-popup-message"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -340,9 +340,9 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi`
`340`	`340`	`$mediaAttributeCodes = $this->mediaConfig->getMediaAttributeCodes();`
`341`	`341`
`342`	`342`	`if (is_array($mediaAttribute)) {`
`343`		`- foreach ($mediaAttribute as $atttribute) {`
`344`		`- if (in_array($atttribute, $mediaAttributeCodes)) {`
`345`		`- $product->setData($atttribute, $value);`
	`343`	`+ foreach ($mediaAttribute as $attribute) {`
	`344`	`+ if (in_array($attribute, $mediaAttributeCodes)) {`
	`345`	`+ $product->setData($attribute, $value);`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`	`} elseif (in_array($mediaAttribute, $mediaAttributeCodes)) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ define([`
`34`	`34`
`35`	`35`	`/** Show login popup window */`
`36`	`36`	`showModal: function () {`
`37`		`- $(this.modalWindow).modal('openModal');`
	`37`	`+ $(this.modalWindow).modal('openModal').trigger('contentUpdated');`
`38`	`38`	`}`
`39`	`39`	`};`
`40`	`40`	`});`