Skip to content

Commit 1cc2f3d

Browse files
committed
MAGETWO-91560: Cannot add address when editing Billing Address during checkout
- Fixed css class name for js component initialization
1 parent 8c1bd4c commit 1cc2f3d

File tree

1 file changed

+20
-12
lines changed
  • app/code/Magento/Multishipping/view/frontend/templates/checkout/address

1 file changed

+20
-12
lines changed

app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,49 @@
1010
?>
1111
<div class="multicheckout">
1212
<div class="block block-billing">
13-
<?php foreach ($block->getAddress() as $_address): ?>
13+
<?php foreach ($block->getAddress() as $address): ?>
1414
<div class="box box-billing-address">
1515
<div class="box-content">
1616
<address>
17-
<?= $block->getAddressAsHtml($_address) ?>
18-
<?php if ($block->isAddressDefaultBilling($_address)): ?>
19-
<br /><strong><?= /* @escapeNotVerified */ __('Default Billing') ?></strong>
17+
<?= $block->getAddressAsHtml($address) ?>
18+
<?php if ($block->isAddressDefaultBilling($address)): ?>
19+
<br /><strong><?= $block->escapeHtml(__('Default Billing')); ?></strong>
2020
<?php endif; ?>
21-
<?php if ($block->isAddressDefaultShipping($_address)): ?>
22-
<br /><strong><?= /* @escapeNotVerified */ __('Default Shipping') ?></strong>
21+
<?php if ($block->isAddressDefaultShipping($address)): ?>
22+
<br /><strong><?= $block->escapeHtml(__('Default Shipping')); ?></strong>
2323
<?php endif; ?>
2424
</address>
2525
</div>
2626
<div class="box-actions">
27-
<a href="<?= /* @escapeNotVerified */ $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Address') ?></span></a>
28-
<a href="<?= /* @escapeNotVerified */ $block->getSetAddressUrl($_address) ?>" class="action select"><span><?= /* @escapeNotVerified */ __('Select Address') ?></span></a>
27+
<a href="<?= $block->escapeUrl($block->getEditAddressUrl($address)); ?>" class="action edit">
28+
<span><?= $block->escapeHtml(__('Edit Address')); ?></span>
29+
</a>
30+
<a href="<?= $block->escapeUrl($block->getSetAddressUrl($address)); ?>" class="action select">
31+
<span><?= $block->escapeHtml(__('Select Address')); ?></span>
32+
</a>
2933
</div>
3034
</div>
3135
<?php endforeach; ?>
3236
</div>
3337
<div class="actions-toolbar">
3438
<div class="primary">
35-
<button type="button" class="action add primary" role="add-address" title="<?= /* @escapeNotVerified */ __('Add New Address') ?>"><span><?= /* @escapeNotVerified */ __('Add New Address') ?></span></button>
39+
<button type="button" class="action add primary" role="add-address" title="<?= $block->escapeHtml(__('Add New Address')); ?>">
40+
<span><?= $block->escapeHtml(__('Add New Address')); ?></span>
41+
</button>
3642
</div>
3743
<div class="secondary">
38-
<a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
44+
<a href="<?= $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
45+
<span><?= $block->escapeHtml(__('Back to Billing Information')); ?></span>
46+
</a>
3947
</div>
4048
</div>
4149
</div>
4250
<script type="text/x-magento-init">
4351
{
44-
".actions": {
52+
".action": {
4553
"address": {
4654
"addAddress": "button[role='add-address']",
47-
"addAddressLocation": "<?= /* @escapeNotVerified */ $block->getAddNewUrl() ?>"
55+
"addAddressLocation": "<?= $block->escapeUrl($block->getAddNewUrl()); ?>"
4856
}
4957
}
5058
}

0 commit comments

Comments
 (0)