Skip to content

Commit 32eda5c

Browse files
committed
MAGETWO-53785: Table Rate price update is not triggered for some countries #4697
1 parent 4490b1a commit 32eda5c

File tree

2 files changed

+13
-4
lines changed
  • app/code/Magento/OfflineShipping/view/frontend/web/js/model

2 files changed

+13
-4
lines changed

app/code/Magento/OfflineShipping/view/frontend/web/js/model/shipping-rates-validation-rules/tablerate.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ define(
1818
},
1919
'region_id': {
2020
'required': true
21+
},
22+
'region_id_input': {
23+
'required': true
2124
}
2225
};
2326
}

app/code/Magento/OfflineShipping/view/frontend/web/js/model/shipping-rates-validator/tablerate.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@ define(
1111
'mage/translate'
1212
],
1313
function ($, utils, validationRules, $t) {
14-
"use strict";
14+
'use strict';
1515
return {
1616
validationErrors: [],
17-
validate: function(address) {
17+
validate: function (address) {
1818
var self = this;
1919
this.validationErrors = [];
20-
$.each(validationRules.getRules(), function(field, rule) {
20+
$.each(validationRules.getRules(), function (field, rule) {
2121
if (rule.required && utils.isEmpty(address[field])) {
2222
var message = $t('Field ') + field + $t(' is required.');
23-
self.validationErrors.push(message);
23+
var regionFields = ['region', 'region_id', 'region_id_input'];
24+
if (
25+
$.inArray(field, regionFields) === -1
26+
|| utils.isEmpty(address['region']) && utils.isEmpty(address['region_id'])
27+
) {
28+
self.validationErrors.push(message);
29+
}
2430
}
2531
});
2632
return !Boolean(this.validationErrors.length);

0 commit comments

Comments
 (0)