@things-factory/operato-wms 4.3.769 → 4.3.771

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

@@ -0,0 +1,182 @@
+import gql from 'graphql-tag'
+
+import { html, css, LitElement } from 'lit-element'
+import { client, CustomAlert } from '@things-factory/shell'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { ScrollbarStyles } from '@things-factory/styles'
+import { showToast } from '../../../util'
+import '../../components/list-view/product-list-view'
+
+class LoadingPackageInfoPopup extends localize(i18next)(LitElement) {
+  static get properties() {
+    return {
+      _data: Array,
+      _packageName: String,
+      _packageId: String,
+      _packageNumber: Number
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          padding: 12px;
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+          background-color: var(--main-section-background-color);
+          position: relative;
+        }
+        .content {
+          display: flex;
+          flex-direction: column;
+          flex: 1;
+          overflow: auto;
+        }
+        .button-container {
+          position: absolute;
+          bottom: 12px;
+          right: 12px;
+          display: flex;
+          gap: 8px;
+        }
+        .tab-info {
+          display: flex;
+          justify-content: space-between;
+          color: #f3f2f7;
+          background-color: #007e7f;
+          padding: 10px;
+        }
+        .text-center {
+          display: flex;
+          align-items: center;
+        }
+        .text-14 {
+          font-size: 14px !important;
+          line-height: 1.5 !important;
+        }
+        .font-bold {
+          font-weight: bold !important;
+        }
+      `
+    ]
+  }
+
+  get packageItemsConfig() {
+    return {
+      selectable: false,
+      columnLeft: {
+        size: 8,
+        fields: [
+          {
+            type: 'row',
+            content: [
+              {
+                header: 'SKU No.',
+                field: 'sku',
+                type: 'string'
+              }
+            ]
+          },
+          {
+            type: 'row',
+            content: [
+              {
+                header: 'Product Name',
+                field: 'productName',
+                type: 'string',
+                style: '-webkit-line-clamp: 2;'
+              }
+            ]
+          },
+          {
+            type: 'row',
+            content: [
+              {
+                header: 'Packing Type',
+                field: 'packingType',
+                type: 'string'
+              }
+            ]
+          }
+        ]
+      },
+      columnRight: {
+        size: 4,
+        fields: [
+          {
+            type: 'valueBox',
+            content: {
+              header: 'Qty:',
+              field: 'qty',
+              type: 'number'
+            }
+          }
+        ]
+      }
+    }
+  }
+
+  render() {
+    return html`
+      <!-- Content Section -->
+      <label class="text-14 font-bold order-no">${i18next.t('field.packing_label_no')}: ${this._packageNumber}</label>
+      <div class="tab-info text-center">
+        <label class="text-14 font-bold">${i18next.t('label.total_sku')}: ${this._getTotalItems()}</label>
+      </div>
+      <div class="content">
+        <product-list-view .config=${this.packageItemsConfig} .data=${this._data}></product-list-view>
+      </div>
+      <div class="button-container">
+        <mwc-button raised @click=${e => this.closePopup(e)}>${i18next.t('button.back')}</mwc-button>
+        <mwc-button raised style="--mdc-theme-primary: #CD4946; --mdc-theme-on-primary: white;" @click=${e => this.undo(e)}>${i18next.t('button.undo')}</mwc-button>
+      </div>
+      <!-- Content Section End -->
+    `
+  }
+
+  async undo(e) {
+    try {
+      if (!this._packageId) {
+        throw new Error('Package ID is not available')
+      }
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation undoLoadingPackages($id: String!) {
+            undoLoadingPackages(id: $id)
+          }
+        `,
+        variables: { id: this._packageId }
+      })
+
+      if (!response.errors) {
+        this.dispatchEvent(
+          new CustomEvent('undo', {
+            detail: { packageId: this._packageId },
+            bubbles: true,
+            composed: true
+          })
+        )
+        showToast({ type: 'success', message: i18next.t('text.undo_loading_package_success') || 'Loading package undone successfully' })
+        setTimeout(() => history.back(), 100)
+      } else {
+        throw new Error(response.errors[0]?.message || 'Failed to undo loading package')
+      }
+    } catch (e) {
+      showToast({ type: 'error', message: e.message || 'Failed to undo loading package' })
+    }
+  }
+
+  _getTotalItems() {
+    return this._data?.length || 0
+  }
+
+  async closePopup(e) {
+    history.back()
+  }
+}
+
+window.customElements.define('loading-package-info-popup', LoadingPackageInfoPopup)

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

@@ -118,14 +118,20 @@ const FIND_LOADABLE_RELEASE_GOOD_BY_BIN = gql`
           batchId
           packingType
           refWorksheetId
+          packedQty
+          releaseQty
           product {
             id
             sku
             name
+            isInventoryDecimal
           }
           productDetail {
             id
           }
+          orderProduct {
+            id
+          }
         }
       }
     }
@@ -179,14 +185,20 @@ const LOADING_WORKSHEET_V2 = gql`
           batchId
           packingType
           refWorksheetId
+          packedQty
+          releaseQty
           product {
             id
             sku
             name
+            isInventoryDecimal
           }
           productDetail {
             id
           }
+          orderProduct {
+            id
+          }
         }
       }
     }
