Skip to content

Commit 46d54c4

Browse files
committed
MAGETWO-71759: Impossible place order from admin using saved PayPal Pro credit card
- static fixes for template
1 parent fa93027 commit 46d54c4

File tree

1 file changed

+29
-18
lines changed
  • app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method

1 file changed

+29
-18
lines changed

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

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,47 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
?>
10-
<?php if ($block->hasMethods()): ?>
8+
<?php if ($block->hasMethods()) : ?>
119
<div id="order-billing_method_form">
1210
<dl class="admin__payment-methods">
1311
<?php
14-
$_methods = $block->getMethods();
15-
$_methodsCount = count($_methods);
12+
$_methods = $block->getMethods();
13+
$_methodsCount = count($_methods);
1614
$_counter = 0;
1715
?>
18-
<?php foreach ($_methods as $_method): $_code = $_method->getCode(); $_counter++; ?>
16+
<?php foreach ($_methods as $_method) :
17+
$_code = $_method->getCode();
18+
$_counter++;
19+
?>
1920
<dt class="admin__field-option">
20-
<?php if ($_methodsCount > 1): ?>
21-
<input id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" type="radio" name="payment[method]"
22-
title="<?= $block->escapeHtml($_method->getTitle()) ?>"
23-
onclick="payment.switchMethod('<?= /* @escapeNotVerified */ $_code ?>')"<?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?>
24-
class="admin__control-radio<?php if ($_counter == $_methodsCount) : ?> validate-one-required-by-name<?php endif; ?>"/>
21+
<?php if ($_methodsCount > 1) : ?>
22+
<input id="p_method_<?= $block->escapeHtml($_code); ?>"
23+
value="<?= $block->escapeHtml($_code); ?>"
24+
type="radio" name="payment[method]"
25+
title="<?= $block->escapeHtml($_method->getTitle()); ?>"
26+
onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
27+
<?php if ($block->getSelectedMethodCode() == $_code) : ?>
28+
checked="checked"
29+
<?php endif; ?>
30+
<?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
31+
class="admin__control-radio<?= $block->escapeHtml($className); ?>"/>
2532
<?php else :?>
2633
<span class="no-display">
27-
<input id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" type="radio"
34+
<input id="p_method_<?= $block->escapeHtml($_code); ?>"
35+
value="<?= $block->escapeHtml($_code); ?>"
36+
type="radio"
2837
name="payment[method]" class="admin__control-radio"
2938
checked="checked"/>
3039
</span>
3140
<?php endif;?>
3241

33-
<label class="admin__field-label" for="p_method_<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_method->getTitle()) ?></label>
42+
<label class="admin__field-label"
43+
for="p_method_<?= $block->escapeHtml($_code); ?>"><?= $block->escapeHtml($_method->getTitle()) ?>
44+
</label>
3445
</dt>
3546
<dd class="admin__payment-method-wrapper">
36-
<?= /* @escapeNotVerified */ $block->getChildHtml('payment.method.' . $_code) ?>
47+
<?= /* @noEscape */ $block->getChildHtml('payment.method.' . $_code) ?>
3748
</dd>
3849
<?php endforeach; ?>
3950
</dl>
@@ -44,11 +55,11 @@
4455
'Magento_Sales/order/create/form'
4556
], function(mage) {
4657
mage.apply();
47-
<?php if ($_methodsCount != 1):?>
48-
order.setPaymentMethod('<?= /* @escapeNotVerified */ $block->getSelectedMethodCode() ?>');
58+
<?php if ($_methodsCount != 1) : ?>
59+
order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
4960
<?php endif; ?>
5061
});
5162
</script>
52-
<?php else: ?>
53-
<div class="admin__message-empty"><?= /* @escapeNotVerified */ __('No Payment Methods') ?></div>
63+
<?php else : ?>
64+
<div class="admin__message-empty"><?= $block->escapeHtml(__('No Payment Methods')); ?></div>
5465
<?php endif; ?>

0 commit comments

Comments
 (0)