Merge remote-tracking branch 'origin/AC-12170' into spartans_pr_04072024

Author: glo60612

app/code/Magento/SalesRule/view/frontend/web/js/view/payment/captcha.js

@@ -4,65 +4,66 @@
  */
 
 define([
-        'Magento_Captcha/js/view/checkout/defaultCaptcha',
-        'Magento_Captcha/js/model/captchaList',
-        'Magento_SalesRule/js/action/set-coupon-code',
-        'Magento_SalesRule/js/action/cancel-coupon',
-        'Magento_Checkout/js/model/quote',
-        'ko'
-    ],
-    function (defaultCaptcha, captchaList, setCouponCodeAction, cancelCouponAction, quote, ko) {
-        'use strict';
+    'Magento_Captcha/js/view/checkout/defaultCaptcha',
+    'Magento_Captcha/js/model/captchaList',
+    'Magento_SalesRule/js/action/set-coupon-code',
+    'Magento_SalesRule/js/action/cancel-coupon',
+    'Magento_Checkout/js/model/quote',
+    'ko'
+], function (defaultCaptcha, captchaList, setCouponCodeAction, cancelCouponAction, quote, ko) {
+    'use strict';
 
-        var totals = quote.getTotals(),
-            couponCode = ko.observable(null),
-            isApplied;
+    return defaultCaptcha.extend({
+        /** @inheritdoc */
+        initialize: function () {
+            var self = this,
+                currentCaptcha,
+                totals = quote.getTotals(),
+                couponCode = ko.observable(null),
+                couponCodeValue,
+                isApplied;
 
-        if (totals()) {
-            couponCode(totals()['coupon_code']);
-        }
-        //Captcha can only be required for adding a coupon so we need to know if one was added already.
-        isApplied = ko.observable(couponCode() != null);
+            if (totals()) {
+                couponCode(totals()['coupon_code']);
+            }
 
-        return defaultCaptcha.extend({
-            /** @inheritdoc */
-            initialize: function () {
-                var self = this,
-                    currentCaptcha;
+            // Captcha can only be required for adding a coupon so we need to know if one was added already.
+            couponCodeValue = couponCode();
+            isApplied = ko.observable(typeof couponCodeValue === 'string' && couponCodeValue.length > 0);
 
-                this._super();
-                //Getting coupon captcha model.
-                currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+            this._super();
+            //Getting coupon captcha model.
+            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
 
-                if (currentCaptcha != null) {
-                    if (!isApplied()) {
-                        //Show captcha if we don't have a coupon applied.
-                        currentCaptcha.setIsVisible(true);
-                    }
-                    this.setCurrentCaptcha(currentCaptcha);
-                    //Add captcha code to coupon-apply request.
-                    setCouponCodeAction.registerDataModifier(function (headers) {
-                        if (self.isRequired()) {
-                            headers['X-Captcha'] = self.captchaValue()();
-                        }
-                    });
-                    //Refresh captcha after failed request.
-                    setCouponCodeAction.registerFailCallback(function () {
-                        if (self.isRequired()) {
-                            self.refresh();
-                        }
-                    });
-                    //Hide captcha when a coupon has been applied.
-                    setCouponCodeAction.registerSuccessCallback(function () {
-                        self.setIsVisible(false);
-                    });
-                    //Show captcha again if it was canceled.
-                    cancelCouponAction.registerSuccessCallback(function () {
-                        if (self.isRequired()) {
-                            self.setIsVisible(true);
-                        }
-                    });
+            if (currentCaptcha != null) {
+                if (!isApplied()) {
+                    //Show captcha if we don't have a coupon applied.
+                    currentCaptcha.setIsVisible(true);
                 }
+                this.setCurrentCaptcha(currentCaptcha);
+                //Add captcha code to coupon-apply request.
+                setCouponCodeAction.registerDataModifier(function (headers) {
+                    if (self.isRequired()) {
+                        headers['X-Captcha'] = self.captchaValue()();
+                    }
+                });
+                //Refresh captcha after failed request.
+                setCouponCodeAction.registerFailCallback(function () {
+                    if (self.isRequired()) {
+                        self.refresh();
+                    }
+                });
+                //Hide captcha when a coupon has been applied.
+                setCouponCodeAction.registerSuccessCallback(function () {
+                    self.setIsVisible(false);
+                });
+                //Show captcha again if it was canceled.
+                cancelCouponAction.registerSuccessCallback(function () {
+                    if (self.isRequired()) {
+                        self.setIsVisible(true);
+                    }
+                });
             }
-        });
+        }
     });
+});

app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js

@@ -14,32 +14,39 @@ define([
 ], function ($, ko, Component, quote, setCouponCodeAction, cancelCouponAction, coupon) {
     'use strict';
 
-    var totals = quote.getTotals(),
-        couponCode = coupon.getCouponCode(),
-        isApplied = coupon.getIsApplied();
-
-    if (totals()) {
-        couponCode(totals()['coupon_code']);
-    }
-    isApplied(couponCode() != null);
-
     return Component.extend({
         defaults: {
             template: 'Magento_SalesRule/payment/discount'
         },
-        couponCode: couponCode,
+        couponCode: coupon.getCouponCode(),
 
         /**
          * Applied flag
          */
-        isApplied: isApplied,
+        isApplied: coupon.getIsApplied(),
+
+        initialize: function () {
+            var totals = quote.getTotals(),
+                couponCode = this.couponCode,
+                isApplied = this.isApplied,
+                couponCodeValue;
+
+            if (totals()) {
+                couponCode(totals()['coupon_code']);
+            }
+
+            couponCodeValue = couponCode();
+            isApplied(typeof couponCodeValue === 'string' && couponCodeValue.length > 0);
+
+            this._super();
+        },
 
         /**
          * Coupon code application procedure
          */
         apply: function () {
             if (this.validate()) {
-                setCouponCodeAction(couponCode(), isApplied);
+                setCouponCodeAction(this.couponCode(), this.isApplied);
             }
         },
 
@@ -48,8 +55,8 @@ define([
          */
         cancel: function () {
             if (this.validate()) {
-                couponCode('');
-                cancelCouponAction(isApplied);
+                this.couponCode('');
+                cancelCouponAction(this.isApplied);
             }
         },