@things-factory/operato-wms 4.3.741 → 4.3.744

package/client/pages/inbound/unload-product.js

@@ -40,6 +40,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       _isLooseItem: Boolean,
       _isQtyChecked: Boolean,
       _isRequiredCheckExpiry: Boolean,
+      _isRequiredCheckManufactureDate: Boolean,
       _isRequireSerialNumberScanningInbound: Boolean,
       _orderNo: String,
       _orderId: String,
@@ -201,6 +202,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     return this.shadowRoot.querySelector('input[name=expDate]')
   }
 
+  get manufactureDateInput() {
+    return this.shadowRoot.querySelector('input[name=manufactureDate]')
+  }
+
   get inputForm() {
     return this.shadowRoot.querySelector('form#input-form')
   }
@@ -334,6 +339,21 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 />
               `
             : ''}
+          ${this._isRequiredCheckManufactureDate && this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value
+            ? html`
+                <label>${i18next.t('label.manufacture_date')}</label>
+                <input
+                  name="manufactureDate"
+                  type="date"
+                  @keypress="${async e => {
+                    if (e.keyCode === 13) {
+                      e.preventDefault()
+                      await this._transactionHandler(e)
+                    }
+                  }}"
+                />
+              `
+            : ''}
           ${this._isRequiredCheckExpiry
             ? html`
                 <label>${i18next.t('label.expiry_date')}</label>
@@ -403,6 +423,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     this._isLooseItem = false
     this._isQtyChecked = false
     this._isRequiredCheckExpiry = false
+    this._isRequiredCheckManufactureDate = false
     this._isRequireSerialNumberScanningInbound = false
     this._orderNo = ''
     this._scanning = false
@@ -444,10 +465,16 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             if (record && record.batchId) {
               this._selectedOrderProduct = record
               this._isRequiredCheckExpiry = record.product?.isRequiredCheckExpiry
+              this._isRequiredCheckManufactureDate = record.product?.isRequiredCheckManufactureDate
               this._isRequireSerialNumberScanningInbound = record.product?.isRequireSerialNumberScanningInbound
               this._isQtyChecked = false
 
               this.inputForm.reset()
+              
+              if (this._isRequiredCheckManufactureDate && record.manufactureDate && this.manufactureDateInput) {
+                this.manufactureDateInput.value = this._formatDateForInput(record.manufactureDate)
+              }
+              
               if (this._enableCartonLabel) {
                 if (this._enableProductScanning) {
                   this.productBarcodeInput.readOnly = false
@@ -481,7 +508,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           'actualPalletQty',
           'packQty',
           'actualPackQty',
-          'manufactureDate',
+          'displayManufactureDate',
           'issue'
         ]
       },
@@ -676,14 +703,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           }
         },
         {
-          type: 'date',
-          name: 'manufactureDate',
+          type: 'string',
+          name: 'displayManufactureDate',
           label: true,
           header: i18next.t('field.manufacture_date'),
           width: 100,
           imex: {
-            type: 'date',
-            key: 'manufactureDate',
+            type: 'string',
+            key: 'displayManufactureDate',
             header: i18next.t('field.manufacture_date'),
             width: 25
           }
@@ -705,6 +732,56 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  _formatManufactureDate(date) {
+    if (!date) return date
+    
+    if (!isNaN(Number(date))) {
+      date = Number(date)
+    }
+    
+    const DATE_OPTIONS = {
+      year: 'numeric',
+      month: 'numeric',
+      day: 'numeric'
+    }
+    const formatter = new Intl.DateTimeFormat(navigator.language, DATE_OPTIONS)
+    return formatter.format(new Date(date))
+  }
+
+  _formatDateForInput(date) {
+    if (!date) return ''
+    
+    if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(date)) {
+      return date
+    }
+    
+    if (!isNaN(Number(date))) {
+      date = Number(date)
+    }
+    
+    const dateObj = new Date(date)
+    if (isNaN(dateObj.getTime())) return ''
+    
+    const year = dateObj.getFullYear()
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0')
+    const day = String(dateObj.getDate()).padStart(2, '0')
+    
+    return `${year}-${month}-${day}`
+  }
+
+  _getValidManufactureDate() {
+    const value = this.manufactureDateInput?.value
+    if (!value || value.trim() === '') return null
+    
+    const dateRegex = /^\d{4}-\d{2}-\d{2}$/
+    if (!dateRegex.test(value)) return null
+    
+    const date = new Date(value)
+    if (isNaN(date.getTime())) return null
+    
+    return value
+  }
+
   async _fetchProducts(orderNo, response) {
     if (this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
       const response = await client.query({
@@ -751,6 +828,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   name
                   description
                   isRequiredCheckExpiry
+                  isRequiredCheckManufactureDate
                   isRequireSerialNumberScanningInbound
                   isInventoryDecimal
                   minInboundShelfLife
@@ -894,6 +972,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                   description
                   sku
                   isRequiredCheckExpiry
+                  isRequiredCheckManufactureDate
                   isRequireSerialNumberScanningInbound
                   isInventoryDecimal
                   minInboundShelfLife
@@ -978,6 +1057,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               name
               sku
               isRequiredCheckExpiry
+              isRequiredCheckManufactureDate
               isRequireSerialNumberScanningInbound
             }
             reusablePallet {
@@ -1005,6 +1085,27 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               .reduce((a, b) => a + b, 0)
           }
 
+          const matchingInventories = this._unloadedInventories.filter(
+            inventory =>
+              inventory.batchId == orderProduct.batchId &&
+              inventory?.product.sku == orderProduct.sku &&
+              inventory.packingType == orderProduct.packingType &&
+              inventory.packingSize == orderProduct.packingSize
+          )
+
+          if (matchingInventories.length > 0) {
+            const manufactureDates = matchingInventories
+              .map(inv => inv.manufactureDate)
+              .filter(date => date != null && date !== '')
+              .map(date => this._formatManufactureDate(date))
+              .filter((date, index, self) => self.indexOf(date) === index)
+              .sort()
+
+            orderProduct.displayManufactureDate = manufactureDates.length > 0 ? manufactureDates.join(', ') : (orderProduct.manufactureDate ? this._formatManufactureDate(orderProduct.manufactureDate) : null)
+          } else if (orderProduct.manufactureDate) {
+            orderProduct.displayManufactureDate = this._formatManufactureDate(orderProduct.manufactureDate)
+          }
+
           return orderProduct
         })
       }
