Skip to content

Commit 77a203a

Browse files
committed
MAGETWO-90104: Credit Card form is no longer displayed when creating an order in the admin(enabled Braintree only)
1 parent eb09566 commit 77a203a

File tree

2 files changed

+11
-3
lines changed
  • app/code/Magento
    • Braintree/view/adminhtml/web/js
    • Sales/view/adminhtml/templates/order/create/billing/method

2 files changed

+11
-3
lines changed

app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ define([
145145
_initBraintree: function () {
146146
var self = this;
147147

148+
this.disableEventListeners();
149+
148150
self.braintree.setup(self.clientToken, 'custom', {
149151
id: self.selector,
150152
hostedFields: self.getHostedFields(),
@@ -154,6 +156,7 @@ define([
154156
*/
155157
onReady: function () {
156158
$('body').trigger('processStop');
159+
self.enableEventListeners();
157160
},
158161

159162
/**

app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
$_methods = $block->getMethods();
1313
$_methodsCount = count($_methods);
1414
$_counter = 0;
15+
$currentSelectedMethod = $block->getSelectedMethodCode();
1516
?>
1617
<?php foreach ($_methods as $_method) :
1718
$_code = $_method->getCode();
@@ -39,8 +40,8 @@
3940
</span>
4041
<?php endif;?>
4142

42-
<label class="admin__field-label"
43-
for="p_method_<?= $block->escapeHtml($_code); ?>"><?= $block->escapeHtml($_method->getTitle()) ?>
43+
<label class="admin__field-label" for="p_method_<?= $block->escapeHtml($_code); ?>">
44+
<?= $block->escapeHtml($_method->getTitle()) ?>
4445
</label>
4546
</dt>
4647
<dd class="admin__payment-method-wrapper">
@@ -55,7 +56,11 @@
5556
'Magento_Sales/order/create/form'
5657
], function(mage) {
5758
mage.apply();
58-
order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
59+
<?php if ($_methodsCount != 1) : ?>
60+
order.setPaymentMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
61+
<?php else : ?>
62+
payment.switchMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
63+
<?php endif; ?>
5964
});
6065
</script>
6166
<?php else : ?>

0 commit comments

Comments
 (0)