Skip to content

Commit 98b4b22

Browse files
author
Michael Yu
committed
MAGETWO-69657: Credit Card Information disappear after user enters promotion code
- Remove self variable, use this instead since it's in scope - Pulled isFreeMethod method out of the setter and getter function for DRY - Remove freeMethodCode var and put value inside isFreeMethod function
1 parent 3f12868 commit 98b4b22

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

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

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ define([
1212
], function (_, quote, methodList, selectPaymentMethod, utils) {
1313
'use strict';
1414

15-
var freeMethodCode = 'free';
15+
/**
16+
* Free method filter
17+
* @param {Object} method
18+
*/
19+
var isFreeMethod = function (method) {
20+
return method.method === 'free';
21+
};
1622

1723
return {
1824
isFreeAvailable: false,
@@ -25,13 +31,10 @@ define([
2531
var freeMethod,
2632
filteredMethods,
2733
methodIsAvailable,
28-
methodNames,
29-
self = this;
34+
methodNames;
3035

31-
freeMethod = _.find(methods, function (method) {
32-
return method.method === freeMethodCode;
33-
});
34-
self.isFreeAvailable = !!freeMethod;
36+
freeMethod = _.find(methods, isFreeMethod);
37+
this.isFreeAvailable = !!freeMethod;
3538

3639
if (freeMethod && quote.totals()['grand_total'] <= 0) {
3740
methods.splice(0, methods.length, freeMethod);
@@ -74,18 +77,9 @@ define([
7477
*/
7578
getAvailablePaymentMethods: function () {
7679
var allMethods = utils.copy(methodList()),
77-
grandTotalOverZero = quote.totals()['grand_total'] > 0,
78-
79-
/**
80-
* Free method filter
81-
* @param {Object} method
82-
*/
83-
isFreeMethod = function (method) {
84-
return method.method === freeMethodCode;
85-
},
86-
self = this;
80+
grandTotalOverZero = quote.totals()['grand_total'] > 0;
8781

88-
if (!self.isFreeAvailable) {
82+
if (!this.isFreeAvailable) {
8983
return allMethods;
9084
}
9185

0 commit comments

Comments
 (0)