@@ -1023,6 +1124,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       this._focusOnExpiryDateInput()
     }
 
+    if (this._selectedOrderProduct?.isRequiredCheckManufactureDate && !this._isRequireSerialNumberScanningInbound)
+      this.manufactureDateInput.value = null
+
+    if (this._isRequiredCheckManufactureDate && !this._isRequireSerialNumberScanningInbound) {
+      this.manufactureDateInput.value = null
+      this._focusOnManufactureDateInput()
+    }
+
     if (this._enableCartonLabel) {
       if (this._isRequireSerialNumberScanningInbound) {
         if (this.cartonInput.value == '') {
@@ -1131,7 +1240,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           inventory: {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
+            manufactureDate: this._isRequiredCheckManufactureDate ? this._getValidManufactureDate() : null
           }
         }
       })
@@ -1188,7 +1298,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           inventory: {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
+            manufactureDate: this._isRequiredCheckManufactureDate ? this._getValidManufactureDate() : null
           }
         }
       })
@@ -1283,6 +1394,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
             qty: qty, // Use the validated qty
             expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
+            manufactureDate: this._isRequiredCheckManufactureDate ? this._getValidManufactureDate() : null,
             reusablePallet: this._usingReusablePallet ? this._reusablePallet : null
           },
           productBarcode: this._enableProductScanning
@@ -1316,6 +1428,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               name
               sku
               isRequiredCheckExpiry
+              isRequiredCheckManufactureDate
               isRequireSerialNumberScanningInbound
               isInventoryDecimal
               minInboundShelfLife
@@ -1347,6 +1460,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
                 name
                 sku
                 isRequiredCheckExpiry
+                isRequiredCheckManufactureDate
                 isRequireSerialNumberScanningInbound
                 isInventoryDecimal
                 minInboundShelfLife
