From f59bc17a78570e4c62015b558b24b42094a6e17c Mon Sep 17 00:00:00 2001
From: shubham sharma <shubhamsharma@shubhams-MacBook-Air.local>
Date: Tue, 9 Oct 2018 01:29:02 +0530
Subject: [PATCH 1/3] fixed issue #18082

---
 .../adminhtml/web/js/variations/variations.js | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
index be290e49a43c3..4e49ac4649ac8 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -406,17 +406,20 @@ define([
          *   - configurable-matrix-serialized;
          *   - associated_product_ids_serialized.
          */
-        serializeData: function () {
-            this.source.data['configurable-matrix-serialized'] =
-                JSON.stringify(this.source.data['configurable-matrix']);
-
-            delete this.source.data['configurable-matrix'];
-
-            this.source.data['associated_product_ids_serialized'] =
-                JSON.stringify(this.source.data['associated_product_ids']);
-
-            delete this.source.data['associated_product_ids'];
-        },
+         serializeData: function () {
+             this.source.data['configurable-matrix-serialized'] =
+                 JSON.stringify(this.source.data['configurable-matrix']);
+             if ($('.admin__field-error').length===0) {
+                 delete this.source.data['configurable-matrix'];
+             }
+
+
+             this.source.data['associated_product_ids_serialized'] =
+                 JSON.stringify(this.source.data['associated_product_ids']);
+             if ($('.admin__field-error').length===0) {
+                 delete this.source.data['associated_product_ids'];
+             }
+         },
 
         /**
          * Check for newly added attributes

From a32b10ea3c4deb1c58e7c9c62cd9a8d72788cb7c Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Sat, 27 Oct 2018 02:20:53 +0530
Subject: [PATCH 2/3] Fixed issue #18724

---
 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..e5ee8a5da57b3 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 ?>%)
+                        (<?= $_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 4ce6db536383bd1d2dd4fe4c3060c771d76920ef Mon Sep 17 00:00:00 2001
From: Shubham Sharma <Shubham.Sharma967@webkul.com>
Date: Sun, 28 Oct 2018 00:55:47 +0530
Subject: [PATCH 3/3] Fixed travis CI issue

---
 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 e5ee8a5da57b3..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)): ?>
-                        (<?= $_order->formatPrice((float)$percent) ?>%)
+                        (<?= /* @escapeNotVerified */ $_order->formatPrice((float)$percent) ?>%)
                     <?php endif; ?>
                     <br />
                 </td>