@b2y/ecommerce-common 1.3.9 → 1.4.0

package/model/Permission.js

@@ -8,16 +8,6 @@ module.exports = (sequelize) => {
       allowNull: false,
       defaultValue: DataTypes.UUIDV4
     },
-    TenantID: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      references: {
-        model: 'Tenant',
-        key: 'TenantID'
-      },
-      onDelete: 'CASCADE',
-      onUpdate: 'CASCADE'
-    },
     Module: {
       type: DataTypes.STRING(100),
       allowNull: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {

package/scripts/QueryBuilder.js

@@ -118,8 +118,8 @@ static productQueryBuilder(filters) {
         fv."SellingPrice",
         fp."GroupBy",
 
-        CASE 
-          WHEN fp."GroupBy" IS NULL
+        CASE
+          WHEN fp."GroupBy" IS NULL OR fv."GroupByAttributeValue" IS NULL
             THEN fv."ProductVariantID"::text
           ELSE
             fv."ProductID"::text || '_' || fv."GroupByAttributeValue"::text
@@ -127,8 +127,8 @@ static productQueryBuilder(filters) {
 
         ROW_NUMBER() OVER (
           PARTITION BY
-            CASE 
-              WHEN fp."GroupBy" IS NULL
+            CASE
+              WHEN fp."GroupBy" IS NULL OR fv."GroupByAttributeValue" IS NULL
                 THEN fv."ProductVariantID"::text
               ELSE
                 fv."ProductID"::text || '_' || fv."GroupByAttributeValue"::text

package/utility/AppUtil.js

@@ -59,6 +59,10 @@ const AppUtil = {
   isValidPhone: function (phoneNumber) {
     const phoneRegex = /^\d{10,20}$/;
     return phoneRegex.test(phoneNumber);
+  },
+  generateTimestampedId: function (prefix, suffix) {
+    const id = `${prefix}-${Date.now()}`;
+    return suffix == null ? id : `${id}-${suffix}`;
   }
 };
 

package/utility/PdfUtil.js

@@ -26,12 +26,15 @@ class PdfUtil {
     let browser;
     try {
       // Launch puppeteer
-      browser = await puppeteer.launch({
-        executablePath: '/usr/bin/chromium',
+      const launchOptions = {
         headless: true,
-        args: ['--no-sandbox', '--disable-setuid-sandbox','--disable-dev-shm-usage']
-      });
-
+        args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage']
+      };
+      // Use system browser when configured (e.g. Docker); otherwise fall back to Puppeteer's bundled Chrome
+      if (process.env.PUPPETEER_EXECUTABLE_PATH) {
+        launchOptions.executablePath = process.env.PUPPETEER_EXECUTABLE_PATH || '/usr/bin/chromium';
+      }
+      browser = await puppeteer.launch(launchOptions);
       const page = await browser.newPage();
       
       // Set content and wait for any resources to load