MC-16222: Cannot save Shipping Methods page because in UPS method have required fields

Author: viktorpetryk

app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml

@@ -150,31 +150,20 @@ require(["prototype"], function(){
                     $(this.checkingUpsXmlId[a]).removeClassName('required-entry');
                 }
                 for (a = 0; a < this.checkingUpsId.length; a++) {
-                    $(this.checkingUpsXmlId[a]).addClassName('required-entry');
+                    $(this.checkingUpsId[a]).addClassName('required-entry');
+                    this.changeFieldsDisabledState(this.checkingUpsId, a);
                 }
                 Event.stopObserving($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
                 showRowArrayElements(this.onlyUpsElements);
                 hideRowArrayElements(this.onlyUpsXmlElements);
                 this.changeOriginShipment(null, 'default');
             } else {
                 for (a = 0; a < this.checkingUpsXmlId.length; a++) {
-                    if ($F(this.carriersUpsActiveId) === '1') {
-                        if ($(this.checkingUpsXmlId[a] + '_inherit') !== null
-                            && $F(this.checkingUpsXmlId[a] + '_inherit') === '1'
-                        ) {
-                            continue;
-                        }
-                        $(this.checkingUpsXmlId[a]).addClassName('required-entry').disabled = false;
-                    } else {
-                        $(this.checkingUpsXmlId[a]).removeClassName('required-entry').disabled = true;
-                        if ($(this.checkingUpsXmlId[a]).next() !== undefined) {
-                            $(this.checkingUpsXmlId[a]).removeClassName('mage-error').next().remove();
-                            $(this.checkingUpsXmlId[a]).removeAttribute('style');
-                        }
-                    }
+                    $(this.checkingUpsXmlId[a]).addClassName('required-entry');
+                    this.changeFieldsDisabledState(this.checkingUpsXmlId, a);
                 }
                 for (a = 0; a < this.checkingUpsId.length; a++) {
-                    $(this.checkingUpsXmlId[a]).removeClassName('required-entry');
+                    $(this.checkingUpsId[a]).removeClassName('required-entry');
                 }
                 Event.observe($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
                 showRowArrayElements(this.onlyUpsXmlElements);
@@ -186,6 +175,16 @@ require(["prototype"], function(){
         {
             this.originShipmentTitle = key ? key : $F('carriers_ups_origin_shipment');
             this.updateAllowedMethods(this.originShipmentTitle);
+        },
+        changeFieldsDisabledState: function (fields, key) {
+            $(fields[key]).disabled = $F(this.carriersUpsActiveId) !== '1'
+                || $(fields[key] + '_inherit') !== null
+                && $F(fields[key] + '_inherit') === '1';
+
+            if ($(fields[key]).next() !== undefined) {
+                $(fields[key]).removeClassName('mage-error').next().remove();
+                $(fields[key]).removeAttribute('style');
+            }
         }
     };
     xml = new upsXml();