Skip to content

Commit 16ae95a

Browse files
author
Mike Weis
committed
Merge branch 'FearlessKiwis-MAGETWO-33961-FPT-JS-error' into develop
2 parents 48a6d4a + 7d03288 commit 16ae95a

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
$_item = $block->getItem();
1212
?>
1313
<?php if ($block->displayPriceWithWeeeDetails()): ?>
14-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
14+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
1515
<?php else: ?>
1616
<span class="cart-price">
1717
<?php endif; ?>
@@ -28,7 +28,7 @@ $_item = $block->getItem();
2828
</span>
2929

3030
<?php if ($block->displayFinalPrice()): ?>
31-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
31+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
3232
<span class="weee" data-label="<?php echo __('Total'); ?>">
3333
<?php echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
3434
</span>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
1414
?>
1515
<?php $_incl = $_item->getRowTotalInclTax(); ?>
1616
<?php if ($block->displayPriceWithWeeeDetails()): ?>
17-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
17+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
1818
<?php else: ?>
1919
<span class="cart-price">
2020
<?php endif; ?>
@@ -31,7 +31,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
3131
</span>
3232

3333
<?php if ($block->displayFinalPrice()): ?>
34-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
34+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}}'>
3535
<span class="weee" data-label="<?php echo __('Total incl. tax'); ?>">
3636
<?php echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
3737
</span>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
$_item = $block->getItem();
1212
?>
1313
<?php if ($block->displayPriceWithWeeeDetails()): ?>
14-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
14+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
1515
<?php else: ?>
1616
<span class="cart-price">
1717
<?php endif; ?>
@@ -29,7 +29,7 @@ $_item = $block->getItem();
2929
</span>
3030

3131
<?php if ($block->displayFinalPrice()): ?>
32-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
32+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
3333
<span class="weee" data-label="<?php echo __('Total'); ?>">
3434
<?php echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
3535
</span>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
1414
?>
1515
<?php $_incl = $_item->getPriceInclTax(); ?>
1616
<?php if ($block->displayPriceWithWeeeDetails()): ?>
17-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
17+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
1818
<?php else: ?>
1919
<span class="cart-price">
2020
<?php endif; ?>
@@ -32,7 +32,7 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
3232
</span>
3333

3434
<?php if ($block->displayFinalPrice()): ?>
35-
<span class="cart-tax-total" data-mage-init='{"taxtToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
35+
<span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}}'>
3636
<span class="weee" data-label="<?php echo __('Total incl. tax'); ?>">
3737
<?php echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
3838
</span>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $item = $block->getItem();
1414
<span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
1515
<?php if ($block->displayPriceWithWeeeDetails()): ?>
1616
<span class="cart-tax-total"
17-
data-mage-init='{"taxtToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
17+
data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
1818
<?php else: ?>
1919
<span class="cart-price">
2020
<?php endif; ?>
@@ -32,7 +32,7 @@ $item = $block->getItem();
3232

3333
<?php if ($block->displayFinalPrice()): ?>
3434
<span class="cart-tax-total"
35-
data-mage-init='{"taxtToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
35+
data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
3636
<span class="weee" data-label="<?php echo $block->escapeHtml(__('Total incl. tax')); ?>">
3737
<?php echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
3838
</span>
@@ -46,7 +46,7 @@ $item = $block->getItem();
4646
<span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
4747
<?php if ($block->displayPriceWithWeeeDetails()): ?>
4848
<span class="cart-tax-total"
49-
data-mage-init='{"taxtToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
49+
data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
5050
<?php else: ?>
5151
<span class="cart-price">
5252
<?php endif; ?>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $item = $block->getItem();
1414
<span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
1515
<?php if ($block->displayPriceWithWeeeDetails()): ?>
1616
<span class="cart-tax-total"
17-
data-mage-init='{"taxtToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $item->getId(); ?>"}}'>
17+
data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $item->getId(); ?>"}}'>
1818
<?php else: ?>
1919
<span class="cart-price">
2020
<?php endif; ?>
@@ -32,7 +32,7 @@ $item = $block->getItem();
3232

3333
<?php if ($block->displayFinalPrice()): ?>
3434
<span class="cart-tax-total"
35-
data-mage-init='{"taxtToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $item->getId(); ?>"}}'>
35+
data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $item->getId(); ?>"}}'>
3636
<span class="weee" data-label="<?php echo $block->escapeHtml(__('Total incl. tax')); ?>">
3737
<?php echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
3838
</span>
@@ -46,7 +46,7 @@ $item = $block->getItem();
4646
<span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
4747
<?php if ($block->displayPriceWithWeeeDetails()): ?>
4848
<span class="cart-tax-total"
49-
data-mage-init='{"taxtToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $item->getId(); ?>"}}'>
49+
data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $item->getId(); ?>"}}'>
5050
<?php else: ?>
5151
<span class="cart-price">
5252
<?php endif; ?>

0 commit comments

Comments
 (0)