@things-factory/operato-wms 3.6.24 → 3.6.29

package/client/pages/order/arrival-notice/create-arrival-notice.js

@@ -351,6 +351,8 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
     super()
     this.productData = { records: [] }
     this.vasData = { records: [] }
+    this._bizplaceId = ''
+    this._bizplaceName = ''
     this.containerSizes = []
     this._importedOrder = false
     this._hasContainer = false
@@ -1252,7 +1254,7 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
         batchIdRef: record?.batchIdRef ? record.batchIdRef : null,
         product: { id: record.product.id },
         packingType: record.packingType,
-        packingSize: record.product.packingSize,
+        packingSize: record.packingSize || record.product.packingSize,
         uomValue: record?.uomValue ? record.uomValue : 0,
         uom: record.uom,
         packQty: record.packQty,
@@ -1576,8 +1578,6 @@ class CreateArrivalNotice extends localize(i18next)(PageView) {
               sku
               description
               type
-              packingType
-              packingSize
               primaryUnit
               primaryValue
             }

package/client/pages/order/release-order/create-release-order.js

@@ -281,6 +281,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
               ?hidden="${!this._checkTransport}"
               name="packingOption"
               .checked="${this._packingOption}"
+              disabled
             />
             <label for="packingOption" ?hidden="${!this._checkTransport}">${i18next.t('label.packing')}</label>
 

package/client/pages/order/release-order/release-order-detail.js

@@ -1,17 +1,21 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+import '../../components/attachment-viewer'
+import '../../components/vas-templates'
+import './release-extra-product-popup'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { getRenderer } from '@things-factory/grist-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, navigate, PageView, store } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin'
+
 import { fetchSettingRule } from '../../../fetch-setting-value'
-import '../../components/attachment-viewer'
-import '../../components/vas-templates'
 import {
   ORDER_STATUS,
   VAS_BATCH_AND_PRODUCT_TYPE,
@@ -19,7 +23,6 @@ import {
   VAS_ETC_TYPE,
   VAS_PRODUCT_TYPE
 } from '../../constants'
-import './release-extra-product-popup'
 
 class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -34,6 +37,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       _exportOption: Boolean,
       _courierOption: Boolean,
       _packingOption: Boolean,
+      roType: String,
       customerBizplaceId: String,
       partnerBizplaceId: String,
       inventoryGristConfig: Object,
@@ -315,7 +319,12 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     var actions = [
       {
         title: i18next.t('button.back_to_list'),
-        action: () => (userIsOfficeAdmin ? navigate(`b2b_order_requests`) : navigate(`b2b_orders`)),
+        action: () =>
+          this.roType === 'b2b'
+            ? userIsOfficeAdmin
+              ? navigate(`b2b_order_requests`)
+              : navigate(`b2b_orders`)
+            : navigate(`b2c_order_requests`),
         ...CommonButtonStyles.back
       }
     ]
@@ -441,12 +450,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.packing_size'),
           width: 140
         },
-        // {
-        //   type: 'integer',
-        //   name: 'qty',
-        //   header: i18next.t('field.available_qty'),
-        //   width: 100
-        // },
         {
           type: 'integer',
           name: 'releaseQty',
@@ -454,19 +457,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           record: { options: { min: 0 } },
           width: 130
         },
-        // {
-        //   type: 'integer',
-        //   name: 'remainQty',
-        //   header: i18next.t('field.remaining_qty'),
-        //   record: { options: { min: 0 } },
-        //   width: 100
-        // },
-        // {
-        //   type: 'string',
-        //   name: 'availableUomValueWithUom',
-        //   header: i18next.t('field.available_uom_value'),
-        //   width: 100
-        // },
         {
           type: 'string',
           name: 'releaseUomValueWithUom',
@@ -474,13 +464,6 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           record: { options: { min: 0 } },
           width: 150
         },
