Skip to content

Commit 445592f

Browse files
committed
MAGETWO-66627: [GitHub] Default Post Code is applied for all Order's addresses if zip is not required
1 parent 08d08dc commit 445592f

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

app/code/Magento/Checkout/view/base/web/js/model/default-post-code-resolver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ define([], function () {
1414
/**
1515
* Resolve default post code
1616
*
17-
* @returns {String|undefined}
17+
* @returns {String|null}
1818
*/
1919
resolve: function () {
20-
return useDefaultPostCode ? window.checkoutConfig.defaultPostcode : undefined;
20+
return useDefaultPostCode ? window.checkoutConfig.defaultPostcode : null;
2121
},
2222

2323
/**

app/code/Magento/Ui/view/base/web/js/form/element/region.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ define([
3535
return;
3636
}
3737
option = options[value];
38-
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
39-
defaultPostCodeResolver.setUseDefaultPostCode(typeof option.is_zipcode_optional !== 'undefined' &&
40-
option.is_zipcode_optional === true ? false : true);
41-
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
38+
defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
4239
if (this.skipValidation) {
4340
this.validation['required-entry'] = false;
4441
this.required(false);

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/base/web/js/model/default-post-code-resolver.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ define([
1919
});
2020

2121
it('resolve', function () {
22-
expect(defaultPostCodeResolver.resolve()).toBeUndefined();
22+
expect(defaultPostCodeResolver.resolve()).toBeNull();
2323
});
2424
it('resolve with using default code', function () {
2525
defaultPostCodeResolver.setUseDefaultPostCode(true);

0 commit comments

Comments
 (0)