@things-factory/operato-wms 4.3.772 → 4.3.773

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

@@ -1076,6 +1076,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
                     id
                     name
                   }
+                  conditionOfGoods
                   completed
                   packingTypeSize
                   reusablePalletName
@@ -2053,7 +2054,11 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
 
     this.data = {
       records: worksheetDetailInfos.map(itm => {
-        return { ...itm, location: itm.status === WORKSHEET_STATUS.DONE.value ? itm.location : null }
+        return {
+          ...itm,
+          location: itm.status === WORKSHEET_STATUS.DONE.value ? itm.location : null,
+          displayConditionOfGoods: this._formatConditionOfGoods(itm.conditionOfGoods)
+        }
       })
     }
 

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

@@ -236,11 +236,11 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get cartonInput() {
-    return this.shadowRoot.querySelector('barcode-scanable-input[name=cartonId]').shadowRoot.querySelector('input')
+    return this.shadowRoot.querySelector('barcode-scanable-input[name=cartonId]')?.shadowRoot?.querySelector('input')
   }
 
   get serialNumberInput() {
-    return this.shadowRoot.querySelector('barcode-scanable-input[name=serialNumber]').shadowRoot.querySelector('input')
+    return this.shadowRoot.querySelector('barcode-scanable-input[name=serialNumber]')?.shadowRoot?.querySelector('input')
   }
 
   get completable() {
@@ -356,7 +356,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   get lotInput() {
-    return this.shadowRoot.querySelector('barcode-scanable-input[name=lotId]').shadowRoot.querySelector('input')
+    return this.shadowRoot.querySelector('barcode-scanable-input[name=lotId]')?.shadowRoot?.querySelector('input')
   }
 
   get orderProductGrist() {
@@ -408,17 +408,17 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           }
           
           if (this._enableCartonLabel) {
-            if (this._enableProductScanning) {
+            if (this._enableProductScanning && this.productBarcodeInput) {
               this.productBarcodeInput.readOnly = false
               this.productBarcodeInput.value = ''
             }
             if (unflattenedRecord.product?.isRequireSerialNumberScanningInbound) {
-              this.serialNumberInput.value = ''
+              if (this.serialNumberInput) this.serialNumberInput.value = ''
             }
-            this.cartonInput.value = ''
+            if (this.cartonInput) this.cartonInput.value = ''
             this._focusOnCartonInput()
           } else {
-            this.lotInput.value = ''
+            if (this.lotInput) this.lotInput.value = ''
             this._focusOnLotInput()
           }
         }
@@ -736,17 +736,17 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               }
               
               if (this._enableCartonLabel) {
-                if (this._enableProductScanning) {
+                if (this._enableProductScanning && this.productBarcodeInput) {
                   this.productBarcodeInput.readOnly = false
                   this.productBarcodeInput.value = ''
                 }
                 if (record.product?.isRequireSerialNumberScanningInbound) {
-                  this.serialNumberInput.value = ''
+                  if (this.serialNumberInput) this.serialNumberInput.value = ''
                 }
-                this.cartonInput.value = ''
+                if (this.cartonInput) this.cartonInput.value = ''
                 this._focusOnCartonInput()
               } else {
-                this.lotInput.value = ''
+                if (this.lotInput) this.lotInput.value = ''
                 this._focusOnLotInput()
               }
             }
@@ -1191,19 +1191,19 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             }
 
             if (this._isRequireSerialNumberScanningInbound) {
-              this.serialNumberInput.value = ''
+              if (this.serialNumberInput) this.serialNumberInput.value = ''
 
               if (this.expDateInput?.value) {
                 this.expDateInput.value = null
               }
 
               if (this._enableCartonLabel) {
-                this.cartonInput.value = ''
-                this.productBarcodeInput.value = ''
+                if (this.cartonInput) this.cartonInput.value = ''
+                if (this.productBarcodeInput) this.productBarcodeInput.value = ''
                 this._packingTypeScanned = ''
                 this._focusOnCartonInput()
               } else {
-                this.lotInput.value = ''
+                if (this.lotInput) this.lotInput.value = ''
                 this._focusOnLotInput()
               }
             }
