Make everything multilanguage - All changes at once.

.github/workflows/tests.yaml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 13.x, 14.x]
-        mongodb-version: [4.2]
+        node-version: [16.x]
+        mongodb-version: [5.0]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -27,4 +27,4 @@ jobs:
       run: npm run test
       env:
         test: true
-        CI: true
+        CI: true

.gitignore

@@ -3,7 +3,9 @@ data/
 public/uploads
 /config/*-local.json
 .vscode
+.idea
 **.DS_Store
 env.yaml
 ecosystem.config.js
-bin/googleproducts.xml
+bin/googleproducts.xml
+/expressCart.iml

Dockerfile

@@ -1,8 +1,6 @@
-FROM mhart/alpine-node:8
+FROM node:16.13.0
 
-ENV NODE_VERSION 8.9.4
-
-RUN apk add --no-cache make gcc g++ python bash
+ENV NODE_VERSION 16.13.0
 
 WORKDIR /var/expressCart
 
@@ -12,13 +10,16 @@ COPY config/ /var/expressCart/config/
 COPY public/ /var/expressCart/public/
 COPY routes/ /var/expressCart/routes/
 COPY views/ /var/expressCart/views/
+COPY locales/ /var/expressCart/locales/
 
 COPY app.js /var/expressCart/
 COPY package.json /var/expressCart/
 COPY deploy.js /var/expressCart/
 
 RUN npm install
 
+RUN npm run deploy
+
 VOLUME /var/expressCart/data
 
 EXPOSE 1111

app.js

@@ -214,6 +214,13 @@ handlebars = handlebars.create({
         discountExpiry: (start, end) => {
             return moment().isBetween(moment(start), moment(end));
         },
+        IsHidden: (v1, operator, v2) => {
+            switch(operator){
+                case '==':
+                    return (v1 === v2) ? "" : "hidden"
+
+            }
+        },
         ifCond: (v1, operator, v2, options) => {
             switch(operator){
                 case '==':
@@ -250,7 +257,7 @@ handlebars = handlebars.create({
             }
             if(status === 'Pending'){
                 const paymentConfig = getPaymentConfig();
-                if(config.paymentGateway === 'instore'){
+                if(['instore', 'wiretransfer' , 'ondelivery'].includes(config.paymentGateway) ){
                     return `<h2 class="text-warning">${paymentConfig.resultMessage}</h2>`;
                 }
                 return '<h2 class="text-warning">The payment for this order is pending. We will be in contact shortly.</h2>';
@@ -315,6 +322,43 @@ handlebars = handlebars.create({
         timeAgo: (date) => {
             return moment(date).fromNow();
         },
+        setVar: (varName, varValue, options) => {
+            options.data.root[varName] = varValue;
+        },
+        getDescriptionLanguage: (result, language) => {
+            return result[`productDescription_${language}`] ? result[`productDescription_${language}`] : ""
+        },
+        getExtraLanguageFromKey: (result, key,  language, defaultLanguage) => {
+            if (defaultLanguage !== language) {
+                return result[`${key}_${language}`] ? result[`${key}_${language}`] : ""
+            } else {
+                return result[key];
+            }
+        },
+        getIdForLanguages : (idName, language, defaultLanguage) => {
+            return defaultLanguage === language ?idName : `${idName}_${language}`;
+        },
+        getIdForLanguagesForMenuId : (idName, language, defaultLanguage,menu) => {
+            if(menu.language === language || (!menu.language && language === defaultLanguage)){
+                return defaultLanguage === language ?idName : `${idName}_${language}`;
+            }else{
+                return "dont_use";
+            }
+
+        },
+        getIdForLanguagesWithId : (idName,id, language, defaultLanguage) => {
+            return defaultLanguage === language ? `${idName}-${id}` : `${idName}-${id}_${language}`;
+        },
+        getMinLength : (language, defaultLanguage, minLengthIfDefaultLang ) => {
+            return language === defaultLanguage ? minLengthIfDefaultLang : 0
+        },
+        getRequired : (language, defaultLanguage ) => {
+            return language === defaultLanguage ? "required" : ""
+        },
+        isMatchingLanguageOrDefault : (menu, lang2 , deflocale, options) => {
+            const result = (lang2 === menu.language) || (typeof menu.language === "undefined" && deflocale === lang2);
+            return  result ? options.fn(this) : options.inverse(this);
+},
         imagePath: (value) => {
             if(value && value.substring(0, 4) === 'http'){
                 return value;
@@ -336,6 +380,7 @@ handlebars = handlebars.create({
                 <use xlink:href="/dist/feather-sprite.svg#${icon}"/>
             </svg>`;
         }
+
     }
 });
 
@@ -363,6 +408,7 @@ app.set('port', process.env.PORT || 1111);
 app.use(logger('dev'));
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser(config.secretCookie));
+
 app.use(session({
     resave: true,
     saveUninitialized: true,
@@ -498,6 +544,7 @@ initDb(config.databaseConnectionString, async (err, db) => {
         await db.cart.deleteMany({
             sessionId: { $nin: validSessionIds }
         });
+
     });
 
     // Fire up the cron job to create google product feed
@@ -525,6 +572,7 @@ initDb(config.databaseConnectionString, async (err, db) => {
         });
     };
 
+
     // Set trackStock for testing
     if(process.env.NODE_ENV === 'test'){
         config.trackStock = true;
@@ -535,6 +583,7 @@ initDb(config.databaseConnectionString, async (err, db) => {
 
     // Start the app
     try{
+        await versionUpdate(db);
         await app.listen(app.get('port'));
         app.emit('appStarted');
         if(process.env.NODE_ENV !== 'test'){
@@ -545,5 +594,28 @@ initDb(config.databaseConnectionString, async (err, db) => {
         process.exit(2);
     }
 });
+const versionUpdate = async (db) => {
+    const version = await db.systeminfo.findOne({_id : "version"});
+    if(!version){
+        console.warn('will upgrade data to latest version');
+        try{
+            const menus = await (db.menu.find({})).toArray();
+            for(const menu of menus){
+                const items = menu.items.map(x => {
+                    x.id = `${Math.floor(Math.random()*10000000000)}`
+                    return x;
+                });
+                db.menu.updateOne({_id : menu._id},{$set : {items : items}});
+
+            }
+            db.systeminfo.insertOne({_id : "version", value :"1.2.0"});
+        }catch(e){
+            console.error("upgrade failed",e);
+        }
 
+    }else{
+        console.log(`expressCart is running V${version.value}`);
+    }
+
+}
 module.exports = app;

bin/testdata.json

@@ -242,15 +242,20 @@
     "menu": {
         "items": [
             {
+                "id" : "9999999999",
                 "title": "Backpacks",
                 "link": "/category/backpack",
                 "order": 0
             },
             {
+                "id" : "1111111111",
                 "title": "Boots",
                 "link": "/category/boots",
                 "order": 1
             }
         ]
+    },
+    "systeminfo" : {
+        "version": "1.2.0"
     }
-}
+}

config/payment/config/ondelivery.json

@@ -0,0 +1,6 @@
+{
+    "description": "Pay on Delivery",
+    "orderStatus": "Pending",
+    "buttonText": "You will pay on delivery",
+    "resultMessage": "The order is place. Please pay for your order on delivery."
+}

config/payment/config/wiretransfer.json

@@ -0,0 +1,7 @@
+{
+    "description": "Pay with wire transfer",
+    "orderStatus": "Pending",
+    "buttonText": "You will pay with wire transfer",
+    "resultMessage": "The order is place. Please pay for your order with wiretransfer.",
+    "accountNumber" : "XXXXXXXXX-XXXXXX-X"
+}

config/payment/schema/ondelivery.json

@@ -0,0 +1,24 @@
+{
+    "properties": {
+        "description": {
+            "type": "string"
+        },
+        "orderStatus": {
+            "type": "string",
+            "enum": ["Completed", "Paid", "Pending"]
+        },
+        "buttonText": {
+            "type": "string"
+        },
+        "resultMessage": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "description",
+        "orderStatus",
+        "buttonText",
+        "resultMessage"
+    ],
+    "additionalProperties": false
+}

config/payment/schema/wiretransfer.json

@@ -0,0 +1,28 @@
+{
+    "properties": {
+        "description": {
+            "type": "string"
+        },
+        "orderStatus": {
+            "type": "string",
+            "enum": ["Completed", "Paid", "Pending"]
+        },
+        "buttonText": {
+            "type": "string"
+        },
+        "resultMessage": {
+            "type": "string"
+        },
+        "accountNumber": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "description",
+        "orderStatus",
+        "buttonText",
+        "resultMessage",
+        "accountNumber"
+    ],
+    "additionalProperties": false
+}

config/settings.json

@@ -15,18 +15,31 @@
     "googleAnalytics": "",
     "injectJs": "",
     "customCss": "",
-    "currencySymbol": "£",
-    "currencyISO": "USD",
+    "currencySymbol": "lei",
+    "currencyISO": "RON",
     "paymentGateway": [
         "stripe"
     ],
     "databaseConnectionString": "mongodb://127.0.0.1:27017/expresscart",
     "theme": "Cloth",
     "trackStock": false,
     "orderHook": "",
+    "hooks" : {
+        "product" : {
+            "onCreate" : ""
+        },
+        "variant" : {
+            "onCreate" : ""
+        },
+        "order" : {
+            "onCreate" : ""
+        }
+
+    },
     "availableLanguages": [
         "en",
-        "it"
+        "it",
+        "ro"
     ],
     "defaultLocale": "en",
     "maxQuantity": 25,
@@ -47,5 +60,8 @@
         }
     },
     "showRelatedProducts": true,
-    "showHomepageVariants": false
-}
+    "showHomepageVariants": false,
+    "variantTemplates" : [{
+        "color" : ["black","white","red"]
+    }]
+}

config/settingsSchema.json

@@ -130,6 +130,35 @@
         "orderHook": {
             "format": "uri-template"
         },
+        "hooks" : {
+            "type": "object",
+            "properties": {
+                "product" : {
+                    "type": "object",
+                    "properties": {
+                        "onCreate": {
+                            "format": "uri-template"
+                        }
+                    }
+                },
+                "variant" : {
+                    "type": "object",
+                    "properties": {
+                        "onCreate": {
+                            "format": "uri-template"
+                        }
+                    }
+                },
+                "order" : {
+                    "type": "object",
+                    "properties": {
+                        "onCreate": {
+                            "format": "uri-template"
+                        }
+                    }
+                }
+            }
+        },
         "secretCookie": {
             "type": "string"
         },
@@ -192,6 +221,20 @@
         "showHomepageVariants": {
             "type": "boolean",
             "default": false
+        },
+        "variantTemplates" : {
+            "type": "array",
+            "items" : {
+                "type" : "object",
+                "patternProperties" : {
+                    ".*" : {
+                        "type" : "array",
+                        "items" : {
+                            "type" : "string"
+                        }
+                    }
+                }
+            }
         }
     },
     "required": [