Merge branch 'ACP2E-1229' of https://github.com/magento-l3/magento2ce into PR-01-10-2023

Author: chittima

app/code/Magento/Checkout/view/frontend/web/js/model/payment-service.js

@@ -50,13 +50,18 @@ define([
             }
 
             filteredMethods = _.without(methods, freeMethod);
-
             if (filteredMethods.length === 1) {
                 selectPaymentMethod(filteredMethods[0]);
             } else if (quote.paymentMethod()) {
                 methodIsAvailable = methods.some(function (item) {
                     return item.method === quote.paymentMethod().method;
                 });
+
+                if (!methodIsAvailable && !_.isEmpty(window.checkoutConfig.vault)) {
+                    methodIsAvailable = Object.keys(window.checkoutConfig.payment.vault)
+                        .findIndex((vaultPayment) => vaultPayment === quote.paymentMethod().method) !== -1;
+                }
+
                 //Unset selected payment method if not available
                 if (!methodIsAvailable) {
                     selectPaymentMethod(null);

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/payment-service.test.js

@@ -0,0 +1,85 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire',
+    'ko'
+], function (Squire, ko) {
+    'use strict';
+
+    let injector = new Squire(),
+        paymentService,
+        methods = [
+            {title: 'Credit Card', method: 'credit_card'},
+            {title: 'Stored Cards', method: 'credit_card_vault'}
+        ],
+        mocksPaymentMethodCheckmo = {
+            'Magento_Checkout/js/model/quote': {
+                paymentMethod: ko.observable({
+                    'method': 'checkmo'
+                })
+            }
+        },
+        mocksPaymentMethodVault = {
+            'Magento_Checkout/js/model/quote': {
+                paymentMethod: ko.observable({
+                    'method': 'credit_card_vault_1'
+                })
+            }
+        };
+
+    beforeEach(function (done) {
+        window.checkoutConfig = {
+            vault: {
+                credit_card_vault: {}
+            },
+            payment: {
+                vault: {
+                    credit_card_vault_1: {},
+                    credit_card_vault_2: {}
+                }
+            }
+        };
+        done();
+    });
+
+    afterEach(function () {
+        try {
+            injector.remove();
+            injector.clean();
+        } catch (e) {}
+    });
+
+    describe('Magento_Checkout/js/model/payment-service', function () {
+        beforeEach(function (done) {
+            injector.mock(mocksPaymentMethodCheckmo);
+            // eslint-disable-next-line max-nested-callbacks
+            injector.require(['Magento_Checkout/js/model/payment-service'], function (instance) {
+                paymentService = instance;
+                done();
+            });
+        });
+        it('payment method is not enabled', function () {
+            paymentService.setPaymentMethods(methods);
+            expect(mocksPaymentMethodCheckmo['Magento_Checkout/js/model/quote'].paymentMethod()).toBeNull();
+        });
+    });
+
+    describe('Magento_Checkout/js/model/payment-service', function () {
+        beforeEach(function (done) {
+            injector.mock(mocksPaymentMethodVault);
+            // eslint-disable-next-line max-nested-callbacks
+            injector.require(['Magento_Checkout/js/model/payment-service'], function (instance) {
+                paymentService = instance;
+                done();
+            });
+        });
+        it('payment method is stored credit card', function () {
+            paymentService.setPaymentMethods(methods);
+            expect(mocksPaymentMethodVault['Magento_Checkout/js/model/quote'].paymentMethod().method)
+                .toEqual('credit_card_vault_1');
+        });
+    });
+});