@@ -1423,6 +1537,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
       if (foundOrderProducts?.length > 1) {
         if (foundOrderProducts.some(op => op.product.isRequiredCheckExpiry)) this._isRequiredCheckExpiry = true
+        if (foundOrderProducts.some(op => op.product.isRequiredCheckManufactureDate)) this._isRequiredCheckManufactureDate = true
 
         if (this._isRequireSerialNumberScanningInbound) {
           if (!this._selectedOrderProduct) {
@@ -1434,11 +1549,13 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       } else if (foundOrderProducts?.length == 1) {
         this.__minInboundShelfLife = product.minInboundShelfLife
         this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
+        this._isRequiredCheckManufactureDate = product.isRequiredCheckManufactureDate
         this._isRequireSerialNumberScanningInbound = product.isRequireSerialNumberScanningInbound
         this._selectedOrderProduct = foundOrderProducts[0]
       } else if (foundOrderProducts?.length == 0 && foundParentProducts?.length > 0) {
         this.__minInboundShelfLife = product.minInboundShelfLife
         this._isRequiredCheckExpiry = product.isRequiredCheckExpiry
+        this._isRequiredCheckManufactureDate = product.isRequiredCheckManufactureDate
         this._isRequireSerialNumberScanningInbound = product.isRequireSerialNumberScanningInbound
         this._selectedOrderProduct = foundParentProducts[0]
       }
@@ -1456,6 +1573,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             this._selectedOrderProduct = e.detail
             this.__minInboundShelfLife = this._selectedOrderProduct.product.minInboundShelfLife
             this._isRequiredCheckExpiry = this._selectedOrderProduct.product.isRequiredCheckExpiry
+            this._isRequiredCheckManufactureDate = this._selectedOrderProduct.product.isRequiredCheckManufactureDate
             this._isRequireSerialNumberScanningInbound =
               this._selectedOrderProduct.product.isRequireSerialNumberScanningInbound
             if (e.detail.product.isRequireSerialNumberScanningInbound) {
@@ -1533,6 +1651,19 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         await this._checkExpiryFormat()
       }
 
+      if (this._isRequiredCheckManufactureDate && this.manufactureDateInput?.value) {
+        const value = this.manufactureDateInput.value
+        const today = new Date()
+        today.setHours(0, 0, 0, 0)
+        const manufactureDate = new Date(value)
+        manufactureDate.setHours(0, 0, 0, 0)
+
+        if (manufactureDate > today) {
+          this._focusOnManufactureDateInput()
+          throw new Error(i18next.t('text.manufacture-date-cannot-be-later-than-today'))
+        }
+      }
+
       if (this._pageSettings.enableLotIdInput) {
         await this._checkLotInput()
       }
@@ -1578,6 +1709,19 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         await this._checkExpiryFormat()
       }
 
+      if (this._isRequiredCheckManufactureDate && this.manufactureDateInput?.value) {
+        const value = this.manufactureDateInput.value
+        const today = new Date()
+        today.setHours(0, 0, 0, 0)
+        const manufactureDate = new Date(value)
+        manufactureDate.setHours(0, 0, 0, 0)
+
+        if (manufactureDate > today) {
+          this._focusOnManufactureDateInput()
+          throw new Error(i18next.t('text.manufacture-date-cannot-be-later-than-today'))
+        }
+      }
+
       return orderProducts
     }
   }
@@ -1710,7 +1854,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           inventory: {
             palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
             cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this.expDateInput?.value ? this.expDateInput.value : null
+            expirationDate: this.expDateInput?.value ? this.expDateInput.value : null,
+            manufactureDate: this.manufactureDateInput?.value ? this.manufactureDateInput.value : null
           }
         }
       })
@@ -1975,6 +2120,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     setTimeout(() => this.expDateInput.focus(), 100)
   }
 
