Payment Method Condition Update

degica · Mar 20, 2023 · 63ef463 · 63ef463
1 parent b3ae375
commit 63ef463
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/cartridges/app_komoju_controllers/cartridge/controllers/COBilling.js b/cartridges/app_komoju_controllers/cartridge/controllers/COBilling.js
@@ -121,13 +121,11 @@ function returnToForm(cart, params) {
             Object.keys(currentPaymentMethod).forEach(function (paymentMethodKey) {
                 var method = {};
                 var object = currentPaymentMethod[paymentMethodKey];
-                method.ID = object.id;
-                method.subTypes = object.subTypes;
-                method.displayName = object.displayValue[locale];
-                method.enabled = object.enabled;
-                if (method.enabled !== undefined && method.enabled === true && method.ID !== 'credit_card') {
-                    allPaymentMethod.push(method);
-                } else if (method.enabled !== undefined && method.enabled === true && method.ID === 'credit_card' && object.currency === currency) {
+                if (object.enabled !== undefined && object.enabled === true && object.currency === currency) {
+                    method.ID = object.id;
+                    method.subTypes = object.subTypes;
+                    method.displayName = object.displayValue[locale];
+                    method.enabled = object.enabled;
                     allPaymentMethod.push(method);
                 }
             });

diff --git a/cartridges/int_komoju_sfra/cartridge/controllers/Checkout.js b/cartridges/int_komoju_sfra/cartridge/controllers/Checkout.js
@@ -84,13 +84,13 @@ server.prepend(
                 Object.keys(currentPaymentMethod).forEach(function (paymentMethodKey) {
                     var method = {};
                     var object = currentPaymentMethod[paymentMethodKey];
-                    method.ID = object.id;
-                    method.subTypes = object.subTypes;
-                    method.displayName = object.displayValue[locale];
-                    method.enabled = object.enabled;
-                    if (object.enabled !== undefined && object.enabled === true && object.id !== 'credit_card') {
+                    if (object.enabled !== undefined && object.enabled === true && object.currency === currency) {
+                        method.ID = object.id;
+                        method.subTypes = object.subTypes;
+                        method.displayName = object.displayValue[locale];
+                        method.enabled = object.enabled;
                         allPaymentMethods.push(method);
-                    } else if (object.enabled !== undefined && object.enabled === true && object.id === 'credit_card' && object.currency === currency) { allPaymentMethods.push(method); }
+                    }
                 });
             });
         }