Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update major npm dependencies (major) #146

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

19 changes: 0 additions & 19 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ repos:
hooks:
- id: check-branch-name
args:
- "-r^((chore|ci|dependabot|devx|docs|feature|fix|release|hotfix|hotfix-backport|infra|other|perf|refactor|security|test)\/.+|(snyk)-.+|main|HEAD|develop)$$"
- "-r^((chore|ci|dependabot|devx|docs|feature|fix|release|hotfix|hotfix-backport|infra|other|perf|refactor|security|test|renovate)\/.+|(snyk)-.+|main|HEAD|develop)$$"
6 changes: 0 additions & 6 deletions cartridges/int_alma/cartridge/controllers/.eslintrc.json

This file was deleted.

14 changes: 6 additions & 8 deletions cartridges/int_alma/cartridge/controllers/Alma.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var server = require('server');
var logger = require('dw/system/Logger').getLogger('alma');

Expand Down Expand Up @@ -122,14 +120,14 @@ server.get('PaymentSuccess', function (req, res, next) {
var paymentHelper = require('*/cartridge/scripts/helpers/almaPaymentHelper');
var orderHelper = require('*/cartridge/scripts/helpers/almaOrderHelper');
var configHelper = require('*/cartridge/scripts/helpers/almaConfigHelper');
var paymentObj = null;
var paymentObj;

try {
paymentObj = buildPaymentObj(req.querystring.pid);
} catch (e) {
res.setStatusCode(500);
res.render('error', {
message: 'Can not find any payment for this order. Your order will fail.'
message: 'Can not find any payment for this order. Your order will fail. Error message: ' + e.toString()
});
return next();
}
Expand Down Expand Up @@ -168,7 +166,7 @@ server.get('PaymentSuccess', function (req, res, next) {
buildViewParams(paymentObj, order, req.locale.id, req.currentCustomer.profile)
);

req.session.raw.custom.orderID = req.querystring.pid; // eslint-disable-line no-param-reassign
req.session.raw.custom.orderID = req.querystring.pid;

return next();
});
Expand Down Expand Up @@ -201,7 +199,7 @@ server.get('IPN', function (req, res, next) {
var orderHelper = require('*/cartridge/scripts/helpers/almaOrderHelper');
var almaSecurityHelper = require('*/cartridge/scripts/helpers/almaSecurityHelper');
var almaHelpers = require('*/cartridge/scripts/helpers/almaHelpers');
var paymentObj = null;
var paymentObj;
var paymentId = req.querystring.pid;
var signature = req.httpHeaders.get('X-Alma-Signature');

Expand All @@ -220,7 +218,7 @@ server.get('IPN', function (req, res, next) {
} catch (e) {
res.setStatusCode(500);
res.render('error', {
message: 'Can not find any payment for this order. Your order will fail.'
message: 'Can not find any payment for this order. Your order will fail. Error message: ' + e.toString()
});
return next();
}
Expand Down Expand Up @@ -319,7 +317,7 @@ server.post('CreatePaymentUrl', server.middleware.https, function (req, res, nex
} catch (e) {
res.setStatusCode(500);
res.render('error', {
message: 'Could not create payment on Alma side'
message: 'Could not create payment on Alma side. Error message: ' + e.toString()
});
}
return next();
Expand Down
2 changes: 0 additions & 2 deletions cartridges/int_alma/cartridge/controllers/Cart.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var server = require('server');

server.extend(module.superModule);
Expand Down
2 changes: 0 additions & 2 deletions cartridges/int_alma/cartridge/controllers/Checkout.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var server = require('server');

/**
Expand Down
2 changes: 0 additions & 2 deletions cartridges/int_alma/cartridge/controllers/Product.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var server = require('server');
var almaWidgetHelper = require('*/cartridge/scripts/helpers/almaWidgetHelper');

Expand Down
2 changes: 0 additions & 2 deletions cartridges/int_alma/cartridge/models/order.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var base = module.superModule;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* format address for eligibility service
* @param {dw.order.OrderAddress} address the customer address
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Resource = require('dw/web/Resource');
var formatCurrency = require('*/cartridge/scripts/util/formatting').formatCurrency;
var isOnShipmentPaymentEnabled = require('*/cartridge/scripts/helpers/almaOnShipmentHelper').isOnShipmentPaymentEnabled;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Site = require('dw/system/Site');

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var logger = require('dw/system/Logger').getLogger('alma');
var formatAddress = require('*/cartridge/scripts/helpers/almaAddressHelper').formatAddress;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Site = require('dw/system/Site');
var System = require('dw/system/System');
var logger = require('dw/system/Logger').getLogger('alma');
Expand Down Expand Up @@ -50,7 +48,7 @@ function addHeaders(service) {
*/
function getUrl(path) {
if (typeof path === 'undefined') {
path = ''; // eslint-disable-line no-param-reassign
path = '';
}

var url = Site.getCurrent().getCustomPreferenceValue('ALMA_APIUrl') + path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* Returns true if 'On shipment' payment is Enabled
* @param {number} installmentsCount number of installments
Expand All @@ -8,7 +6,7 @@
*/
function isOnShipmentPaymentEnabled(installmentsCount, deferredDays) {
var Site = require('dw/system/Site');
deferredDays = (typeof deferredDays !== 'undefined') ? deferredDays : 0; // eslint-disable-line no-param-reassign
deferredDays = (typeof deferredDays !== 'undefined') ? deferredDays : 0;

var getAllowedPlans = require('*/cartridge/scripts/helpers/almaPlanHelper').getAllowedPlans;
var find = require('*/cartridge/scripts/helpers/almaUtilsHelper').find;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Transaction = require('dw/system/Transaction');

/**
Expand All @@ -9,7 +7,6 @@ var Transaction = require('dw/system/Transaction');
*/
function addPidToOrder(order, pid) {
Transaction.wrap(function () {
// eslint-disable-next-line no-param-reassign
order.custom.almaPaymentId = pid;
});
}
Expand All @@ -21,7 +18,6 @@ function addPidToOrder(order, pid) {
*/
function addAlmaPaymentDetails(order, payDetail) {
Transaction.wrap(function () {
// eslint-disable-next-line no-param-reassign
order.custom.ALMA_ResponseDetails = payDetail;
});
}
Expand All @@ -35,14 +31,12 @@ function addAlmaPaymentDetails(order, payDetail) {
function setAlmaDeferredCaptureFields(order, deferredCaptureStatus, amount) {
if (amount) {
Transaction.wrap(function () {
// eslint-disable-next-line no-param-reassign
order.custom.ALMA_Deferred_Capture_Status = deferredCaptureStatus;
order.custom.ALMA_Deferred_Capture_Partial_Amount_Captured = amount;
order.custom.ALMA_Deferred_Capture_Partial_Amount = null;
});
} else {
Transaction.wrap(function () {
// eslint-disable-next-line no-param-reassign
order.custom.ALMA_Deferred_Capture_Status = deferredCaptureStatus;
order.custom.ALMA_Deferred_Capture_Partial_Amount = null;
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var pkg = require('../../../package.json');

var CAPTURE = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Site = require('dw/system/Site');
var logger = require('dw/system/Logger').getLogger('alma');
var almaUtilsHelpers = require('*/cartridge/scripts/helpers/almaUtilsHelper');
Expand All @@ -23,7 +21,7 @@ function getFeePlans() {
try {
return JSON.parse(plansString);
} catch (e) {
logger.error('Configuration Error, please run \'npm run build:sitepref\' and import site_template.zip again.');
logger.error('Configuration Error, please run \'npm run build:sitepref\' and import site_template.zip again. Error message: ' + e.toString());
}
return [];
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* Get product id
* @param {Object} product product
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* @param {dw.order.Order} order order to refund
* @param {int|null} amount amount for refund
Expand Down Expand Up @@ -54,11 +52,10 @@ exports.refundPaymentForOrder = function (order, amount) {
}

Transaction.wrap(function () {
// eslint-disable-next-line no-param-reassign
order.custom.almaRefundedAmount += amount ? Math.round(amount) : order.getTotalGrossPrice();
// eslint-disable-next-line no-param-reassign

order.custom.almaWantedRefundAmount = 0;
// eslint-disable-next-line no-param-reassign

order.custom.almaRefundType = null;
});
};
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Mac = require('dw/crypto/Mac');
var Encoding = require('dw/crypto/Encoding');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* A forOf function to mimic for..of . :')
* @param {array|Object} iterable any iterable item
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Site = require('dw/system/Site');
var almaHelpers = require('*/cartridge/scripts/helpers/almaHelpers');
var utils = require('*/cartridge/scripts/helpers/almaUtilsHelper');
Expand Down
2 changes: 0 additions & 2 deletions cartridges/int_alma/cartridge/scripts/helpers/request.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var URLUtils = require('dw/web/URLUtils');
var pkg = require('../../../package.json');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var Resource = require('dw/web/Resource');
var Transaction = require('dw/system/Transaction');
var OrderMgr = require('dw/order/OrderMgr');
Expand Down Expand Up @@ -77,7 +75,7 @@ function Authorize(orderNumber, paymentInstrument, paymentProcessor) {
} catch (e) {
error = true;
serverErrors.push(
Resource.msg('error.technical', 'checkout', null)
Resource.msg('error.technical Error message: ' + e.toString(), 'checkout', null)
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* Verifies the required information for billing form is provided.
* @param {Object} req - The request object
Expand Down
20 changes: 9 additions & 11 deletions cartridges/int_alma/cartridge/scripts/services/alma.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var LocalServiceRegistry = require('dw/svc/LocalServiceRegistry');
var almaHelpers = require('*/cartridge/scripts/helpers/almaHelpers');

Expand All @@ -16,7 +14,7 @@ function createPayment() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v1/payments'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand All @@ -39,7 +37,7 @@ function triggerPayment() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/trigger'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/trigger');
almaHelpers.addHeaders(service);
},
parseResponse: function (svc, client) {
Expand All @@ -60,7 +58,7 @@ function getPaymentDetails() {
*/
createRequest: function (service, params) {
service.setRequestMethod('GET');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid);
almaHelpers.addHeaders(service);
},
parseResponse: function (svc, client) {
Expand All @@ -82,7 +80,7 @@ function checkEligibility() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v2/payments/eligibility'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v2/payments/eligibility');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand All @@ -106,7 +104,7 @@ function refundPayment() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/refunds'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/refunds');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand All @@ -130,7 +128,7 @@ function flagAsPotentialFraud() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/potential-fraud'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/potential-fraud');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand All @@ -154,7 +152,7 @@ function setOrderMerchantReferenceAPI() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/orders'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.pid + '/orders');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand All @@ -178,7 +176,7 @@ function captures() {
*/
createRequest: function (service, params) {
service.setRequestMethod('POST');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.external_id + '/captures'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.external_id + '/captures');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand All @@ -202,7 +200,7 @@ function cancelAlmaPayment() {
*/
createRequest: function (service, params) {
service.setRequestMethod('PUT');
service.URL = almaHelpers.getUrl('/v1/payments/' + params.external_id + '/cancel'); // eslint-disable-line no-param-reassign
service.URL = almaHelpers.getUrl('/v1/payments/' + params.external_id + '/cancel');
almaHelpers.addHeaders(service);

return JSON.stringify(params);
Expand Down
6 changes: 0 additions & 6 deletions cartridges/int_alma/cartridge/scripts/steps/.eslintrc.json

This file was deleted.

Loading
Loading