Skip to content

Commit 7e0af8b

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

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ define([], function () {
1616
*
1717
* @returns {String|undefined}
1818
*/
19-
resolve: function ()
20-
{
19+
resolve: function () {
2120
return useDefaultPostCode ? window.checkoutConfig.defaultPostcode : undefined;
2221
},
2322

@@ -27,8 +26,7 @@ define([], function () {
2726
* @param {Boolean} shouldUseDefaultPostCode
2827
* @returns {underscore}
2928
*/
30-
setUseDefaultPostCode: function (shouldUseDefaultPostCode)
31-
{
29+
setUseDefaultPostCode: function (shouldUseDefaultPostCode) {
3230
useDefaultPostCode = shouldUseDefaultPostCode;
3331

3432
return this;

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ define([
1010

1111
describe('checkout/js/model/default-post-code-resolver', function () {
1212
var defaultPostCodeResolver;
13+
1314
beforeEach(function () {
1415
defaultPostCodeResolver = DefaultPostCodeResolver;
1516
window.checkoutConfig = {

0 commit comments

Comments
 (0)