From 0b69c1a8a92c1bc3a64bb8e006ff98a2cfb58bca Mon Sep 17 00:00:00 2001
From: "chirag.p" <chirag.p@wagento.com>
Date: Sun, 7 Jan 2018 11:23:23 +0530
Subject: [PATCH 1/4] Resolved Checkout-Payment-Wrong promo code canceled issue

---
 .../view/frontend/templates/cart/coupon.phtml         |  2 +-
 .../view/frontend/web/template/payment/discount.html  | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index b224c96f07e9b..1d67b325e01c5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -24,7 +24,7 @@
                 <div class="field">
                     <label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
                     <div class="control">
-                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" />
+                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" <?php if (strlen($block->getCouponCode())): ?> disabled="disabled" <?php endif; ?> />
                     </div>
                 </div>
                 <div class="actions-toolbar">
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 7246460382fa7..205496ee8ace2 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -22,12 +22,23 @@
                         <span data-bind="i18n: 'Enter discount code'"></span>
                     </label>
                     <div class="control">
+                        <!-- ko ifnot: isApplied() -->
                         <input class="input-text"
                                type="text"
                                id="discount-code"
                                name="discount_code"
                                data-validate="{'required-entry':true}"
                                data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
+                        <!-- /ko -->
+                        <!-- ko if: isApplied() -->
+                        <input class="input-text"
+                               type="text"
+                               id="discount-code-applied"
+                               disabled="disabled"
+                               name="discount_code"
+                               data-validate="{'required-entry':true}"
+                               data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
+                        <!-- /ko -->
                     </div>
                 </div>
             </div>

From 7783300d3dec5f51a7993417ee14d747edf9b64d Mon Sep 17 00:00:00 2001
From: "chirag.p" <chirag.p@wagento.com>
Date: Sun, 7 Jan 2018 14:13:23 +0530
Subject: [PATCH 2/4] Resolved Checkout-Payment-Wrong promo code cancelled
 issue

---
 .../view/frontend/web/template/payment/discount.html  | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 205496ee8ace2..bfc4ccdda245b 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -22,23 +22,14 @@
                         <span data-bind="i18n: 'Enter discount code'"></span>
                     </label>
                     <div class="control">
-                        <!-- ko ifnot: isApplied() -->
-                        <input class="input-text"
-                               type="text"
-                               id="discount-code"
-                               name="discount_code"
-                               data-validate="{'required-entry':true}"
-                               data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
-                        <!-- /ko -->
-                        <!-- ko if: isApplied() -->
                         <input class="input-text"
+                               data-bind="attr:{disabled:isApplied()}"
                                type="text"
                                id="discount-code-applied"
                                disabled="disabled"
                                name="discount_code"
                                data-validate="{'required-entry':true}"
                                data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
-                        <!-- /ko -->
                     </div>
                 </div>
             </div>

From 78f889456137dba01c0712b7bbd98ce8049261ca Mon Sep 17 00:00:00 2001
From: "chirag.p" <chirag.p@wagento.com>
Date: Sun, 7 Jan 2018 15:06:32 +0530
Subject: [PATCH 3/4] Resolved Checkout-Payment-Wrong promo code cancelled
 issue

---
 .../view/frontend/web/template/payment/discount.html          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index bfc4ccdda245b..12ef638a02d05 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -23,13 +23,11 @@
                     </label>
                     <div class="control">
                         <input class="input-text"
-                               data-bind="attr:{disabled:isApplied()}"
                                type="text"
                                id="discount-code-applied"
-                               disabled="disabled"
                                name="discount_code"
                                data-validate="{'required-entry':true}"
-                               data-bind="value: couponCode, attr:{placeholder: $t('Enter discount code')} " />
+                               data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />
                     </div>
                 </div>
             </div>

From 1ac8ab250de45af0656c025d40cf58aa940884cb Mon Sep 17 00:00:00 2001
From: "chirag.p" <chirag.p@wagento.com>
Date: Sun, 7 Jan 2018 16:14:52 +0530
Subject: [PATCH 4/4] Resolved Checkout-Payment-Wrong promo code cancelled
 issue

---
 .../SalesRule/view/frontend/web/template/payment/discount.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 12ef638a02d05..d622b5ea5762d 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -24,7 +24,7 @@
                     <div class="control">
                         <input class="input-text"
                                type="text"
-                               id="discount-code-applied"
+                               id="discount-code"
                                name="discount_code"
                                data-validate="{'required-entry':true}"
                                data-bind="value: couponCode, attr:{disabled:isApplied() , placeholder: $t('Enter discount code')} " />