@things-factory/operato-wms 4.3.740 → 4.3.741

package/client/pages/inbound/serial-number-list-popup.js

@@ -182,13 +182,17 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
           }
         }
       },
+      list: {
+        fields: ['serialNumber', 'palletId', 'cartonId']
+      },
       columns: [
-        { type: 'gutter', gutterName: 'sequence' },
+        { type: 'gutter', gutterName: 'sequence', forList: true },
         { type: 'object', name: 'inventory', hidden: true },
         {
           type: 'gutter',
           gutterName: 'button',
           icon: 'close',
+          forList: true,
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               this.undoSerialNumberUnload(record.id)
@@ -199,18 +203,21 @@ class SerialNumberListPopup extends localize(i18next)(LitElement) {
           type: 'string',
           name: 'serialNumber',
           header: i18next.t('field.serial_number'),
+          label: true,
           width: 150
         },
         {
           type: 'string',
           name: 'palletId',
           header: i18next.t('field.lot_id'),
+          label: true,
           width: 180
         },
         {
           type: 'string',
           name: 'cartonId',
           header: i18next.t('field.carton_id'),
+          label: true,
           width: 180
         }
       ]

package/config.development.js

@@ -4,30 +4,31 @@ module.exports = {
   useVirtualHostBasedDomain: false,
   fallbackRoute: '/',
   subdomainOffset: 2,
-  port: 4000,
+  port: 4002,
   inspect: '9330',
-
-  storage: {
-    type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
-    secretAccessKey: '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',
-    bucketName: 'opa-one',
-    region: 'ap-southeast-1'
-  },
-  // arif
+  // postgres2
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'arif',
+  //   database: 'postgres',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '10.254.29.189',
+  //   host: '192.168.0.151',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'postgres',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.144',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
-
-  // STAGING DATABASE
   ormconfig: {
     name: 'default',
     type: 'postgres',
@@ -39,37 +40,36 @@ module.exports = {
     synchronize: false,
     logging: true
   },
-
+  // // sum //live db important
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
-  //   port: 55432,
   //   database: 'postgres',
-  //   username: 'postgres',
-  //   password: 'abcd1234',
+  //   username: 'sum',
+  //   password: 'hatio1234',
+  //   host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
+  //   port: 55432,
   //   synchronize: false,
-  //   logging: true,
-  //   connectTimeoutMS: 30000,
-  //   extra: { poolSize: 30 }
+  //   logging: false
   // },
+  
 
-  //db izzah
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: '06072023',
+  //   database: 'operato-eric',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.153',
-  //   port: 15432,f
-  //   synchronize: true,
+  //   host: '192.168.0.248',
+  //   port: 15432,
+  //   synchronize: false,
   //   logging: true
   // },
+  //operato
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'postgres',
+  //   database: 'operato',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.151',
@@ -77,12 +77,11 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-
-  // //ERIC
+  //153 - operato
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'eric',
+  //   database: 'operato',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.153',
@@ -90,8 +89,7 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-
-  //eric 2
+  //eric2
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -103,7 +101,65 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-
+  // arif's
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'arif',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.151',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
+  //EMS
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'EMS',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   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.36',
+  //   port: 15432,
+  //   synchronize: true,
+  //   logging: true
+  // },
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'eric',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.153',
+  //   port: 15432,
+  //   synchronize: true,
+  //   logging: true
+  // },
+  //db izzah
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: '06072023',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.153',
+  //   port: 15432,
+  //   synchronize: false,
+  //   logging: true
+  // },
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -192,30 +248,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: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',
   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.740",
+  "version": "4.3.741",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -108,7 +108,7 @@
     "@things-factory/transport-base": "^4.3.740",
     "@things-factory/tutorial-ui": "^4.3.740",
     "@things-factory/warehouse-base": "^4.3.740",
-    "@things-factory/worksheet-base": "^4.3.740"
+    "@things-factory/worksheet-base": "^4.3.741"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.740",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "a44a2bba35384ffe5934a419b677f9e8f49d1ffe"
+  "gitHead": "97de9f3e63d7acdb0e59eff61f5c170457582490"
 }