Skip to content

Commit 6bd63e3

Browse files
author
Oleksandr Gorkun
committed
MC-33823: Merge CE, EE and B2B changes
1 parent cd58d3d commit 6bd63e3

File tree

6 files changed

+8
-40
lines changed

6 files changed

+8
-40
lines changed

‎app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ $_item = $block->getItem();
2424
</span>
2525

2626
<?php if ($weeeHelper->getApplied($_item)): ?>
27-
<span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>">
28-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
29-
'display: none',
30-
'div#esubtotal-item-tax-details' . (int) $item->getId()
31-
) ?>
27+
<span class="cart-tax-info no-display" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>">
3228
<?php if ($block->displayPriceWithWeeeDetails()): ?>
3329
<?php foreach ($weeeHelper->getApplied($_item) as $tax): ?>
3430
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">

‎app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $_weeeHelper = $block->getData('weeeHelper');
2424
</span>
2525

2626
<?php if ($_weeeHelper->getApplied($_item)): ?>
27-
<span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>">
27+
<span class="cart-tax-info no-display" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>">
2828
<?php if ($block->displayPriceWithWeeeDetails()): ?>
2929
<?php foreach ($_weeeHelper->getApplied($_item) as $tax): ?>
3030
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
@@ -33,10 +33,6 @@ $_weeeHelper = $block->getData('weeeHelper');
3333
<?php endforeach; ?>
3434
<?php endif; ?>
3535
</span>
36-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
37-
'display: none',
38-
'div#subtotal-item-tax-details' . (int) $item->getId()
39-
) ?>
4036

4137
<?php if ($block->displayFinalPrice()): ?>
4238
<span class="cart-tax-total"

‎app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ $_item = $block->getItem();
2424
<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
2525
</span>
2626
<?php if ($weeeHelper->getApplied($_item)): ?>
27-
<span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>">
28-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
29-
'display: none',
30-
'span#eunit-item-tax-details' . (int) $item->getId()
31-
) ?>
27+
<span class="cart-tax-info no-display" id="eunit-item-tax-details<?= (int) $_item->getId() ?>">
3228
<?php if ($block->displayPriceWithWeeeDetails()): ?>
3329
<?php foreach ($weeeHelper->getApplied($_item) as $tax): ?>
3430
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">

‎app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $_weeeHelper = $block->getData('weeeHelper');
2525
</span>
2626

2727
<?php if ($_weeeHelper->getApplied($_item)): ?>
28-
<span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>">
28+
<span class="cart-tax-info no-display" id="unit-item-tax-details<?= (int) $_item->getId() ?>">
2929
<?php if ($block->displayPriceWithWeeeDetails()): ?>
3030
<?php foreach ($_weeeHelper->getApplied($_item) as $tax): ?>
3131
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
@@ -34,10 +34,6 @@ $_weeeHelper = $block->getData('weeeHelper');
3434
<?php endforeach; ?>
3535
<?php endif; ?>
3636
</span>
37-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
38-
'display: none',
39-
'span#unit-item-tax-details' . (int) $item->getId()
40-
) ?>
4137

4238
<?php if ($block->displayFinalPrice()): ?>
4339
<span class="cart-tax-total"

‎app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,13 @@ $item = $block->getItem();
2626
</span>
2727

2828
<?php if ($weeeHelper->getApplied($item)): ?>
29-
<div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>">
29+
<div class="cart-tax-info no-display" id="subtotal-item-tax-details<?= (int) $item->getId() ?>">
3030
<?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
3131
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
3232
<?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
3333
</span>
3434
<?php endforeach; ?>
3535
</div>
36-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
37-
'display: none',
38-
'div#subtotal-item-tax-details' . (int) $item->getId()
39-
) ?>
4036

4137
<?php if ($block->displayFinalPrice()): ?>
4238
<span class="cart-tax-total"
@@ -63,17 +59,13 @@ $item = $block->getItem();
6359
</span>
6460

6561
<?php if ($weeeHelper->getApplied($item)): ?>
66-
<span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>">
62+
<span class="cart-tax-info no-display" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>">
6763
<?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
6864
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
6965
<?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
7066
</span>
7167
<?php endforeach; ?>
7268
</span>
73-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
74-
'display: none',
75-
'div#esubtotal-item-tax-details' . (int) $item->getId()
76-
) ?>
7769

7870
<?php if ($block->displayFinalPrice()): ?>
7971
<span class="cart-tax-total"

‎app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,13 @@ $item = $block->getItem();
2626
</span>
2727

2828
<?php if ($weeeHelper->getApplied($item)): ?>
29-
<span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>">
29+
<span class="cart-tax-info no-display" id="unit-item-tax-details<?= (int) $item->getId() ?>">
3030
<?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
3131
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
3232
<?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
3333
</span>
3434
<?php endforeach; ?>
3535
</span>
36-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
37-
'display: none',
38-
'span#unit-item-tax-details' . (int) $item->getId()
39-
) ?>
4036

4137
<?php if ($block->displayFinalPrice()): ?>
4238
<span class="cart-tax-total"
@@ -62,17 +58,13 @@ $item = $block->getItem();
6258
</span>
6359

6460
<?php if ($weeeHelper->getApplied($item)): ?>
65-
<span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>">
61+
<span class="cart-tax-info no-display" id="eunit-item-tax-details<?= (int) $item->getId() ?>">
6662
<?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
6763
<span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
6864
<?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
6965
</span>
7066
<?php endforeach; ?>
7167
</span>
72-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
73-
'display: none',
74-
'span#eunit-item-tax-details' . (int) $item->getId()
75-
) ?>
7668
<?php if ($block->displayFinalPrice()): ?>
7769
<span class="cart-tax-total"
7870
data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?=(int)$item->getId()?>"}}'>

0 commit comments

Comments
 (0)