Skip to content

hide or show the select for regions instead of enabling/disabling in customer registration #23272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2019
Merged

hide or show the select for regions instead of enabling/disabling in customer registration #23272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ define([
regionInput = $(this.options.regionInputId),
postcode = $(this.options.postcodeId),
label = regionList.parent().siblings('label'),
requiredLabel = regionList.parents('div.field');
container = regionList.parents('div.field');

this._clearError();
this._checkRegionRequired(country);
Expand All @@ -181,15 +181,16 @@ define([

if (this.options.isRegionRequired) {
regionList.addClass('required-entry').removeAttr('disabled');
requiredLabel.addClass('required');
container.addClass('required').show();
} else {
regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
requiredLabel.removeClass('required');
container.removeClass('required');

if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
regionList.attr('disabled', 'disabled');
regionList.hide();
container.hide();
} else {
regionList.removeAttr('disabled');
regionList.show();
}
}

Expand All @@ -201,12 +202,13 @@ define([

if (this.options.isRegionRequired) {
regionInput.addClass('required-entry').removeAttr('disabled');
requiredLabel.addClass('required');
container.addClass('required').show();
} else {
if (!this.options.optionalRegionAllowed) { //eslint-disable-line max-depth
regionInput.attr('disabled', 'disabled');
container.hide();
}
requiredLabel.removeClass('required');
container.removeClass('required');
regionInput.removeClass('required-entry');
}

Expand Down