@things-factory/operato-wms 4.3.734 → 4.3.737

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

@@ -35,6 +35,114 @@ const toFloatOrUndefined = v => {
   return Number.isFinite(n) ? n : undefined
 }
 
+// Import UI may produce human headers (e.g. "packing type") instead of GraphQL input keys (e.g. "packingType").
+// GraphQL rejects unknown fields, so normalize/sanitize patches before submitting.
+const INVENTORY_PATCH_KEYS = new Set([
+  'id',
+  'name',
+  'bizplace',
+  'refInventory',
+  'bizplaceName',
+  'palletId',
+  'cartonId',
+  'batchId',
+  'batchIdRef',
+  'product',
+  'productDetail',
+  'sku',
+  'brand',
+  'productName',
+  'productDetailName',
+  'productDetailId',
+  'reusablePallet',
+  'reusablePalletId',
+  'location',
+  'locationName',
+  'warehouse',
+  'warehouseName',
+  'packingType',
+  'packingSize',
+  'otherRef',
+  'transactionType',
+  'details',
+  'zone',
+  'weight',
+  'uom',
+  'uomValue',
+  'qty',
+  'status',
+  'description',
+  'remark',
+  'expirationDate',
+  'manufactureDate',
+  'unitCost',
+  'adjustmentCode',
+  'adjustmentNote',
+  'inventoryItemChangesJson',
+  'serialNumbers',
+  'updatedAt',
+  'updater',
+  'cuFlag',
+  'transferQty',
+  'transferUomValue',
+  'obsolete'
+])
+
+const toCamelKey = key =>
+  String(key)
+    .trim()
+    .replace(/[_-]+/g, ' ')
+    .replace(/\s+([a-zA-Z0-9])/g, (_, c) => String(c).toUpperCase())
+    .replace(/^\w/, c => c.toLowerCase())
+
+const normalizeInventoryPatch = patch => {
+  if (!patch || typeof patch !== 'object') return patch
+
+  const headerKeyMap = {
+    'packing type': 'packingType',
+    'packing size': 'packingSize',
+    'uom value': 'uomValue',
+    'unit cost': 'unitCost',
+    'batch id': 'batchId',
+    'batch no': 'batchId',
+    'batch no.': 'batchId',
+    'batch id ref': 'batchIdRef',
+    'batch no ref': 'batchIdRef',
+    'batch no. ref': 'batchIdRef'
+  }
+
+  const normalized = {}
+
+  Object.entries(patch).forEach(([rawKey, value]) => {
+    const lower = String(rawKey).trim().toLowerCase()
+    let key = headerKeyMap[lower] || rawKey
+
+    if (!INVENTORY_PATCH_KEYS.has(key)) {
+      const camel = toCamelKey(rawKey)
+      if (INVENTORY_PATCH_KEYS.has(camel)) key = camel
+    }
+
+    if (!INVENTORY_PATCH_KEYS.has(key)) return
+
+    // prefer already-correct keys if both exist
+    if (normalized[key] === undefined) normalized[key] = value
+  })
+
+  // sanitize nested refs to what GraphQL expects
+  if (normalized.bizplace && normalized.bizplace.id) normalized.bizplace = { id: normalized.bizplace.id }
+  if (normalized.location && normalized.location.id) {
+    normalized.location = { id: normalized.location.id, name: normalized.location.name }
+  }
+  if (normalized.product && normalized.product.id) normalized.product = { id: normalized.product.id }
+  if (normalized.productDetail && normalized.productDetail.id)
+    normalized.productDetail = { id: normalized.productDetail.id }
+
+  // ScalarDate cannot parse empty string; treat blank as undefined.
+  if (normalized.manufactureDate === '') delete normalized.manufactureDate
+
+  return normalized
+}
+
 class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return [
@@ -1161,17 +1269,19 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
 
   async importHandler(patches) {
     try {
+      patches = patches.map(patch => normalizeInventoryPatch(patch))
+
       patches.map(itm => {
-        if (itm?.uomValue < 0 || itm?.uommValue?.toString() == NaN.toString()) {
+        if (toFloatOrUndefined(itm?.uomValue) < 0) {
           throw new Error(i18next.t('text.invalid_uom_value'))
         }
-        if (itm?.qty < 0) {
+        if (toFloatOrUndefined(itm?.qty) < 0) {
           throw new Error(i18next.t('text.invalid_qty'))
         }
         if (itm?.packingType?.trim() == '') {
           throw new Error(i18next.t('text.invalid_packing_type'))
         }
-        if (itm?.unitCost < 0) {
+        if (toFloatOrUndefined(itm?.unitCost) < 0) {
           throw new Error(i18next.t('text.invalid_unit_cost'))
         }
         if (new Date(itm?.manufactureDate) > new Date()) {
@@ -1211,9 +1321,9 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
             throw new Error(i18next.t('text.invalid_value_in_list'))
           }
         }
-        itm.qty = parseFloat(itm.qty)
-        itm.packingSize = parseFloat(itm.packingSize)
-        itm.uomValue = parseFloat(itm.uomValue)
+        itm.qty = toFloatOrUndefined(itm.qty)
+        itm.packingSize = toFloatOrUndefined(itm.packingSize)
+        itm.uomValue = toFloatOrUndefined(itm.uomValue)
         itm.transferQty = toFloatOrUndefined(itm.transferQty)
         itm.transferUomValue = toFloatOrUndefined(itm.transferUomValue)
 
@@ -1221,7 +1331,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
           itm.unitCost = null
         }
         if (itm.unitCost != null) {
-          itm.unitCost = parseFloat(itm.unitCost)
+          itm.unitCost = toFloatOrUndefined(itm.unitCost)
           if (isNaN(itm.unitCost)) {
             throw new Error(i18next.t('text.invalid_unit_cost'))
           }

package/client/pages/order/return-order/return-order-inventory-popup.js

@@ -118,12 +118,26 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
         type: 'text',
         value: this.releaseOrderNo || this.releaseGoodNameInput || null,
         props: { searchOper: 'i_like' }
+      },
+      {
+        name: 'productSKU',
+        label: i18next.t('field.sku'),
+        type: 'text',
+        props: { searchOper: 'i_like' }
       }
     ]
 
     this.config = {
       list: {
-        fields: ['releaseGoodName', 'batchId', 'productName', 'packingType', 'releaseQty', 'releaseUomValue']
+        fields: [
+          'releaseGoodName',
+          'batchId',
+          'productSKU',
+          'productName',
+          'packingType',
+          'releaseQty',
+          'releaseUomValue'
+        ]
       },
       pagination: { pages: [10, 20, 50, 2500] },
       rows: { selectable: { multiple: true }, appendable: false },
@@ -166,6 +180,12 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.batch_id'),
           width: 120
         },
+        {
+          type: 'string',
+          name: 'productSKU',
+          header: i18next.t('field.sku'),
+          width: 150
+        },
         {
           type: 'string',
           name: 'productName',
@@ -257,6 +277,7 @@ class ReturnOrderInventoryPopup extends localize(i18next)(LitElement) {
                 id
               }
               productName
+              productSKU
               productBrand
               packingType
               packingSize

package/config.development.js

@@ -4,118 +4,86 @@ module.exports = {
   useVirtualHostBasedDomain: false,
   fallbackRoute: '/',
   subdomainOffset: 2,
-  port: 4000,
+  port: 4011,
   inspect: '9330',
-
-  
-  storage: {
-    type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
-    secretAccessKey: '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',
-    bucketName: 'opa-one',
-    region: 'ap-southeast-1'
-  },
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'EMS',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.161',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
   ormconfig: {
     name: 'default',
     type: 'postgres',
-    database: 'arif',
+    database: 'postgres',
     username: 'postgres',
-    password: 'hatio',
-    host: '10.254.29.189',
-    port: 15432,
+    password: 't62dgT#Ns*GerhuZ9wnzm^',
+    host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
+    port: 55432,
     synchronize: false,
     logging: true
   },
   // 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: 'operato',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.153',
-  //   port: 15432,f
-  //   synchronize: true,
+  //   port: 15432,
+  //   synchronize: false,
   //   logging: true
   // },
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'postgres',
-  //   username: 'postgres',
-  //   password: 'hatio',
-  //   host: '192.168.0.151',
-  //   port: 15432,
+  //   database: 'operato',
+  //   username: 'operato',
+  //   password: 'abcd1234',
+  //   host: 'localhost',
+  //   port: 25432,
   //   synchronize: false,
   //   logging: true
   // },
-
-  // //ERIC
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'eric',
+  //   database: 'operato',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.153',
+  //   host: '192.168.0.151',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
-
-  //eric 2
+  //arif
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'eric2',
+  //   database: 'arif',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.153',
+  //   host: '10.254.29.189',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
-
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
-  //   port: 55432,
-  //   database: 'postgres',
+  //   database: 'operato-eric',
   //   username: 'postgres',
-  //   password: 'abcd1234',
+  //   password: 'hatio',
+  //   host: '192.168.0.249',
+  //   port: 5432,
   //   synchronize: false,
-  //   logging: true,
-  //   connectTimeoutMS: 30000,
-  //   extra: { poolSize: 30 }
+  //   logging: true
   // },
-  //ormconfig: {
-  //  name: 'default',
-  //  type: 'postgres',
-  //  database: 'dev2',
-  //  username: 'postgres',
-  //  password: 'hatio',
-  //  host: 'localhost',
-  //  port: 15432,
-  //  synchronize: false,
-  //  logging: true,
-  //  connectTimeoutMS: 30000,
-  //  extra: { poolSize: 30 }
-  //},
-  SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
   password: {
     lowerCase: true,
     upperCase: false,
@@ -128,8 +96,22 @@ module.exports = {
     looseCharacterLength: 4,
     history: 2
   },
+  sftpFileStorage: {
+    type: 's3',
+    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
+    secretAccessKey: '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',
+    bucketName: 'operato-sftp'
+  },
+  // storage: {
+  //   type: 's3',
+  //   accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
+  //   secretAccessKey: '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',
+  //   bucketName: 'opa-one',
+  //   region: 'ap-southeast-1'
+  // },
   uploads: 'uploads',
   attachmentsPath: 'attachments',
+  SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
   logger: {
     file: {
       filename: 'logs/application-%DATE%.log',
@@ -145,7 +127,7 @@ module.exports = {
     port: 587,
     secure: false, // true for 465, false for other ports
     auth: {
-      user: 'no-reply@hatiolab.com', // generated ethereal user
+      user: 'noreply@hatiolab.com', // generated ethereal user
       pass: 'h@ti0LAB1008' // generated ethereal password
     },
     secureConnection: false,
@@ -153,7 +135,7 @@ module.exports = {
       ciphers: 'SSLv3'
     }
   },
-  sender: 'no-reply@hatiolab.com',
+  sender: 'noreply@hatiolab.com',
   notification: {
     // fcm: {
     //   serviceAccount: {
@@ -177,30 +159,80 @@ 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',
-  // reportApiUrl: 'http://10.100.109.66:8090/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'
+  },
+  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'
+  // },
+
+  accountingIntegrationXero: {
+    platform: 'xero',
+    application: 'Operato WMS',
+    apiKey: '6B12D1AAC05347DC92159C2AEC812859',
+    apiSecret: 'T139_ItMjObC82mmy7iwnNflhd2iV0kUvDBj0P_201EmA7Sj',
+    callback: 'http://operato-h.com:3000/callback-xero',
+    hostname: 'http://operato-h.com:3000/'
+  },
+  lmdIntegrationNinjavan: {
+    clientId: 'P8WCEwMo0FHNlPECwTLetwN3diAmt5KF',
+    secretKey: '1D0yNZGseOjhxnwri29xmuZiiuRp131L',
+    refreshThreshold: 43200
+  },
+
+  lmdIntegrationEms: { refreshThreshold: 43200 },
+
+  lmdIntegrationCitylink: { refreshThreshold: 172800000 },
   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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'
+  },
+  lmdIntegrationConfig: {
+    version: {
+      v1: 'lmdMiddleware',
+      v2: 'lmdMiddlewareV2'
+    }
+  },
+  awsSesEmail: {
+    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
+    secretAccessKey: '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',
+    email: 'support@hatio.asia'
   },
   reportApiUrl:
-    'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
+    '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.734",
+  "version": "4.3.737",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/print-ui": "^4.3.734",
     "@things-factory/product-base": "^4.3.734",
     "@things-factory/resource-ui": "^4.3.734",
-    "@things-factory/sales-ui": "^4.3.734",
+    "@things-factory/sales-ui": "^4.3.736",
     "@things-factory/scene-data-transform": "^4.3.734",
     "@things-factory/scene-excel": "^4.3.734",
     "@things-factory/scene-firebase": "^4.3.734",
@@ -108,7 +108,7 @@
     "@things-factory/transport-base": "^4.3.734",
     "@things-factory/tutorial-ui": "^4.3.734",
     "@things-factory/warehouse-base": "^4.3.734",
-    "@things-factory/worksheet-base": "^4.3.734"
+    "@things-factory/worksheet-base": "^4.3.736"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.734",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "c85c5a1e8ed4f0c4e7c438b6067539216d96caa9"
+  "gitHead": "e6f8a64149623c60ac264af2d2060bbe823e1d36"
 }