Skip to content

Update subtotal.phtml #39612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 25, 2025
Merged

Update subtotal.phtml #39612

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e1475c
Update subtotal.phtml
vkrokh Feb 10, 2025
7401e87
Merge branch '2.4-develop' into fix-typo-checkout-subtotal
engcom-Bravo Apr 10, 2025
2a1c980
Merge branch '2.4-develop' into fix-typo-checkout-subtotal
engcom-Dash Apr 11, 2025
caea1d4
Merge branch '2.4-develop' into fix-typo-checkout-subtotal
engcom-Dash Apr 11, 2025
09da3f5
Merge branch '2.4-develop' into fix-typo-checkout-subtotal
engcom-Dash Apr 14, 2025
d927d0b
Fixed Static Test Failures
engcom-Dash Apr 14, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

/**
* @var $block \Magento\Tax\Block\Checkout\Subtotal
* @see \Magento\Tax\Block\Checkout\Subtotal
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
* @var $escaper \Magento\Framework\Escaper
*/
?>
<?php
$style = $block->escapeHtmlAttr($block->getStyle());
$style = $escaper->escapeHtmlAttr($block->getStyle());
$colspan = (int) $block->getColspan();
/** @var \Magento\Checkout\Helper\Data $checkoutHelper */
$checkoutHelper = $block->getData('checkoutHelper');
?>
<?php if ($block->displayBoth()): ?>
<tr class="totals sub excl">
<th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
<?= $escaper->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
</th>
<tdclass="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
<td class="amount" data-th="<?= $escaper->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
<?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
</td>
</tr>
Expand All @@ -31,9 +32,9 @@ $checkoutHelper = $block->getData('checkoutHelper');
<?php endif; ?>
<tr class="totals sub incl">
<th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
<?= $escaper->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
</th>
<td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
<td class="amount" data-th="<?= $escaper->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
<?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueInclTax()) ?>
</td>
</tr>
Expand All @@ -44,9 +45,9 @@ $checkoutHelper = $block->getData('checkoutHelper');
<?php else: ?>
<tr class="totals sub">
<th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
<?= $escaper->escapeHtml($block->getTotal()->getTitle()) ?>
</th>
<td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
<td class="amount" data-th="<?= $escaper->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
<?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?>
</td>
</tr>
Expand Down