@things-factory/operato-wms 4.3.788 → 4.3.790

package/client/pages/inventory/inventory-adjustment.js

@@ -1304,56 +1304,107 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
     try {
       patches = patches.map(patch => normalizeInventoryPatch(patch))
 
-      patches.map(itm => {
+      const validAdjustmentCodes = new Set(
+        Object.values(ADJUSTMENT_CODE).map(ac => ac.value)
+      )
+
+      // Fetch fresh locations for client-side validation (avoid stale cache)
+      await this.fetchLocation()
+      const locationNameSet = new Set((this._locations || []).map(l => l.name))
+
+      patches.forEach(itm => {
+        const errors = []
+        delete itm.errMsg
+
         if (toFloatOrUndefined(itm?.uomValue) < 0) {
-          throw new Error(i18next.t('text.invalid_uom_value'))
+          errors.push(i18next.t('text.invalid_uom_value'))
         }
         if (toFloatOrUndefined(itm?.qty) < 0) {
-          throw new Error(i18next.t('text.invalid_qty'))
+          errors.push(i18next.t('text.invalid_qty'))
         }
         if (itm?.packingType?.trim() == '') {
-          throw new Error(i18next.t('text.invalid_packing_type'))
+          errors.push(i18next.t('text.invalid_packing_type'))
         }
         if (toFloatOrUndefined(itm?.unitCost) < 0) {
-          throw new Error(i18next.t('text.invalid_unit_cost'))
+          errors.push(i18next.t('text.invalid_unit_cost'))
         }
         if (new Date(itm?.manufactureDate) > new Date()) {
-          throw new Error(i18next.t('text.invalid_manufacture_date'))
+          errors.push(i18next.t('text.invalid_manufacture_date'))
         }
-        if (
-          itm?.adjustmentCode?.trim() == '' ||
-          (itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC01.value &&
-            itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC02.value &&
-            itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC03.value &&
-            itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC04.value &&
-            itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC05.value &&
-            itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC06.value &&
-            itm?.adjustmentCode?.trim() != ADJUSTMENT_CODE.AC07.value)
-        ) {
-          throw new Error(i18next.t('text.adjustment_code_is_required_kindly_fill_in_the_adjustment_code_to_continue'))
+        if (!itm?.adjustmentCode?.trim() || !validAdjustmentCodes.has(itm.adjustmentCode.trim())) {
+          errors.push(i18next.t('text.adjustment_code_is_required_kindly_fill_in_the_adjustment_code_to_continue'))
         }
         if (itm?.adjustmentNote?.trim() == '') {
-          throw new Error(i18next.t('text.invalid_adjustment_note'))
+          errors.push(i18next.t('text.invalid_adjustment_note'))
+        }
+
+        // Validate location for all rows
+        if (!itm?.location || !itm?.location?.name) {
+          errors.push(i18next.t('text.location_is_required_kindly_fill_in_the_location_to_continue'))
+        } else if (!locationNameSet.has(itm.location.name)) {
+          errors.push(`${i18next.t('text.location_not_found')}: ${itm.location.name}`)
         }
 
         if (itm.cuFlag == '+') {
-          this.validation(itm)
+          if (!itm?.batchId) {
+            errors.push(i18next.t('text.batch_no_is_required_kindly_fill_in_the_batch_no_to_continue'))
+          }
+          if (!itm?.bizplace || !itm?.bizplace?.id) {
+            errors.push(i18next.t('text.company_is_required_kindly_fill_in_the_company_to_continue'))
+          }
+          if (!itm?.qty) {
+            errors.push(i18next.t('text.qty_is_required_kindly_fill_in_the_qty_to_continue'))
+          }
+          if (!itm?.uomValue) {
+            errors.push(i18next.t('text.total_uom_value_is_required_kindly_fill_in_the_total_uom_value_to_continue'))
+          }
+          if (!itm?.adjustmentCode) {
+            // already checked above, but keep for cuFlag '+' specific check
+          }
+          if (!itm?.adjustmentNote) {
+            errors.push(i18next.t('text.adjustment_note_is_required_kindly_fill_in_the_adjustment_note_to_continue'))
+          }
 
           if (!itm.sku) {
-            throw new Error(i18next.t('text.sku_is_required_kindly_fill_in_the_sku_to_continue'))
+            errors.push(i18next.t('text.sku_is_required_kindly_fill_in_the_sku_to_continue'))
           }
 
           if (itm.qty < 0 || itm.unitCost < 0 || itm.uomValue < 0) {
-            throw new Error(i18next.t('text.invalid_value_in_list'))
+            errors.push(i18next.t('text.invalid_value_in_list'))
           }
 
           if (
             itm.manufactureDate &&
             (itm.manufactureDate.getFullYear < 1000 || itm.manufactureDate.getTime > new Date().getTime)
           ) {
-            throw new Error(i18next.t('text.invalid_value_in_list'))
+            errors.push(i18next.t('text.invalid_value_in_list'))
+          }
+        }
+
+        if (itm.serialNumbers) {
+          let serialNumbers = itm.serialNumbers
+          itm.serialNumbers = serialNumbers.replace(' ', '')
+
+          if (itm.serialNumbers.split(',').length != itm.qty) {
+            errors.push(i18next.t('text.serial_number_not_tally_with_qty'))
           }
         }
+
+        if (errors.length) {
+          itm.errMsg = errors.join('; ')
+        }
+      })
+
+      const hasErrors = patches.some(p => p.errMsg)
+      if (hasErrors) {
+        return patches
+      }
+
+      // Save original patches for error display if the server mutation fails
+      const originalPatches = patches.map(p => ({ ...p }))
+
+      // All validations passed — apply transformations and submit
+      patches.forEach(itm => {
         itm.qty = toFloatOrUndefined(itm.qty)
         itm.packingSize = toFloatOrUndefined(itm.packingSize)
         itm.uomValue = toFloatOrUndefined(itm.uomValue)
@@ -1365,19 +1416,14 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         }
         if (itm.unitCost != null) {
           itm.unitCost = toFloatOrUndefined(itm.unitCost)
-          if (isNaN(itm.unitCost)) {
-            throw new Error(i18next.t('text.invalid_unit_cost'))
-          }
         }
 
-        if (itm.location.zone || itm.location.row || itm.location.column) {
-          //if user repic location after import
+        if (itm.location && (itm.location.zone || itm.location.row || itm.location.column)) {
           delete itm.location.zone
           delete itm.location.row
           delete itm.location.column
         }
 
-        //if user repick product after import
         if (itm?.product?.productId) {
           itm.product.id = itm.product.productId
           delete itm.product.productId
@@ -1399,14 +1445,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           itm.manufactureDate = `${mdt.getFullYear()}-${mdt.getMonth() + 1}-${mdt.getDate()}`
         }
 
-        if (itm.serialNumbers) {
-          let serialNumbers = itm.serialNumbers
-          itm.serialNumbers = serialNumbers.replace(' ', '')
-
-          if (itm.serialNumbers.split(',').length != itm.qty) {
-            throw new Error(i18next.t('text.serial_number_not_tally_with_qty'))
-          }
-        }
+        delete itm.errMsg
       })
 
       const response = await client.mutate({
@@ -1419,9 +1458,15 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
       })
 
       if (!response.errors) {
-        history.back()
         this.dataGrist.fetch()
         this.showToast({ message: i18next.t('text.data_inventory_adjustment_has_been_submitted_for_approval') })
+      } else {
+        // Server returned errors — show in the error column on original patches
+        const errMsg = response.errors.map(e => e.message).join('; ')
+        originalPatches.forEach(p => {
+          p.errMsg = errMsg
+        })
+        return originalPatches
       }
     } catch (e) {
       this.showToast(e)
@@ -1450,6 +1495,14 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
         return { ...column }
       })
 
+    columns.push({
+      type: 'string',
+      name: 'errMsg',
+      header: i18next.t('field.error_message'),
+      width: 300,
+      record: { editable: false }
+    })
+
     setTimeout(() => {
       openPopup(
         html`
@@ -1459,6 +1512,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             rows: this.config.rows,
             columns: columns
           }}
+            .enableRowErrors=${true}
             .importHandler="${this.importHandler.bind(this)}"
             @field-change="${this.fieldChange.bind(this)}"
           ></import-pop-up>

package/client/pages/report/inbound-order-details-report.js

@@ -829,6 +829,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         { header: i18next.t('field.carton_id'), key: 'cartonId', width: 25, type: 'string' },
         { header: i18next.t('field.batch_id'), key: 'batchId', width: 25, type: 'string' },
         { header: i18next.t('field.batch_id_ref'), key: 'batchIdRef', width: 25, type: 'string' },
+        { header: i18next.t('field.unloaded_by'), key: 'unloadedBy', width: 30, type: 'string' },
         { header: i18next.t('field.unloaded_at'), key: 'unloadedAt', width: 15, type: 'string' },
         { header: i18next.t('field.exp_date'), key: 'expirationDate', width: 15, type: 'string' },
         { header: i18next.t('field.manufacture_date'), key: 'manufactureDate', width: 15, type: 'string' },

package/config.development.js

@@ -6,18 +6,29 @@ module.exports = {
   subdomainOffset: 2,
   port: 4000,
   inspect: '9330',
-
-  storage: {
-    type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
-    secretAccessKey: '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',
-    bucketName: 'opa-one',
-    region: 'ap-southeast-1'
-  },
-  // arif
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
+  //   database: 'postgres',
+  //   username: 'izzah',
+  //   password: 'hatio1234',
+  //   host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
+  //   port: 55432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  // postgres2
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'postgres',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.151',
+  //   port: 15432,
+  //   synchronize: false,debug
+  //   name: 'default',
+  //   type: 'postgres',
   //   database: 'arif',
   //   username: 'postgres',
   //   password: 'hatio',
@@ -26,7 +37,51 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'operato-eric',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.248',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  //operato
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'operato',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.151',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  //153 - operatodebug
+  //   type: 'postgres',
+  //   database: 'operato',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.153',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  //eric2
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'eric2',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.153',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
   // STAGING DATABASE
   ormconfig: {
     name: 'default',
@@ -39,46 +94,30 @@ module.exports = {
     synchronize: false,
     logging: true
   },
-
+  //EMS
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
-  //   port: 55432,
-  //   database: 'postgres',
-  //   username: 'postgres',
-  //   password: 'abcd1234',
-  //   synchronize: false,
-  //   logging: true,
-  //   connectTimeoutMS: 30000,
-  //   extra: { poolSize: 30 }
-  // },
-
-  //db izzah
-  // ormconfig: {
-  //   name: 'default',
-  //   type: 'postgres',
-  //   database: '06072023',
+  //   database: 'EMS',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.153',
-  //   port: 15432,f
-  //   synchronize: true,
+  //   host: '192.168.0.161',
+  //   port: 15432,
+  //   synchronize: false,
   //   logging: true
   // },
+  //db nora
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
   //   database: 'postgres',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.151',
+  //   host: '192.168.0.36',
   //   port: 15432,
-  //   synchronize: false,
+  //   synchronize: true,
   //   logging: true
   // },
-
-  // //ERIC
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -87,15 +126,14 @@ module.exports = {
   //   password: 'hatio',
   //   host: '192.168.0.153',
   //   port: 15432,
-  //   synchronize: false,
+  //   synchronize: true,
   //   logging: true
   // },
-
-  //eric 2
+  //db izzah
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'eric2',
+  //   database: '06072023',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.153',
@@ -103,21 +141,20 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
-  //   port: 55432,
+  //   host: 'a6cf0bb5671f54555985dede599d5a87-649005352.ap-southeast-1.elb.amazonaws.com',
+  //   port: 15432,
   //   database: 'postgres',
-  //   username: 'postgres',
-  //   password: 'abcd1234',
+  //   username: 'operato-hub-app',
+  //   password: 'a5Z(7|6n$Zti',
   //   synchronize: false,
   //   logging: true,
   //   connectTimeoutMS: 30000,
   //   extra: { poolSize: 30 }
   // },
-  //ormconfig: {
+  // //ormconfig: {
   //  name: 'default',
   //  type: 'postgres',
   //  database: 'dev2',
@@ -145,16 +182,7 @@ module.exports = {
   },
   uploads: 'uploads',
   attachmentsPath: 'attachments',
-  logger: {
-    file: {
-      filename: 'logs/application-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      zippedArchive: true,
-      maxSize: '200m',
-      maxFiles: '1m',
-      level: 'info'
-    }
-  },
+  logger: {},
   email: {
     host: 'smtp.office365.com',
     port: 587,
@@ -192,30 +220,72 @@ module.exports = {
     //   privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
     // }
   },
-  // reportApiUrl:
-  //   'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html',
-  // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html',
-  // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html',
+  fulfillmentIntegrationOperato: {
+    host: '192.168.0.161:3000',
+    protocol: 'http',
+    platform: 'operato',
+    application: 'Operato MMS',
+    appKey: 'a9bf751e622bf146662b240d58971051',
+    appSecret: '1c385935dc131c4b902b9bbf6a4798af',
+    callback: 'http://192.168.0.161:5000/callback-operato'
+  },
+  lmdIntegrationNinjavan: {
+    clientId: 'P8WCEwMo0FHNlPECwTLetwN3diAmt5KF',
+    secretKey: '1D0yNZGseOjhxnwri29xmuZiiuRp131L',
+    refreshThreshold: 43200
+  },
+
+  lmdIntegrationEms: { refreshThreshold: 43200 },
+  marketplaceIntegrationShopee: {
+    platform: 'shopee',
+    isUAT: false,
+    application: 'Operato MMS',
+    partnerId: 846025,
+    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64',
+    v2: true
+  },
+  marketplaceIntegrationLazada: {
+    platform: 'lazada',
+    application: 'operato-mms',
+    appKey: '120961',
+    appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
+    callback: 'https://maybank.operato-m.com/lazada-callback'
+  },
+
+  //testinglazada
+  // marketplaceIntegrationLazada: {
+  //   platform: 'lazada',
+  //   application: 'powrup_bi',
+  //   appKey: '117890',
+  //   appSecret: 'tQVllnUa7irAHoNxAwXEVxoP1we1bUjE',
+  //   callback: 'https://73c5-175-141-30-142.ngrok-free.app/lazada-callback'
+  // },
+  reportApiUrl: 'http://localhost:8090/rest/report/show_html',
+  // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html'
   // reportApiUrl: 'http://10.100.109.66:8090/rest/report/show_html',
   awbFileStorage: {
     type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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',
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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',
     bucketName: 'operato-awb',
     region: 'ap-southeast-1'
   },
-  invoiceFileStorage: {
-    type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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',
-    invoiceBucket: 'operato-invoice',
-    region: 'ap-southeast-1'
-  },
   lambda: {
     region: 'ap-southeast-1',
-    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
-    secretAccessKey: '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'
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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'
   },
-  reportApiUrl:
-    'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
+  lmdIntegrationConfig: {
+    version: {
+      v1: 'lmdMiddleware',
+      v2: 'lmdMiddlewareV2'
+    }
+  },
+  awsSesEmail: {
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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',
+    email: 'support@hatio.asia'
+  }
+  // reportApiUrl:
+  //   'http://k8s-default-operator-2fd6178d98-66c66a0f76c09575.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.788",
+  "version": "4.3.790",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -66,7 +66,7 @@
     "@things-factory/attachment-ui": "^4.3.767",
     "@things-factory/auth-ui": "^4.3.767",
     "@things-factory/barcode-ui": "^4.3.767",
-    "@things-factory/biz-ui": "^4.3.770",
+    "@things-factory/biz-ui": "^4.3.790",
     "@things-factory/board-service": "^4.3.767",
     "@things-factory/board-ui": "^4.3.770",
     "@things-factory/code-ui": "^4.3.770",
@@ -81,8 +81,8 @@
     "@things-factory/help": "^4.3.767",
     "@things-factory/i18n-base": "^4.3.767",
     "@things-factory/id-rule-base": "^4.3.770",
-    "@things-factory/import-ui": "^4.3.770",
-    "@things-factory/import-ui-excel": "^4.3.776",
+    "@things-factory/import-ui": "^4.3.790",
+    "@things-factory/import-ui-excel": "^4.3.790",
     "@things-factory/menu-ui": "^4.3.770",
     "@things-factory/more-ui": "^4.3.767",
     "@things-factory/notification": "^4.3.767",
@@ -90,8 +90,8 @@
     "@things-factory/print-proxy-service": "^4.3.767",
     "@things-factory/print-ui": "^4.3.767",
     "@things-factory/product-base": "^4.3.788",
-    "@things-factory/resource-ui": "^4.3.770",
-    "@things-factory/sales-ui": "^4.3.788",
+    "@things-factory/resource-ui": "^4.3.790",
+    "@things-factory/sales-ui": "^4.3.790",
     "@things-factory/scene-data-transform": "^4.3.767",
     "@things-factory/scene-excel": "^4.3.767",
     "@things-factory/scene-firebase": "^4.3.767",
@@ -107,8 +107,8 @@
     "@things-factory/system-ui": "^4.3.767",
     "@things-factory/transport-base": "^4.3.767",
     "@things-factory/tutorial-ui": "^4.3.767",
-    "@things-factory/warehouse-base": "^4.3.788",
-    "@things-factory/worksheet-base": "^4.3.788"
+    "@things-factory/warehouse-base": "^4.3.790",
+    "@things-factory/worksheet-base": "^4.3.790"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.767",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "d00e590725e3c583903b49b35d333b5f540b2c8e"
+  "gitHead": "aac8be0c440911f309204b31d37d0b9fabd0c451"
 }