Skip to content

Commit 3218166

Browse files
zakdmazakdma
committed
MC-15404: Stabilize AdminAbleToShipPartiallyInvoicedItemsTest
1 parent f3d7a0d commit 3218166

File tree

2 files changed

+67
-53
lines changed

2 files changed

+67
-53
lines changed

‎app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -136,67 +136,76 @@
136136
</section>
137137

138138
<script>
139-
require(['jquery', 'prototype'], function(jQuery){
139+
require(['jquery'], function(jQuery){
140140

141141
//<![CDATA[
142-
var submitButtons = $$('.submit-button');
143-
var updateButtons = $$('.update-button');
144-
var fields = $$('.qty-input');
142+
var submitButtons = jQuery('.submit-button');
143+
var updateButtons = jQuery('.update-button');
144+
var fields = jQuery('.qty-input');
145145

146-
updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
146+
function enableButtons(buttons) {
147+
buttons.removeClass('disabled').prop('disabled', false);
148+
}
147149

148-
for(var i=0;i<fields.length;i++){
149-
fields[i].observe('change', checkButtonsRelation)
150-
fields[i].baseValue = fields[i].value;
150+
function disableButtons(buttons) {
151+
buttons.addClass('disabled').prop('disabled', true);
151152
}
152153

154+
disableButtons(updateButtons);
155+
156+
fields.on('change', checkButtonsRelation);
157+
fields.each(function (i, elem) {
158+
elem.baseValue = elem.value;
159+
});
160+
153161
function checkButtonsRelation() {
154162
var hasChanges = false;
155-
fields.each(function (elem) {
163+
fields.each(function (i, elem) {
156164
if (elem.baseValue != elem.value) {
157165
hasChanges = true;
158166
}
159167
}.bind(this));
160168
if (hasChanges) {
161-
submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
162-
updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
169+
disableButtons(submitButtons);
170+
enableButtons(updateButtons);
163171
}
164172
else {
165-
submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
166-
updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
173+
enableButtons(submitButtons);
174+
disableButtons(updateButtons);
167175
}
168176
}
169177

170178
submitCreditMemo = function() {
171-
if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=0;
179+
var creditMemoOffline = jQuery('#creditmemo_do_offline');
180+
if (creditMemoOffline.length) {
181+
creditMemoOffline.prop('value', 0);
182+
}
172183
// Temporary solution will be replaced after refactoring order functionality
173184
jQuery('#edit_form').triggerHandler('save');
174-
}
185+
};
175186

176187
submitCreditMemoOffline = function() {
177-
if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=1;
188+
var creditMemoOffline = jQuery('#creditmemo_do_offline');
189+
if (creditMemoOffline.length) {
190+
creditMemoOffline.prop('value', 1);
191+
}
178192
// Temporary solution will be replaced after refactoring order functionality
179193
jQuery('#edit_form').triggerHandler('save');
180-
}
181-
182-
var sendEmailCheckbox = $('send_email');
194+
};
183195

184-
if (sendEmailCheckbox) {
185-
var notifyCustomerCheckbox = $('notify_customer');
186-
var creditmemoCommentText = $('creditmemo_comment_text');
187-
Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
196+
var sendEmailCheckbox = jQuery('#send_email');
197+
if (sendEmailCheckbox.length) {
198+
var notifyCustomerCheckbox = jQuery('#notify_customer');
199+
sendEmailCheckbox.on('change', bindSendEmail);
188200
bindSendEmail();
189201
}
190202

191-
function bindSendEmail()
192-
{
193-
if (sendEmailCheckbox.checked == true) {
194-
notifyCustomerCheckbox.disabled = false;
195-
//creditmemoCommentText.disabled = false;
203+
function bindSendEmail() {
204+
if (sendEmailCheckbox.prop('checked') == true) {
205+
notifyCustomerCheckbox.prop('disabled', false);
196206
}
197207
else {
198-
notifyCustomerCheckbox.disabled = true;
199-
//creditmemoCommentText.disabled = true;
208+
notifyCustomerCheckbox.prop('disabled', true);
200209
}
201210
}
202211

‎app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,56 +134,61 @@
134134
</section>
135135

136136
<script>
137-
require(['jquery', 'prototype'], function(jQuery){
137+
require(['jquery'], function(jQuery){
138138

139139
//<![CDATA[
140-
var submitButtons = $$('.submit-button');
141-
var updateButtons = $$('.update-button');
140+
var submitButtons = jQuery('.submit-button');
141+
var updateButtons = jQuery('.update-button');
142142
var enableSubmitButtons = <?= (int) !$block->getDisableSubmitButton() ?>;
143-
var fields = $$('.qty-input');
143+
var fields = jQuery('.qty-input');
144144

145-
updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
145+
function enableButtons(buttons) {
146+
buttons.removeClass('disabled').prop('disabled', false);
147+
}
146148

147-
for(var i=0;i<fields.length;i++){
148-
jQuery(fields[i]).on('keyup', checkButtonsRelation);
149-
fields[i].baseValue = fields[i].value;
149+
function disableButtons(buttons) {
150+
buttons.addClass('disabled').prop('disabled', true);
150151
}
151152

153+
disableButtons(updateButtons);
154+
155+
fields.on('keyup', checkButtonsRelation);
156+
fields.each(function (i, elem) {
157+
elem.baseValue = elem.value;
158+
});
159+
152160
function checkButtonsRelation() {
153161
var hasChanges = false;
154-
fields.each(function (elem) {
162+
fields.each(function (i, elem) {
155163
if (elem.baseValue != elem.value) {
156164
hasChanges = true;
157165
}
158166
}.bind(this));
159167
if (hasChanges) {
160-
submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
161-
updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
168+
disableButtons(submitButtons);
169+
enableButtons(updateButtons);
162170
}
163171
else {
164172
if (enableSubmitButtons) {
165-
submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
173+
enableButtons(submitButtons);
166174
}
167-
updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
175+
disableButtons(updateButtons);
168176
}
169177
}
170178

171-
var sendEmailCheckbox = $('send_email');
172-
if (sendEmailCheckbox) {
173-
var notifyCustomerCheckbox = $('notify_customer');
174-
var invoiceCommentText = $('invoice_comment_text');
175-
Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
179+
var sendEmailCheckbox = jQuery('#send_email');
180+
if (sendEmailCheckbox.length) {
181+
var notifyCustomerCheckbox = jQuery('#notify_customer');
182+
sendEmailCheckbox.on('change', bindSendEmail);
176183
bindSendEmail();
177184
}
178185
function bindSendEmail()
179186
{
180-
if (sendEmailCheckbox.checked == true) {
181-
notifyCustomerCheckbox.disabled = false;
182-
//invoiceCommentText.disabled = false;
187+
if (sendEmailCheckbox.prop('checked') == true) {
188+
notifyCustomerCheckbox.prop('disabled', false);
183189
}
184190
else {
185-
notifyCustomerCheckbox.disabled = true;
186-
//invoiceCommentText.disabled = true;
191+
notifyCustomerCheckbox.prop('disabled', true);
187192
}
188193
}
189194

0 commit comments

Comments
 (0)