@evershop/evershop 1.0.0-beta → 1.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evershop/evershop",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-beta.2",
   "description": "The React Ecommerce platform. Built with React and MySQL. Open-source and free. Fast and customizable.",
   "files": [
     "bin",

package/src/modules/auth/api/admin/all/[tokenVerify]demoAccountBlocking[auth].js

@@ -0,0 +1,20 @@
+const { getConfig } = require('../../../../../lib/util/getConfig');
+const { getContextValue } = require('../../../../graphql/services/contextHelper');
+
+module.exports = (request, response, stack, next) => {
+  if (request.method == "GET") {
+    next();
+  } else {
+    const tokenPayLoad = getContextValue(request, 'tokenPayload');
+    const currentUserEmail = tokenPayLoad?.user?.email;
+    const demoUserEmail = getConfig('system.demoUser');
+    if (demoUserEmail && currentUserEmail === demoUserEmail) {
+      response.json({
+        success: false,
+        message: 'The demo account is not allowed to make changes'
+      });
+    } else {
+      next();
+    }
+  }
+};

package/src/modules/auth/migration/Version-1.0.0.js

@@ -6,7 +6,7 @@ module.exports = exports = async () => {
   await execute(pool, `DROP TABLE IF EXISTS \`admin_user\``);
   await execute(pool, `CREATE TABLE \`admin_user\` (
   \`admin_user_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  \`uuid\` varchar(255) DEFAULT replace(uuid(),'-',''),
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`status\` smallint(5) unsigned NOT NULL,
   \`email\` varchar(255) NOT NULL,
   \`password\` varchar(255) NOT NULL,

package/src/modules/catalog/migration/Version-1.0.0.js

@@ -132,6 +132,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`customer_group\` (
   \`customer_group_id\` int(10) unsigned NOT NULL,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`group_name\` char(255) NOT NULL,
   \`created_at\` timestamp NOT NULL DEFAULT current_timestamp(),
   \`updated_at\` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -143,6 +144,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`product\` (
   \`product_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`variant_group_id\` int(10) unsigned DEFAULT NULL,
   \`visibility\` smallint(2) DEFAULT NULL,
   \`group_id\` int(10) unsigned DEFAULT NULL,
@@ -247,6 +249,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`category\` (
   \`category_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`status\` smallint(6) NOT NULL,
   \`parent_id\` int(10) unsigned DEFAULT NULL,
   \`include_in_nav\` smallint(5) unsigned NOT NULL,

package/src/modules/checkout/api/admin/bestsellers/route

@@ -1,2 +1,2 @@
-POST
+GET
 /lifetimesales

package/src/modules/checkout/api/admin/lifetimesales/route

@@ -1,2 +1,2 @@
-POST
+GET
 /bestsellers

package/src/modules/checkout/api/admin/salestatistic/loadData.js

@@ -5,7 +5,7 @@ const { pool } = require('../../../../../lib/mysql/connection');
 // eslint-disable-next-line no-unused-vars
 module.exports = async (request, response, stack, next) => {
   response.$body = [];
-  const { period } = request.params;
+  const { period = 'weekly' } = request.query;
   let i = 5;
   const result = [];
   const today = dayjs().format('YYYY-MM-DD').toString();

package/src/modules/checkout/api/admin/salestatistic/route

@@ -1,2 +1,2 @@
-POST
-/salestatistic/:period
+GET
+/salestatistic

package/src/modules/checkout/migration/Version-1.0.0.js

@@ -5,6 +5,8 @@ const { pool } = require('../../../lib/mysql/connection');
 module.exports = exports = async () => {
   await execute(pool, `CREATE TABLE \`cart\` (
   \`cart_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
+  \`sid\` varchar(255) DEFAULT NULL,
   \`currency\` varchar(11) NOT NULL,
   \`customer_id\` int(10) unsigned DEFAULT NULL,
   \`customer_group_id\` smallint(6) DEFAULT NULL,
@@ -36,6 +38,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`cart_address\` (
   \`cart_address_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`full_name\` varchar(255) DEFAULT NULL,
   \`postcode\` varchar(255) DEFAULT NULL,
   \`telephone\` varchar(255) DEFAULT NULL,
@@ -50,10 +53,12 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`cart_item\` (
   \`cart_item_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`cart_id\` int(10) unsigned NOT NULL,
   \`product_id\` int(10) unsigned NOT NULL,
   \`product_sku\` varchar(255) NOT NULL,
   \`product_name\` text NOT NULL,
+  \`thumbnail\` varchar(255) DEFAULT NULL,
   \`product_weight\` decimal(12,4) DEFAULT NULL,
   \`product_price\` decimal(12,4) NOT NULL,
   \`product_price_incl_tax\` decimal(12,4) NOT NULL,
@@ -79,6 +84,8 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`order\` (
   \`order_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
+  \`sid\` varchar(255) DEFAULT NULL,
   \`order_number\` varchar(255) NOT NULL,
   \`cart_id\` int(10) unsigned NOT NULL,
   \`currency\` varchar(11) NOT NULL,
@@ -127,6 +134,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`order_address\` (
   \`order_address_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`full_name\` varchar(255) DEFAULT NULL,
   \`postcode\` varchar(255) DEFAULT NULL,
   \`telephone\` varchar(255) DEFAULT NULL,
@@ -141,11 +149,13 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`order_item\` (
   \`order_item_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`order_item_order_id\` int(10) unsigned NOT NULL,
   \`product_id\` int(10) unsigned NOT NULL,
   \`referer\` int(10) unsigned DEFAULT NULL,
   \`product_sku\` varchar(255) NOT NULL,
   \`product_name\` text NOT NULL,
+  \`thumbnail\` varchar(255) DEFAULT NULL,
   \`product_weight\` decimal(12,4) DEFAULT NULL,
   \`product_price\` decimal(12,4) NOT NULL,
   \`product_price_incl_tax\` decimal(12,4) NOT NULL,
@@ -170,6 +180,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`payment_transaction\` (
   \`payment_transaction_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`payment_transaction_order_id\` int(10) unsigned NOT NULL,
   \`transaction_id\` varchar(100) DEFAULT NULL,
   \`transaction_type\` char(255) NOT NULL,
@@ -186,6 +197,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`shipment\` (
   \`shipment_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`shipment_order_id\` int(10) unsigned NOT NULL,
   \`carrier_name\` varchar(255) DEFAULT NULL,
   \`tracking_number\` varchar(255) DEFAULT NULL,

package/src/modules/checkout/pages/admin/dashboard/Bestsellers.js

@@ -13,7 +13,7 @@ export default function BestSellers({ api }) {
   React.useEffect(() => {
     if (window !== undefined) {
       fetch(api, {
-        method: 'POST', // or 'PUT'
+        method: 'GET',
         headers: {
           'Content-Type': 'application/json'
         }

package/src/modules/checkout/pages/admin/dashboard/Lifetimesales.js

@@ -26,7 +26,7 @@ export default function LifetimeSale({ api }) {
   React.useEffect(() => {
     if (window !== undefined) {
       fetch(api, {
-        method: 'POST', // or 'PUT'
+        method: 'GET',
         headers: {
           'Content-Type': 'application/json'
         }

package/src/modules/checkout/pages/admin/dashboard/Statistic.js

@@ -14,12 +14,11 @@ export default function SaleStatistic({ api }) {
 
   useEffect(() => {
     if (window !== undefined) {
-      fetch(api.replace('monthly', period).replace('weekly', period).replace('daily', period), {
-        method: 'POST', // or 'PUT'
+      fetch((api + `?period=${period}`), {
+        method: 'GET',
         headers: {
           'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(data)
+        }
       })
         .then((response) => response.json())
         .then((json) => {

package/src/modules/cms/migration/Version-1.0.0.js

@@ -5,6 +5,7 @@ const { pool } = require('../../../lib/mysql/connection');
 module.exports = exports = async () => {
   await execute(pool, `CREATE TABLE \`cms_page\` (
   \`cms_page_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`layout\` varchar(255) NOT NULL,
   \`status\` smallint(6) DEFAULT NULL,
   \`created_at\` datetime DEFAULT NULL,

package/src/modules/customer/migration/Version-1.0.0.js

@@ -5,6 +5,7 @@ const { pool } = require('../../../lib/mysql/connection');
 module.exports = exports = async () => {
   await execute(pool, `CREATE TABLE \`customer\` (
   \`customer_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`status\` smallint(6) NOT NULL DEFAULT 1,
   \`group_id\` int(10) unsigned DEFAULT NULL,
   \`email\` char(255) NOT NULL,
@@ -21,6 +22,7 @@ module.exports = exports = async () => {
 
   await execute(pool, `CREATE TABLE \`customer_address\` (
   \`customer_address_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`customer_id\` int(10) unsigned NOT NULL,
   \`full_name\` varchar(255) DEFAULT NULL,
   \`telephone\` varchar(255) DEFAULT NULL,

package/src/modules/promotion/migration/Version-1.0.0.js

@@ -5,6 +5,7 @@ const { pool } = require('../../../lib/mysql/connection');
 module.exports = exports = async () => {
   await execute(pool, `CREATE TABLE \`coupon\` (
   \`coupon_id\` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  \`uuid\` varchar(255) DEFAULT (replace(uuid(),'-','')),
   \`status\` smallint(6) NOT NULL DEFAULT 1,
   \`description\` char(255) NOT NULL,
   \`discount_amount\` decimal(12,4) NOT NULL,

package/src/modules/checkout/migration/Version-1.0.1.js

@@ -1,10 +0,0 @@
-const { execute } = require('@evershop/mysql-query-builder');
-const { pool } = require('../../../lib/mysql/connection');
-
-// eslint-disable-next-line no-multi-assign
-module.exports = exports = async () => {
-  await execute(pool, `ALTER TABLE \`cart\` ADD \`sid\` text DEFAULT NULL AFTER \`user_ip\``);
-  await execute(pool, `ALTER TABLE \`order\` ADD \`sid\` text DEFAULT NULL AFTER \`user_ip\``);
-  await execute(pool, `ALTER TABLE \`cart_item\` ADD \`thumbnail\` text DEFAULT NULL AFTER \`product_name\``);
-  await execute(pool, `ALTER TABLE \`order_item\` ADD \`thumbnail\` text DEFAULT NULL AFTER \`product_name\``);
-};

package/src/modules/checkout/migration/Version-1.0.2.js

@@ -1,14 +0,0 @@
-const { execute } = require('@evershop/mysql-query-builder');
-const { pool } = require('../../../lib/mysql/connection');
-
-// eslint-disable-next-line no-multi-assign
-module.exports = exports = async () => {
-  await execute(pool, `ALTER TABLE \`cart\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`cart_id\``);
-  await execute(pool, `ALTER TABLE \`order\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`order_id\``);
-  await execute(pool, `ALTER TABLE \`cart_item\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`cart_item_id\``);
-  await execute(pool, `ALTER TABLE \`order_item\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`order_item_id\``);
-  await execute(pool, `ALTER TABLE \`cart_address\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`cart_address_id\``);
-  await execute(pool, `ALTER TABLE \`order_address\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`order_address_id\``);
-  await execute(pool, `ALTER TABLE \`payment_transaction\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`payment_transaction_id\``);
-  await execute(pool, `ALTER TABLE \`shipment\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`shipment_id\``);
-};

package/src/modules/customer/migration/Version-1.0.1.js

@@ -1,8 +0,0 @@
-const { execute } = require('@evershop/mysql-query-builder');
-const { pool } = require('../../../lib/mysql/connection');
-
-// eslint-disable-next-line no-multi-assign
-module.exports = exports = async () => {
-  await execute(pool, `ALTER TABLE \`customer\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`customer_id\``);
-  await execute(pool, `ALTER TABLE \`customer_address\` ADD \`uuid\` varchar(255) DEFAULT replace(uuid(),'-','') AFTER \`customer_address_id\``);
-};