@things-factory/operato-hub 4.3.185 → 4.3.186

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

@@ -8,6 +8,7 @@ import { syncProductsToAccountResolver } from './sync-products-to-account'
 import { syncProductsToSellercraftResolver } from './sync-products-to-sellercraft'
 import { createDatShipments } from './create-dat-shipments'
 import { autoUpdateAllMarketplaceProductVariationQuantityResolver } from './auto-update-all-marketplace-product-variation-quantity'
+import { getLmdAwbResolver } from './get-lmd-awb'
 
 export const Query = {
   ...fetchSyncProductsResolver,
@@ -22,5 +23,6 @@ export const Mutation = {
   ...syncAllProductsToSellercraftResolver,
   ...sellercraftPackMarketplaceOrderResolver,
   ...createDatShipments,
-  ...autoUpdateAllMarketplaceProductVariationQuantityResolver
+  ...autoUpdateAllMarketplaceProductVariationQuantityResolver,
+  ...getLmdAwbResolver
 }

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

@@ -17,6 +17,7 @@ export const Mutation = /* GraphQL */ `
   syncProductsToAccount(accountId: String!, bizplaceId: String!): Boolean @transaction
   syncAllProductsToSellercraft: Boolean @transaction
   sellercraftPackMarketplaceOrder: Boolean @transaction
+  getLmdAwb: Boolean @transaction
   createDatShipments: Boolean @transaction
   autoUpdateAllMarketplaceProductVariationQuantity(companyDomainId: String, warehouseId: String): Boolean @transaction
   sendEmails: Boolean @transaction

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

@@ -1,4 +1,14 @@
-import { EntityManager, getConnection, getRepository, ILike, In, Not, Repository, SelectQueryBuilder } from 'typeorm'
+import {
+  EntityManager,
+  getConnection,
+  getRepository,
+  In,
+  Not,
+  Repository,
+  SelectQueryBuilder,
+  ILike,
+  Brackets
+} from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
@@ -30,6 +40,7 @@ import {
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { ValidationError } from '../../../../errors/index'
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
@@ -116,7 +127,8 @@ router.post(
           paidAmount: bodyReq?.paidAmount,
           discountAmount: bodyReq?.discountAmount,
           taxAmount: bodyReq?.taxAmount,
-          shippingFee: bodyReq?.shippingFee
+          shippingFee: bodyReq?.shippingFee,
+          lmdOption: bodyReq?.lmdOption
         }
 
         // check existing order
@@ -492,6 +504,12 @@ async function createReleaseGood(
         })
       : null
 
+    // assign lmd
+    let lmd: any = null
+    if (releaseGood?.lmdOption) {
+      lmd = await autoAssignLmd(domain, deliveryCountry?.id, releaseGood?.postalCode)
+    }
+
     newReleaseGood = {
       name: roNoSetting
         ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
@@ -545,6 +563,8 @@ async function createReleaseGood(
       discountAmount: releaseGood?.discountAmount,
       taxAmount: releaseGood?.taxAmount,
       shippingFee: releaseGood?.shippingFee,
+      lmdOption: releaseGood?.lmdOption,
+      lastMileDelivery: lmd,
       creator: user,
       updater: user,
       acceptedBy: user,
@@ -1123,3 +1143,33 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
 
   return orderProducts
 }
+
+async function autoAssignLmd(domain, countryId, postalCode) {
+  const qb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
+    .createQueryBuilder('lmd')
+    .leftJoinAndSelect('lmd.lastMileDeliverySettings', 'lmds')
+    .innerJoinAndSelect('lmds.geoCountry', 'gc')
+    .where('lmd.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('lower(lmd.status) = :status', { status: 'active' })
+    .andWhere('gc.id = :gcId', { gcId: countryId })
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.include_postal_code = ''`)
+          .orWhere('lmds.include_postal_code is null')
+          .orWhere('lmds.include_postal_code like :includePostCode', { includePostCode: `%${postalCode}%` })
+      })
+    )
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.exclude_postal_code = ''`)
+          .orWhere('lmds.exclude_postal_code is null')
+          .orWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+      })
+    )
+    // .andWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+    .orderBy('lmd.rank')
+
+  const lmdResult: LastMileDelivery = await qb.getOne()
+
+  return lmdResult
+}

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -188,6 +188,7 @@ export const params = {
     'deliverTo.state',
     'deliverTo.phone1',
     'deliverTo.phone2',
+    'deliverTo.email',
     'marketplaceOrderStatus',
     'airwayBill',
     'invoice',
@@ -217,7 +218,8 @@ export const params = {
     'platformName',
     'discountAmount',
     'taxAmount',
-    'shippingFee'
+    'shippingFee',
+    'lmdOption'
   ],
   'cancel-release-order': ['bizplaceId', 'roId', 'orderNo', 'orderNo2', 'orderNo3', 'remark'],
   'update-release-order-details': [

package/server/routers/api/restful-apis/v1/warehouse/add-release-order.ts

@@ -1,4 +1,4 @@
-import { EntityManager, getConnection, getRepository, In, Not, Repository, SelectQueryBuilder, ILike } from 'typeorm'
+import { EntityManager, getConnection, getRepository, In, Not, Repository, SelectQueryBuilder, ILike, Brackets } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { restfulApiRouter as router } from '@things-factory/api'
@@ -29,6 +29,7 @@ import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 import { GeoCountry } from '@things-factory/geography'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -120,6 +121,7 @@ router.post(
           discountAmount: bodyReq?.discountAmount,
           taxAmount: bodyReq?.taxAmount,
           shippingFee: bodyReq?.shippingFee,
+          lmdOption: bodyReq?.lmdOption,
           shippingOrder: {
             shipName: bodyReq?.shippingOrder.shipName,
             containerNo: bodyReq?.shippingOrder.containerNo,
@@ -414,6 +416,12 @@ async function createReleaseGood(
       })
     : null
 
+  // assign lmd
+  let lmd: any = null
+  if (releaseGood?.lmdOption) {
+    lmd = await autoAssignLmd(domain, deliveryCountry?.id, releaseGood?.postalCode)
+  }
+
   newReleaseGood = {
     name: roNoSetting
       ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
@@ -470,7 +478,9 @@ async function createReleaseGood(
     updater: user,
     acceptedBy: user,
     acceptedAt: new Date(),
-    shippingOrder: shippingOrder ? shippingOrder : null
+    shippingOrder: shippingOrder ? shippingOrder : null,
+    lastMileDelivery: lmd,
+    lmdOption: releaseGood.lmdOption
   }
 
   let resultReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
@@ -981,3 +991,33 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
 
   return orderProducts
 }
+
+async function autoAssignLmd(domain, countryId, postalCode) {
+  const qb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
+    .createQueryBuilder('lmd')
+    .leftJoinAndSelect('lmd.lastMileDeliverySettings', 'lmds')
+    .innerJoinAndSelect('lmds.geoCountry', 'gc')
+    .where('lmd.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('lower(lmd.status) = :status', { status: 'active' })
+    .andWhere('gc.id = :gcId', { gcId: countryId })
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.include_postal_code = ''`)
+          .orWhere('lmds.include_postal_code is null')
+          .orWhere('lmds.include_postal_code like :includePostCode', { includePostCode: `%${postalCode}%` })
+      })
+    )
+    .andWhere(
+      new Brackets(qb => {
+        qb.where(`lmds.exclude_postal_code = ''`)
+          .orWhere('lmds.exclude_postal_code is null')
+          .orWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+      })
+    )
+    // .andWhere('lmds.exclude_postal_code not like :excludePostCode', { excludePostCode: `%${postalCode}%` })
+    .orderBy('lmd.rank')
+
+  const lmdResult: LastMileDelivery = await qb.getOne()
+
+  return lmdResult
+}

package/server/routers/xilnex-router.ts

@@ -447,6 +447,7 @@ xilnexRouter.post('/webhook-xilnex-transfer-note', async (context, next) => {
                   palletQty: 1,
                   totalUomValue: `${(productDetail.uomValue * item.confirmedQty).toFixed(2)} ${productDetail.uom}`,
                   status: 'PENDING',
+                  refItemId: item.orderItemId,
                   arrivalNotice,
                   domain: warehouseDomain,
                   bizplace: customerBizplace