zet-lib 3.0.8 → 3.1.0

package/lib/zMenuRouter.js

@@ -44,6 +44,27 @@ router.get('/', async function (req, res, next) {
       company_id : companyId
     }
   });
+  if(rows.length == 0){
+    //copy from companyId;
+    let copyMenu = await connection.result({
+      table : "zmenu",
+      where : {
+        company_id : 1
+      }
+    })
+    if(copyMenu){
+      copyMenu.updated_by = res.locals.userId;
+      copyMenu.created_by = res.locals.userId;
+      copyMenu.created_at = Util.now();
+      copyMenu.updated_at = Util.now();
+      copyMenu.company_id = companyId;
+      delete copyMenu.id;
+      await connection.insert({
+        table : "zmenu",
+        data : copyMenu
+      });
+    }
+  }
   if (rows.length > 0) {
     hasAccessMenu = true;
     //check id changes

package/lib/zRoute.js

@@ -329,6 +329,42 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
         post[routeName][key] = val ? val : val === 0 ? 0 : null;
         break;
 
+      case "money":
+        if (typeof val == "string" && val.trim() !== "") {
+          // Get widget configuration
+          const widgetConfig = widgets[key] || {};
+          const symbol = widgetConfig.symbol || "";
+          const thousandSeparator = widgetConfig.thousandSeparator || ",";
+          const decimalPlaces = widgetConfig.decimalPlaces || ".";
+
+          // Remove symbol if present
+          let cleanedVal = val.trim();
+          if (symbol && cleanedVal.startsWith(symbol)) {
+            cleanedVal = cleanedVal.substring(symbol.length).trim();
+          }
+
+          // Remove thousand separators
+          if (thousandSeparator) {
+            // Escape special regex characters
+            const escapedThousandSep = thousandSeparator.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            cleanedVal = cleanedVal.replace(new RegExp(escapedThousandSep, 'g'), '');
+          }
+
+          // Replace decimal separator with standard dot
+          if (decimalPlaces && decimalPlaces !== ".") {
+            // Escape special regex characters
+            const escapedDecimalSep = decimalPlaces.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            cleanedVal = cleanedVal.replace(escapedDecimalSep, '.');
+          }
+
+          // Convert to number
+          const numVal = parseFloat(cleanedVal);
+          post[routeName][key] = isNaN(numVal) ? null : numVal;
+        } else {
+          post[routeName][key] = val ? val : val === 0 ? 0 : null;
+        }
+        break;
+
       case "json_array":
         myval = null;
         if (val) {
@@ -1272,6 +1308,10 @@ zRoute.dataTableData = (
             myvalue = Util.formatNumber(value);
             break;
 
+          case "money":
+            myvalue = `${MYMODEL.widgets[key].symbol} ${Util.formatNumber(value, MYMODEL.widgets[key].thousandSeparator)}`;
+            break;
+
           case "integer":
             myvalue = value + "";
             break;
@@ -3723,7 +3763,10 @@ zRoute.viewForm = (
           obj[key].value = data[key] || "";
           break;
         case "number":
-          obj[key].value = data[key] ? Util.formatNumber(data[key], ",") : "";
+          obj[key].value = data[key] ? Util.formatNumber(data[key], ".") : "";
+          break;
+        case "money":
+          obj[key].value = data[key] ? `${widgets[key].symbol} ${Util.formatNumber(data[key], ".")}` : "";
           break;
         case "typeahead":
           obj[key].type = "text";
@@ -4127,6 +4170,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
   let hasAttributes = [];
   let joinsFields = [];
   let selectize = [];
+  let moneys = [];
   if (MYMODEL.joins) {
     joinsFields = MYMODEL.joins.list;
   }
@@ -4136,6 +4180,9 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         hasDatePicker = true;
       } else if (widgets[key].name == "number") {
         hasNumber = true;
+      } else if (widgets[key].name == "money") {
+        hasNumber = true;
+        moneys.push(key);
       } else if (widgets[key].name == "clockpicker") {
         hasClockPicker = true;
       } else if (widgets[key].name == "editor") {
@@ -4227,6 +4274,24 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     scriptForm += numberObj.script;
     headObj.number = numberObj.head;
     endObj.number = numberObj.end;
+    if(moneys.length > 0) {
+      let moneyScript = ``
+      moneys.map((money) => {
+        moneyScript += `$('#${money}').formatCurrency({
+            symbol: '${widgets[money].symbol || "" }',
+            decimalSymbol: '${widgets[money].decimalPlaces || "," }',
+            digitGroupSymbol: '${widgets[money].thousandSeparator || "." }',
+            roundToDecimalPlace: ${widgets[money].digitDecimal || 0}
+        });`
+        moneyScript += `$('#${money}').formatCurrencyLive({
+            symbol: '${widgets[money].symbol || "" }',
+            decimalSymbol: '${widgets[money].decimalPlaces || "," }',
+            digitGroupSymbol: '${widgets[money].thousandSeparator || "." }',
+            roundToDecimalPlace: ${widgets[money].digitDecimal || 0}
+        });`
+      })
+      scriptForm += ` $(function() {${moneyScript}});`;
+    }
   }
   if (hasClockPicker) {
     let clockpickerObj = moduleLib.clockpicker(req, res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "3.0.8",
+  "version": "3.1.0",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"