Merge pull request #1682 from magento-engcom/2.2-develop-prs

Public Pull Requests

#11958 11197: Blank page at the checkout 'shipping' step[backport]. by @nmalevanec
#11588 Fix Issue #7225 - Remove hardcoding of apply_to when saving attributes by @MartinPeverelli

Fixed Public Issues

#11197 Blank page at the checkout 'shipping' step
#7225 [BUG] [Magento 2.1.2] Programmatically creating an empty dropdown attribute, "apply_to" is set to NULL (from "simple") after adding options through store admin

Author: Oleksii Korshenko

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -193,7 +193,7 @@ public function execute()
                 );
             }
 
-            $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0, 'apply_to' => []];
+            $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
 
             if (is_null($model->getIsUserDefined()) || $model->getIsUserDefined() != 0) {
                 $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);

app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js

@@ -47,7 +47,7 @@ define([
 
             steps.sort(this.sortItems).forEach(function (element) {
                 if (element.code == hashString || element.alias == hashString) { //eslint-disable-line eqeqeq
-                    element.navigate();
+                    element.navigate(element);
                 } else {
                     element.isVisible(false);
                 }

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -127,10 +127,12 @@ define([
         },
 
         /**
-         * Load data from server for shipping step
+         * Navigator change hash handler.
+         *
+         * @param {Object} step - navigation step
          */
-        navigate: function () {
-            //load data from server for shipping step
+        navigate: function (step) {
+            step && step.isVisible(true);
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/shipping.test.js

@@ -80,7 +80,12 @@ define(['squire', 'ko', 'jquery', 'jquery/validate'], function (Squire, ko, $) {
     describe('Magento_Checkout/js/view/shipping', function () {
         describe('"navigate" method', function () {
             it('Check for return value.', function () {
-                expect(obj.navigate()).toBeUndefined();
+                var step = {
+                    isVisible: ko.observable(false)
+                };
+
+                expect(obj.navigate(step)).toBeUndefined();
+                expect(step.isVisible()).toBe(true);
             });
         });