Skip to content

Commit abf11b5

Browse files
author
Cristian Partica
committed
MAGETWO-35027: FPT Attribute is displayed as required on "create Product" Backend page for countries with states
- js artifacts fix
1 parent 9671ad8 commit abf11b5

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

app/code/Magento/Weee/view/adminhtml/web/js/fpt-attribute.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ define([
2727
});
2828
},
2929
_initOptionItem: function () {
30-
var widget = this;
31-
var originalElementClass=$(widget.element).attr('class');
30+
var widget = this,
31+
isOriginalRequired = $(widget.element).hasClass('required');
3232

3333
this._on({
3434
//Add new tax item
@@ -44,7 +44,9 @@ define([
4444
//Change tax item country/state
4545
'change [data-role="select-country"]': function (event, data) {
4646
var currentElement = event.target || event.srcElement || event.currentTarget,
47-
parentElement = $(currentElement).closest('[data-role="fpt-item-row"]');
47+
parentElement = $(currentElement).closest('[data-role="fpt-item-row"]'),
48+
isCurrentRequired = $(widget.element).hasClass('required');
49+
4850
data = data || {};
4951
var updater = new RegionUpdater(
5052
parentElement.find('[data-role="select-country"]').attr('id'), null,
@@ -56,10 +58,9 @@ define([
5658
if (data.state) {
5759
parentElement.find('[data-role="select-state"]').val(data.state);
5860
}
59-
//fpt is a field with multiple sub-fields so we restore it's required status
60-
var currentElementClass=$(widget.element).attr('class');
61-
if (!originalElementClass.match(/required/) && currentElementClass.match(/required/))
62-
$(widget.element).attr('class',originalElementClass);
61+
if (!isOriginalRequired && isCurrentRequired) {
62+
$(widget.element).removeClass('required');
63+
}
6364
}
6465
});
6566

0 commit comments

Comments
 (0)