@things-factory/operato-hub 4.0.9 → 4.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.0.9",
+  "version": "4.0.13",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -41,80 +41,80 @@
     "@material/mwc-formfield": "^0.25.3",
     "@material/mwc-linear-progress": "^0.25.3",
     "@material/mwc-radio": "^0.25.3",
-    "@operato/scene-switch": "^0.0.9",
-    "@things-factory/api": "^4.0.9",
-    "@things-factory/apptool-ui": "^4.0.9",
-    "@things-factory/attachment-base": "^4.0.9",
-    "@things-factory/auth-base": "^4.0.9",
-    "@things-factory/auth-ui": "^4.0.9",
-    "@things-factory/biz-base": "^4.0.9",
-    "@things-factory/biz-ui": "^4.0.9",
-    "@things-factory/board-service": "^4.0.9",
-    "@things-factory/board-ui": "^4.0.9",
-    "@things-factory/code-ui": "^4.0.9",
-    "@things-factory/component-ui": "^4.0.9",
-    "@things-factory/context-ui": "^4.0.9",
-    "@things-factory/document-template-ui": "^4.0.9",
-    "@things-factory/export-ui": "^4.0.9",
-    "@things-factory/export-ui-csv": "^4.0.9",
-    "@things-factory/export-ui-excel": "^4.0.9",
-    "@things-factory/grist-ui": "^4.0.9",
-    "@things-factory/i18n-base": "^4.0.9",
-    "@things-factory/i18n-ui": "^4.0.9",
-    "@things-factory/import-ui": "^4.0.9",
-    "@things-factory/import-ui-excel": "^4.0.9",
-    "@things-factory/integration-accounting": "^4.0.9",
-    "@things-factory/integration-fulfillment": "^4.0.9",
-    "@things-factory/integration-lmd": "^4.0.9",
-    "@things-factory/integration-marketplace": "^4.0.9",
-    "@things-factory/integration-pos": "^4.0.9",
-    "@things-factory/integration-sellercraft": "^4.0.9",
-    "@things-factory/lite-menu": "^4.0.9",
-    "@things-factory/more-ui": "^4.0.9",
-    "@things-factory/notification": "^4.0.9",
-    "@things-factory/pdf": "^4.0.9",
-    "@things-factory/product-ui": "^4.0.9",
-    "@things-factory/resource-ui": "^4.0.9",
-    "@things-factory/sales-base": "^4.0.9",
-    "@things-factory/scene-chartjs": "^4.0.9",
-    "@things-factory/scene-clock": "^4.0.9",
-    "@things-factory/scene-clone": "^4.0.9",
-    "@things-factory/scene-compass": "^4.0.9",
-    "@things-factory/scene-data-transform": "^4.0.9",
-    "@things-factory/scene-excel": "^4.0.9",
-    "@things-factory/scene-firebase": "^4.0.9",
-    "@things-factory/scene-form": "^4.0.9",
-    "@things-factory/scene-gauge": "^4.0.9",
-    "@things-factory/scene-google-map": "^4.0.9",
-    "@things-factory/scene-graphql": "^4.0.9",
+    "@operato/scene-chartjs": "^0.0.17",
+    "@operato/scene-clock": "^0.0.17",
+    "@operato/scene-clone": "^0.0.17",
+    "@operato/scene-compass": "^0.0.17",
+    "@operato/scene-gauge": "^0.0.17",
+    "@operato/scene-indoor-map": "^0.0.17",
+    "@operato/scene-legend": "^0.0.17",
+    "@operato/scene-progressbar": "^0.0.17",
+    "@operato/scene-random": "^0.0.17",
+    "@operato/scene-switch": "^0.0.17",
+    "@operato/scene-table": "^0.0.17",
+    "@operato/scene-wheel-sorter": "^0.0.17",
+    "@things-factory/api": "^4.0.13",
+    "@things-factory/apptool-ui": "^4.0.13",
+    "@things-factory/attachment-base": "^4.0.13",
+    "@things-factory/auth-base": "^4.0.13",
+    "@things-factory/auth-ui": "^4.0.13",
+    "@things-factory/biz-base": "^4.0.13",
+    "@things-factory/biz-ui": "^4.0.13",
+    "@things-factory/board-service": "^4.0.13",
+    "@things-factory/board-ui": "^4.0.13",
+    "@things-factory/code-ui": "^4.0.13",
+    "@things-factory/component-ui": "^4.0.13",
+    "@things-factory/context-ui": "^4.0.13",
+    "@things-factory/document-template-ui": "^4.0.13",
+    "@things-factory/export-ui": "^4.0.13",
+    "@things-factory/export-ui-csv": "^4.0.13",
+    "@things-factory/export-ui-excel": "^4.0.13",
+    "@things-factory/grist-ui": "^4.0.13",
+    "@things-factory/i18n-base": "^4.0.13",
+    "@things-factory/i18n-ui": "^4.0.13",
+    "@things-factory/import-ui": "^4.0.13",
+    "@things-factory/import-ui-excel": "^4.0.13",
+    "@things-factory/integration-accounting": "^4.0.13",
+    "@things-factory/integration-fulfillment": "^4.0.13",
+    "@things-factory/integration-lmd": "^4.0.13",
+    "@things-factory/integration-marketplace": "^4.0.13",
+    "@things-factory/integration-pos": "^4.0.13",
+    "@things-factory/integration-sellercraft": "^4.0.13",
+    "@things-factory/lite-menu": "^4.0.13",
+    "@things-factory/more-ui": "^4.0.13",
+    "@things-factory/notification": "^4.0.13",
+    "@things-factory/pdf": "^4.0.13",
+    "@things-factory/product-ui": "^4.0.13",
+    "@things-factory/resource-ui": "^4.0.13",
+    "@things-factory/sales-base": "^4.0.13",
+    "@things-factory/scene-data-transform": "^4.0.13",
+    "@things-factory/scene-excel": "^4.0.13",
+    "@things-factory/scene-firebase": "^4.0.13",
+    "@things-factory/scene-form": "^4.0.13",
+    "@things-factory/scene-google-map": "^4.0.13",
+    "@things-factory/scene-graphql": "^4.0.13",
     "@things-factory/scene-half-roundrect": "^4.0.9",
