From 21c91835de2311fdca848a1ea847fc60bdab0db0 Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Mon, 12 Nov 2018 23:20:57 +0530
Subject: [PATCH 1/5] fixed issue #18724 for 2.3-develop

---
 app/code/Magento/Tax/view/frontend/templates/order/tax.phtml    | 2 +-
 .../Tax/view/frontend/web/template/checkout/summary/tax.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index b329f00973b5a..38f5ba3169854 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -26,7 +26,7 @@
                 <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
                     <?php if (!is_null($percent)): ?>
-                        (<?= (float)$percent ?>%)
+                        (<?= /* @escapeNotVerified */ $_order->formatPrice((float)$percent) ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
index 0f2e3251bcfdb..b40edd068bffe 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
@@ -38,7 +38,7 @@
         <!-- 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].formatPrice(percent) + '%)'"></th>
             <!-- /ko -->
             <!-- ko if: !percent -->
                 <th class="mark" scope="row" data-bind="text: title"></th>

From 6d60eb22e1afcd6ab4425cf0bcddde276ad0ac20 Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Thu, 22 Nov 2018 00:55:48 +0530
Subject: [PATCH 2/5] update notation

---
 app/code/Magento/Tax/view/frontend/templates/order/tax.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index 38f5ba3169854..092b6be2a7a5b 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -26,7 +26,7 @@
                 <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
                     <?php if (!is_null($percent)): ?>
-                        (<?= /* @escapeNotVerified */ $_order->formatPrice((float)$percent) ?>%)
+                        (<?= /* @noEscape */ $_order->formatPrice((float)$percent) ?>%)
                     <?php endif; ?>
                     <br />
                 </td>

From d42410a4d643e1091e80ac512c9e018c3c97bf85 Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Wed, 19 Dec 2018 23:48:56 +0530
Subject: [PATCH 3/5] fixed $ sign in percent

---
 app/code/Magento/Catalog/view/base/web/js/price-utils.js  | 1 +
 .../view/frontend/web/js/view/summary/abstract-total.js   | 4 ++++
 .../Magento/Tax/view/frontend/templates/order/tax.phtml   | 2 +-
 .../Tax/view/frontend/web/js/view/checkout/summary/tax.js | 8 ++++++++
 .../view/frontend/web/template/checkout/summary/tax.html  | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/base/web/js/price-utils.js b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
index e2ea42f7d5fe3..7a5f4124e5140 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-utils.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
@@ -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);
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
index 2ca829abd72f7..3743db2c96191 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
@@ -20,6 +20,10 @@ define([
         getFormattedPrice: function (price) {
             return priceUtils.formatPrice(price, quote.getPriceFormat());
         },
+        
+        getFormattedPriceWithoutSign: function (price) {
+            return priceUtils.formatPrice(price, quote.getPriceFormat(), false);
+        },
 
         /**
          * @return {*}
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index 092b6be2a7a5b..c33b9974531eb 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -26,7 +26,7 @@
                 <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
                     <?php if (!is_null($percent)): ?>
-                        (<?= /* @noEscape */ $_order->formatPrice((float)$percent) ?>%)
+                        (<?= /* @noEscape */ $_order->getOrderCurrency()->formatTxt((float)$percent, ['display' => \Magento\Framework\Currency::NO_SYMBOL]) ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
index b21be98531ba9..c6be23aeb7d89 100644
--- a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
+++ b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
@@ -97,6 +97,14 @@ define([
         formatPrice: function (amount) {
             return this.getFormattedPrice(amount);
         },
+        
+        /**
+         * @param {*} percent
+         * @return {*|String}
+         */
+        formatTxt: function (percent) {
+            return this.getFormattedPriceWithoutSign(percent);
+        },
 
         /**
          * @return {Array}
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
index b40edd068bffe..4756fca71bc96 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
@@ -38,7 +38,7 @@
         <!-- ko foreach: rates -->
         <tr class="totals-tax-details">
             <!-- ko if: percent -->
-                <th class="mark" scope="row" data-bind="text: title + ' (' + $parents[1].formatPrice(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>

From f1cacc4669912bbc0a08f69ab8f513a8ac85a681 Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Thu, 20 Dec 2018 23:56:19 +0530
Subject: [PATCH 4/5] fixed travis CI issue

---
 .../view/frontend/web/js/view/summary/abstract-total.js     | 6 +++++-
 .../Tax/view/frontend/web/js/view/checkout/summary/tax.js   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
index 3743db2c96191..c46e1d798ae3f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/abstract-total.js
@@ -20,7 +20,11 @@ define([
         getFormattedPrice: function (price) {
             return priceUtils.formatPrice(price, quote.getPriceFormat());
         },
-        
+
+        /**
+         * @param {*} price
+         * @return {*|String}
+         */
         getFormattedPriceWithoutSign: function (price) {
             return priceUtils.formatPrice(price, quote.getPriceFormat(), false);
         },
diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
index c6be23aeb7d89..2b5813edd628e 100644
--- a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
+++ b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
@@ -97,7 +97,7 @@ define([
         formatPrice: function (amount) {
             return this.getFormattedPrice(amount);
         },
-        
+
         /**
          * @param {*} percent
          * @return {*|String}

From 9a393e9b1b2737bbfbf9e68332281b3b3b544710 Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Sat, 2 Mar 2019 00:06:11 +0530
Subject: [PATCH 5/5] Update tax.js

---
 .../web/js/view/checkout/summary/tax.js       | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
index bd54d3e1befe9..18726e2c5acef 100644
--- a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
+++ b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
@@ -102,38 +102,11 @@ define([
         },
 
         /**
-<<<<<<< HEAD
          * @param {*} percent
          * @return {*|String}
          */
         formatTxt: function (percent) {
             return this.getFormattedPriceWithoutSign(percent);
-=======
-         * @param {*} parent
-         * @param {*} percentage
-         * @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);
->>>>>>> a5330a77625445ebc4552eaf3e7c34d44b26d2b2
         },
 
         /**