@@ -1396,44 +1396,44 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
   _resetInput() {
     if (this._selectedOrderProduct?.isRequiredCheckExpiry && !this._isRequireSerialNumberScanningInbound)
-      this.expDateInput.value = null
+      if (this.expDateInput) this.expDateInput.value = null
 
     if (this._isRequiredCheckExpiry && !this._isRequireSerialNumberScanningInbound) {
-      this.expDateInput.value = null
+      if (this.expDateInput) this.expDateInput.value = null
       this._focusOnExpiryDateInput()
     }
 
     if (this._selectedOrderProduct?.isRequiredCheckManufactureDate && !this._isRequireSerialNumberScanningInbound)
-      this.manufactureDateInput.value = null
+      if (this.manufactureDateInput) this.manufactureDateInput.value = null
 
     if (this._isRequiredCheckManufactureDate && !this._isRequireSerialNumberScanningInbound) {
-      this.manufactureDateInput.value = null
+      if (this.manufactureDateInput) this.manufactureDateInput.value = null
       this._focusOnManufactureDateInput()
     }
 
     if (this._enableCartonLabel) {
       if (this._isRequireSerialNumberScanningInbound) {
-        if (this.cartonInput.value == '') {
+        if (!this.cartonInput?.value) {
           this._focusOnCartonInput()
         } else {
-          this.serialNumberInput.value = ''
+          if (this.serialNumberInput) this.serialNumberInput.value = ''
           this._focusOnSerialNumberInput()
         }
       } else {
         if (this._enableInputQty >= 0 && this._enableInputQty < 4) {
-          this.actualQtyInput.value = ''
+          if (this.actualQtyInput) this.actualQtyInput.value = ''
         }
-        this.cartonInput.value = ''
+        if (this.cartonInput) this.cartonInput.value = ''
         this._focusOnCartonInput()
       }
     } else {
-      if (this.lotInput.value !== '') {
+      if (this.lotInput?.value !== '') {
         if (this._isRequireSerialNumberScanningInbound) {
-          this.serialNumberInput.value = ''
+          if (this.serialNumberInput) this.serialNumberInput.value = ''
           this._focusOnSerialNumberInput()
         } else {
-          this.lotInput.value = ''
-          if (this._enableInputQty >= 0 && this._enableInputQty < 4) this.actualQtyInput.value = ''
+          if (this.lotInput) this.lotInput.value = ''
+          if (this._enableInputQty >= 0 && this._enableInputQty < 4 && this.actualQtyInput) this.actualQtyInput.value = ''
           this._focusOnLotInput()
         }
       }
@@ -1441,7 +1441,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
     if (this._enableProductScanning) {
       if (!this._isRequireSerialNumberScanningInbound) {
-        this.productBarcodeInput.value = ''
+        if (this.productBarcodeInput) this.productBarcodeInput.value = ''
         if (this.cartonInput?.value) {
           this._focusOnProductBarcodeInput()
         }
@@ -1463,7 +1463,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     e.preventDefault()
     try {
       if (this._enableProductScanning) {
-        this._productBarcode = this.productBarcodeInput.value
+        this._productBarcode = this.productBarcodeInput?.value
       }
       if (!this._enableCartonLabel) return this._unloadSelected()
       if (this._pageSettings.enableLotIdInput) {
@@ -1499,7 +1499,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
 
     try {
-      const response = await client.mutate({
+      await client.mutate({
         mutation: gql`
           mutation scanProductUnload(
             $worksheetDetailName: String!
@@ -1517,25 +1517,23 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           worksheetDetailName: this._selectedOrderProduct.name,
           productBarcode: this._productBarcodeScanned,
           inventory: {
-            palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
-            cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
+            palletId: this._enableCartonLabel ? null : this.lotInput?.value?.trim(),
+            cartonId: this._enableCartonLabel ? this.cartonInput?.value?.trim() : null,
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput?.value : null,
             manufactureDate: this._getManufactureDateValue(),
             conditionOfGoods: this._conditionOfGoods || CONDITION_OF_GOODS.GOOD.value
           }
         }
       })
 
-      if (!response.errors) {
-        await this._fetchProducts(this._orderNo)
-      }
     } catch (e) {
       // for cartonId + product scanning
       // show custom toast for incorrect product barcodes
       // full errors for everything else
-      if (!(e instanceof TypeError)) return this._showToast(e)
-      this._showToast({ message: i18next.t('text.incorrect_product_barcode') })
+      if (!(e instanceof TypeError)) this._showToast(e)
+      else this._showToast({ message: i18next.t('text.incorrect_product_barcode') })
     } finally {
+      await this._fetchProducts(this._orderNo)
       this._scanning = false
     }
   }
@@ -1546,7 +1544,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
     this._scanning = true
 
-    if (this.serialNumberInput.value == '') {
+    if (this.serialNumberInput && !this.serialNumberInput.value) {
       this._scanning = false
       this._focusOnSerialNumberInput()
       return this._showToast({ message: i18next.t('text.enter_serial_number') })
@@ -1558,7 +1556,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
 
     try {
-      const response = await client.mutate({
+      await client.mutate({
         mutation: gql`
           mutation scanSerialNumberUnload(
             $worksheetDetailName: String!
@@ -1574,33 +1572,30 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         `,
         variables: {
           worksheetDetailName: this._selectedOrderProduct.name,
-          serialNumber: this.serialNumberInput.value.trim(),
+          serialNumber: this.serialNumberInput?.value?.trim(),
           inventory: {
-            palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
-            cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
-            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
+            palletId: this._enableCartonLabel ? null : this.lotInput?.value?.trim(),
+            cartonId: this._enableCartonLabel ? this.cartonInput?.value?.trim() : null,
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput?.value : null,
             manufactureDate: this._getManufactureDateValue(),
             conditionOfGoods: this._conditionOfGoods || CONDITION_OF_GOODS.GOOD.value
           }
         }
       })
-
-      if (!response.errors) {
-        await this._fetchProducts(this._orderNo)
-      }
     } catch (e) {
       // for cartonId + product scanning
       // show custom toast for incorrect product barcodes
       // full errors for everything else
-      if (!(e instanceof TypeError)) return this._showToast(e)
-      this._showToast({ message: i18next.t('text.incorrect_serial_number') })
+      if (!(e instanceof TypeError)) this._showToast(e)
+      else this._showToast({ message: i18next.t('text.incorrect_serial_number') })
     } finally {
+      await this._fetchProducts(this._orderNo)
       this._scanning = false
     }
   }
 
   async _checkExpiryFormat() {
-    const inputExpDate = this.expDateInput.value
+    const inputExpDate = this.expDateInput?.value
     let intValueYear = parseInt(inputExpDate)
 
     if (intValueYear > 9999) {
@@ -1612,7 +1607,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   async _checkExpiry() {
     let date = new Date()
     const acceptBefore = new Date(date.setDate(date.getDate() + this.__minInboundShelfLife))
-    let expiryDate = new Date(this.expDateInput.value)
+    let expiryDate = new Date(this.expDateInput?.value)
     if (expiryDate < acceptBefore) {
       return await CustomAlert({
         title: i18next.t('title.item_unloading_is_expiring_soon'),
@@ -1624,7 +1619,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
   async _checkLotInput() {
     if (this._selectedOrderProduct.palletId)
-      if (this.lotInput.value !== this._selectedOrderProduct.palletId)
+      if (this.lotInput?.value !== this._selectedOrderProduct.palletId)
         throw new Error(i18next.t('text.incorrect_lot_id'))
   }
 
@@ -1639,12 +1634,12 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
     try {
       // Add validation for qty
-      const qty = parseFloat(this.actualQtyInput.value)
+      const qty = parseFloat(this.actualQtyInput?.value)
       if (isNaN(qty)) {
         throw new Error(i18next.t('text.invalid_quantity'))
       }
 
-      const response = await client.mutate({
+      await client.mutate({
         mutation: gql`
           mutation unload(
             $worksheetDetailName: String!
@@ -1671,10 +1666,10 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
           orderType: this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value ? 'arrivalNotice' : 'returnOrder',
           worksheetDetailName: this._selectedOrderProduct?.name || '',
           inventory: {
-            palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
-            cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
+            palletId: this._enableCartonLabel ? null : this.lotInput?.value?.trim(),
+            cartonId: this._enableCartonLabel ? this.cartonInput?.value?.trim() : null,
             qty: qty, // Use the validated qty
-            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput.value : null,
+            expirationDate: this._isRequiredCheckExpiry ? this.expDateInput?.value : null,
             manufactureDate: this._getManufactureDateValue(),
             reusablePallet: this._usingReusablePallet ? this._reusablePallet : null,
             conditionOfGoods: this._conditionOfGoods || CONDITION_OF_GOODS.GOOD.value
@@ -1686,13 +1681,12 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
             : null
         }
       })
-      if (!response.errors) {
-        await this._fetchProducts(this._orderNo)
-      }
     } catch (e) {
       this._showToast(e)
+    } finally {
+      await this._fetchProducts(this._orderNo)
+      this._scanning = false
     }
-    this._scanning = false
   }
 
   async fetchProductDetail(gtin, productId) {
@@ -1776,7 +1770,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     if (!response.errors) {
       let orderProductData = this.orderProductData.records
       let checkedProductDetails = response.data.checkGtin.items
-      this.productBarcodeInput.value = `${checkedProductDetails[0].gtin}`
+      if (this.productBarcodeInput) this.productBarcodeInput.value = `${checkedProductDetails[0].gtin}`
       this._packingTypeScanned = checkedProductDetails ? `${checkedProductDetails[0].packingType}` : ''
       this._productBarcodeScanned = checkedProductDetails[0].gtin
       this._previousSelectedOrderProduct = this._selectedOrderProduct
@@ -1795,14 +1789,14 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
       if (!foundOrderProducts?.length && !foundParentProducts?.length) {
         if (this._enableInputQty >= 0 && this._enableInputQty < 4 && !this._isRequireSerialNumberScanningInbound) {
-          if (this.actualQtyInput?.value) this.actualQtyInput.value = ''
+          if (this.actualQtyInput) this.actualQtyInput.value = ''
         }
 
         if (this._isRequireSerialNumberScanningInbound) {
-          if (this.serialNumberInput?.value) this.serialNumberInput.value = ''
+          if (this.serialNumberInput) this.serialNumberInput.value = ''
         }
 
-        this.productBarcodeInput.value = ''
+        if (this.productBarcodeInput) this.productBarcodeInput.value = ''
         this._focusOnProductBarcodeInput()
         throw new Error(i18next.t('text.no_matching_product_found'))
       }
@@ -1860,7 +1854,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
               this._selectedOrderProduct.product.isRequireSerialNumberScanningInbound
             if (e.detail.product.isRequireSerialNumberScanningInbound) {
               this._isRequireSerialNumberScanningInbound = true
-              if (!this.serialNumberInput.value) {
+              if (!this.serialNumberInput?.value) {
                 this._focusOnSerialNumberInput()
                 this._showToast(Error(i18next.t('text.serial_number_is_empty')))
               }
@@ -1885,47 +1879,47 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
   async _validateUnloading() {
     if (!this._enableCartonLabel) {
-      if (!this.lotInput.value) {
+      if (!this.lotInput?.value) {
         this._focusOnLotInput()
         throw new Error(i18next.t('text.lot_id_is_empty'))
       }
     } else {
-      if (!this.cartonInput.value) {
+      if (!this.cartonInput?.value) {
         this._focusOnCartonInput()
         throw new Error(i18next.t('text.carton_id_is_empty'))
       }
     }
-
+    
     if (!this._enableProductScanning) {
       if (!this._selectedOrderProduct) throw new Error(i18next.t('text.target_does_not_selected'))
 
       if (this._isRequireSerialNumberScanningInbound) {
-        if (!this.serialNumberInput.value) {
+        if (!this.serialNumberInput?.value) {
           this._focusOnSerialNumberInput()
           throw new Error(i18next.t('text.serial_number_is_empty'))
         }
       } else {
         // 4. qty value existing
-        if (!parseFloat(this.actualQtyInput.value)) {
+        if (!parseFloat(this.actualQtyInput?.value)) {
           this._focusOnActualQtyInput()
           throw new Error(i18next.t('text.qty_is_empty'))
         }
 
         // 5. qty value has to be positive
-        if (!(parseFloat(this.actualQtyInput.value) > 0)) {
-          setTimeout(() => this.actualQtyInput.select(), 100)
+        if (!(parseFloat(this.actualQtyInput?.value) > 0)) {
+          setTimeout(() => this.actualQtyInput?.select(), 100)
           throw new Error(i18next.t('text.qty_should_be_positive'))
         }
 
         // Check if quantity has decimals and validate against product settings
-        const qty = parseFloat(this.actualQtyInput.value)
+        const qty = parseFloat(this.actualQtyInput?.value)
         if (qty % 1 !== 0 && !this._selectedOrderProduct.product.isInventoryDecimal) {
           throw new Error(i18next.t('text.decimal_quantities_not_allowed'))
         }
       }
 
       if (this._isRequiredCheckExpiry) {
-        if (!this.expDateInput.value) {
+        if (!this.expDateInput?.value) {
           this._focusOnExpiryDateInput()
           throw new Error(i18next.t('text.expiry_date_is_empty'))
         }
@@ -1934,7 +1928,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
 
       if (this._isRequiredCheckManufactureDate && this.manufactureDateInput?.value) {
-        const value = this.manufactureDateInput.value
+        const value = this.manufactureDateInput?.value
         const today = new Date()
         today.setHours(0, 0, 0, 0)
         const manufactureDate = new Date(value)
@@ -1952,7 +1946,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
     }
 
     if (this._enableProductScanning) {
-      if (!this.productBarcodeInput.value) {
+      if (!this.productBarcodeInput?.value) {
         this._focusOnProductBarcodeInput()
         throw new Error(i18next.t('text.scan_product_barcode'))
       }
@@ -1960,18 +1954,18 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       let orderProducts = await this._checkedScannedProduct()
 
       if (this._enableInputQty >= 0 && this._enableInputQty < 4 && !this._isRequireSerialNumberScanningInbound) {
-        if (!parseFloat(this.actualQtyInput.value)) {
+        if (!parseFloat(this.actualQtyInput?.value)) {
           this._focusOnActualQtyInput()
           throw new Error(i18next.t('text.enter_qty'))
         }
 
-        if (!(parseFloat(this.actualQtyInput.value) > 0)) {
-          setTimeout(() => this.actualQtyInput.select(), 100)
+        if (!(parseFloat(this.actualQtyInput?.value) > 0)) {
+          setTimeout(() => this.actualQtyInput?.select(), 100)
           throw new Error(i18next.t('text.qty_should_be_positive'))
         }
 
         // Check if quantity has decimals and validate against product settings
-        const qty = parseFloat(this.actualQtyInput.value)
+        const qty = parseFloat(this.actualQtyInput?.value)
         if (qty % 1 !== 0 && !this._selectedOrderProduct.product.isInventoryDecimal) {
           throw new Error(i18next.t('text.decimal_quantities_not_allowed'))
         }
@@ -1983,7 +1977,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
 
       if (this._isRequiredCheckExpiry) {
-        if (!this.expDateInput.value) {
+        if (!this.expDateInput?.value) {
           this._focusOnExpiryDateInput()
           throw new Error(i18next.t('text.expiry_date_is_empty'))
         }
@@ -1992,7 +1986,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       }
 
       if (this._isRequiredCheckManufactureDate && this.manufactureDateInput?.value) {
-        const value = this.manufactureDateInput.value
+        const value = this.manufactureDateInput?.value
         const today = new Date()
         today.setHours(0, 0, 0, 0)
         const manufactureDate = new Date(value)
@@ -2134,8 +2128,8 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
         variables: {
           worksheetDetailName: this._selectedOrderProduct?.name || '',
           inventory: {
-            palletId: this._enableCartonLabel ? null : this.lotInput.value.trim(),
-            cartonId: this._enableCartonLabel ? this.cartonInput.value.trim() : null,
+            palletId: this._enableCartonLabel ? null : this.lotInput?.value?.trim(),
+            cartonId: this._enableCartonLabel ? this.cartonInput?.value?.trim() : null,
             expirationDate: this.expDateInput?.value ? this.expDateInput.value : null,
             manufactureDate: this.manufactureDateInput?.value ? this.manufactureDateInput.value : null
           }
@@ -2144,7 +2138,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
 
       if (!response.errors) {
         this._selectedInventory = null
-        this.cartonInput.value = ''
+        if (this.cartonInput) this.cartonInput.value = ''
 
         await this._fetchProducts(this._orderNo)
       }
@@ -2443,39 +2437,41 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
   }
 
   _focusOnLotInput() {
-    setTimeout(() => this.lotInput.focus(), 100)
+    setTimeout(() => this.lotInput?.focus(), 100)
   }
 
   _focusOnCartonInput() {
-    if (this._enableProductScanning) this.productBarcodeInput.readOnly = false
-    setTimeout(() => this.cartonInput.focus(), 100)
+    if (this._enableProductScanning && this.productBarcodeInput) this.productBarcodeInput.readOnly = false
+    setTimeout(() => this.cartonInput?.focus(), 100)
   }
 
   _focusOnActualQtyInput() {
-    setTimeout(() => this.actualQtyInput.focus(), 100)
+    setTimeout(() => this.actualQtyInput?.focus(), 100)
   }
 
   _focusOnExpiryDateInput() {
-    setTimeout(() => this.expDateInput.focus(), 100)
+    setTimeout(() => this.expDateInput?.focus(), 100)
   }
 
   _focusOnManufactureDateInput() {
-    setTimeout(() => this.manufactureDateInput.focus(), 100)
+    setTimeout(() => this.manufactureDateInput?.focus(), 100)
   }
 
   _focusOnProductBarcodeInput() {
-    this.productBarcodeInput.readOnly = false
-    setTimeout(() => this.productBarcodeInput.focus(), 100)
+    if (this.productBarcodeInput) {
+      this.productBarcodeInput.readOnly = false
+      setTimeout(() => this.productBarcodeInput.focus(), 100)
+    }
   }
 
   _focusOnSerialNumberInput() {
-    setTimeout(() => this.serialNumberInput.focus(), 100)
+    setTimeout(() => this.serialNumberInput?.focus(), 100)
   }
 
   orderTypeChangeHandler(e) {
     this.refOrderType = e.currentTarget.value
     this._clearView()
-    this.orderNoInput.select()
+    this.orderNoInput?.select()
   }
 
   _getFieldSequence(isMobile = false) {
@@ -2505,7 +2501,7 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
       const sequences = {
         'carton_product': ['cartonId', 'productBarcode', getConditionRow()],
         'carton_product_qty': ['cartonId', 'productBarcode', getConditionRow(), 'qty'],
-        'carton_product_exp_serial': ['cartonId', 'productBarcode', ['expDate', 'serialNumber'], getConditionRow()],
+        'carton_product_exp_serial': ['cartonId', 'productBarcode', ['expiryDate', 'serialNumber'], getConditionRow()],
         'lot_qty_mfg_exp': [['lotId', 'qty'], ['manufactureDate', 'expiryDate'], getConditionRow()],
         'carton_product_serial': ['cartonId', 'productBarcode', 'serialNumber', getConditionRow()],
         'carton_product_mfg_exp': ['cartonId', 'productBarcode', ['manufactureDate', 'expiryDate'], getConditionRow()],

package/config.development.js

@@ -4,23 +4,34 @@ module.exports = {
   useVirtualHostBasedDomain: false,
   fallbackRoute: '/',
   subdomainOffset: 2,
-  port: 4011,
+  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: 'EMS',
+  //   database: 'arif',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.161',
+  //   host: '10.254.29.189',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
+
+  // STAGING DATABASE
   ormconfig: {
     name: 'default',
     type: 'postgres',
-    database: 'postgres',
+    database: 'staging',
     username: 'postgres',
     password: 't62dgT#Ns*GerhuZ9wnzm^',
     host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
@@ -28,32 +39,37 @@ module.exports = {
     synchronize: false,
     logging: true
   },
+
   // 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 }
   // },
+
+  //db izzah
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'operato',
-  //   username: 'operato',
-  //   password: 'abcd1234',
-  //   host: 'localhost',
-  //   port: 25432,
-  //   synchronize: false,
+  //   database: '06072023',
+  //   username: 'postgres',
+  //   password: 'hatio',
+  //   host: '192.168.0.153',
+  //   port: 15432,f
+  //   synchronize: true,
   //   logging: true
   // },
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'operato',
+  //   database: 'postgres',
   //   username: 'postgres',
   //   password: 'hatio',
   //   host: '192.168.0.151',
@@ -61,29 +77,60 @@ module.exports = {
   //   synchronize: false,
   //   logging: true
   // },
-  //arif
+
+  // //ERIC
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'arif',
+  //   database: 'eric',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '10.254.29.189',
+  //   host: '192.168.0.153',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
+
+  //eric 2
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'operato-eric',
+  //   database: 'eric2',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '192.168.0.249',
-  //   port: 5432,
+  //   host: '192.168.0.153',
+  //   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',
+  //   username: 'postgres',
+  //   password: 'abcd1234',
+  //   synchronize: false,
+  //   logging: true,
+  //   connectTimeoutMS: 30000,
+  //   extra: { poolSize: 30 }
+  // },
+  //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,
@@ -96,22 +143,8 @@ 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',
@@ -127,7 +160,7 @@ module.exports = {
     port: 587,
     secure: false, // true for 465, false for other ports
     auth: {
-      user: 'noreply@hatiolab.com', // generated ethereal user
+      user: 'no-reply@hatiolab.com', // generated ethereal user
       pass: 'h@ti0LAB1008' // generated ethereal password
     },
     secureConnection: false,
@@ -135,7 +168,7 @@ module.exports = {
       ciphers: 'SSLv3'
     }
   },
-  sender: 'noreply@hatiolab.com',
+  sender: 'no-reply@hatiolab.com',
   notification: {
     // fcm: {
     //   serviceAccount: {
@@ -159,80 +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'
-  },
-  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 },
+  // 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.772",
+  "version": "4.3.773",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "6705404e7dbd56da45088fe9247462a56e751691"
+  "gitHead": "3e1725fae738b84e6ab1cd9b651c5e144f0c9fc5"
 }