-    "@things-factory/scene-indoor-map": "^4.0.9",
-    "@things-factory/scene-label": "^4.0.9",
-    "@things-factory/scene-legend": "^4.0.9",
-    "@things-factory/scene-marker": "^4.0.9",
-    "@things-factory/scene-mqtt": "^4.0.9",
-    "@things-factory/scene-news-ticker": "^4.0.9",
-    "@things-factory/scene-progressbar": "^4.0.9",
-    "@things-factory/scene-random": "^4.0.9",
-    "@things-factory/scene-restful": "^4.0.9",
-    "@things-factory/scene-tab": "^4.0.9",
-    "@things-factory/scene-table": "^4.0.9",
-    "@things-factory/scene-visualizer": "^4.0.9",
-    "@things-factory/scene-wheel-sorter": "^4.0.9",
-    "@things-factory/setting-ui": "^4.0.9",
-    "@things-factory/shell": "^4.0.9",
-    "@things-factory/system-ui": "^4.0.9",
-    "@things-factory/warehouse-base": "^4.0.9",
-    "@things-factory/worksheet-base": "^4.0.9",
+    "@things-factory/scene-label": "^4.0.13",
+    "@things-factory/scene-marker": "^4.0.13",
+    "@things-factory/scene-mqtt": "^4.0.13",
+    "@things-factory/scene-news-ticker": "^4.0.13",
+    "@things-factory/scene-restful": "^4.0.13",
+    "@things-factory/scene-tab": "^4.0.13",
+    "@things-factory/scene-visualizer": "^4.0.13",
+    "@things-factory/setting-ui": "^4.0.13",
+    "@things-factory/shell": "^4.0.13",
+    "@things-factory/system-ui": "^4.0.13",
+    "@things-factory/warehouse-base": "^4.0.13",
+    "@things-factory/worksheet-base": "^4.0.13",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.0.9"
+    "@things-factory/builder": "^4.0.13"
   },
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "81c8ae24487cfe79da62717f12bb6752761911ae"
+  "gitHead": "a542fdd4e7c447c3b571fe91c92f5919561bdc2c"
 }

package/server/controllers/bizplace-initializer/dataset/codes.ts