+  _focusOnManufactureDateInput() {
+    setTimeout(() => this.manufactureDateInput.focus(), 100)
+  }
+
   _focusOnProductBarcodeInput() {
     this.productBarcodeInput.readOnly = false
     setTimeout(() => this.productBarcodeInput.focus(), 100)

package/client/pages/inbound/unloaded-inventories-popup.js

@@ -70,7 +70,7 @@ class UnloadedInventoriesPopup extends connect(store)(localize(i18next)(LitEleme
     this.config = {
       rows: { appendable: false },
       list: {
-        fields: ['palletId', 'cartonId', 'qty', 'expirationDate', 'reusablePallet']
+        fields: ['palletId', 'cartonId', 'qty', 'expirationDate', 'manufactureDate', 'reusablePallet']
       },
       pagination: { infinite: true },
       columns: [

package/client/pages/outbound/loading-v2/loading.js

@@ -44,6 +44,9 @@ const FIND_LOADABLE_RELEASE_GOOD = gql`
       attentionTo
       deliveryAddress1
       deliveryAddress2
+      deliveryAddress3
+      deliveryAddress4
+      deliveryAddress5
       sortedBy {
         name
       }
@@ -459,10 +462,22 @@ class LoadingProductV2 extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async selectReleaseOrderPopup(orders) {
-    let releaseGoods = orders.map(ro => ({
-      ...ro,
-      sortedByUser: ro.sortedBy?.name
-    }))
+    let releaseGoods = orders.map(ro => {
+      const addressParts = [
+        ro.deliveryAddress1,
+        ro.deliveryAddress2,
+        ro.deliveryAddress3,
+        ro.deliveryAddress4,
+        ro.deliveryAddress5
+      ].filter(addr => addr && addr.trim() !== '')
+       .map(addr => addr.trim().replace(/,+\s*$/, ''))
+      
+      return {
+        ...ro,
+        sortedByUser: ro.sortedBy?.name,
+        address: addressParts.join(', ')
+      }
+    })
 
     await sleep(1010)
     openPopup(

package/client/pages/outbound/show-ro-list-popup.js

@@ -146,7 +146,7 @@ class ShowRoListPopup extends localize(i18next)(LitElement) {
       rows: { selectable: { multiple: false }, appendable: false },
       pagination: { infinite: true },
       list: {
-        fields: ['name', 'refNo', 'refNo2', 'district', 'attentionCompany', 'status', 'sortedByUser', 'itemCounts']
+        fields: ['name', 'refNo', 'refNo2', 'district', 'attentionCompany', 'address', 'status', 'sortedByUser', 'itemCounts']
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
@@ -186,6 +186,13 @@ class ShowRoListPopup extends localize(i18next)(LitElement) {
           label: true,
           width: 120
         },
+        {
+          type: 'string',
+          name: 'address',
+          header: i18next.t('field.address'),
+          label: true,
+          width: 200
+        },
         {
           type: 'string',
           name: 'status',

package/client/pages/outbound/sorting-product.js

@@ -389,6 +389,11 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
                 status
                 district
                 attentionCompany
+                deliveryAddress1
+                deliveryAddress2
+                deliveryAddress3
+                deliveryAddress4
+                deliveryAddress5
                 sortedByUser
               }
               selectedReleaseGood
@@ -401,7 +406,21 @@ class SortingProduct extends connect(store)(localize(i18next)(PageView)) {
 
       if (!response.errors) {
         this.taskNo = response.data.findSortingReleaseOrdersByTaskNo.taskNo
-        this.releaseOrders = response.data.findSortingReleaseOrdersByTaskNo.releaseGoods
+        this.releaseOrders = response.data.findSortingReleaseOrdersByTaskNo.releaseGoods.map(ro => {
+          const addressParts = [
+            ro.deliveryAddress1,
+            ro.deliveryAddress2,
+            ro.deliveryAddress3,
+            ro.deliveryAddress4,
+            ro.deliveryAddress5
+          ].filter(addr => addr && addr.trim() !== '')
+           .map(addr => addr.trim().replace(/,+\s*$/, ''))
+          
+          return {
+            ...ro,
+            address: addressParts.join(', ')
+          }
+        })
 
         if (response.data.findSortingReleaseOrdersByTaskNo?.selectedReleaseGood) {
           await this._setSelectedRO(response.data.findSortingReleaseOrdersByTaskNo.selectedReleaseGood)

package/config.development.js

@@ -4,31 +4,30 @@ module.exports = {
   useVirtualHostBasedDomain: false,
   fallbackRoute: '/',
   subdomainOffset: 2,
-  port: 4002,
+  port: 4000,
   inspect: '9330',
-  // postgres2
-  // ormconfig: {
-  //   name: 'default',
-  //   type: 'postgres',
-  //   database: 'postgres',
-  //   username: 'postgres',
-  //   password: 'hatio',
-  //   host: '192.168.0.151',
-  //   port: 15432,
-  //   synchronize: false,
-  //   logging: true
-  // },
+
+  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',
+  //   database: 'arif',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.144',
+  //   host: '10.254.29.189',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
+
+  // STAGING DATABASE
   ormconfig: {
     name: 'default',
     type: 'postgres',
@@ -40,72 +39,37 @@ module.exports = {
     synchronize: false,
     logging: true
   },
-  // // sum //live db important
-  // ormconfig: {
-  //   name: 'default',
-  //   type: 'postgres',
-  //   database: 'postgres',
-  //   username: 'sum',
-  //   password: 'hatio1234',
-  //   host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
-  //   port: 55432,
-  //   synchronize: false,
-  //   logging: false
-  // },
-  
 
   // 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 - operato
-  // ormconfig: {
-  //   name: 'default',
-  //   type: 'postgres',
-  //   database: 'operato',
+  //   host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
+  //   port: 55432,
+  //   database: 'postgres',
   //   username: 'postgres',
-  //   password: 'hatio',
-  //   host: '192.168.0.153',
-  //   port: 15432,
+  //   password: 'abcd1234',
   //   synchronize: false,
-  //   logging: true
+  //   logging: true,
+  //   connectTimeoutMS: 30000,
+  //   extra: { poolSize: 30 }
   // },
-  //eric2
+
+  //db izzah
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'eric2',
+  //   database: '06072023',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.153',
-  //   port: 15432,
-  //   synchronize: false,
+  //   port: 15432,f
+  //   synchronize: true,
   //   logging: true
   // },
-  // arif's
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'arif',
+  //   database: 'postgres',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.151',
@@ -113,30 +77,8 @@ module.exports = {
   //   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
-  // },
+
+  // //ERIC
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -145,14 +87,15 @@ module.exports = {
   //   password: 'hatio',
   //   host: '192.168.0.153',
   //   port: 15432,
-  //   synchronize: true,
+  //   synchronize: false,
   //   logging: true
   // },
-  //db izzah
+
+  //eric 2
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: '06072023',
+  //   database: 'eric2',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.153',
@@ -160,6 +103,7 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
+
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
@@ -248,72 +192,30 @@ module.exports = {
     //   privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
     // }
   },
-  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://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',
   awbFileStorage: {
     type: 's3',
-    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
-    secretAccessKey: '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',
+    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
+    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: 'AKIAUQEOPWEJPXIVER74',
-    secretAccessKey: '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'
-  },
-  lmdIntegrationConfig: {
-    version: {
-      v1: 'lmdMiddleware',
-      v2: 'lmdMiddlewareV2'
-    }
-  },
-  awsSesEmail: {
-    accessKeyId: 'AKIAUQEOPWEJPXIVER74',
-    secretAccessKey: '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',
-    email: 'support@hatio.asia'
+    accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
+    secretAccessKey: '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'
   },
   reportApiUrl:
-    'http://k8s-default-operator-2fd6178d98-66c66a0f76c09575.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
+    'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.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.741",
+  "version": "4.3.744",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -62,60 +62,60 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/apptool-ui": "^4.3.740",
-    "@things-factory/attachment-ui": "^4.3.740",
-    "@things-factory/auth-ui": "^4.3.740",
-    "@things-factory/barcode-ui": "^4.3.740",
-    "@things-factory/biz-ui": "^4.3.740",
-    "@things-factory/board-service": "^4.3.740",
-    "@things-factory/board-ui": "^4.3.740",
-    "@things-factory/code-ui": "^4.3.740",
-    "@things-factory/context-ui": "^4.3.740",
-    "@things-factory/export-ui": "^4.3.740",
-    "@things-factory/export-ui-csv": "^4.3.740",
-    "@things-factory/export-ui-excel": "^4.3.740",
-    "@things-factory/fav-base": "^4.3.740",
-    "@things-factory/form-ui": "^4.3.740",
-    "@things-factory/geography": "^4.3.740",
-    "@things-factory/grist-ui": "^4.3.740",
-    "@things-factory/help": "^4.3.740",
-    "@things-factory/i18n-base": "^4.3.740",
-    "@things-factory/id-rule-base": "^4.3.740",
-    "@things-factory/import-ui": "^4.3.740",
-    "@things-factory/import-ui-excel": "^4.3.740",
-    "@things-factory/menu-ui": "^4.3.740",
-    "@things-factory/more-ui": "^4.3.740",
-    "@things-factory/notification": "^4.3.740",
-    "@things-factory/pdf": "^4.3.740",
-    "@things-factory/print-proxy-service": "^4.3.740",
-    "@things-factory/print-ui": "^4.3.740",
-    "@things-factory/product-base": "^4.3.740",
-    "@things-factory/resource-ui": "^4.3.740",
-    "@things-factory/sales-ui": "^4.3.740",
-    "@things-factory/scene-data-transform": "^4.3.740",
-    "@things-factory/scene-excel": "^4.3.740",
-    "@things-factory/scene-firebase": "^4.3.740",
-    "@things-factory/scene-form": "^4.3.740",
-    "@things-factory/scene-google-map": "^4.3.740",
-    "@things-factory/scene-graphql": "^4.3.740",
-    "@things-factory/scene-label": "^4.3.740",
-    "@things-factory/scene-marker": "^4.3.740",
-    "@things-factory/scene-mqtt": "^4.3.740",
-    "@things-factory/scene-restful": "^4.3.740",
-    "@things-factory/scene-visualizer": "^4.3.740",
-    "@things-factory/setting-ui": "^4.3.740",
-    "@things-factory/system-ui": "^4.3.740",
-    "@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.741"
+    "@things-factory/apptool-ui": "^4.3.743",
+    "@things-factory/attachment-ui": "^4.3.743",
+    "@things-factory/auth-ui": "^4.3.743",
+    "@things-factory/barcode-ui": "^4.3.743",
+    "@things-factory/biz-ui": "^4.3.743",
+    "@things-factory/board-service": "^4.3.743",
+    "@things-factory/board-ui": "^4.3.743",
+    "@things-factory/code-ui": "^4.3.743",
+    "@things-factory/context-ui": "^4.3.743",
+    "@things-factory/export-ui": "^4.3.743",
+    "@things-factory/export-ui-csv": "^4.3.743",
+    "@things-factory/export-ui-excel": "^4.3.743",
+    "@things-factory/fav-base": "^4.3.743",
+    "@things-factory/form-ui": "^4.3.743",
+    "@things-factory/geography": "^4.3.743",
+    "@things-factory/grist-ui": "^4.3.743",
+    "@things-factory/help": "^4.3.743",
+    "@things-factory/i18n-base": "^4.3.743",
+    "@things-factory/id-rule-base": "^4.3.743",
+    "@things-factory/import-ui": "^4.3.743",
+    "@things-factory/import-ui-excel": "^4.3.743",
+    "@things-factory/menu-ui": "^4.3.743",
+    "@things-factory/more-ui": "^4.3.743",
+    "@things-factory/notification": "^4.3.743",
+    "@things-factory/pdf": "^4.3.743",
+    "@things-factory/print-proxy-service": "^4.3.743",
+    "@things-factory/print-ui": "^4.3.743",
+    "@things-factory/product-base": "^4.3.743",
+    "@things-factory/resource-ui": "^4.3.743",
+    "@things-factory/sales-ui": "^4.3.743",
+    "@things-factory/scene-data-transform": "^4.3.743",
+    "@things-factory/scene-excel": "^4.3.743",
+    "@things-factory/scene-firebase": "^4.3.743",
+    "@things-factory/scene-form": "^4.3.743",
+    "@things-factory/scene-google-map": "^4.3.743",
+    "@things-factory/scene-graphql": "^4.3.743",
+    "@things-factory/scene-label": "^4.3.743",
+    "@things-factory/scene-marker": "^4.3.743",
+    "@things-factory/scene-mqtt": "^4.3.743",
+    "@things-factory/scene-restful": "^4.3.743",
+    "@things-factory/scene-visualizer": "^4.3.743",
+    "@things-factory/setting-ui": "^4.3.743",
+    "@things-factory/system-ui": "^4.3.743",
+    "@things-factory/transport-base": "^4.3.743",
+    "@things-factory/tutorial-ui": "^4.3.743",
+    "@things-factory/warehouse-base": "^4.3.743",
+    "@things-factory/worksheet-base": "^4.3.744"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.3.740",
+    "@things-factory/builder": "^4.3.743",
     "cypress": "^9.4.1",
     "cypress-file-upload": "^5.0.8",
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "97de9f3e63d7acdb0e59eff61f5c170457582490"
+  "gitHead": "1519990fa45b1edfdfa52b0ac3748b841fb18afd"
 }

package/translations/en.json

@@ -969,6 +969,7 @@
   "label.execute_date": "execute date",
   "label.executing": "executing",
   "label.expiry_date": "expiry date",
+  "label.manufacture_date": "manufacture date",
   "label.export": "export",
   "label.export_remark": "export remark",
   "label.fax": "fax",

package/translations/ko.json

@@ -953,6 +953,7 @@
   "label.execute_date": "수행일",
   "label.executing": "수행중",
   "label.expiry_date": "유통기한",
+  "label.manufacture_date": "제조일",
   "label.export_remark": "export remark",
   "label.export": "수출",
   "label.fax": "팩스",

package/translations/zh.json

@@ -996,6 +996,7 @@
   "label.execute_date": "执行日期",
   "label.executing": "执行中",
   "label.expiry_date": "过期日期",
+  "label.manufacture_date": "制造日期",
   "label.export": "出口",
   "label.export_remark": "出口备注",
   "label.fax": "传真",