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] 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 b224c96f07e..1d67b325e01 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 7246460382f..205496ee8ac 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> -- GitLab