Skip to content

Commit e6ff98d

Browse files
committed
AC-7865::Unable to Place Order via Admin - Unknown or expired payment_method_n
1 parent 328d3d5 commit e6ff98d

File tree

2 files changed

+10
-43
lines changed

2 files changed

+10
-43
lines changed

app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<?php $scriptString = <<<script
1212
require(["Magento_Sales/order/create/form"], function(){
1313
order.setCurrencySymbol('{$block->escapeJs($block->getCurrencySymbol($block->getCurrentCurrencyCode()))}')
14+
order.setCustomerId('{$block->escapeJs($block->getCustomerId())}');
15+
order.quoteId = '{$block->escapeJs($block->getQuote()->getId())}';
1416
});
1517
script;
1618
?>

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

Lines changed: 8 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,26 @@ define([
139139
$(this.getAreaId('header')).callback = 'setCustomerAfter';
140140
$('back_order_top_button').hide();
141141
$('reset_order_top_button').show();
142-
this.loadArea(['header', 'data'], true);
143142
},
144143

145144
setCustomerAfter: function () {
146145
this.customerSelectorHide();
147146
if (this.storeId) {
148147
$(this.getAreaId('data')).callback = 'dataLoaded';
149-
this.loadArea(['data'], true);
148+
$(this.getAreaId('form')).callback = 'dataLoaded';
149+
this.loadArea(['data', 'form'], true);
150150
} else {
151151
this.storeSelectorShow();
152152
}
153153
},
154154

155-
setStoreId: function (id) {
155+
setStoreId: function (id) {
156156
this.storeId = id;
157157
this.storeSelectorHide();
158158
this.sidebarShow();
159-
//this.loadArea(['header', 'sidebar','data'], true);
159+
this.loadArea(['header', 'sidebar','data'], true);
160160
this.dataShow();
161-
this.loadArea(['header', 'data'], true);
161+
/// this.loadArea(['header', 'data', 'form'], true);
162162
},
163163

164164
setCurrencyId: function (id) {
@@ -507,7 +507,7 @@ define([
507507
this.loadArea(['card_validation'], true, data);
508508
},
509509

510-
setPaymentMethod: function (method) {
510+
setPaymentMethod: function (method) {
511511
if (this.paymentMethod && $('payment_form_' + this.paymentMethod)) {
512512
var form = 'payment_form_' + this.paymentMethod;
513513
[form + '_before', form, form + '_after'].each(function (el) {
@@ -1164,42 +1164,7 @@ define([
11641164
}
11651165
},
11661166

1167-
loadArea: function (area, indicator, params) {
1168-
var deferred = new jQuery.Deferred();
1169-
var url = this.loadBaseUrl;
1170-
if (area) {
1171-
area = this.prepareArea(area);
1172-
url += 'block/' + area;
1173-
}
1174-
if (indicator === true) indicator = 'html-body';
1175-
params = this.prepareParams(params);
1176-
params.json = true;
1177-
if (!this.loadingAreas) this.loadingAreas = [];
1178-
if (indicator) {
1179-
this.loadingAreas = area;
1180-
new Ajax.Request(url, {
1181-
parameters: params,
1182-
loaderArea: indicator,
1183-
onSuccess: function (transport) {
1184-
var response = transport.responseText.evalJSON();
1185-
this.loadAreaResponseHandler(response);
1186-
deferred.resolve();
1187-
}.bind(this)
1188-
});
1189-
} else {
1190-
new Ajax.Request(url, {
1191-
parameters: params,
1192-
loaderArea: indicator,
1193-
onSuccess: function (transport) {
1194-
deferred.resolve();
1195-
}
1196-
});
1197-
}
1198-
if (typeof productConfigure != 'undefined' && area instanceof Array && area.indexOf('items') != -1) {
1199-
productConfigure.clean('quote_items');
1200-
}
1201-
return deferred.promise();
1202-
},
1167+
12031168

12041169
loadAreaResponseHandler: function (response) {
12051170
if (response.error) {
@@ -1273,7 +1238,7 @@ define([
12731238
return 'order-' + area;
12741239
},
12751240

1276-
prepareParams: function (params) {
1241+
prepareParams: function (params) {
12771242
if (!params) {
12781243
params = {};
12791244
}

0 commit comments

Comments
 (0)