VP-1948: Fix possible null reference exception

VirtoCommerce · Apr 17, 2020 · c65e38b · c65e38b
1 parent e5e9f21
commit c65e38b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/assets/js/common-components/paymentMethods.js b/assets/js/common-components/paymentMethods.js
@@ -19,7 +19,10 @@ storefrontApp.component('vcPaymentMethods', {
                 ctrl.availPaymentMethods = _.sortBy(methods, function (x) { return x.priority; });
                 if (ctrl.paymentMethod) {
                     ctrl.paymentMethod = _.findWhere(ctrl.availPaymentMethods, { code: ctrl.paymentMethod.code });
-                    ctrl.selectMethod(ctrl.paymentMethod);
+
+                    if (ctrl.paymentMethod) {
+                        ctrl.selectMethod(ctrl.paymentMethod);
+                    }
                 }
                 if (!ctrl.paymentMethod && ctrl.availPaymentMethods.length > 0) {
                     ctrl.selectMethod(ctrl.availPaymentMethods[0]);