|
58 | 58 | <input type="radio" name="shipping_method[<?= (int) $_address->getId() ?>]" value="<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" id="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" <?= ($_rate->getCode()===$block->getAddressShippingMethod($_address)) ? ' checked="checked"' : '' ?> class="radio" />
|
59 | 59 | <?php endif; ?>
|
60 | 60 | </div>
|
61 |
| - <label for="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>"><?= $block->escapeHtml($_rate->getMethodTitle()) ?> |
| 61 | + <label for="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>"> |
| 62 | + <?= $block->escapeHtml($_rate->getMethodTitle()) ?> |
62 | 63 | <?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
|
63 | 64 | <?php $_incl = $block->getShippingPrice($_address, $_rate->getPrice(), true); ?>
|
64 |
| - <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?> |
| 65 | + <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?> |
65 | 66 | <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
|
66 |
| - <?php endif; ?> |
67 |
| - <?= $block->escapeHtml($_incl) ?> |
68 |
| - <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?> |
| 67 | + <?php endif; ?> |
| 68 | + <?= $block->escapeHtml($_incl, ['span']) ?> |
| 69 | + <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?> |
| 70 | + </span> |
| 71 | + <?php endif; ?> |
| 72 | + <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?> |
| 73 | + <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"> |
| 74 | + <?= $block->escapeHtml($_excl, ['span']) ?> |
69 | 75 | </span>
|
70 |
| - <?php endif; ?> |
71 |
| - <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?> |
72 |
| - <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"><?= $block->escapeHtml($_excl) ?></span> |
73 |
| - <?php endif; ?> |
| 76 | + <?php endif; ?> |
74 | 77 | </label>
|
75 | 78 | <?php endif ?>
|
76 | 79 | </div>
|
|
80 | 83 | <?php endforeach; ?>
|
81 | 84 | </dl>
|
82 | 85 | <?php endif; ?>
|
83 |
| - <?= $block->escapeHtml($block->getItemsBoxTextAfter($_address)) ?> |
| 86 | + <?= /* @noEscape */ $block->getItemsBoxTextAfter($_address) ?> |
84 | 87 | </div>
|
85 | 88 | </div>
|
86 | 89 | <div class="box box-items">
|
|
0 commit comments