Skip to content

fixed issue #18724 for 2.3-develop #19177

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

Closed
wants to merge 9 commits into from
Closed

fixed issue #18724 for 2.3-develop #19177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21c9183
fixed issue #18724 for 2.3-develop
Nov 12, 2018
6d60eb2
update notation
Nov 21, 2018
3e306c4
Merge branch '2.3-develop' of https://github.com/Shubham-Webkul/magen…
Nov 21, 2018
b00cfbd
Merge branch '2.3-develop' of https://github.com/Shubham-Webkul/magen…
Dec 13, 2018
4619843
Merge branch '2.3-develop' of https://github.com/Shubham-Webkul/magen…
Dec 19, 2018
d42410a
fixed $ sign in percent
Dec 19, 2018
f1cacc4
fixed travis CI issue
Dec 20, 2018
339ce18
fixed conflict
Feb 28, 2019
9a393e9
Update tax.js
Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/code/Magento/Catalog/view/base/web/js/price-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ define([
s = amount < 0 ? '-' : isShowSign ? '+' : '';
} else if (isShowSign === false) {
s = '';
pattern = '%s';
}
pattern = pattern.indexOf('{sign}') < 0 ? s + pattern : pattern.replace('{sign}', s);

Expand Down
6 changes: 5 additions & 1 deletion app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ define([
return priceUtils.formatPrice(price, quote.getPriceFormat());
},

getFormattedPriceWithoutSign: function (price) {
return priceUtils.formatPrice(price, quote.getPriceFormat(), false);
},

/**
* @return {*}
*/
Expand All @@ -39,4 +43,4 @@ define([
return stepNavigator.isProcessed('shipping');
}
});
});
});
6 changes: 2 additions & 4 deletions app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

// @codingStandardsIgnoreFile

?>
<?php
$_order = $block->getOrder();
Expand All @@ -26,7 +24,7 @@
<td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
<?= $block->escapeHtml($title) ?>
<?php if (!is_null($percent)): ?>
(<?= (float)$percent ?>%)
(<?= /* @noEscape */ $_order->getOrderCurrency()->formatTxt((float)$percent, ['display' => \Magento\Framework\Currency::NO_SYMBOL]) ?>%)
<?php endif; ?>
<br />
</td>
Expand Down Expand Up @@ -54,4 +52,4 @@
<td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
<?= /* @escapeNotVerified */ $_order->formatPrice($_source->getTaxAmount()) ?>
</td>
</tr>
</tr>
25 changes: 3 additions & 22 deletions app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,11 @@ define([
},

/**
* @param {*} parent
* @param {*} percentage
* @param {*} percent
* @return {*|String}
*/
getTaxAmount: function (parent, percentage) {
var totalPercentage = 0;

taxAmount = parent.amount;
rates = parent.rates;
_.each(rates, function (rate) {
totalPercentage += parseFloat(rate.percent);
});

return this.getFormattedPrice(this.getPercentAmount(taxAmount, totalPercentage, percentage));
},

/**
* @param {*} amount
* @param {*} totalPercentage
* @param {*} percentage
* @return {*|String}
*/
getPercentAmount: function (amount, totalPercentage, percentage) {
return parseFloat(amount * percentage / totalPercentage);
formatTxt: function (percent) {
return this.getFormattedPriceWithoutSign(percent);
},

/**
Expand Down
26 changes: 14 additions & 12 deletions app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,24 @@
<!-- ko foreach: rates -->
<tr class="totals-tax-details">
<!-- ko if: percent -->
<th class="mark" scope="row" data-bind="text: title + ' (' + percent + '%)'"></th>
<th class="mark" scope="row" data-bind="text: title + ' (' + $parents[1].formatTxt(percent) + '%)'"></th>
<!-- /ko -->
<!-- ko if: !percent -->
<th class="mark" scope="row" data-bind="text: title"></th>
<!-- /ko -->
<td class="amount">
<!-- ko if: $parents[1].isCalculated() -->
<span class="price"
data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
<!-- /ko -->
<!-- ko ifnot: $parents[1].isCalculated() -->
<span class="not-calculated"
data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
<!-- /ko -->
</td>
<!-- ko if: $index() == 0 -->
<td class="amount">
<!-- ko if: $parents[1].isCalculated() -->
<span class="price"
data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
<!-- /ko -->
<!-- ko ifnot: $parents[1].isCalculated() -->
<span class="not-calculated"
data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
<!-- /ko -->
</td>
<!-- /ko -->
</tr>
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->
<!-- /ko -->