Skip to content

Commit 20ed919

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'MAGETWO-45603' into bugfixes
2 parents 7abfdb4 + 7774b70 commit 20ed919

File tree

1 file changed

+16
-5
lines changed
  • app/code/Magento/Sales/view/adminhtml/web/order/create

1 file changed

+16
-5
lines changed

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,11 +1152,22 @@ define([
11521152
jQuery('#edit_form').triggerHandler('save');
11531153
}
11541154
if (this.orderItemChanged) {
1155-
if (confirm('You have item changes')) {
1156-
disableAndSave();
1157-
} else {
1158-
this.itemsUpdate();
1159-
}
1155+
var self = this;
1156+
1157+
jQuery('#edit_form').trigger('processStop');
1158+
1159+
confirm({
1160+
content: jQuery.mage.__('You have item changes'),
1161+
actions: {
1162+
confirm: function() {
1163+
jQuery('#edit_form').trigger('processStart');
1164+
disableAndSave();
1165+
},
1166+
cancel: function() {
1167+
self.itemsUpdate();
1168+
}
1169+
}
1170+
});
11601171
} else {
11611172
disableAndSave();
11621173
}

0 commit comments

Comments
 (0)