- {zone.country.name}
+ {zone.country?.name || 'Worldwide'}
{zone.provinces
@@ -97,6 +126,7 @@ Zone.propTypes = {
})
),
addMethodApi: PropTypes.string,
+ deleteApi: PropTypes.string,
updateApi: PropTypes.string
}).isRequired,
countries: PropTypes.arrayOf(
diff --git a/packages/evershop/src/components/admin/oms/shippingSetting/Zones.jsx b/packages/evershop/src/components/admin/oms/shippingSetting/Zones.jsx
index 57bb10c3f..9740aab22 100644
--- a/packages/evershop/src/components/admin/oms/shippingSetting/Zones.jsx
+++ b/packages/evershop/src/components/admin/oms/shippingSetting/Zones.jsx
@@ -5,7 +5,9 @@ import Zone from './Zone';
export function Zones({ countries, getZones, zones }) {
return (
<>
- {zones.map((zone) => )}
+ {zones.map((zone) => (
+
+ ))}
);
}
@@ -34,7 +36,8 @@ Zones.propTypes = {
uuid: PropTypes.string.isRequired,
name: PropTypes.string.isRequired
})
- ).isRequired
+ ).isRequired,
+ deleteApi: PropTypes.string.isRequired
})
).isRequired,
getZones: PropTypes.func.isRequired
diff --git a/packages/evershop/src/lib/event/event-manager.js b/packages/evershop/src/lib/event/event-manager.js
index 3cfbe2559..78f7eaff0 100644
--- a/packages/evershop/src/lib/event/event-manager.js
+++ b/packages/evershop/src/lib/event/event-manager.js
@@ -7,7 +7,7 @@ const { getCoreModules } = require('@evershop/evershop/bin/lib/loadModules');
const { getEnabledExtensions } = require('@evershop/evershop/bin/extension');
const { callSubscribers } = require('./callSubscibers');
const { loadSubscribers } = require('./loadSubscribers');
-const { error } = require('../log/debuger');
+const { error } = require('../log/logger');
const { lockHooks } = require('../util/hookable');
const { lockRegistry } = require('../util/registry');
diff --git a/packages/evershop/src/lib/event/loadSubscribers.js b/packages/evershop/src/lib/event/loadSubscribers.js
index dc5399fce..49072f74c 100644
--- a/packages/evershop/src/lib/event/loadSubscribers.js
+++ b/packages/evershop/src/lib/event/loadSubscribers.js
@@ -1,6 +1,6 @@
const path = require('path');
const fs = require('fs');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
function loadModuleSubscribers(modulePath) {
const subscribers = [];
@@ -46,7 +46,7 @@ module.exports.loadSubscribers = function loadSubscribers(modules) {
// Load routes
subscribers.push(...loadModuleSubscribers(module.path));
} catch (e) {
- debug('critical', e);
+ error(e);
process.exit(0);
}
});
diff --git a/packages/evershop/src/lib/log/CustomColorize.js b/packages/evershop/src/lib/log/CustomColorize.js
new file mode 100644
index 000000000..efd2266ca
--- /dev/null
+++ b/packages/evershop/src/lib/log/CustomColorize.js
@@ -0,0 +1,22 @@
+// Extend the default winston colorize format and add color to the stack trace
+const { format } = require('winston');
+const { LEVEL } = require('triple-beam');
+
+const { colorize } = format;
+
+class CustomColorize extends colorize.Colorizer {
+ constructor(opts = {}) {
+ super(opts);
+ }
+
+ transform(info, opts) {
+ super.transform(info, opts);
+ if (info.stack) {
+ // eslint-disable-next-line no-param-reassign
+ info.stack = this.colorize(info[LEVEL], info.level, info.stack);
+ }
+ return info;
+ }
+}
+
+module.exports = (opts) => new CustomColorize(opts);
diff --git a/packages/evershop/src/lib/log/debuger.js b/packages/evershop/src/lib/log/debuger.js
deleted file mode 100644
index 17dcdb80b..000000000
--- a/packages/evershop/src/lib/log/debuger.js
+++ /dev/null
@@ -1,89 +0,0 @@
-const { green, red, blue, yellow, white } = require('kleur');
-const isDevelopmentMode = require('../util/isDevelopmentMode');
-
-// Define logger function
-function debug(level, message) {
- if (isDevelopmentMode() || process.argv.includes('--debug')) {
- let logMessage = ``;
- let textMessage = `${message}`;
- // If message is an exception object, include the stack trace
- if (message instanceof Error) {
- textMessage = `${message.message}\n${message.stack}`;
- }
- // Switch color based on level
- switch (level) {
- case 'critical':
- logMessage += red(`[debug] ❌ ${textMessage}`);
- break;
- case 'warning':
- logMessage += yellow(`[debug] ⚠️ ${textMessage}`);
- break;
- case 'info':
- logMessage += blue(`[debug] ℹ️ ${textMessage}`);
- break;
- case 'success':
- logMessage += green(`[debug] ✅ ${textMessage}`);
- break;
- default:
- logMessage += white(`[debug] - ${textMessage}`);
- break;
- }
-
- // If message is added to a group, store it in the group
- if (this.group && Array.isArray(this.group.messages)) {
- this.group.messages.push(logMessage);
- return; // Do not output message to console or file
- }
-
- // eslint-disable-next-line no-console
- console.log(logMessage);
- } else {
- // Do not output message to console or file
- }
-}
-
-function error(e) {
- // Check if e is a string message
- if (typeof e === 'string') {
- // eslint-disable-next-line no-console
- console.log(`\n❌ ${red(e)}\n`);
- } else if (e instanceof Error) {
- // eslint-disable-next-line no-console
- console.log(`\n❌ ${red(e.stack)}`);
- } else {
- throw new Error('Error message must be a string or an Error object');
- }
-}
-
-function warning(message) {
- if (typeof message === 'string' || typeof message === 'number') {
- // eslint-disable-next-line no-console
- console.log(`\n⚠️ ${yellow(message)}\n`);
- } else {
- throw new Error('Warning message must be a string or number');
- }
-}
-
-function info(message) {
- if (typeof message === 'string' || typeof message === 'number') {
- // eslint-disable-next-line no-console
- console.log(`\nℹ️ ${blue(message)}\n`);
- } else {
- throw new Error('Warning message must be a string or number');
- }
-}
-
-function success(message) {
- if (typeof message === 'string' || typeof message === 'number') {
- // eslint-disable-next-line no-console
- console.log(`\n✅ ${green(message)}\n`);
- } else {
- throw new Error('Warning message must be a string or number');
- }
-}
-
-module.exports.success = success;
-module.exports.info = info;
-module.exports.warning = warning;
-module.exports.error = error;
-module.exports.debug = debug;
diff --git a/packages/evershop/src/lib/log/logger.js b/packages/evershop/src/lib/log/logger.js
index 676e56be0..b5cbcbc5e 100644
--- a/packages/evershop/src/lib/log/logger.js
+++ b/packages/evershop/src/lib/log/logger.js
@@ -1,24 +1,151 @@
+/* eslint-disable no-param-reassign */
const winston = require('winston');
-const path = require('path');
-const { CONSTANTS } = require('../helpers');
-
-const logger = winston.createLogger({
- level: 'info',
- format: winston.format.json(),
- defaultMeta: { service: 'user-service' },
- transports: [
- new winston.transports.File({
- filename: path.resolve(CONSTANTS.ROOTPATH, '.log/error.log'),
- level: 'error'
- })
- ]
-});
-// Call exceptions.handle with a transport to handle exceptions
-logger.exceptions.handle(
- new winston.transports.File({
- filename: path.resolve(CONSTANTS.ROOTPATH, '.log/exceptions.log')
+
+const { errors } = winston.format;
+const customColorize = require('./CustomColorize');
+const isDevelopmentMode = require('../util/isDevelopmentMode');
+const { getEnv } = require('../util/getEnv');
+const { getValueSync } = require('../util/registry');
+
+const isDebugging = isDevelopmentMode() || process.argv.includes('--debug');
+const format = winston.format.combine(
+ errors({ stack: true }),
+ customColorize({
+ colors: {
+ error: 'red',
+ warn: 'yellow',
+ info: 'green',
+ http: 'blue',
+ verbose: 'cyan',
+ debug: 'magenta',
+ silly: 'gray'
+ },
+ level: false,
+ message: true
+ }),
+ winston.format.printf(({ level, message, stack }) => {
+ let icon;
+ switch (level) {
+ case 'error':
+ icon = '❌'; // Error icon
+ break;
+ case 'warn':
+ icon = '⚠️'; // Warning icon
+ break;
+ case 'info':
+ icon = 'ℹ️'; // Info icon
+ break;
+ case 'http':
+ icon = '🌐'; // HTTP icon
+ break;
+ case 'verbose':
+ icon = '🔍'; // Verbose icon
+ break;
+ case 'debug':
+ icon = '🐛'; // Debug icon
+ break;
+ case 'silly':
+ icon = '🤪'; // Silly icon
+ break;
+ default:
+ icon = '';
+ break;
+ }
+ // Now apply color to the icon and level
+ switch (level) {
+ case 'error':
+ level = `\x1b[31m${level}\x1b[0m`; // Red color
+ icon = `\x1b[31m${icon}\x1b[0m`; // Red color
+ break;
+ case 'warn':
+ level = `\x1b[33m${level}\x1b[0m`; // Yellow color
+ icon = `\x1b[33m${icon}\x1b[0m`; // Yellow color
+ break;
+ case 'info':
+ level = `\x1b[32m${level}\x1b[0m`; // Green color
+ icon = `\x1b[32m${icon}\x1b[0m`; // Green color
+ break;
+ case 'http':
+ level = `\x1b[34m${level}\x1b[0m`; // Blue color
+ icon = `\x1b[34m${icon}\x1b[0m`; // Blue color
+ break;
+ case 'verbose':
+ level = `\x1b[36m${level}\x1b[0m`; // Cyan color
+ icon = `\x1b[36m${icon}\x1b[0m`; // Cyan color
+ break;
+ case 'debug':
+ level = `\x1b[35m${level}\x1b[0m`; // Magenta color
+ icon = `\x1b[35m${icon}\x1b[0m`; // Magenta color
+ break;
+ case 'silly':
+ level = `\x1b[37m${level}\x1b[0m`; // Gray color
+ icon = `\x1b[37m${icon}\x1b[0m`; // Gray color
+ break;
+ default:
+ break;
+ }
+ if (stack) {
+ message = `${message}\n${stack}`;
+ }
+ return `${icon} ${level}: \n${message}`;
})
);
+const consoleTransport = new winston.transports.Console();
+const logFile = getEnv('LOG_FILE', undefined);
+// Default transports
+const DEFAULT_CONFIG = {
+ level: isDebugging ? 'silly' : getEnv('LOGGER_LEVEL', 'warn'),
+ format,
+ // By default, log to console
+ transports:
+ isDebugging || !logFile
+ ? [consoleTransport]
+ : [new winston.transports.File({ filename: logFile })],
+ exceptionHandlers:
+ isDebugging || !logFile
+ ? [consoleTransport]
+ : [new winston.transports.File({ filename: logFile })]
+};
+
+function createLogger() {
+ const config = getValueSync('logger_configuration', DEFAULT_CONFIG, {
+ isDebugging
+ });
+
+ return getValueSync('logger', winston.createLogger(config), { isDebugging });
+}
+
+// Define logger function
+function debug(message) {
+ const logger = createLogger();
+ logger.debug(message);
+}
+
+function error(e) {
+ const logger = createLogger();
+ logger.error(e);
+}
+
+function warning(message) {
+ const logger = createLogger();
+ logger.warn(message);
+}
+
+function info(message) {
+ const logger = createLogger();
+ logger.info(message);
+}
+
+function success(message) {
+ const logger = createLogger();
+ logger.info(message);
+}
// eslint-disable-next-line no-multi-assign
-module.exports = exports = logger;
+module.exports = exports = {
+ success,
+ info,
+ warning,
+ error,
+ debug
+};
diff --git a/packages/evershop/src/lib/middleware/Handler.js b/packages/evershop/src/lib/middleware/Handler.js
index 735d3ca4a..15b593be0 100644
--- a/packages/evershop/src/lib/middleware/Handler.js
+++ b/packages/evershop/src/lib/middleware/Handler.js
@@ -5,7 +5,7 @@ const { sortMiddlewares } = require('./sort');
const { parseFromFile } = require('./parseFromFile');
const { noDublicateId } = require('./noDuplicateId');
const { getRoutes } = require('../router/Router');
-const { error } = require('../log/debuger');
+const { error } = require('../log/logger');
class Handler {
static middlewares = [];
@@ -99,8 +99,7 @@ class Handler {
static middleware() {
return (request, response, next) => {
request.params = {
-
- ...request.locals?.customParams || {},
+ ...(request.locals?.customParams || {}),
...request.params
};
const { currentRoute } = request;
diff --git a/packages/evershop/src/lib/middleware/async.js b/packages/evershop/src/lib/middleware/async.js
index e512c16cf..eb0babf33 100644
--- a/packages/evershop/src/lib/middleware/async.js
+++ b/packages/evershop/src/lib/middleware/async.js
@@ -1,5 +1,4 @@
const logger = require('@evershop/evershop/src/lib/log/logger');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
const { setDelegate } = require('./delegate');
// eslint-disable-next-line no-multi-assign
@@ -36,11 +35,11 @@ exports.asyncMiddlewareWrapper = async function asyncMiddlewareWrapper(
await delegate;
} catch (e) {
// Log the error
- logger.log('error', `Exception in middleware ${id}`, {
+ logger.error(`Exception in middleware ${id}`, {
message: e.message,
stack: e.stack
});
- debug('critical', `Exception in middleware ${id}`);
+ logger.error(`Exception in middleware ${id}`);
// Call error handler middleware if it is not called yet
next(e);
}
diff --git a/packages/evershop/src/lib/middleware/sync.js b/packages/evershop/src/lib/middleware/sync.js
index 438ee0b61..011b3e740 100644
--- a/packages/evershop/src/lib/middleware/sync.js
+++ b/packages/evershop/src/lib/middleware/sync.js
@@ -1,5 +1,4 @@
const logger = require('@evershop/evershop/src/lib/log/logger');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
const { setDelegate } = require('./delegate');
// eslint-disable-next-line no-multi-assign
@@ -35,11 +34,8 @@ exports.syncMiddlewareWrapper = function syncMiddlewareWrapper(
setDelegate(id, delegate, request);
} catch (e) {
// Log the error
- logger.log('error', `Exception in middleware ${id}`, {
- message: e.message,
- stack: e.stack
- });
- debug('critical', `Exception in middleware ${id}`);
+ logger.error(`Exception in middleware ${id}`);
+ logger.error(e);
// Call error handler middleware if it is not called yet
next(e);
diff --git a/packages/evershop/src/lib/middleware/tests/app/app.js b/packages/evershop/src/lib/middleware/tests/app/app.js
index 5791c0eb2..a04e6b75a 100644
--- a/packages/evershop/src/lib/middleware/tests/app/app.js
+++ b/packages/evershop/src/lib/middleware/tests/app/app.js
@@ -13,7 +13,7 @@ const { once } = require('events');
const { getModuleMiddlewares } = require('../..');
const { getRoutes } = require('../../../router/Router');
const { Handler } = require('../../Handler');
-const { error } = require('../../../log/debuger');
+const { error } = require('../../../log/logger');
/** Create express app */
const app = express();
diff --git a/packages/evershop/src/lib/util/registry.js b/packages/evershop/src/lib/util/registry.js
index 806685157..a253f87a0 100644
--- a/packages/evershop/src/lib/util/registry.js
+++ b/packages/evershop/src/lib/util/registry.js
@@ -200,6 +200,12 @@ module.exports = {
},
lockRegistry() {
+ // Reset the values cache by removing all values from all properties in the registry values
+ Object.keys(registry.values).forEach((key) => {
+ if (Object.prototype.hasOwnProperty.call(registry.values, key)) {
+ delete registry.values[key].value;
+ }
+ });
locked = true;
}
};
diff --git a/packages/evershop/src/lib/webpack/loaders/AreaLoader.js b/packages/evershop/src/lib/webpack/loaders/AreaLoader.js
index 941a6ceac..ba885ef72 100644
--- a/packages/evershop/src/lib/webpack/loaders/AreaLoader.js
+++ b/packages/evershop/src/lib/webpack/loaders/AreaLoader.js
@@ -2,7 +2,7 @@ const fs = require('fs');
const { inspect } = require('util');
const JSON5 = require('json5');
const { CONSTANTS } = require('../../helpers');
-const { error } = require('../../log/debuger');
+const { error } = require('../../log/logger');
/* eslint-disable no-multi-assign */
/* eslint-disable global-require */
diff --git a/packages/evershop/src/lib/webpack/loaders/loadTranslationFromCsv.js b/packages/evershop/src/lib/webpack/loaders/loadTranslationFromCsv.js
index 1679235ca..314bcbd7f 100644
--- a/packages/evershop/src/lib/webpack/loaders/loadTranslationFromCsv.js
+++ b/packages/evershop/src/lib/webpack/loaders/loadTranslationFromCsv.js
@@ -3,7 +3,7 @@ const path = require('path');
const { getConfig } = require('../../util/getConfig');
const { CONSTANTS } = require('../../helpers');
const { readCsvFile } = require('../../util/readCsvFile');
-const { error } = require('../../log/debuger');
+const { error } = require('../../log/logger');
module.exports.loadCsvTranslationFiles =
async function loadCsvTranslationFiles() {
diff --git a/packages/evershop/src/lib/webpack/plugins/Tailwindcss.js b/packages/evershop/src/lib/webpack/plugins/Tailwindcss.js
index ddb4c6387..4c41db1b5 100644
--- a/packages/evershop/src/lib/webpack/plugins/Tailwindcss.js
+++ b/packages/evershop/src/lib/webpack/plugins/Tailwindcss.js
@@ -7,7 +7,7 @@ const autoprefixer = require('autoprefixer');
const CleanCSS = require('clean-css');
const { Compilation, sources } = require('webpack');
const { getTailwindConfig } = require('../util/getTailwindConfig');
-const { error } = require('../../log/debuger');
+const { error } = require('../../log/logger');
// eslint-disable-next-line no-multi-assign
module.exports = exports = {};
diff --git a/packages/evershop/src/modules/base/api/global/[apiResponse]apiErrorHandler.js b/packages/evershop/src/modules/base/api/global/[apiResponse]apiErrorHandler.js
index 4e664a669..732c596b8 100644
--- a/packages/evershop/src/modules/base/api/global/[apiResponse]apiErrorHandler.js
+++ b/packages/evershop/src/modules/base/api/global/[apiResponse]apiErrorHandler.js
@@ -1,11 +1,11 @@
const {
INTERNAL_SERVER_ERROR
} = require('@evershop/evershop/src/lib/util/httpStatus');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
// eslint-disable-next-line no-unused-vars
module.exports = async (err, request, response, delegate, next) => {
- debug('critical', err);
+ error(err);
// Set this flag to make sure this middleware only be executed 1 time
response.locals.errorHandlerTriggered = true;
const promises = [];
diff --git a/packages/evershop/src/modules/base/pages/global/[response]errorHandler.js b/packages/evershop/src/modules/base/pages/global/[response]errorHandler.js
index be2daa5fb..53a712f2e 100644
--- a/packages/evershop/src/modules/base/pages/global/[response]errorHandler.js
+++ b/packages/evershop/src/modules/base/pages/global/[response]errorHandler.js
@@ -2,11 +2,11 @@ const { encode } = require('html-entities');
const {
INTERNAL_SERVER_ERROR
} = require('@evershop/evershop/src/lib/util/httpStatus');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
// eslint-disable-next-line no-unused-vars
module.exports = async (err, request, response, delegate, next) => {
- debug('critical', err);
+ error(err);
// Set this flag to make sure this middleware only be executed 1 time
response.locals.errorHandlerTriggered = true;
const promises = [];
diff --git a/packages/evershop/src/modules/catalog/api/addProductToCategory/addProducts.js b/packages/evershop/src/modules/catalog/api/addProductToCategory/addProducts.js
index 22c8791ee..6dfe43a8d 100644
--- a/packages/evershop/src/modules/catalog/api/addProductToCategory/addProducts.js
+++ b/packages/evershop/src/modules/catalog/api/addProductToCategory/addProducts.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const {
INVALID_PAYLOAD,
diff --git a/packages/evershop/src/modules/catalog/api/addProductToCollection/addProducts.js b/packages/evershop/src/modules/catalog/api/addProductToCollection/addProducts.js
index ca188c70d..0943d5723 100644
--- a/packages/evershop/src/modules/catalog/api/addProductToCollection/addProducts.js
+++ b/packages/evershop/src/modules/catalog/api/addProductToCollection/addProducts.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const {
getConnection
} = require('@evershop/evershop/src/lib/postgres/connection');
diff --git a/packages/evershop/src/modules/catalog/services/product/updateProduct.js b/packages/evershop/src/modules/catalog/services/product/updateProduct.js
index 8f302e7b6..de3b95c13 100644
--- a/packages/evershop/src/modules/catalog/services/product/updateProduct.js
+++ b/packages/evershop/src/modules/catalog/services/product/updateProduct.js
@@ -16,7 +16,7 @@ const {
const {
getConnection
} = require('@evershop/evershop/src/lib/postgres/connection');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { getAjv } = require('../../../base/services/getAjv');
const productDataSchema = require('./productDataSchema.json');
@@ -248,7 +248,7 @@ async function updateProductImages(images, productId, connection) {
)
);
} catch (e) {
- debug('critical', e);
+ error(e);
throw e;
}
}
diff --git a/packages/evershop/src/modules/catalog/subscribers/category_created/buildUrlRewrite.js b/packages/evershop/src/modules/catalog/subscribers/category_created/buildUrlRewrite.js
index bebde5dc0..ca0aa2329 100644
--- a/packages/evershop/src/modules/catalog/subscribers/category_created/buildUrlRewrite.js
+++ b/packages/evershop/src/modules/catalog/subscribers/category_created/buildUrlRewrite.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const {
execute,
diff --git a/packages/evershop/src/modules/catalog/subscribers/category_deleted/deleteUrlRewrite.js b/packages/evershop/src/modules/catalog/subscribers/category_deleted/deleteUrlRewrite.js
index 07ede9d99..88bea537b 100644
--- a/packages/evershop/src/modules/catalog/subscribers/category_deleted/deleteUrlRewrite.js
+++ b/packages/evershop/src/modules/catalog/subscribers/category_deleted/deleteUrlRewrite.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const { execute, select } = require('@evershop/postgres-query-builder');
diff --git a/packages/evershop/src/modules/catalog/subscribers/category_updated/builUrlRewrite.js b/packages/evershop/src/modules/catalog/subscribers/category_updated/builUrlRewrite.js
index 7d201ce32..6316c65e4 100644
--- a/packages/evershop/src/modules/catalog/subscribers/category_updated/builUrlRewrite.js
+++ b/packages/evershop/src/modules/catalog/subscribers/category_updated/builUrlRewrite.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const {
execute,
diff --git a/packages/evershop/src/modules/catalog/subscribers/product_created/builUrlRewrite.js b/packages/evershop/src/modules/catalog/subscribers/product_created/builUrlRewrite.js
index c71bb43f0..d7f481275 100644
--- a/packages/evershop/src/modules/catalog/subscribers/product_created/builUrlRewrite.js
+++ b/packages/evershop/src/modules/catalog/subscribers/product_created/builUrlRewrite.js
@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const { select, insertOnUpdate } = require('@evershop/postgres-query-builder');
diff --git a/packages/evershop/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js b/packages/evershop/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js
index a5b8c3df6..cb4868eb3 100644
--- a/packages/evershop/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js
+++ b/packages/evershop/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js
@@ -5,7 +5,7 @@ const sharp = require('sharp');
const { update } = require('@evershop/postgres-query-builder');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
module.exports = async function localGenerateProductImageVariant(data) {
if (getConfig('system.file_storage') === 'local') {
@@ -55,8 +55,8 @@ module.exports = async function localGenerateProductImageVariant(data) {
.where('product_image_product_id', '=', data.product_image_product_id)
.and('origin_image', '=', data.origin_image)
.execute(pool);
- } catch (error) {
- debug('critical', error);
+ } catch (e) {
+ error(e);
}
}
};
diff --git a/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js b/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js
new file mode 100644
index 000000000..f72478e5b
--- /dev/null
+++ b/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js
@@ -0,0 +1,61 @@
+/* eslint-disable camelcase */
+const {
+ rollback,
+ commit,
+ startTransaction,
+ del,
+ select
+} = require('@evershop/postgres-query-builder');
+const {
+ getConnection
+} = require('@evershop/evershop/src/lib/postgres/connection');
+const {
+ OK,
+ INTERNAL_SERVER_ERROR,
+ INVALID_PAYLOAD
+} = require('@evershop/evershop/src/lib/util/httpStatus');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
+
+// eslint-disable-next-line no-unused-vars
+module.exports = async (request, response, deledate, next) => {
+ const { id } = request.params;
+ const connection = await getConnection();
+ await startTransaction(connection);
+ try {
+ // Load the shipping zone
+ const shippingZone = await select()
+ .from('shipping_zone')
+ .where('uuid', '=', id)
+ .load(connection);
+
+ if (!shippingZone) {
+ response.status(INVALID_PAYLOAD);
+ response.json({
+ error: {
+ status: INVALID_PAYLOAD,
+ message: 'Invalid zone id'
+ }
+ });
+ return;
+ }
+ const zone = await del('shipping_zone')
+ .where('uuid', '=', id)
+ .execute(connection);
+
+ await commit(connection);
+ response.status(OK);
+ response.json({
+ data: zone
+ });
+ } catch (e) {
+ error(e);
+ await rollback(connection);
+ response.status(INTERNAL_SERVER_ERROR);
+ response.json({
+ error: {
+ status: INTERNAL_SERVER_ERROR,
+ message: e.message
+ }
+ });
+ }
+};
diff --git a/packages/evershop/src/modules/checkout/api/deleteShippingZone/route.json b/packages/evershop/src/modules/checkout/api/deleteShippingZone/route.json
new file mode 100644
index 000000000..7d3b5f1fc
--- /dev/null
+++ b/packages/evershop/src/modules/checkout/api/deleteShippingZone/route.json
@@ -0,0 +1,5 @@
+{
+ "methods": ["DELETE"],
+ "path": "/shippingZones/:id",
+ "access": "private"
+}
diff --git a/packages/evershop/src/modules/checkout/bootstrap.js b/packages/evershop/src/modules/checkout/bootstrap.js
index 6e5f1e716..7def465d5 100644
--- a/packages/evershop/src/modules/checkout/bootstrap.js
+++ b/packages/evershop/src/modules/checkout/bootstrap.js
@@ -1,4 +1,4 @@
-const { error } = require('../../lib/log/debuger');
+const { error } = require('../../lib/log/logger');
const { addProcessor, addFinalProcessor } = require('../../lib/util/registry');
const { sortFields } = require('./services/cart/sortFields');
const {
diff --git a/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.graphql b/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.graphql
index 573630922..dfd7b927b 100644
--- a/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.graphql
+++ b/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.graphql
@@ -22,10 +22,11 @@ type ShippingZone {
shipping_zone_id: Int!
uuid: String!
name: String!
- country: Country!
+ country: Country
provinces: [Province]
methods: [ShippingMethodByZone]
updateApi: String!
+ deleteApi: String!
addMethodApi: String!
removeMethodApi: String!
}
diff --git a/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.resolvers.js b/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.resolvers.js
index bb71a0777..6ce38e780 100644
--- a/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.resolvers.js
+++ b/packages/evershop/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.resolvers.js
@@ -1,4 +1,5 @@
const { select } = require('@evershop/postgres-query-builder');
+const { contries } = require('@evershop/evershop/src/lib/locale/countries');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
const { buildUrl } = require('@evershop/evershop/src/lib/router/buildUrl');
@@ -36,6 +37,18 @@ module.exports = {
const methods = await query.execute(pool);
return methods.map((row) => camelCase(row));
},
+ country: ({ country }) => {
+ if (!country) {
+ return null;
+ } else {
+ const c = contries.find((p) => p.code === country);
+ if (c) {
+ return c;
+ } else {
+ return null;
+ }
+ }
+ },
provinces: async ({ shippingZoneId }) => {
const provinces = await select('province')
.from('shipping_zone_province')
@@ -43,10 +56,10 @@ module.exports = {
.execute(pool);
return provinces.map((row) => row.province);
},
- updateApi: async ({ uuid }) => buildUrl('updateShippingZone', { id: uuid }),
- addMethodApi: async ({ uuid }) =>
- buildUrl('addShippingZoneMethod', { id: uuid }),
- removeMethodApi: async ({ uuid }) =>
+ updateApi: ({ uuid }) => buildUrl('updateShippingZone', { id: uuid }),
+ deleteApi: ({ uuid }) => buildUrl('deleteShippingZone', { id: uuid }),
+ addMethodApi: ({ uuid }) => buildUrl('addShippingZoneMethod', { id: uuid }),
+ removeMethodApi: ({ uuid }) =>
buildUrl('removeShippingZoneMethod', { id: uuid })
},
ShippingMethodByZone: {
diff --git a/packages/evershop/src/modules/checkout/graphql/types/Weight/Weight.resolvers.js b/packages/evershop/src/modules/checkout/graphql/types/Weight/Weight.resolvers.js
index eb46be41b..e704907ef 100644
--- a/packages/evershop/src/modules/checkout/graphql/types/Weight/Weight.resolvers.js
+++ b/packages/evershop/src/modules/checkout/graphql/types/Weight/Weight.resolvers.js
@@ -1,20 +1,17 @@
-const { getSetting } = require('../../../../setting/services/setting');
+const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
module.exports = {
Weight: {
- value: (raw) => parseFloat(raw), // TODO: Format for decimal value?
- unit: async () => {
- const unit = await getSetting('weightUnit', 'kg');
+ value: (raw) => parseFloat(raw),
+ unit: () => {
+ const unit = getConfig('shop.weightUnit', 'kg');
return unit;
},
- text: async (raw) => {
- const weight = parseFloat(raw); // TODO: Format for decimal value?
- const unit = await getSetting('weightUnit', 'kg');
- const language = await getSetting('storeLanguage', 'en');
+ text: (raw) => {
+ const weight = parseFloat(raw);
+ const unit = getConfig('shop.weightUnit', 'kg');
// Localize the weight
- return new Intl.NumberFormat(language, { style: 'unit', unit }).format(
- weight
- );
+ return `${weight} ${unit}`;
}
}
};
diff --git a/packages/evershop/src/modules/checkout/pages/frontStore/all/[auth]addCustomerToCart.js b/packages/evershop/src/modules/checkout/pages/frontStore/all/[auth]addCustomerToCart.js
index e7431898e..8698583a5 100644
--- a/packages/evershop/src/modules/checkout/pages/frontStore/all/[auth]addCustomerToCart.js
+++ b/packages/evershop/src/modules/checkout/pages/frontStore/all/[auth]addCustomerToCart.js
@@ -1,6 +1,6 @@
const { select, update } = require('@evershop/postgres-query-builder');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
module.exports = async (request, response, delegate, next) => {
try {
@@ -25,8 +25,8 @@ module.exports = async (request, response, delegate, next) => {
.execute(pool);
}
}
- } catch (error) {
- debug('critical', error);
+ } catch (e) {
+ error(e);
}
next();
};
diff --git a/packages/evershop/src/modules/checkout/services/cart/DataObject.js b/packages/evershop/src/modules/checkout/services/cart/DataObject.js
index f0c991fe6..34261ce45 100644
--- a/packages/evershop/src/modules/checkout/services/cart/DataObject.js
+++ b/packages/evershop/src/modules/checkout/services/cart/DataObject.js
@@ -1,6 +1,6 @@
/* eslint-disable no-underscore-dangle */
const isEqualWith = require('lodash/isEqualWith');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
module.exports.DataObject = class DataObject {
#fields;
diff --git a/packages/evershop/src/modules/customer/api/createCustomer/[bodyParser]createCustomer.js b/packages/evershop/src/modules/customer/api/createCustomer/[bodyParser]createCustomer.js
index 741b6f8ce..03ae6076a 100644
--- a/packages/evershop/src/modules/customer/api/createCustomer/[bodyParser]createCustomer.js
+++ b/packages/evershop/src/modules/customer/api/createCustomer/[bodyParser]createCustomer.js
@@ -3,7 +3,7 @@ const {
INTERNAL_SERVER_ERROR
} = require('@evershop/evershop/src/lib/util/httpStatus');
const { buildUrl } = require('@evershop/evershop/src/lib/router/buildUrl');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const createCustomer = require('../../services/customer/createCustomer');
// eslint-disable-next-line no-unused-vars
@@ -36,7 +36,7 @@ module.exports = async (request, response, delegate, next) => {
};
next();
} catch (e) {
- debug('critical', e);
+ error(e);
response.status(INTERNAL_SERVER_ERROR);
response.json({
error: {
diff --git a/packages/evershop/src/modules/customer/api/resetPassword/[bodyParser]resetPassword.js b/packages/evershop/src/modules/customer/api/resetPassword/[bodyParser]resetPassword.js
index 2648ba514..df0441991 100644
--- a/packages/evershop/src/modules/customer/api/resetPassword/[bodyParser]resetPassword.js
+++ b/packages/evershop/src/modules/customer/api/resetPassword/[bodyParser]resetPassword.js
@@ -4,7 +4,7 @@ const {
OK,
INTERNAL_SERVER_ERROR
} = require('@evershop/evershop/src/lib/util/httpStatus');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const crypto = require('crypto');
// eslint-disable-next-line no-unused-vars
@@ -45,7 +45,7 @@ module.exports = async (request, response, delegate, next) => {
// An extension can add a middleware to this route to send email
next();
} catch (e) {
- debug('critical', e);
+ error(e);
response.status(INTERNAL_SERVER_ERROR);
response.json({
error: {
diff --git a/packages/evershop/src/modules/customer/api/updatePassword/[bodyParser]updatePassword.js b/packages/evershop/src/modules/customer/api/updatePassword/[bodyParser]updatePassword.js
index cdbecb045..d759a5bbb 100644
--- a/packages/evershop/src/modules/customer/api/updatePassword/[bodyParser]updatePassword.js
+++ b/packages/evershop/src/modules/customer/api/updatePassword/[bodyParser]updatePassword.js
@@ -9,7 +9,7 @@ const {
INTERNAL_SERVER_ERROR,
INVALID_PAYLOAD
} = require('@evershop/evershop/src/lib/util/httpStatus');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
const updatePassword = require('../../services/customer/updatePassword');
@@ -72,7 +72,7 @@ module.exports = async (request, response, delegate, next) => {
response.$body = {};
next();
} catch (e) {
- debug('critical', e);
+ error(e);
response.status(INTERNAL_SERVER_ERROR);
response.json({
error: {
diff --git a/packages/evershop/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js b/packages/evershop/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js
index 783d79257..d07407cfc 100644
--- a/packages/evershop/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js
+++ b/packages/evershop/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js
@@ -8,7 +8,7 @@ const {
} = require('@evershop/evershop/src/lib/webpack/getRouteBuildPath');
const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
const { getRoutes } = require('@evershop/evershop/src/lib/router/Router');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
// eslint-disable-next-line no-unused-vars
const { getContextValue } = require('../../services/contextHelper');
diff --git a/packages/evershop/src/modules/graphql/pages/global/[buildQuery]graphql[notification].js b/packages/evershop/src/modules/graphql/pages/global/[buildQuery]graphql[notification].js
index f9addf7cb..d9d1f90cd 100644
--- a/packages/evershop/src/modules/graphql/pages/global/[buildQuery]graphql[notification].js
+++ b/packages/evershop/src/modules/graphql/pages/global/[buildQuery]graphql[notification].js
@@ -1,7 +1,7 @@
const { execute } = require('graphql');
const { parse } = require('graphql');
const { validate } = require('graphql/validation');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { debug } = require('@evershop/evershop/src/lib/log/logger');
const adminSchema = require('../../services/buildSchema');
const storeFrontSchema = require('../../services/buildStoreFrontSchema');
const { getContext } = require('../../services/contextHelper');
diff --git a/packages/evershop/src/modules/oms/pages/admin/shippingSetting/ShippingSetting.jsx b/packages/evershop/src/modules/oms/pages/admin/shippingSetting/ShippingSetting.jsx
index 050c15226..2d6fe1e08 100644
--- a/packages/evershop/src/modules/oms/pages/admin/shippingSetting/ShippingSetting.jsx
+++ b/packages/evershop/src/modules/oms/pages/admin/shippingSetting/ShippingSetting.jsx
@@ -51,6 +51,7 @@ const ZonesQuery = `
updateApi
}
updateApi
+ deleteApi
addMethodApi
}
}
diff --git a/packages/evershop/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js b/packages/evershop/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js
index 59a49f855..9449d5641 100644
--- a/packages/evershop/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js
+++ b/packages/evershop/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js
@@ -12,7 +12,7 @@ const {
} = require('@evershop/evershop/src/lib/postgres/connection');
const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
const { emit } = require('@evershop/evershop/src/lib/event/emitter');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { debug } = require('@evershop/evershop/src/lib/log/logger');
const { display } = require('zero-decimal-currencies');
const { getSetting } = require('../../../setting/services/setting');
@@ -57,7 +57,9 @@ module.exports = async (request, response, delegate, next) => {
// Create payment transaction
await insert('payment_transaction')
.given({
- amount: parseFloat(display(paymentIntent.amount, paymentIntent.currency)),
+ amount: parseFloat(
+ display(paymentIntent.amount, paymentIntent.currency)
+ ),
payment_transaction_order_id: order.order_id,
transaction_id: paymentIntent.id,
transaction_type: 'online',
diff --git a/packages/google_login/pages/frontStore/gcallback/gCallback.js b/packages/google_login/pages/frontStore/gcallback/gCallback.js
index 4bbc7e313..a5c7efd07 100644
--- a/packages/google_login/pages/frontStore/gcallback/gCallback.js
+++ b/packages/google_login/pages/frontStore/gcallback/gCallback.js
@@ -8,11 +8,11 @@ const {
getGoogleUserInfo
} = require('@evershop/google_login/services/getGoogleUserInfo');
const { select, insert } = require('@evershop/postgres-query-builder');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
/* eslint-disable-next-line no-unused-vars */
module.exports = async (request, response, delegate, next) => {
- const {code} = request.query;
+ const { code } = request.query;
const client_id = getConfig('google_login.client_id');
const client_secret = getConfig('google_login.client_secret');
const homeUrl = getConfig('shop.homeUrl', 'http://localhost:3000');
@@ -66,16 +66,16 @@ module.exports = async (request, response, delegate, next) => {
delete customer.password;
// Save the customer in the request
request.locals.customer = customer;
- request.session.save((error) => {
- if (error) {
- debug('critical', error);
+ request.session.save((e) => {
+ if (e) {
+ error(e);
response.redirect(failureUrl);
} else {
response.redirect(successUrl);
}
});
- } catch (error) {
- debug('critical', error);
+ } catch (err) {
+ error(err);
response.redirect(failureUrl);
}
};
diff --git a/packages/resend/api/resetPassword/[resetPassword]sendMail.js b/packages/resend/api/resetPassword/[resetPassword]sendMail.js
index e7a01a6db..25d739476 100644
--- a/packages/resend/api/resetPassword/[resetPassword]sendMail.js
+++ b/packages/resend/api/resetPassword/[resetPassword]sendMail.js
@@ -4,7 +4,7 @@ const {
INTERNAL_SERVER_ERROR
} = require('@evershop/evershop/src/lib/util/httpStatus');
const { buildUrl } = require('@evershop/evershop/src/lib/router/buildUrl');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const {
getContextValue
} = require('@evershop/evershop/src/modules/graphql/services/contextHelper');
@@ -74,7 +74,7 @@ module.exports = async (request, response, delegate, next) => {
await resend.emails.send(msg);
next();
} catch (e) {
- debug('critical', e);
+ error(e);
response.status(INTERNAL_SERVER_ERROR);
response.json({
error: {
diff --git a/packages/resend/subscribers/customer_registered/sendWelcomeEmail.js b/packages/resend/subscribers/customer_registered/sendWelcomeEmail.js
index d3f8fd73c..b5111595d 100644
--- a/packages/resend/subscribers/customer_registered/sendWelcomeEmail.js
+++ b/packages/resend/subscribers/customer_registered/sendWelcomeEmail.js
@@ -5,7 +5,7 @@ const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
const { Resend } = require('resend');
const Handlebars = require('handlebars');
const { select } = require('@evershop/postgres-query-builder');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { getEnv } = require('@evershop/evershop/src/lib/util/getEnv');
const { getValue } = require('@evershop/evershop/src/lib/util/registry');
diff --git a/packages/resend/subscribers/order_placed/sendOrderConfirmationEmail.js b/packages/resend/subscribers/order_placed/sendOrderConfirmationEmail.js
index b461e8455..56d4b80af 100644
--- a/packages/resend/subscribers/order_placed/sendOrderConfirmationEmail.js
+++ b/packages/resend/subscribers/order_placed/sendOrderConfirmationEmail.js
@@ -6,7 +6,7 @@ const { Resend } = require('resend');
const { select } = require('@evershop/postgres-query-builder');
const { contries } = require('@evershop/evershop/src/lib/locale/countries');
const { provinces } = require('@evershop/evershop/src/lib/locale/provinces');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const Handlebars = require('handlebars');
const { getEnv } = require('@evershop/evershop/src/lib/util/getEnv');
const { getValue } = require('@evershop/evershop/src/lib/util/registry');
diff --git a/packages/s3_file_storage/subscribers/product_image_added/awsGenerateProductImageVariant.js b/packages/s3_file_storage/subscribers/product_image_added/awsGenerateProductImageVariant.js
index bf9dc8036..3f8661420 100644
--- a/packages/s3_file_storage/subscribers/product_image_added/awsGenerateProductImageVariant.js
+++ b/packages/s3_file_storage/subscribers/product_image_added/awsGenerateProductImageVariant.js
@@ -9,7 +9,7 @@ const { getEnv } = require('@evershop/evershop/src/lib/util/getEnv');
const sharp = require('sharp');
const { update } = require('@evershop/postgres-query-builder');
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
async function downloadObjectToBuffer(objectUrl) {
const parsedUrl = new URL(objectUrl);
@@ -113,8 +113,8 @@ module.exports = async function awsGenerateProductImageVariant(data) {
.where('product_image_product_id', '=', data.product_image_product_id)
.and('origin_image', '=', data.origin_image)
.execute(pool);
- } catch (error) {
- debug('critical', error);
+ } catch (e) {
+ error(e);
}
}
};
diff --git a/packages/sendgrid/api/resetPassword/[resetPassword]sendMail.js b/packages/sendgrid/api/resetPassword/[resetPassword]sendMail.js
index 3d2b760c8..688972d4f 100644
--- a/packages/sendgrid/api/resetPassword/[resetPassword]sendMail.js
+++ b/packages/sendgrid/api/resetPassword/[resetPassword]sendMail.js
@@ -2,7 +2,7 @@ const {
INTERNAL_SERVER_ERROR
} = require('@evershop/evershop/src/lib/util/httpStatus');
const { buildUrl } = require('@evershop/evershop/src/lib/router/buildUrl');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const {
getContextValue
} = require('@evershop/evershop/src/modules/graphql/services/contextHelper');
@@ -59,7 +59,7 @@ module.exports = async (request, response, delegate, next) => {
await sgMail.send(msg);
next();
} catch (e) {
- debug('critical', e);
+ error(e);
response.status(INTERNAL_SERVER_ERROR);
response.json({
error: {
diff --git a/packages/sendgrid/subscribers/customer_registered/sendWelcomeEmail.js b/packages/sendgrid/subscribers/customer_registered/sendWelcomeEmail.js
index 6d43f5a0e..4cf64c9fb 100644
--- a/packages/sendgrid/subscribers/customer_registered/sendWelcomeEmail.js
+++ b/packages/sendgrid/subscribers/customer_registered/sendWelcomeEmail.js
@@ -2,7 +2,7 @@ const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
const sgMail = require('@sendgrid/mail');
const { select } = require('@evershop/postgres-query-builder');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { getEnv } = require('@evershop/evershop/src/lib/util/getEnv');
const { getValue } = require('@evershop/evershop/src/lib/util/registry');
diff --git a/packages/sendgrid/subscribers/order_placed/sendOrderConfirmationEmail.js b/packages/sendgrid/subscribers/order_placed/sendOrderConfirmationEmail.js
index d99a40a43..b154b9daf 100644
--- a/packages/sendgrid/subscribers/order_placed/sendOrderConfirmationEmail.js
+++ b/packages/sendgrid/subscribers/order_placed/sendOrderConfirmationEmail.js
@@ -4,7 +4,7 @@ const sgMail = require('@sendgrid/mail');
const { select } = require('@evershop/postgres-query-builder');
const { contries } = require('@evershop/evershop/src/lib/locale/countries');
const { provinces } = require('@evershop/evershop/src/lib/locale/provinces');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
const { getEnv } = require('@evershop/evershop/src/lib/util/getEnv');
const { getValue } = require('@evershop/evershop/src/lib/util/registry');