@@ -31,8 +31,9 @@ export const CODES = {
       description: 'grn status',
       details: [
         { name: 'PENDING_PROCESS', description: 'executing' },
+        { name: 'PENDING_RECEIVE', description: 'pending_receive' },
         { name: 'RECEIVED', description: 'received' },
-        { name: 'SUBMITTED', description: 'submitted' }
+        { name: 'SUBMITTED', description: 'submitted' },
       ]
     },
     {
@@ -75,7 +76,8 @@ export const CODES = {
       details: [
         { name: 'DO_TEMPLATE', description: 'template for delivery order' },
         { name: 'LOGO', description: 'template for logo' },
-        { name: 'GRN_TEMPLATE', description: 'template for goods received note' }
+        { name: 'GRN_TEMPLATE', description: 'template for goods received note' },
+        { name: 'MANIFEST_TEMPLATE', description: 'template for manifest' }
       ]
     },
     {
@@ -124,14 +126,36 @@ export const CODES = {
     },
     {
       name: 'RO_REQUESTS_STATUS',
+      description: 'release order requests status',
+      details: [
+        { name: 'PENDING', description: 'order_status_pending' },
+        { name: 'PENDING_RECEIVE', description: 'order_status_pending_receive' },
+        { name: 'PENDING_WORKSHEET', description: 'order_status_pending_worksheet' },
+        { name: 'PENDING_CANCEL', description: 'order_status_pending_cancel' },
+        { name: 'DEACTIVATED', description: 'order_status_deactivated' },
+        { name: 'READY_TO_PICK', description: 'order_status_ready_to_pick' },
+        { name: 'PICKING', description: 'order_status_picking' },
+        { name: 'READY_TO_PACK', description: 'order_status_ready_to_pack' },
+        { name: 'PACKING', description: 'order_status_packing' },
+        { name: 'LOADING', description: 'order_status_loading' },
+        { name: 'PARTIAL_RETURN', description: 'order_status_partial_return' },
+        { name: 'DONE', description: 'order_status_done' },
+        { name: 'REJECTED', description: 'order_status_rejected' },
+        { name: 'CANCELLED', description: 'order_status_cancelled' }
+      ]
+    },
+    {
+      name: 'RO_LIST_STATUS',
       description: 'release order status',
       details: [
         { name: 'PENDING', description: 'order_status_pending' },
         { name: 'PENDING_RECEIVE', description: 'order_status_pending_receive' },
         { name: 'PENDING_WORKSHEET', description: 'order_status_pending_worksheet' },
         { name: 'PENDING_CANCEL', description: 'order_status_pending_cancel' },
+        { name: 'DEACTIVATED', description: 'order_status_deactivated' },
         { name: 'READY_TO_PICK', description: 'order_status_ready_to_pick' },
         { name: 'PICKING', description: 'order_status_picking' },
+        { name: 'READY_TO_PACK', description: 'order_status_ready_to_pack' },
         { name: 'PACKING', description: 'order_status_packing' },
         { name: 'LOADING', description: 'order_status_loading' },
         { name: 'PARTIAL_RETURN', description: 'order_status_partial_return' },
@@ -218,7 +242,7 @@ export const CODES = {
       details: [
         { name: 'PENDING', description: 'order_status_pending' },
         { name: 'PENDING_RECEIVE', description: 'order_status_pending_receive' },
-        { name: 'IN_TRANSIT', description: 'order_status_in_transit' },
+        { name: 'INTRANSIT', description: 'order_status_in_transit' },
         { name: 'ARRIVED', description: 'order_status_arrived' },
         { name: 'READY_TO_UNLOAD', description: 'order_status_ready_to_unload' },
         { name: 'READY_TO_PUTAWAY', description: 'order_status_ready_to_putaway' },
@@ -278,7 +302,7 @@ export const CODES = {
         { name: 'cm', description: 'Centimeter' },
         { name: 'm', description: 'Meter' },
         { name: 'inch', description: 'Inch' },
-        { name: 'ft', description: 'Foot' },
+        { name: 'ft', description: 'Foot' }
       ]
     },
     {

package/server/controllers/bizplace-initializer/dataset/menus.ts

@@ -128,6 +128,28 @@ export const MENUS = {
         }
       ]
     },
+    {
+      name: 'Loading Manifest',
+      menuType: 'MENU',
+      children: [
+        {
+          name: 'Create Loading Manifest',
+          template: 'create-loading-manifest',
+          menuType: 'SCREEN',
+          routingType: 'STATIC',
+          resourceUrl: 'create_loading_manifest',
+          roles: ['Business Owner', 'Office Admin']
+        },
+        {
+          name: 'Manifest List',
+          template: 'loading-manifest-list',
+          menuType: 'SCREEN',
+          routingType: 'STATIC',
+          resourceUrl: 'loading_manifest_list',
+          roles: ['Business Owner', 'Office Admin']
+        }
+      ]
+    },
     {
       name: 'Return Order',
       menuType: 'MENU',

package/server/controllers/bizplace-initializer/dataset/roles-privileges.ts

@@ -248,6 +248,55 @@ export const ROLES_PRIVILEGES = {
         { name: 'query', category: 'vas' },
         { name: 'query', category: 'warehouse' }
       ]
+    },
+    {
+      name: 'Support',
+      description: 'SUPPORT',
+      privileges: [
+        { name: 'mutation', category: 'bizplace' },
+        { name: 'mutation', category: 'claim' },
+        { name: 'mutation', category: 'company' },
+        { name: 'mutation', category: 'contact_point' },
+        { name: 'mutation', category: 'inventory' },
+        { name: 'mutation', category: 'inventory_adjustment_approval' },
+        { name: 'mutation', category: 'movement' },
+        { name: 'mutation', category: 'order' },
+        { name: 'mutation', category: 'order_customer' },
+        { name: 'mutation', category: 'order_warehouse' },
+        { name: 'mutation', category: 'partner' },
+        { name: 'mutation', category: 'setting' },
+        { name: 'mutation', category: 'system' },
+        { name: 'mutation', category: 'transport' },
+        { name: 'mutation', category: 'vas' },
+        { name: 'mutation', category: 'warehouse' },
+        { name: 'mutation', category: 'worker' },
+        { name: 'mutation', category: 'worksheet' },
+        { name: 'mutation', category: 'worksheet_execute' },
+        { name: 'query', category: 'bizplace' },
+        { name: 'query', category: 'claim' },
+        { name: 'query', category: 'company' },
+        { name: 'query', category: 'contact_point' },
+        { name: 'query', category: 'customer' },
+        { name: 'query', category: 'inventory' },
+        { name: 'query', category: 'movement' },
+        { name: 'query', category: 'order' },
+        { name: 'query', category: 'order_customer' },
+        { name: 'query', category: 'order_warehouse' },
+        { name: 'query', category: 'partner' },
+        { name: 'query', category: 'setting' },
+        { name: 'query', category: 'system' },
+        { name: 'query', category: 'transport' },
+        { name: 'query', category: 'user' },
+        { name: 'query', category: 'vas' },
+        { name: 'query', category: 'vendor' },
+        { name: 'query', category: 'warehouse' },
+        { name: 'query', category: 'worker' },
+        { name: 'query', category: 'worksheet' },
+        { name: 'query', category: 'worksheet_execute' },
+        { name: 'role', category: 'owner' },
+        { name: 'role', category: 'warehouse' },
+        { name: 'query', category: 'inventory_comparison' }
+      ]
     }
   ],
   retail: [

package/server/controllers/bizplace-initializer/dataset/settings.ts

@@ -48,6 +48,11 @@ export const SETTINGS = {
       name: 'hide-cc-columns',
       description: 'hide cycle count info for blind count. true - blind count , false - normal count',
       category: 'id-rule'
+    },
+    {
+      name: 'allow-ro-add-product',
+      description: 'allow edit release order product',
+      category: 'id-rule'
     }
   ],
   retail: []

package/server/graphql/resolvers/synchronization/fetch-sync-invoices.ts

@@ -29,7 +29,7 @@ export async function getAccountingInvoices(accountId: string, warehouseId: stri
     const accounting: AccountingAPI = await AccountingAPI.getAccounting(accountId)
 
     const fulfilmentCenter: FulfillmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
-    const invoices: any[] = await AccountingAPI.getInvoices(accounting)
+    const invoices: any[] = await AccountingAPI.getInvoices(accounting, { Statuses: 'AUTHORISED' })
 
     for (var i = 0; i < invoices.length; i++) {
       const releaseOrder = invoices[i]

package/server/graphql/resolvers/synchronization/fetch-sync-purchase-orders.ts

@@ -7,26 +7,52 @@ export const fetchSyncPurchaseOrdersResolver = {
     {
       accountId,
       warehouseId,
-      customerBizplaceId
-    }: { accountId: string; warehouseId: string; customerBizplaceId: string },
+      customerBizplaceId,
+      fromDate,
+      toDate
+    }: { accountId: string; warehouseId: string; customerBizplaceId: string; fromDate: string; toDate: string },
     context: any
   ): Promise<void> {
     try {
-      await getAccountingPurchaseOrders(accountId, warehouseId, customerBizplaceId)
+      await getAccountingPurchaseOrders(accountId, warehouseId, customerBizplaceId, fromDate, toDate)
     } catch (e) {
       throw e
     }
   }
 }
 
-export async function getAccountingPurchaseOrders(accountId: string, warehouseId: string, customerBizplaceId: string) {
+export async function getAccountingPurchaseOrders(
+  accountId: string,
+  warehouseId: string,
+  customerBizplaceId: string,
+  fromDate: string,
+  toDate: string
+) {
   try {
     const accounting: AccountingAPI = await AccountingAPI.getAccounting(accountId)
 
     const fulfilmentCenter: FulfillmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
-    const purchaseOrders: any[] = await AccountingAPI.getPurchaseOrders(accounting)
+    let parameters: any = { status: 'AUTHORISED' }
 
-    for (var i = 0; i < purchaseOrders.length; i++) {
+    if (fromDate) {
+      if (!toDate) throw new Error('From Date setting requires To Date')
+      parameters = { ...parameters, DateFrom: fromDate, DateTo: toDate }
+    }
+
+    const purchaseOrders: any[] = await AccountingAPI.getPurchaseOrders(accounting, { ...parameters })
+    await createInboundOrder(fulfilmentCenter, purchaseOrders, customerBizplaceId)
+  } catch (e) {
+    throw new Error(e.statusText)
+  }
+}
+
+export async function createInboundOrder(
+  fulfilmentCenter: FulfillmentCenter,
+  purchaseOrders: any[],
+  customerBizplaceId: string
+) {
+  for (var i = 0; i < purchaseOrders.length; i++) {
+    try {
       const purchaseOrder = purchaseOrders[i]
 
       const existingArrivalNotice = await FulfillmentAPI.getInboundOrder(fulfilmentCenter, {
@@ -41,8 +67,6 @@ export async function getAccountingPurchaseOrders(accountId: string, warehouseId
           purchaseOrder
         })
       }
-    }
-  } catch (e) {
-    throw new Error(e.statusText)
+    } catch (e) {}
   }
 }

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

@@ -7,7 +7,7 @@ import { SyncPurchaseOrderSet, Types as pTypes } from './sync-purchase-order-set
 
 export const Query = /* GraphQL */ `
   fetchSyncProducts(accountId: String!, bizplaceId: String!, pagination: Pagination): SyncProductList
-  fetchSyncPurchaseOrders(accountId: String!, warehouseId: String!, customerBizplaceId: String): Boolean
+  fetchSyncPurchaseOrders(accountId: String!, warehouseId: String!, customerBizplaceId: String, fromDate: String, toDate: String): Boolean
   fetchSyncInvoices(accountId: String!, warehouseId: String!, customerBizplaceId: String!): Boolean
 `
 

package/server/routers/api/restful-apis/unstable/add-inbound-order.ts

@@ -46,7 +46,8 @@ router.post(
     })
 
     //#2 assign product id found to order product
-    bodyReq.orderProducts = bodyReq.orderProducts.map(orderProduct => {
+    let orderProducts: any[] = []
+    bodyReq.orderProducts.map(orderProduct => {
       productDetails.forEach(productDetail => {
         const product: Product = productDetail.product
         const packingType: string = productDetail.packingType
@@ -77,13 +78,12 @@ router.post(
         }
       })
 
-      return orderProduct
+      if (orderProduct.product?.id) orderProducts.push({ ...orderProduct })
     })
 
-    //#3 check if product is not found
-    bodyReq.orderProducts.forEach(orderProduct => {
-      if (!orderProduct.product?.id) context.throw(404, t(`error.sku code ${orderProduct.product.sku} is not exist`))
-    })
+    if (!orderProducts?.length) {
+      context.throw(404, t(`no matching product found`))
+    }
 
     //#4 include supplier id if there's any
     if (bodyReq?.supplier) {
@@ -173,7 +173,7 @@ router.post(
               }
             }
           `,
-          variables: { arrivalNotice: { ...bodyReq, warehouseId }, attachments },
+          variables: { arrivalNotice: { ...bodyReq, orderProducts, warehouseId }, attachments },
           context: {
             ...context,
             hasUpload: true,