From 40dcee6531dc5dc67d8cc9a0e1cd8d7cd4ff1c04 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com> Date: Sat, 27 Jun 2015 17:27:39 +0300 Subject: [PATCH] MAGETWO-38968: There is no ZIP validation for new address modal window --- .../frontend/web/js/model/shipping-rates-validator.js | 10 +++++++--- .../Checkout/view/frontend/web/js/view/shipping.js | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js index 812a95327ce..7bd07200870 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js @@ -41,11 +41,15 @@ define( var observableFields = shippingRatesValidationRules.getObservableFields(); $.each(elements, function(index, elem) { if (elem && observableFields.indexOf(elem.index) != -1) { - self.bindHandler(elem); - if (elem.index == 'postcode') { - postcodeElement = elem; + if (elem.index !== 'postcode') { + self.bindHandler(elem); } } + + if (elem.index === 'postcode') { + self.bindHandler(elem); + postcodeElement = elem; + } }); }, diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js index 96a44091473..7a0b60c7609 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js @@ -110,7 +110,7 @@ define( }, initElement: function(element) { - if (this.isFormInline && element.index == 'shipping-address-fieldset') { + if (element.index === 'shipping-address-fieldset') { shippingRatesValidator.bindChangeHandlers(element.elems()); } }, -- GitLab