Skip to content

Commit e5e8e2b

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

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
* @api
77
*/
88
define([
9-
'underscore'
10-
], function (_) {
9+
'underscore',
10+
'Magento_Checkout/js/model/default-post-code-resolver'
11+
], function (_, DefaultPostCodeResolver) {
1112
'use strict';
1213

1314
/**
@@ -35,7 +36,7 @@ define([
3536
company: addressData.company,
3637
telephone: addressData.telephone,
3738
fax: addressData.fax,
38-
postcode: addressData.postcode ? addressData.postcode : window.checkoutConfig.defaultPostcode || undefined,
39+
postcode: addressData.postcode ? addressData.postcode : DefaultPostCodeResolver.resolve(),
3940
city: addressData.city,
4041
firstname: addressData.firstname,
4142
lastname: addressData.lastname,

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,20 @@ define([
1010

1111
describe('checkout/js/model/default-post-code-resolver', function () {
1212
var defaultPostCodeResolver;
13-
1413
beforeEach(function () {
1514
defaultPostCodeResolver = DefaultPostCodeResolver;
15+
window.checkoutConfig = {
16+
defaultPostcode: '19800'
17+
};
1618
});
1719

1820
it('resolve', function () {
19-
expect(defaultPostCodeResolver.resolve()).toBe(undefined);
21+
expect(defaultPostCodeResolver.resolve()).toBeUndefined();
22+
});
23+
it('resolve with using default code', function () {
24+
defaultPostCodeResolver.setUseDefaultPostCode(true);
25+
expect(defaultPostCodeResolver.resolve()).toEqual('19800');
2026
});
2127
});
28+
2229
});

0 commit comments

Comments
 (0)