-        // {
-        //   type: 'string',
-        //   name: 'remainUomValueWithUom',
-        //   header: i18next.t('field.remain_uom_value'),
-        //   record: { options: { min: 0 } },
-        //   width: 100
-        // },
         {
           type: 'string',
           name: 'roundedUomValue',
@@ -611,6 +594,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             id
             name
             truckNo
+            type
             bizplace {
               id
               name
@@ -705,6 +689,7 @@ class ReleaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     if (!response.errors) {
       const releaseOrder = response.data.releaseGoodDetail
       const shippingOrder = releaseOrder.shippingOrderInfo
+      this.roType = releaseOrder.type
       const orderInventories = releaseOrder.inventoryInfos.map(inventoryInfo => {
         let roundedUomValue =
           inventoryInfo.releaseQty *

package/client/pages/outbound/packing-worksheet-list.js

@@ -8,7 +8,7 @@ import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
-import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
+import { isMobileDevice } from '@things-factory/utils'
 
 import { WORKSHEET_TYPE } from '../constants'
 
@@ -81,7 +81,7 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
 
   async pageInitialized() {
     const _worksheetStatus = await getCodeByName('WORKSHEET_STATUS')
-    this._bizplaces = [...(await this._fetchBizplaceList())]
+    const partners = [...(await this._fetchPartners())]
 
     this._searchFields = [
       {
@@ -97,16 +97,16 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
         props: { searchOper: 'i_like' }
       },
       {
-        name: 'bizplaceId',
         label: i18next.t('field.company'),
+        name: 'bizplaceId',
         type: 'select',
         options: [
           { value: '' },
-          ...this._bizplaces
-            .map(bizplaceList => {
+          ...partners
+            .map(partner => {
               return {
-                name: bizplaceList.name,
-                value: bizplaceList.id
+                name: `${partner.name} ${partner.description ? `(${partner.description})` : ''}`,
+                value: partner.id
               }
             })
             .sort(this._compareValues('name', 'asc'))
@@ -264,12 +264,8 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
     })
     const response = await client.query({
       query: gql`
-        query {
-          worksheets(${gqlBuilder.buildArgs({
-            filters,
-            pagination: { page, limit },
-            sortings: sorters
-          })}) {
+        query worksheets($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          worksheets(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
@@ -298,7 +294,8 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
             total
           }
         }
-      `
+      `,
+      variables: { filters, pagination: { page, limit }, sortings: sorters }
     })
 
     if (!response.errors) {
@@ -316,25 +313,25 @@ class PackingWorksheetList extends localize(i18next)(PageView) {
     return this.config.columns
   }
 
-  async _fetchBizplaceList() {
+  async _fetchPartners() {
+    const filters = []
     const response = await client.query({
       query: gql`
-          query {
-            bizplaces(${gqlBuilder.buildArgs({
-              filters: []
-            })}) {
-              items{
-                id
-                name
-                description
-              }
+        query partnersBizplaces($filters: [Filter!]) {
+          partnersBizplaces(filters: $filters) {
+            items {
+              id
+              name
+              description
             }
           }
-        `
+        }
+      `,
+      variables: { filters }
     })
 
     if (!response.errors) {
-      return response.data.bizplaces.items
+      return response.data.partnersBizplaces.items
     }
   }
 

package/client/pages/report/custom-elccl/elccl-delivery-order-summary.js

@@ -274,7 +274,7 @@ class ElcclDeliveryOrderSummary extends connect(store)(localize(i18next)(PageVie
         total: response.data.deliveryOrders.total || 0,
         records:
           response.data.deliveryOrders.items.map(itm => {
-            let remarks = itm.orderInventories.reduce((acc, itm) => {
+            let remarks = (itm.orderInventories || []).reduce((acc, itm) => {
               let dt = {
                 product_name: `${itm.inventory.product.name} (${itm.inventory.product.description})`,
                 product_batch: itm.inventory.batchId,

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

@@ -211,7 +211,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
       },
       {
         type: 'string',
-        name: 'supplier|name',
+        name: 'contactPoint|companyName',
         header: i18next.t('field.supplier'),
         width: 170
       },
@@ -472,7 +472,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         'grnNo',
         'deliveryOrderNo',
         'purchaseOrder|name',
-        'supplier|name',
+        'contactPoint|companyName',
         'refNo1',
         'refNo2',
         'refNo3',
@@ -570,7 +570,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
 
       const response = await client.query({
         query: gql`
-          query inboundOrderDetailsReport($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          query inboundOrderDetailsReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             inboundOrderDetailsReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
                 bizplace {
@@ -606,7 +606,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
                   id
                   name
                 }
-                supplier {
+                contactPoint {
                   id
                   name
                 }
@@ -735,7 +735,7 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         { header: i18next.t('field.grn_no'), key: 'grnNo', width: 30, type: 'string' },
         { header: i18next.t('field.do_no'), key: 'deliveryOrderNo', width: 30, type: 'string' },
         { header: i18next.t('field.po_no'), key: 'purchaseOrder|name', width: 30, type: 'string' },
-        { header: i18next.t('field.supplier'), key: 'supplier|name', width: 30, type: 'string' },
+        { header: i18next.t('field.supplier'), key: 'contactPoint|companyName', width: 30, type: 'string' },
         { header: i18next.t('field.ref_no'), key: 'refNo1', width: 60, type: 'string' },
         { header: i18next.t('field.ref_no_2'), key: 'refNo2', width: 60, type: 'string' },
         { header: i18next.t('field.ref_no_3'), key: 'refNo3', width: 60, type: 'string' },

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

@@ -527,7 +527,7 @@ class OutboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVi
 
       const response = await client.query({
         query: gql`
-          query outboundOrderDetailsReport($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+          query outboundOrderDetailsReport($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
             outboundOrderDetailsReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
                 bizplace {

package/config.development.js

@@ -0,0 +1,95 @@
+module.exports = {
+  domainType: 'warehouse',
+  domainExtType: 'warehouse',
+  useVirtualHostBasedDomain: false,
+  fallbackRoute: '/',
+  subdomainOffset: 2,
+  SECRET: '0xD58F835B61C217A76CA5FA4a70a1D0d4D79dBD20',
+  reportApiUrl: 'http://localhost:8090/rest/report/show_html',
+  // storage: {
+  //   type: 's3',
+  //   accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
+  //   secretAccessKey: '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',
+  //   bucketName: 'opa-one'
+  // },
+  // ormconfig: {
+  //   name: 'default',
+  //   type: 'postgres',
+  //   database: 'postgres',
+  //   username: 'postgres',
+  //   password: 'abcd1234',
+  //   host: 'operatov3-instance-1.cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
+  //   port: 55432,
+  //   synchronize: true,
+  //   logging: true
+  // },
+  ormconfig: {
+    name: 'default',
+    type: 'postgres',
+    database: 'postgres',
+    username: 'postgres',
+    password: 'abcd1234',
+    host: 'localhost',
+    port: 15432,
+    synchronize: true,
+    logging: true
+  },
+  // notification: {
+  //   fcm: {
+  //     serviceAccount: {
+  //       project_id: 'operato',
+  //       private_key:
+  //         '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
+  //       client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
+  //     },
+  //     appConfig: {
+  //       apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
+  //       projectId: 'operato',
+  //       messagingSenderId: 79537064975,
+  //       appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
+  //     },
+  //     serverKey:
+  //       'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
+  //   },
+  //   vapidKey: {
+  //     subject: 'mailto:heartyoh@hatiolab.com',
+  //     publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
+  //     privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
+  //   }
+  // },
+  uploads: 'uploads',
+  attachmentsPath: 'attachments',
+  sellercraftIntegrationConfig: {
+    apiKey: 'Et0KqtLvA6e92bDvOywy9eCCud4hpAal8akpqI90'
+  },
+  marketplaceIntegrationShopee: {
+    platform: 'shopee',
+    isUAT: false,
+    application: 'Operato MMS',
+    partnerId: 846025,
+    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
+  },
+  marketplaceIntegrationLazada: {
+    platform: 'lazada',
+    application: 'operato-mms',
+    appKey: '120961',
+    appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
+    callback: 'https://myoperato.com/lazada-callback'
+  },
+  port: 4000,
+  SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
+  email: {
+    host: 'smtp.office365.com',
+    port: 587,
+    secure: false, // true for 465, false for other ports
+    auth: {
+      user: 'no-reply@hatiolab.com', // generated ethereal user
+      pass: 'h@ti0LAB1008' // generated ethereal password
+    },
+    secureConnection: false,
+    tls: {
+      ciphers: 'SSLv3'
+    },
+    sender: 'no-reply@hatiolab.com'
+  }
+}

package/config.production.js

@@ -0,0 +1,90 @@
+module.exports = {
+  domainType: 'warehouse',
+  domainExtType: 'warehouse',
+  useVirtualHostBasedDomain: false,
+  subdomainOffset: 2,
+  SECRET: '0xD58F835B61C217A76CA5FA4a70a1D0d4D79dBD20',
+  reportApiUrl: 'https://operatowms.com/rest/report/show_html',
+  email: {
+    host: 'smtp.office365.com',
+    port: 587,
+    secure: false,
+    auth: {
+      user: 'no-reply@hatiolab.com', // generated ethereal user
+      pass: 'h@ti0LAB1008' // generated ethereal password
+    },
+    secureConnection: false,
+    tls: {
+      ciphers: 'SSLv3'
+    }
+  },
+  logger: {
+    file: {
+      filename: 'logs/application-%DATE%.log',
+      datePattern: 'YYYY-MM-DD-HH',
+      zippedArchive: false,
+      maxSize: '20m',
+      maxFiles: '2d',
+      level: 'info'
+    },
+    console: {
+      level: 'silly'
+    }
+  },
+  ormconfig: {
+    name: 'default',
+    type: 'postgres',
+    database: 'postgres',
+    username: 'postgres',
+    password: 'abcd1234',
+    host: '13.212.171.146',
+    port: 55432,
+    synchronize: true,
+    logging: true
+  },
+  uploads: 'uploads',
+  storage: {
+    type: 's3',
+    accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
+    secretAccessKey: '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',
+    bucketName: 'opa-one'
+  },
+  marketplaceIntegrationShopee: {
+    platform: 'shopee',
+    isUAT: false,
+    application: 'Operato MMS',
+    partnerId: 846025,
+    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
+  },
+  marketplaceIntegrationLazada: {
+    platform: 'lazada',
+    application: 'operato-mms',
+    appKey: '120961',
+    appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
+    callback: 'https://myoperato.com/lazada-callback'
+  },
+  attachmentsPath: 'attachments',
+  notification: {
+    fcm: {
+      serviceAccount: {
+        project_id: 'operato',
+        private_key:
+          '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
+        client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
+      },
+      appConfig: {
+        apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
+        projectId: 'operato',
+        messagingSenderId: 79537064975,
+        appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
+      },
+      serverKey:
+        'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
+    },
+    vapidKey: {
+      subject: 'mailto:heartyoh@hatiolab.com',
+      publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
+      privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
+    }
+  }
+}

package/dist-server/graphql/resolvers/reports/inbound-order-details-report.js

@@ -51,7 +51,7 @@ exports.inboundOrderDetailsReport = {
             await tx.query(`
         create temp table temp_inbound_order_report on commit drop as (
           select * from (
-            select b2.name as "bizplace_name", b2.description as "bizplace_description", 
+            select b2.id as "bizplace_id", b2.name as "bizplace_name", b2.description as "bizplace_description", 
             grn.name as "grn_no", 
             an.name as "gan_no", an.ref_no as "ref_no_1", an.ref_no_2 as "ref_no_2", an.ref_no_3 as "ref_no_3",
             an.loose_item, an.import_cargo, an.container_no, an.container_size, an.own_transport, 

package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js

@@ -43,11 +43,11 @@ exports.outboundOrderDetailsReport = {
             await tx.query(`
         create temp table temp_outbound_order_report on commit drop as (
           select * from (
-            select b2.name AS "bizplace_name", b2.description AS "bizplace_description", 
+            select b2.id AS "bizplace_id", b2.name AS "bizplace_name", b2.description AS "bizplace_description", 
             do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date", coalesce(do2."to", concat(cp.address, cp.address_2)) as "delivery_address",
             rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", 
             rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by,
-            p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
+            p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
             oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
             w.started_at as "picking_start", w.ended_at as "picking_complete",
             ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref, 
@@ -111,6 +111,7 @@ exports.outboundOrderDetailsReport = {
             let items = result.map(itm => {
                 return {
                     bizplace: {
+                        id: itm.bizplace_id,
                         name: itm.bizplace_name,
                         description: itm.bizplace_description
                     },
@@ -128,6 +129,7 @@ exports.outboundOrderDetailsReport = {
                     pickingStart: itm.picking_start,
                     pickingComplete: itm.picking_complete,
                     product: {
+                        id: itm.product_id,
                         sku: itm.product_sku,
                         name: itm.product_name,
                         description: itm.product_description,

package/dist-server/graphql/resolvers/reports/outbound-order-details-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"outbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-order-details-report.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/types/reports/inbound-order-details-report.js

@@ -29,7 +29,7 @@ exports.InboundOrderDetailsReport = (0, graphql_tag_1.default) `
     orderLineItem: Int
     product: Product
     purchaseOrder: PurchaseOrder
-    supplier: ContactPoint
+    contactPoint: ContactPoint
     packType: String
     packSize: Int
     qty: Int

package/dist-server/graphql/types/reports/index.js

@@ -6,8 +6,8 @@ const inbound_order_details_report_list_1 = require("./inbound-order-details-rep
 const outbound_order_details_report_1 = require("./outbound-order-details-report");
 const outbound_order_details_report_list_1 = require("./outbound-order-details-report-list");
 exports.Query = `
-  inboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InboundOrderDetailsReportList @transaction
-  outboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): OutboundOrderDetailsReportList @transaction
+  inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
+  outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
 `;
 exports.Types = [
     inbound_order_details_report_1.InboundOrderDetailsReport,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "3.6.24",
+  "version": "3.6.29",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -41,36 +41,36 @@
     "docker:run": "docker run -p 4000:3000 hatiolab/operato-wms:latest"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^3.6.24",
-    "@things-factory/attachment-ui": "^3.6.24",
-    "@things-factory/auth-ui": "^3.6.24",
-    "@things-factory/barcode-ui": "^3.6.24",
-    "@things-factory/biz-ui": "^3.6.24",
-    "@things-factory/board-service": "^3.6.24",
-    "@things-factory/board-ui": "^3.6.24",
-    "@things-factory/code-ui": "^3.6.24",
-    "@things-factory/context-ui": "^3.6.24",
-    "@things-factory/export-ui": "^3.6.24",
-    "@things-factory/export-ui-csv": "^3.6.24",
-    "@things-factory/export-ui-excel": "^3.6.24",
-    "@things-factory/fav-base": "^3.6.24",
-    "@things-factory/form-ui": "^3.6.24",
+    "@things-factory/apptool-ui": "^3.6.29",
+    "@things-factory/attachment-ui": "^3.6.29",
+    "@things-factory/auth-ui": "^3.6.29",
+    "@things-factory/barcode-ui": "^3.6.29",
+    "@things-factory/biz-ui": "^3.6.29",
+    "@things-factory/board-service": "^3.6.29",
+    "@things-factory/board-ui": "^3.6.29",
+    "@things-factory/code-ui": "^3.6.29",
+    "@things-factory/context-ui": "^3.6.29",
+    "@things-factory/export-ui": "^3.6.29",
+    "@things-factory/export-ui-csv": "^3.6.29",
+    "@things-factory/export-ui-excel": "^3.6.29",
+    "@things-factory/fav-base": "^3.6.29",
+    "@things-factory/form-ui": "^3.6.29",
     "@things-factory/grist-ui": "^3.6.24",
-    "@things-factory/help": "^3.6.24",
-    "@things-factory/i18n-ui": "^3.6.24",
-    "@things-factory/id-rule-base": "^3.6.24",
-    "@things-factory/import-ui": "^3.6.24",
-    "@things-factory/import-ui-excel": "^3.6.24",
-    "@things-factory/menu-ui": "^3.6.24",
-    "@things-factory/more-ui": "^3.6.24",
-    "@things-factory/notification": "^3.6.24",
+    "@things-factory/help": "^3.6.29",
+    "@things-factory/i18n-ui": "^3.6.29",
+    "@things-factory/id-rule-base": "^3.6.29",
+    "@things-factory/import-ui": "^3.6.29",
+    "@things-factory/import-ui-excel": "^3.6.29",
+    "@things-factory/menu-ui": "^3.6.29",
+    "@things-factory/more-ui": "^3.6.29",
+    "@things-factory/notification": "^3.6.29",
     "@things-factory/pdf": "^3.6.24",
-    "@things-factory/print-proxy-service": "^3.6.24",
-    "@things-factory/print-service": "^3.6.24",
-    "@things-factory/print-ui": "^3.6.24",
-    "@things-factory/product-base": "^3.6.24",
-    "@things-factory/resource-ui": "^3.6.24",
-    "@things-factory/sales-ui": "^3.6.24",
+    "@things-factory/print-proxy-service": "^3.6.29",
+    "@things-factory/print-service": "^3.6.29",
+    "@things-factory/print-ui": "^3.6.29",
+    "@things-factory/product-base": "^3.6.29",
+    "@things-factory/resource-ui": "^3.6.29",
+    "@things-factory/sales-ui": "^3.6.29",
     "@things-factory/scene-chartjs": "^3.6.24",
     "@things-factory/scene-clock": "^3.6.24",
     "@things-factory/scene-clone": "^3.6.24",
@@ -84,7 +84,7 @@
     "@things-factory/scene-graphql": "^3.6.24",
     "@things-factory/scene-half-roundrect": "^3.6.24",
     "@things-factory/scene-indoor-map": "^3.6.24",
-    "@things-factory/scene-label": "^3.6.24",
+    "@things-factory/scene-label": "^3.6.29",
     "@things-factory/scene-legend": "^3.6.24",
     "@things-factory/scene-marker": "^3.6.24",
     "@things-factory/scene-mqtt": "^3.6.24",
@@ -97,15 +97,15 @@
     "@things-factory/scene-table": "^3.6.24",
     "@things-factory/scene-visualizer": "^3.6.24",
     "@things-factory/scene-wheel-sorter": "^3.6.24",
-    "@things-factory/setting-ui": "^3.6.24",
-    "@things-factory/system-ui": "^3.6.24",
-    "@things-factory/transport-base": "^3.6.24",
-    "@things-factory/tutorial-ui": "^3.6.24",
-    "@things-factory/warehouse-base": "^3.6.24",
-    "@things-factory/worksheet-base": "^3.6.24"
+    "@things-factory/setting-ui": "^3.6.29",
+    "@things-factory/system-ui": "^3.6.29",
+    "@things-factory/transport-base": "^3.6.29",
+    "@things-factory/tutorial-ui": "^3.6.29",
+    "@things-factory/warehouse-base": "^3.6.29",
+    "@things-factory/worksheet-base": "^3.6.29"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.6.24"
   },
-  "gitHead": "b6277d4b37ae6f304a683c150e983bdb81baaa72"
+  "gitHead": "68873f7d01cf4fdabb992d3cca0c7c2d4cca07b4"
 }

package/server/graphql/resolvers/reports/inbound-order-details-report.ts

@@ -60,7 +60,7 @@ export const inboundOrderDetailsReport = {
         `
         create temp table temp_inbound_order_report on commit drop as (
           select * from (
-            select b2.name as "bizplace_name", b2.description as "bizplace_description", 
+            select b2.id as "bizplace_id", b2.name as "bizplace_name", b2.description as "bizplace_description", 
             grn.name as "grn_no", 
             an.name as "gan_no", an.ref_no as "ref_no_1", an.ref_no_2 as "ref_no_2", an.ref_no_3 as "ref_no_3",
             an.loose_item, an.import_cargo, an.container_no, an.container_size, an.own_transport, 

package/server/graphql/resolvers/reports/outbound-order-details-report.ts

@@ -52,11 +52,11 @@ export const outboundOrderDetailsReport = {
         `
         create temp table temp_outbound_order_report on commit drop as (
           select * from (
-            select b2.name AS "bizplace_name", b2.description AS "bizplace_description", 
+            select b2.id AS "bizplace_id", b2.name AS "bizplace_name", b2.description AS "bizplace_description", 
             do2.name AS "delivery_order_no", do2.delivery_date as "delivery_order_date", coalesce(do2."to", concat(cp.address, cp.address_2)) as "delivery_address",
             rg.name AS "ro_no", rg."type" as "ro_type", rg.ref_no AS "ref_no_1", rg.ref_no_2 AS "ref_no_2", rg.ref_no_3 AS "ref_no_3", 
             rg.created_at AS "order_created_at", rg.accepted_at, u4.name as accepted_by,
-            p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
+            p.id as "product_id", p.sku as "product_sku", p.name AS "product_name", p.description AS "product_description", p.type as "product_type",
             oi.packing_type as "pack_type", oi.packing_size as "pack_size", oi.release_qty AS "release_qty",
             w.started_at as "picking_start", w.ended_at as "picking_complete",
             ih.qty as "qty", ih.uom_value as "uom_value", ih.uom, ih.pallet_id, ih.carton_id, ih.batch_id, ih.batch_id_ref, 
@@ -128,6 +128,7 @@ export const outboundOrderDetailsReport = {
       let items = result.map(itm => {
         return {
           bizplace: {
+            id: itm.bizplace_id,
             name: itm.bizplace_name,
             description: itm.bizplace_description
           },
@@ -145,6 +146,7 @@ export const outboundOrderDetailsReport = {
           pickingStart: itm.picking_start,
           pickingComplete: itm.picking_complete,
           product: {
+            id: itm.product_id,
             sku: itm.product_sku,
             name: itm.product_name,
             description: itm.product_description,

package/server/graphql/types/reports/inbound-order-details-report.ts

@@ -24,7 +24,7 @@ export const InboundOrderDetailsReport = gql`
     orderLineItem: Int
     product: Product
     purchaseOrder: PurchaseOrder
-    supplier: ContactPoint
+    contactPoint: ContactPoint
     packType: String
     packSize: Int
     qty: Int

package/server/graphql/types/reports/index.ts

@@ -4,8 +4,8 @@ import { OutboundOrderDetailsReport } from './outbound-order-details-report'
 import { OutboundOrderDetailsReportList } from './outbound-order-details-report-list'
 
 export const Query = `
-  inboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InboundOrderDetailsReportList @transaction
-  outboundOrderDetailsReport(filters: [Filter], pagination: Pagination, sortings: [Sorting]): OutboundOrderDetailsReportList @transaction
+  inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
+  outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
 `
 
 export const Types = [