@@ -263,14 +275,20 @@ const GET_LOADING_TASK = gql`
           batchId
           packingType
           refWorksheetId
+          packedQty
+          releaseQty
           product {
             id
             sku
             name
+            isInventoryDecimal
           }
           productDetail {
             id
           }
+          orderProduct {
+            id
+          }
         }
       }
     }

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

@@ -9,6 +9,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, gqlContext, PageView, store } from '@things-factory/shell'
 import { flattenObject, isMobileDevice } from '@things-factory/utils'
+import { CONDITION_OF_GOODS } from '../constants/order'
 
 function formatLocalDate(date = new Date()) {
   const year = date.getFullYear()
@@ -401,6 +402,12 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         header: i18next.t('field.uom'),
         width: 100
       },
+      {
+        type: 'string',
+        name: 'conditionOfGoods',
+        header: i18next.t('field.type_of_condition'),
+        width: 150
+      },
       {
         type: 'string',
         name: 'unitCost',
@@ -556,6 +563,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         'batchId',
         'batchIdRef',
         'expirationDate',
+        'conditionOfGoods',
         'manufactureDate',
         'unloadedBy',
         'unloadedAt',
@@ -669,6 +677,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
                 batchId
                 batchIdRef
                 expirationDate
+                conditionOfGoods
                 manufactureDate
                 unloadedAt
                 unloadedBy
@@ -689,7 +698,8 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
           response.data.inboundOrderDetailsReport.items.map(itm => {
             itm = {
               ...itm,
-              unitCost: parseFloat(itm.unitCost ? itm.unitCost : 0).toFixed(2)
+              unitCost: parseFloat(itm.unitCost ? itm.unitCost : 0).toFixed(2),
+              conditionOfGoods: this._formatConditionOfGoods(itm.conditionOfGoods)
             }
 
             return flattenObject({ ...itm, bizplace: { name: `${itm.bizplace.name} ${itm.bizplace.description}` } })
@@ -806,6 +816,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         { header: i18next.t('field.qty'), key: 'actualPackQty', width: 15, type: 'string' },
         { header: i18next.t('field.uom_value'), key: 'actualPackUomValue', width: 15, type: 'string' },
         { header: i18next.t('field.uom'), key: 'uom', width: 15, type: 'string' },
+        { header: i18next.t('field.type_of_condition'), key: 'conditionOfGoods', width: 25, type: 'string' },
         { header: i18next.t('field.unit_cost'), key: 'unitCost', width: 15, type: 'string' },
         { header: i18next.t('field.unit_volume'), key: 'unitVolume', width: 15, type: 'string' },
         { header: i18next.t('field.total_volume'), key: 'totalVolume', width: 15, type: 'string' },
@@ -850,6 +861,20 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
     }
   }
 
+  _formatConditionOfGoods(conditionValue) {
+    if (!conditionValue) return null
+    
+    const conditionKey = Object.keys(CONDITION_OF_GOODS).find(
+      key => CONDITION_OF_GOODS[key].value === conditionValue
+    )
+    
+    if (conditionKey) {
+      return i18next.t(`label.${CONDITION_OF_GOODS[conditionKey].name}`)
+    }
+    
+    return conditionValue
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/client/route.js

@@ -203,6 +203,10 @@ export default function route(page) {
       import('./pages/order/release-order/bulk-print-packing-list')
       return page
 
+    case 'preview_print_packing_list':
+      import('./pages/order/release-order/preview-print-packing-list')
+      return page
+
     case 'create_loading_manifest':
       import('./pages/manifest/create-loading-manifest')
       return page
@@ -363,9 +367,22 @@ export default function route(page) {
       return page
 
     case 'unloading':
+      if (isMobileDevice()) {
+        const urlParams = new URLSearchParams(window.location.search)
+        const hasParams = urlParams.has('orderType') && urlParams.has('orderNo')
+        
+        if (!hasParams) {
+          import('./pages/inbound/unload-product-landing-page')
+          return 'unloading_landing'
+        }
+      }
       import('./pages/inbound/unload-product')
       return page
 
+    case 'unloading_landing':
+      import('./pages/inbound/unload-product-landing-page')
+      return page
+
     case 'execute_vas':
       import('./pages/vas/execute-vas')
       return page

package/config.development.js

@@ -4,30 +4,19 @@ 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'
-  },
-  // arif
   // ormconfig: {
   //   name: 'default',
   //   type: 'postgres',
-  //   database: 'arif',
+  //   database: 'EMS',
   //   username: 'postgres',
   //   password: 'hatio',
-  //   host: '10.254.29.189',
+  //   host: '192.168.0.161',
   //   port: 15432,
   //   synchronize: false,
   //   logging: true
   // },
-
-  // STAGING DATABASE
   ormconfig: {
     name: 'default',
     type: 'postgres',
@@ -39,98 +28,62 @@ module.exports = {
     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,
@@ -143,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',
@@ -160,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,
@@ -168,7 +135,7 @@ module.exports = {
       ciphers: 'SSLv3'
     }
   },
-  sender: 'no-reply@hatiolab.com',
+  sender: 'noreply@hatiolab.com',
   notification: {
     // fcm: {
     //   serviceAccount: {
@@ -192,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'
 }