zet-lib 3.1.0 → 3.1.2

package/lib/zMenuRouter.js

@@ -53,56 +53,63 @@ router.get('/', async function (req, res, next) {
       }
     })
     if(copyMenu){
+      copyMenu.json = '[]';
       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;
+      company.name = 'Default';
       delete copyMenu.id;
       await connection.insert({
         table : "zmenu",
         data : copyMenu
       });
     }
+    rows= await connection.results({
+      table: "zmenu",
+      where : {
+        company_id : companyId
+      }
+    });
   }
-  if (rows.length > 0) {
-    hasAccessMenu = true;
-    //check id changes
-    let rowsChanges = rows.filter((item) => item.active == 1);
-    idChanges = rowsChanges[0].id;
-    if (id) {
-      await connection.update({
-        table : "zmenu",
-        data: {
-          active:0
-        },
-        where : {
-          company_id: companyId
-        }
-      });
-      await connection.update({
-        table : "zmenu",
-        data : {
-          active : 1,
-        },
-        where : {
-          id: id
-        }
-      });
-    } else {
-      id =1;
-      let selected = rows.filter(item=>item.active == 1)[0] || {}
-      id = selected.id;
-      name = selected.name;
-    }
+  hasAccessMenu = true;
+  //check id changes
+  let rowsChanges = rows.filter((item) => item.active == 1);
+  idChanges = rowsChanges.length > 0 ? rowsChanges[0].id : null;
+  if (id) {
+    await connection.update({
+      table : "zmenu",
+      data: {
+        active:0
+      },
+      where : {
+        company_id: companyId
+      }
+    });
+    await connection.update({
+      table : "zmenu",
+      data : {
+        active : 1,
+      },
+      where : {
+        id: id
+      }
+    });
+  } else {
+    id =1;
+    let selected = rows.filter(item=>item.active == 1)[0] || {}
+    id = selected.id;
+    name = selected.name;
   }
+
   findArr = await connection.results({
     table:"zmenu",
     where: {
       id:id
     }
   });
-  arr = findArr[0].json;
+  arr = findArr && findArr.length > 0 && findArr[0].json ? findArr[0].json : arr;
   let refresh = 0;
   if (id != idChanges) {
     refresh = 1;

package/lib/zRoute.js

@@ -3766,7 +3766,9 @@ zRoute.viewForm = (
           obj[key].value = data[key] ? Util.formatNumber(data[key], ".") : "";
           break;
         case "money":
-          obj[key].value = data[key] ? `${widgets[key].symbol} ${Util.formatNumber(data[key], ".")}` : "";
+          // Set value in standard format (number with dot as decimal separator)
+          // Let formatCurrency handle the formatting
+          obj[key].value = data[key] ? `${widgets[key].symbol || ""} ${Util.formatNumber(data[key], widgets[key].thousandSeparator)}` : "";
           break;
         case "typeahead":
           obj[key].type = "text";
@@ -4277,6 +4279,50 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     if(moneys.length > 0) {
       let moneyScript = ``
       moneys.map((money) => {
+        // Clean and normalize the value to standard format (number with dot as decimal separator)
+        // This must be done BEFORE formatCurrency is called
+        moneyScript += `var ${money}Val = $('#${money}').val();`
+        moneyScript += `if(${money}Val) {`
+        // Remove all non-numeric characters (symbols, spaces, etc)
+        moneyScript += `  ${money}Val = ${money}Val.toString().replace(/[^0-9.,-]/g, '');`
+        // Normalize to standard format based on thousand separator configuration
+        moneyScript += `  if('${widgets[money].thousandSeparator || "."}' === '.') {`
+        // Thousand separator is ".", so "," is decimal separator
+        // If value has multiple dots or comma, it's already formatted - normalize it
+        moneyScript += `    var dotCount = (${money}Val.match(/\\./g) || []).length;`
+        moneyScript += `    var commaCount = (${money}Val.match(/,/g) || []).length;`
+        moneyScript += `    if(dotCount > 1 || commaCount > 0) {`
+        // Remove all dots (thousand separators) and replace comma with dot (decimal separator)
+        moneyScript += `      ${money}Val = ${money}Val.replace(/\\./g, '').replace(',', '.');`
+        moneyScript += `    }`
+        // If dotCount === 1 and commaCount === 0, value is already in standard format, keep it
+        moneyScript += `  } else {`
+        // Thousand separator is ",", so "." is decimal separator
+        moneyScript += `    var commaCount = (${money}Val.match(/,/g) || []).length;`
+        moneyScript += `    if(commaCount > 1) {`
+        // Multiple commas means formatted - remove all commas (thousand separators)
+        moneyScript += `      ${money}Val = ${money}Val.replace(/,/g, '');`
+        moneyScript += `    }`
+        // If commaCount <= 1, value is already in standard format, keep it
+        moneyScript += `  }`
+        // Convert to number first to ensure we have a valid number, then back to string
+        moneyScript += `  var ${money}Num = parseFloat(${money}Val);`
+        moneyScript += `  if(!isNaN(${money}Num)) {`
+        // Always use toFixed to ensure proper decimal format
+        moneyScript += `    var ${money}Decimals = ${widgets[money].digitDecimal || 0};`
+        moneyScript += `    ${money}Val = ${money}Num.toFixed(${money}Decimals);`
+        // If thousand separator is ".", formatCurrency expects comma as decimal separator
+        // So we need to replace dot with comma before formatCurrency processes it
+        moneyScript += `    if('${widgets[money].thousandSeparator || "."}' === '.') {`
+        moneyScript += `      ${money}Val = ${money}Val.replace('.', ',');`
+        moneyScript += `    }`
+        moneyScript += `  } else {`
+        moneyScript += `    ${money}Val = '';`
+        moneyScript += `  }`
+        // Set the normalized value back to input
+        moneyScript += `  $('#${money}').val(${money}Val);`
+        moneyScript += `}`
+        // Now formatCurrency will format the standard format value correctly
         moneyScript += `$('#${money}').formatCurrency({
             symbol: '${widgets[money].symbol || "" }',
             decimalSymbol: '${widgets[money].decimalPlaces || "," }',

package/package.json

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