@things-factory/sales-base 4.3.250 → 4.3.252

package/server/controllers/ecommerce/powrup-controller.ts

@@ -1,4 +1,4 @@
-import { getRepository, EntityManager } from 'typeorm'
+import { getRepository, EntityManager, getConnection } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
@@ -112,64 +112,12 @@ export class PowrupController {
     user?: User,
     trxMgr?: EntityManager
   ): Promise<void> {
-    const bizplace: Bizplace = await trxMgr.getRepository(Bizplace).findOne({ domain: customerDomain })
-    const powrup: Powrup = await trxMgr
-      .getRepository(Powrup)
-      .findOne({ where: { platform: Platform.POWRUP, active: true } })
-
-    if (powrup) {
-      for (let inventory of inventories) {
-        let product: Product = inventory.product
-        const productDetail: ProductDetail = inventory.productDetail
-        const warehouseDomainId: string = inventory.domainId
-        let qb = await trxMgr.getRepository(Inventory).createQueryBuilder('inv')
-        qb.leftJoinAndSelect('inv.location', 'loc')
-          .andWhere('"inv"."domain_id" = :domainId')
-          .andWhere('"inv"."bizplace_id" = :bizplaceId')
-          .andWhere('"inv"."product_id" = :productId')
-          .andWhere('"inv"."product_detail_id" = :productDetailId')
-          .andWhere('"inv"."status" = :status')
-          .andWhere('"loc"."type" NOT IN (:...locationTypes)')
-          .setParameters({
-            domainId: warehouseDomainId,
-            bizplaceId: bizplace.id,
-            productId: product.id,
-            productDetailId: productDetail.id,
-            status: INVENTORY_STATUS.STORED,
-            locationTypes: [LOCATION_TYPE.QUARANTINE]
-          })
-
-        let inventories: Inventory[] = await qb.getMany()
-        let inventoryTotalQty: number = 0
-        let inventoryTotalLockedQty: number = 0
-        let inventoryBufferQty: number = 0
-
-        inventories.forEach((inventory: Inventory) => {
-          const { qty, lockedQty } = inventory
-          inventoryTotalQty += qty
-          inventoryTotalLockedQty += lockedQty
-          if (inventory.location.type === LOCATION_TYPE.RESERVE) {
-            inventoryBufferQty += qty
-          }
-        })
-
-        const powrupInvs: any[] = [
-          {
-            refCode: productDetail.refCode,
-            stock: {
-              quantityTotal: inventoryTotalQty - inventoryTotalLockedQty - inventoryBufferQty || 0,
-              quantityReserved: inventoryTotalLockedQty - inventoryBufferQty || 0,
-              quantityBuffer: inventoryBufferQty || 0
-            }
-          }
-        ]
-
-        await PowrupAPI.updateStock(powrup, {
-          context: { state: { domain: customerDomain || null, user: user || user } },
-          warehouseDomainId,
-          powrupInvs
-        })
-      }
+    if (trxMgr) {
+      await this.updateStockFunction(inventories, customerDomain, user, trxMgr)
+    } else {
+      await getConnection().transaction(async (tx: EntityManager) => {
+        await this.updateStockFunction(inventories, customerDomain, user, tx)
+      })
     }
   }
 
@@ -260,22 +208,18 @@ export class PowrupController {
             }
 
             const {
-              documents,
               trackingNo,
-              transporter
-            }: { documents: any[]; trackingNo: string; transporter: string } = await PowrupAPI.fetchDocument(powrup, {
+              transporter,
+              printLabels
+            }: { trackingNo: string; transporter: string; printLabels: any[] } = await PowrupAPI.fetchDocument(powrup, {
               ...orderInformation,
               context: { state: { domain: domain || null, user: user || null } }
             })
 
             let updateInfo: any
-            if (documents?.length) {
-              documents.map(document => {
-                if (document.type === 'invoice') {
-                  updateInfo = { ...updateInfo, invoice: document.download_url }
-                } else if (document.type === 'airway_bill') {
-                  updateInfo = { ...updateInfo, airwayBill: document.download_url }
-                }
+            if (printLabels?.length) {
+              printLabels.map(pl => {
+                updateInfo = { ...updateInfo, airwayBill: pl.awbUrl }
               })
 
               updateInfo = {
@@ -298,4 +242,75 @@ export class PowrupController {
       throw error
     }
   }
+
+  async updateStockFunction(
+    inventories: Inventory[],
+    customerDomain: Domain,
+    user?: User,
+    trxMgr?: EntityManager
+  ): Promise<void> {
+    const bizplace: Bizplace = await trxMgr.getRepository(Bizplace).findOne({ domain: customerDomain })
+    const powrup: Powrup = await trxMgr
+      .getRepository(Powrup)
+      .findOne({ where: { platform: Platform.POWRUP, active: true } })
+
+    if (powrup) {
+      for (let inventory of inventories) {
+        try {
+          let product: Product = inventory.product
+          const productDetail: ProductDetail = inventory.productDetail
+          const warehouseDomainId: string = inventory.domainId
+          let qb = trxMgr.getRepository(Inventory).createQueryBuilder('inv')
+          qb.leftJoinAndSelect('inv.location', 'loc')
+            .andWhere('"inv"."domain_id" = :domainId')
+            .andWhere('"inv"."bizplace_id" = :bizplaceId')
+            .andWhere('"inv"."product_id" = :productId')
+            .andWhere('"inv"."product_detail_id" = :productDetailId')
+            .andWhere('"inv"."status" = :status')
+            .andWhere('"loc"."type" NOT IN (:...locationTypes)')
+            .setParameters({
+              domainId: warehouseDomainId,
+              bizplaceId: bizplace.id,
+              productId: product.id,
+              productDetailId: productDetail.id,
+              status: INVENTORY_STATUS.STORED,
+              locationTypes: [LOCATION_TYPE.QUARANTINE]
+            })
+
+          let foundInventories: Inventory[] = await qb.getMany()
+          let inventoryTotalQty: number = 0
+          let inventoryTotalLockedQty: number = 0
+          let inventoryBufferQty: number = 0
+
+          foundInventories.forEach((inventory: Inventory) => {
+            const { qty, lockedQty } = inventory
+            inventoryTotalQty += qty
+            inventoryTotalLockedQty += lockedQty
+            if (inventory.location.type === LOCATION_TYPE.RESERVE) {
+              inventoryBufferQty += qty
+            }
+          })
+
+          const powrupInvs: any[] = [
+            {
+              refCode: productDetail.refCode,
+              stock: {
+                quantityTotal: inventoryTotalQty || 0,
+                quantityReserved: inventoryTotalLockedQty || 0,
+                quantityBuffer: inventoryBufferQty || 0
+              }
+            }
+          ]
+
+          await PowrupAPI.updateStock(powrup, {
+            context: { state: { domain: customerDomain || null, user: user || user } },
+            warehouseDomainId,
+            powrupInvs
+          })
+        } catch (e) {
+          console.log(e)
+        }
+      }
+    }
+  }
 }

package/server/service/draft-release-good/draft-release-good-mutation.ts

@@ -13,9 +13,12 @@ import {
   EntityManager,
   getConnection,
   getRepository,
+  ILike,
   In,
   IsNull,
-  Repository
+  Repository,
+  SelectQueryBuilder,
+  Brackets
 } from 'typeorm'
 
 import {
@@ -77,6 +80,8 @@ import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 //   receiveArrivalNoticeFunction
 // } from '../arrival-notice/arrival-notice-mutation'
 import { getDraftReleaseGoodFunction } from './draft-release-good-query'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
+import { GeoCountry } from '@things-factory/geography'
 
 @Resolver(DraftReleaseGood)
 export class DraftReleaseGoodMutation {
@@ -244,7 +249,8 @@ export class DraftReleaseGoodMutation {
           'bizplace.domain',
           'domain',
           'creator',
-          'updater'
+          'updater',
+          'lastMileDelivery'
         ]
       })
 
@@ -523,6 +529,7 @@ export async function createDraftReleaseGoodFunction(
   let arrError: string[] = []
 
   const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
+  const geoCountryRepo: Repository<GeoCountry> = tx?.getRepository(GeoCountry) || getRepository(GeoCountry)
 
   if (draftReleaseGood?.bizplace?.id) {
     const permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
@@ -567,6 +574,25 @@ export async function createDraftReleaseGoodFunction(
     draftReleaseGood.shippingOrder = newShippingOrder
   }
 
+  // standardise country
+  let deliveryCountry: GeoCountry = draftReleaseGood?.country
+    ? await geoCountryRepo.findOne({
+        where: [{ name: ILike(draftReleaseGood?.country) }, { description: ILike(draftReleaseGood?.country) }]
+      })
+    : null
+
+  let platformCountry: GeoCountry = draftReleaseGood?.platformCountry
+    ? await geoCountryRepo.findOne({
+        where: [{ name: ILike(draftReleaseGood.platformCountry) }, { description: ILike(draftReleaseGood.platformCountry) }]
+      })
+    : null
+
+  // assign lmd
+  let lmd: any = null
+  if (draftReleaseGood?.lmdOption) {
+    lmd = await autoAssignLmd(domain, deliveryCountry?.id, draftReleaseGood?.postalCode)
+  }
+
   // // 2. Create draft release good
   const createdDraftReleaseGood: DraftReleaseGood = await tx.getRepository(DraftReleaseGood).save({
     ...draftReleaseGood,
@@ -574,7 +600,8 @@ export async function createDraftReleaseGoodFunction(
     status: DRAFT_RELEASE_ORDER_STATUS.DRAFT,
     domain,
     creator: user,
-    updater: user
+    updater: user,
+    lastMileDelivery: lmd
   })
 
   // // 3. Create draft release good product
@@ -826,4 +853,34 @@ export async function upsertDraftReleaseGoodProducts(
   } catch (error) {
     throw error
   }
+
+}
+
+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}%` })
+      })
+    )
+    .orderBy('lmd.rank')
+
+  const lmdResult: LastMileDelivery = await qb.getOne()
+
+  return lmdResult
 }

package/server/service/draft-release-good/draft-release-good.ts

@@ -18,6 +18,7 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { Domain } from '@things-factory/shell'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { OrderProduct, ReleaseGood, ShippingOrder, ShippingOrderInfo } from '../'
 import { ReleaseOrderType } from '../../constants'
@@ -331,4 +332,16 @@ export class DraftReleaseGood {
   @Column({ nullable: true })
   @Field({ nullable: true })
   stopId: string
+
+  // @Column({ nullable: true })
+  // @Field({ nullable: true })
+  // lastMileDeliveryId: string
+
+  @ManyToOne(type => LastMileDelivery)
+  @Field(type => LastMileDelivery, { nullable: true })
+  lastMileDelivery: LastMileDelivery
+
+  @RelationId((draftReleaseGood: DraftReleaseGood) => draftReleaseGood.lastMileDelivery)
+  lastMileDeliveryId?: string
 }
+

package/server/service/release-good/release-good-mutation.ts

@@ -21,6 +21,7 @@ import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/pr
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, ProductDetailStock } from '@things-factory/warehouse-base'
+import { GeoCountry } from '@things-factory/geography'
 
 // import { NewOrderProduct } from '../order-product/order-product-types'
 import {
@@ -161,7 +162,7 @@ export class ReleaseGoodMutation {
               childTx
             )
           }
-        } catch (error) {}
+        } catch (error) { }
     })
 
     if (errorsCaught.length)
@@ -682,8 +683,8 @@ export async function generateReleaseGoodFunction(
       orderMethod: releaseGood?.orderMethod
         ? releaseGood.orderMethod
         : releaseGood.orderInventories[0]?.inventory?.id
-        ? ORDER_METHOD.SELECT_BY_PALLET
-        : ORDER_METHOD.SELECT_BY_PRODUCT,
+          ? ORDER_METHOD.SELECT_BY_PALLET
+          : ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
       packageId: releaseGood?.packageId,
       storeName: releaseGood?.storeName,
@@ -950,7 +951,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
 
   let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { name, status: ORDER_STATUS.PENDING },
-    relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass']
+    relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain', 'orderVass', "lastMileDelivery"]
   })
 
   if (!foundReleaseGood) throw new Error(`Release good order doesn't exists.`)
@@ -985,19 +986,6 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
     }
   }
 
-  const customerBizplaceId: string = foundReleaseGood.bizplace.id
-  const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
-  const application: Application = await tx
-    .getRepository(Application)
-    .findOne({ domain: companyBizplace.domain, status: 'ACTIVE', type: ApplicationType.POWRUP })
-
-  let updatePowrupStock = async powrup => {
-    if (application) {
-      const powrupController: PowrupController = new PowrupController()
-      await powrupController.updateStock(foundOPs, domain, user, tx)
-    }
-  }
-
   const orderSource: string = foundReleaseGood.source
   switch (orderSource) {
     case ApplicationType.MMS:
@@ -1083,15 +1071,25 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
       updateSCStock(sellercraft)
       break
 
-    case ApplicationType.POWRUP:
-      updatePowrupStock(application)
-      break
-
     default:
       updateSCStock(sellercraft)
       break
   }
 
+  if (foundReleaseGood.type == 'b2b') {
+    const customerDomain: Domain = foundReleaseGood.bizplace.domain
+    const customerBizplaceId: string = foundReleaseGood.bizplace.id
+    const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+    const application: Application = await tx
+      .getRepository(Application)
+      .findOne({ domain: companyBizplace.domain, status: 'ACTIVE', type: ApplicationType.POWRUP })
+
+    if (application) {
+      const powrupController: PowrupController = new PowrupController()
+      await powrupController.updateStock(foundOPs, customerDomain, user, tx)
+    }
+  }
+
   // 1. RO Status change (PENDING => PENDING_RECEIVE)
   const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).save({
     ...foundReleaseGood,
@@ -1169,7 +1167,7 @@ export async function receiveReleaseGood(name: string, context: any, tx: EntityM
 
   const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name, status: ORDER_STATUS.PENDING_RECEIVE },
-    relations: ['bizplace', 'orderInventories', 'orderVass']
+    relations: ['bizplace', 'orderInventories', 'orderVass', 'lastMileDelivery']
   })
 
   if (!foundReleaseGood) throw new Error(`Release good order doesn't exists.`)
@@ -1320,23 +1318,24 @@ export async function rejectReleaseGood(
         }
         break
 
-      case ApplicationType.POWRUP:
-        const customerBizplaceId: string = releaseGood.bizplace.id
-        const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
-        const application: Application = await tx
-          .getRepository(Application)
-          .findOne({ domain: companyBizplace.domain, status: 'ACTIVE', type: ApplicationType.POWRUP })
-
-        if (application) {
-          const powrupController: PowrupController = new PowrupController()
-          await powrupController.updateStock(foundOPs, companyBizplace.domain, user, tx)
-        }
-        break
-
       default:
         break
     }
 
+    if (releaseGood.type == 'b2b') {
+      const customerDomain: Domain = releaseGood.bizplace.domain
+      const customerBizplaceId: string = releaseGood.bizplace.id
+      const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+      const application: Application = await tx
+        .getRepository(Application)
+        .findOne({ domain: companyBizplace.domain, status: 'ACTIVE', type: ApplicationType.POWRUP })
+
+      if (application) {
+        const powrupController: PowrupController = new PowrupController()
+        await powrupController.updateStock(foundOPs, customerDomain, user, tx)
+      }
+    }
+
     await tx.getRepository(OrderProduct).save(
       await Promise.all(
         foundOPs.map(async (op: OrderProduct) => {
@@ -1417,6 +1416,12 @@ export async function bulkGenerateReleaseGood(
 
     let bizplace: Bizplace = await tx.getRepository(Bizplace).findOne(bizplaceId)
 
+    let geoCountries: GeoCountry = await tx.getRepository(GeoCountry).find()
+    let geoCountry = null;
+    if (geoCountries.length > 0) {
+      geoCountry = geoCountries.find((gc) => gc?.name.toLowerCase() == releaseGood?.country.toLowerCase())
+    }
+
     let newReleaseGood: ReleaseGood = {
       ...releaseGood,
       name: roNoSetting
@@ -1433,7 +1438,7 @@ export async function bulkGenerateReleaseGood(
       city: releaseGood?.city || null,
       state: releaseGood?.state || null,
       postalCode: releaseGood?.postalCode || null,
-      country: releaseGood?.country || null,
+      country: releaseGood?.country?.toLowerCase() == geoCountry?.name?.toLowerCase() ? geoCountry?.description : releaseGood?.country || null,
       phone1: releaseGood?.phone1 || null,
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
@@ -1448,9 +1453,9 @@ export async function bulkGenerateReleaseGood(
       status: ORDER_STATUS.PENDING,
       creator: releaseGood?.creator || user,
       updater: releaseGood?.updater || user,
+      lastMileDeliveryId: releaseGood.lastMileDeliveryId,
       assignedInventory: worksheetPickingAssignment?.value == 'true' ? false : true
     }
-
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
 
     /** Generate Shipping Order */

package/server/utils/inventory-util.ts

@@ -794,7 +794,6 @@ async function getConditions(
   let bundleWhereClause = `
     WHERE pb.status = 'ACTIVATED'
   `
-
   let whereClause = hasRemainingQty ? ` WHERE "remainQty" > 0 ` : ` WHERE 1 = 1 `
 
   let productDetailWhereClause = ``