Hotfix #2405

Author: pkarw

core/modules/checkout/components/Payment.ts

@@ -32,7 +32,7 @@ export const Payment = {
   },
   created () {
     if (!this.payment.paymentMethod || this.notInMethods(this.payment.paymentMethod)) {
-      this.payment.paymentMethod = this.paymentMethods[0].code
+      this.payment.paymentMethod = this.paymentMethods.length > 0 ? this.paymentMethods[0].code : 'cashondelivery'
     }
   },
   mounted () {

core/modules/checkout/store/payment/index.ts

@@ -6,7 +6,7 @@ import rootStore from '@vue-storefront/store'
 export const paymentModule: Module<PaymentState, RootState> = {
   namespaced: true,
   state: {
-    methods: [{"code":"cashondelivery","title":"Cash On Delivery","is_server_method":true}]
+    methods: [{"code":"cashondelivery","title":"Cash On Delivery","is_server_method":false}]
   },
   mutations: {
     addMethod (state, paymentMethod) {

src/modules/payment-backend-methods/hooks/afterRegistration.ts

@@ -22,7 +22,7 @@ export function afterRegistration({ Vue, config, store, isServer }) {
     // Mount the info component when required.
     Vue.prototype.$bus.$on('checkout-payment-method-changed', (paymentMethodCode) => {
       let methods = store.state['payment-backend-methods'].methods
-      if (methods !== null && methods.find(item => item.code === paymentMethodCode)) {
+      if (methods !== null && methods.find(item => (item.code === paymentMethodCode && item.is_server_method === true))) {
         correctPaymentMethod = true
       } else {
         correctPaymentMethod = false

src/modules/payment-cash-on-delivery/hooks/afterRegistration.ts

@@ -15,13 +15,16 @@ export function afterRegistration({ Vue, config, store, isServer }) {
       'cost': 0,
       'costInclTax': 0,
       'default': true,
-      'offline': true
+      'offline': true,
+      'is_server_method': false
     }
     rootStore.dispatch('payment/addMethod', paymentMethodConfig)
 
     // Mount the info component when required.
     Vue.prototype.$bus.$on('checkout-payment-method-changed', (paymentMethodCode) => {
-      if (paymentMethodCode === 'cashondelivery') {
+      let methods = store.state['payment-backend-methods'].methods
+      let method = methods.find(item => (item.code === paymentMethodCode))
+      if (paymentMethodCode === 'cashondelivery' && ((typeof method !== 'undefined' && !method.is_server_method) || typeof method === 'undefined') /* otherwise it could be a `payment-backend-methods` module */) {
         // Register the handler for what happens when they click the place order button.
         Vue.prototype.$bus.$on('checkout-before-placeOrder', placeOrder)