lint fixes

MONEI · Aug 15, 2023 · d463744 · d463744
1 parent 751ad3d
commit d463744
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 81 deletions.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -9,7 +9,7 @@
         "scss/at-import-no-partial-leading-underscore": true,
         "scss/at-import-partial-extension-blacklist": ["scss"],
         "scss/dollar-variable-no-missing-interpolation": true,
-        "scss/media-feature-value-dollar-variable": "always",
+        "scss/media-feature-value-dollar-variable": "never",
         "scss/selector-no-redundant-nesting-selector": true,
         "at-rule-empty-line-before": [ "always", { "ignoreAtRules": ["else"], "ignore": ["blockless-after-same-name-blockless", "inside-block"] } ],
         "block-closing-brace-newline-after": [ "always", { "ignoreAtRules": ["if", "else"] } ]

diff --git a/cartridges/int_monei_sfra/cartridge/client/default/js/checkout.js b/cartridges/int_monei_sfra/cartridge/client/default/js/checkout.js
@@ -5,4 +5,4 @@ var processInclude = require('base/util');
 $(document).ready(function () { // eslint-disable-line
     processInclude(require('./checkout/checkout'));
     processInclude(require('./monei/moneiCheckout'));
-});
+});
diff --git a/cartridges/int_monei_sfra/cartridge/client/default/js/checkout/billing.js b/cartridges/int_monei_sfra/cartridge/client/default/js/checkout/billing.js
@@ -13,7 +13,7 @@ function updatePaymentInformation(order) {
 
     if (order.billing.payment && order.billing.payment.selectedPaymentInstruments
         && order.billing.payment.selectedPaymentInstruments.length > 0) {
-        if (order.billing.payment.selectedPaymentInstruments[0].paymentMethod == "CREDIT_CARD") {
+        if (order.billing.payment.selectedPaymentInstruments[0].paymentMethod === 'CREDIT_CARD') {
             htmlToAppend += '<span>' + order.resources.cardType + ' '
                 + order.billing.payment.selectedPaymentInstruments[0].type
                 + '</span>';
@@ -23,19 +23,19 @@ function updatePaymentInformation(order) {
                     + order.billing.payment.selectedPaymentInstruments[0].maskedCreditCardNumber
                     + '</div>';
             }
-            if(order.billing.payment.selectedPaymentInstruments[0].expirationMonth && order.billing.payment.selectedPaymentInstruments[0].expirationYear){
+            if (order.billing.payment.selectedPaymentInstruments[0].expirationMonth && order.billing.payment.selectedPaymentInstruments[0].expirationYear) {
                 htmlToAppend += '<div><span>'
                 + order.resources.cardEnding + ' '
                 + order.billing.payment.selectedPaymentInstruments[0].expirationMonth
                 + '/' + order.billing.payment.selectedPaymentInstruments[0].expirationYear
                 + '</span></div>';
             }
-        } else if (order.billing.payment.selectedPaymentInstruments[0].paymentMethod.toLowerCase().indexOf("monei") > -1) {
+        } else if (order.billing.payment.selectedPaymentInstruments[0].paymentMethod.toLowerCase().indexOf('monei') > -1) {
             htmlToAppend += '<div><span>'
                 + order.billing.payment.selectedPaymentInstruments[0].paymentMethodName
                 + '</span></div>';
 
-            if (typeof order.billing.payment.selectedPaymentInstruments[0].amount !== "undefined") {
+            if (typeof order.billing.payment.selectedPaymentInstruments[0].amount !== 'undefined') {
                 htmlToAppend += '<div><span>'
                     + order.billing.payment.selectedPaymentInstruments[0].formattedAmount
                     + '</span></div>';

diff --git a/cartridges/int_monei_sfra/cartridge/client/default/js/monei/moneiCheckout.js b/cartridges/int_monei_sfra/cartridge/client/default/js/monei/moneiCheckout.js
@@ -12,7 +12,7 @@ var confirmationPaymentErrorStatus = [
 ];
 
 function moneiTokenHandler(token, selector) {
-    $container = $(selector);
+    var $container = $(selector);
 
     $container.find('[name="dwfrm_billing_moneiPaymentFields_moneiToken"]').val(token);
     $container.find('[name="dwfrm_billing_moneiPaymentFields_moneiAmount"]').val(moneiOrderData.amount);
@@ -41,6 +41,31 @@ function initBizum() {
     bizum.render('#monei-bizum-content .monei-bizum-button-container');
 }
 
+function initPaymentrequest() {
+    if (paymentrequest) {
+        paymentrequest.close();
+    }
+
+    paymentrequest = monei.PaymentRequest({ // eslint-disable-new-cap
+        accountId: $('[name="monei_id"]').val(),
+        sessionId: $('[name="dwfrm_billing_moneiPaymentFields_moneiSessionID"]').val(),
+        amount: moneiOrderData.amount,
+        currency: moneiOrderData.currency,
+        language: $('[name="monei_lang"]').val(),
+        onSubmit(result) {
+            $('.card-paymentMethod-type').prop('disabled', true);
+            $('.prequest-paymentMethod-type').prop('disabled', false);
+            moneiTokenHandler(result.token, '.monei-card-content');
+            $('.submit-payment').trigger('click');
+        },
+        onError(error) {
+            $('.monei-error').html(error);
+            $('.monei-error').show();
+        }
+    });
+    paymentrequest.render('#monei-card-content .monei-paymentrequest-button-container');
+}
+
 function initCard() {
     if (card) {
         card.close();
@@ -74,41 +99,15 @@ function initCard() {
     }
 }
 
-
-function initPaymentrequest() {
-    if (paymentrequest) {
-        paymentrequest.close();
-    }
-
-    paymentrequest = monei.PaymentRequest({ // eslint-disable-new-cap
-        accountId: $('[name="monei_id"]').val(),
-        sessionId: $('[name="dwfrm_billing_moneiPaymentFields_moneiSessionID"]').val(),
-        amount: moneiOrderData.amount,
-        currency: moneiOrderData.currency,
-        language: $('[name="monei_lang"]').val(),
-        onSubmit(result) {
-            $('.card-paymentMethod-type').prop('disabled', true);
-            $('.prequest-paymentMethod-type').prop('disabled', false);
-            moneiTokenHandler(result.token, '.monei-card-content');
-            $('.submit-payment').trigger('click');
-        },
-        onError(error) {
-            $('.monei-error').html(error);
-            $('.monei-error').show();
-        }
-    });
-    paymentrequest.render('#monei-card-content .monei-paymentrequest-button-container');
-}
-
-function manageCardForm () {
-    $('#monei-card-content .monei-card-name-input input').off('focus').on('focus', function() {
+function manageCardForm() {
+    $('#monei-card-content .monei-card-name-input input').off('focus').on('focus', function () {
         $('#monei-card-content .monei-card-name-input').addClass('is-focused');
     });
-    $('#monei-card-content .monei-card-name-input input').off('blur').on('blur', function() {
+    $('#monei-card-content .monei-card-name-input input').off('blur').on('blur', function () {
         $('#monei-card-content .monei-card-name-input').removeClass('is-focused');
     });
-    $('#monei-card-content .monei-card-name-input input').off('change.validation blur.validation').on('change.validation blur.validation', function() {
-        if ($('#monei-card-content .monei-card-name-input input').val() === "") {
+    $('#monei-card-content .monei-card-name-input input').off('change.validation blur.validation').on('change.validation blur.validation', function () {
+        if ($('#monei-card-content .monei-card-name-input input').val() === '') {
             $('#monei-card-content .monei-card-name-input').addClass('is-invalid');
             $('#monei-card-content .monei-error').html($('#monei-card-content .monei-card-name-input input').data('missing-error'));
         } else {
@@ -128,7 +127,7 @@ function manageCardForm () {
                 e.stopImmediatePropagation();
                 window.localStorage.setItem('monei_card_payment', true);
 
-                if ($('#monei-card-content .monei-card-name-input input').val() == '') {
+                if ($('#monei-card-content .monei-card-name-input input').val() === '') {
                     $('#monei-card-content .monei-card-name-input').addClass('is-invalid');
                     $('#monei-card-content .monei-error').html($('#monei-card-content .monei-card-name-input input').data('missing-error'));
                     window.localStorage.removeItem('monei_card_payment');
@@ -199,7 +198,7 @@ function managePaymentSelections() {
         });
 
         setTimeout(function () {
-            if ($("[data-checkout-stage]").attr("data-checkout-stage") === "payment") {
+            if ($('[data-checkout-stage]').attr('data-checkout-stage') === 'payment') {
                 var $submitPaymentBtn = $('.submit-payment');
                 if ($(e.target).hasClass('active')) {
                     var currentPaymentId = $(e.target).parent().attr('data-method-id').toLowerCase();
@@ -297,7 +296,7 @@ function switchPlaceOrderBtn() {
     }
 }
 
-function failCreatedOrderAsync(orderId, restoreBasket, statusCode = "", statusMessage = "") {
+function failCreatedOrderAsync(orderId, restoreBasket, statusCode = '', statusMessage = '') {
     if ($('[name="monei_failOrderEndpoint"]').length > 0) {
         $.ajax({
             url: $('[name="monei_failOrderEndpoint"]').val(),
@@ -336,17 +335,6 @@ function placeCreatedOrderAsync(result, orderId) {
             },
             success: function (data) {
                 if (!data.error) {
-                    var continueUrl = data.continueUrl;
-                    var urlParams = {
-                        ID: data.orderId,
-                        token: data.orderToken ? data.orderToken : null
-                    };
-
-                    continueUrl += (continueUrl.indexOf('?') !== -1 ? '&' : '?') +
-                        Object.keys(urlParams).map(function (key) {
-                            return key + '=' + encodeURIComponent(urlParams[key]);
-                        }).join('&');
-
                     if (result.nextAction && result.nextAction.mustRedirect) {
                         window.location.href = result.nextAction.redirectUrl;
                     } else {
@@ -373,7 +361,8 @@ function moneiComponentConfirmPayment(data) {
         paymentId: data.orderMoneiPaymentId,
         paymentToken: data.orderMoneiToken,
         language: $('[name="monei_lang"]').val()
-    }
+    };
+
     if (Object.hasOwnProperty.call(data, 'orderMoneiCreditCardHolder') && data.orderMoneiCreditCardHolder) {
         payload.paymentMethod = {
             card: {

diff --git a/cartridges/int_monei_sfra/cartridge/client/default/scss/monei.scss b/cartridges/int_monei_sfra/cartridge/client/default/scss/monei.scss
@@ -49,7 +49,7 @@
     }
 
     .monei-card-input {
-        background-color: #FFFFFF;
+        background-color: #fff;
     }
 }
 

diff --git a/cartridges/int_monei_sfra/cartridge/controllers/Monei.js b/cartridges/int_monei_sfra/cartridge/controllers/Monei.js
@@ -100,11 +100,11 @@ server.post('failOrder', function (req, res, next) {
         if (!result) {
             var Transaction = require('dw/system/Transaction');
             session.custom.moneiErrorMessage = Resource.msg('error.technical', 'checkout', null);
-            session.custom.moneiErrorStatusCode = req.form.statusCode ? req.form.statusCode : "";
+            session.custom.moneiErrorStatusCode = req.form.statusCode ? req.form.statusCode : '';
             if (req.form.statusCode) {
                 session.custom.moneiErrorStatusMessage = Resource.msg('label.statuscode.' + req.form.statusCode, 'moneistatuscodes', null);
             } else {
-                session.custom.moneiErrorStatusMessage = req.form.statusMessage ? req.form.statusMessage : "";
+                session.custom.moneiErrorStatusMessage = req.form.statusMessage ? req.form.statusMessage : '';
             }
 
             Transaction.wrap(function () {

diff --git a/cartridges/int_monei_sfra/cartridge/models/payment.js b/cartridges/int_monei_sfra/cartridge/models/payment.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var PaymentMgr = require('dw/order/PaymentMgr');
-var PaymentInstrument = require('dw/order/PaymentInstrument');
 var StringUtils	= require('dw/util/StringUtils');
 var collections = require('*/cartridge/scripts/util/collections');
 

diff --git a/cartridges/int_monei_sfra/cartridge/scripts/helpers/moneiHelper.js b/cartridges/int_monei_sfra/cartridge/scripts/helpers/moneiHelper.js
@@ -155,27 +155,29 @@ function createPaymentPayload(currentBasket, paymentInformation) {
 
 function updateOrderPaymentAttributes(paymentInfo, order) {
     var Transaction = require('dw/system/Transaction');
-    if (Object.hasOwnProperty.call(paymentInfo, "card")) {
+    var currentOrder = order;
+
+    if (Object.hasOwnProperty.call(paymentInfo, 'card')) {
         Transaction.wrap(function () {
-            if (Object.hasOwnProperty.call(paymentInfo.card, "brand")) {
-                order.custom.moneiBrand = paymentInfo.card.brand;
+            if (Object.hasOwnProperty.call(paymentInfo.card, 'brand')) {
+                currentOrder.custom.moneiBrand = paymentInfo.card.brand;
             }
-            if (Object.hasOwnProperty.call(paymentInfo.card, "tokenizationMethod")) {
-                order.custom.moneiType = paymentInfo.card.tokenizationMethod;
-            } else if (Object.hasOwnProperty.call(paymentInfo.card, "type")) {
-                order.custom.moneiType = paymentInfo.card.type;
+            if (Object.hasOwnProperty.call(paymentInfo.card, 'tokenizationMethod')) {
+                currentOrder.custom.moneiType = paymentInfo.card.tokenizationMethod;
+            } else if (Object.hasOwnProperty.call(paymentInfo.card, 'type')) {
+                currentOrder.custom.moneiType = paymentInfo.card.type;
             }
-            if (Object.hasOwnProperty.call(paymentInfo.card, "cardholderName")) {
-                order.custom.moneiCardHolder = paymentInfo.card.cardholderName;
+            if (Object.hasOwnProperty.call(paymentInfo.card, 'cardholderName')) {
+                currentOrder.custom.moneiCardHolder = paymentInfo.card.cardholderName;
             }
-            if (Object.hasOwnProperty.call(paymentInfo.card, "last4")) {
-                order.custom.moneiLastfour = paymentInfo.card["last4"];
+            if (Object.hasOwnProperty.call(paymentInfo.card, 'last4')) {
+                currentOrder.custom.moneiLastfour = paymentInfo.card.last4;
             }
         });
-    } else if (Object.hasOwnProperty.call(paymentInfo, "bizum")) {
+    } else if (Object.hasOwnProperty.call(paymentInfo, 'bizum')) {
         Transaction.wrap(function () {
-            if (Object.hasOwnProperty.call(paymentInfo.bizum, "phoneNumber")) {
-                order.custom.moneiPhoneNumber = paymentInfo.bizum.phoneNumber;
+            if (Object.hasOwnProperty.call(paymentInfo.bizum, 'phoneNumber')) {
+                currentOrder.custom.moneiPhoneNumber = paymentInfo.bizum.phoneNumber;
             }
         });
     }

diff --git a/cartridges/int_monei_sfra/cartridge/scripts/helpers/moneiOrderHelper.js b/cartridges/int_monei_sfra/cartridge/scripts/helpers/moneiOrderHelper.js
@@ -91,14 +91,14 @@ function cancelOrFailOrder(order) {
     var error = false;
 
     if (order) {
-        if (order.getStatus() != Order.ORDER_STATUS_FAILED && order.getStatus() != Order.ORDER_STATUS_CANCELLED) {
-            if (order.getStatus() == Order.ORDER_STATUS_CREATED) {
+        if (order.getStatus() !== Order.ORDER_STATUS_FAILED && order.getStatus() !== Order.ORDER_STATUS_CANCELLED) {
+            if (order.getStatus() === Order.ORDER_STATUS_CREATED) {
                 Transaction.wrap(function () {
                     order.addNote('Monei', 'failing order');
                     OrderMgr.failOrder(order, true);
                     session.custom.moneiErrorMessage = Resource.msg('error.technical', 'checkout', null);
                 });
-            } else if (order.getStatus() != Order.ORDER_STATUS_CREATED && order.getStatus() != Order.ORDER_STATUS_FAILED) {
+            } else if (order.getStatus() !== Order.ORDER_STATUS_CREATED && order.getStatus() !== Order.ORDER_STATUS_FAILED) {
                 Transaction.wrap(function () {
                     order.addNote('Monei', 'cancelling order');
                     OrderMgr.cancelOrder(order);
@@ -117,14 +117,14 @@ function undoCancelOrFailOrder(order) {
     var error = true;
 
     if (!empty(order)) {
-        if (order.getStatus() == Order.ORDER_STATUS_FAILED) {
+        if (order.getStatus() === Order.ORDER_STATUS_FAILED) {
             Transaction.wrap(function () {
                 order.addNote('Monei', 'undoing fail order');
                 OrderMgr.undoFailOrder(order);
                 error = false;
             });
         }
-        if (order.getStatus() == Order.ORDER_STATUS_CANCELLED) {
+        if (order.getStatus() === Order.ORDER_STATUS_CANCELLED) {
             Transaction.wrap(function () {
                 order.addNote('Monei', 'undoing cancel order');
                 OrderMgr.undoCancelOrder(order);
@@ -143,7 +143,7 @@ function placeOrder(order, currentLocale, paymentResult, paymentMethod, restoreB
     if (order) {
         undoCancelOrFailOrder(order);
 
-        if (order.getStatus() == Order.ORDER_STATUS_CREATED) {
+        if (order.getStatus() === Order.ORDER_STATUS_CREATED) {
             var handlePaymentResult = COHelpers.handlePayments(order, order.orderNo);
             if (handlePaymentResult.error) {
                 return {
@@ -176,7 +176,7 @@ function placeOrder(order, currentLocale, paymentResult, paymentMethod, restoreB
             });
         }
 
-        if (paymentMethod.method == 'card' && Object.prototype.hasOwnProperty.call(paymentMethod, 'card')) {
+        if (paymentMethod.method === 'card' && Object.prototype.hasOwnProperty.call(paymentMethod, 'card')) {
             Transaction.wrap(function () {
                 if (Object.prototype.hasOwnProperty.call(paymentMethod.card, 'brand')) {
                     order.paymentInstrument.setCreditCardType(paymentMethod.card.brand);

diff --git a/cartridges/int_monei_sfra/cartridge/scripts/hooks/payment/processor/bizum/monei_processor.js b/cartridges/int_monei_sfra/cartridge/scripts/hooks/payment/processor/bizum/monei_processor.js
@@ -41,7 +41,6 @@ function Handle(basket, paymentInformation) {
 }
 
 function Authorize(orderNumber, paymentInstrument, paymentProcessor) {
-    var Resource = require('dw/web/Resource');
     var OrderMgr = require('dw/order/OrderMgr');
     var serverErrors = [];
     var error = false;

diff --git a/cartridges/int_monei_sfra/cartridge/scripts/hooks/payment/processor/card/monei_processor.js b/cartridges/int_monei_sfra/cartridge/scripts/hooks/payment/processor/card/monei_processor.js
@@ -41,7 +41,6 @@ function Handle(basket, paymentInformation) {
 }
 
 function Authorize(orderNumber, paymentInstrument, paymentProcessor) {
-    var Resource = require('dw/web/Resource');
     var OrderMgr = require('dw/order/OrderMgr');
     var serverErrors = [];
     var error = false;

diff --git a/...nt_monei_sfra/cartridge/scripts/hooks/payment/processor/paymentrequest/monei_processor.js b/...nt_monei_sfra/cartridge/scripts/hooks/payment/processor/paymentrequest/monei_processor.js
@@ -41,7 +41,6 @@ function Handle(basket, paymentInformation) {
 }
 
 function Authorize(orderNumber, paymentInstrument, paymentProcessor) {
-    var Resource = require('dw/web/Resource');
     var OrderMgr = require('dw/order/OrderMgr');
     var serverErrors = [];
     var error = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ @@
         }
         .monei-card-input {
-            background-color: #FFFFFF;
+            background-color: #fff;
         }
     }
@@ Expand Down @@