@things-factory/sales-base 4.3.534 → 4.3.536

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -35,6 +35,7 @@ import { OrderProduct } from '../order-product/order-product'
 import { NewOrderProduct, OrderProductPatch } from '../order-product/order-product-types'
 import { OrderVas } from '../order-vas/order-vas'
 import { ReleaseGood } from '../release-good/release-good'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
 import { confirmReleaseGood, deleteReleaseGood, rejectReleaseGood } from '../release-good/release-good-mutation'
 import { Vas } from '../vas/vas'
 import { validateBulkArrivalNoticesFunction } from './'
@@ -70,6 +71,7 @@ export class ArrivalNoticeMutation {
       context,
       tx
     )
+    webhookHandler(createdArrivalNotice, { id: createdArrivalNotice.bizplace }, WebhookEvents.ArrivalNoticeCreated)
 
     return createdArrivalNotice
   }
@@ -92,6 +94,8 @@ export class ArrivalNoticeMutation {
       }
     }
 
+    webhookHandler(arrivalNotice, arrivalNotice.bizplace, WebhookEvents.ArrivalNoticeConfirmed)
+
     return arrivalNotice
   }
 
@@ -154,84 +158,84 @@ export class ArrivalNoticeMutation {
     const { user, domain, tx }: { user: User; domain: Domain; tx: EntityManager } = context.state
 
     try {
-    let arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
-      where: { name: ganNo },
-      relations: ['bizplace', 'orderProducts']
-    })
-
-    arrivalNotice.status = approvedAddEditProducts ? ORDER_STATUS.PENDING : ORDER_STATUS.PENDING_APPROVAL
-    arrivalNotice.updater = user
-    arrivalNotice = await tx.getRepository(ArrivalNotice).save(arrivalNotice)
-
-    //only for status GAN in 'PENDING'
-    //allow to add/edit products without approval from client
-    if (approvedAddEditProducts) {
-      if (newOrderProducts?.length > 0) {
-        let updatedNewOrderProducts = newOrderProducts.map(op => {
-          op.status = ORDER_PRODUCT_STATUS.PENDING
-          return op
-        })
+      let arrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
+        where: { name: ganNo },
+        relations: ['bizplace', 'orderProducts']
+      })
 
-        await addArrivalNoticeProducts(domain, arrivalNotice, updatedNewOrderProducts, user, tx)
-      }
+      arrivalNotice.status = approvedAddEditProducts ? ORDER_STATUS.PENDING : ORDER_STATUS.PENDING_APPROVAL
+      arrivalNotice.updater = user
+      arrivalNotice = await tx.getRepository(ArrivalNotice).save(arrivalNotice)
+
+      //only for status GAN in 'PENDING'
+      //allow to add/edit products without approval from client
+      if (approvedAddEditProducts) {
+        if (newOrderProducts?.length > 0) {
+          let updatedNewOrderProducts = newOrderProducts.map(op => {
+            op.status = ORDER_PRODUCT_STATUS.PENDING
+            return op
+          })
 
+          await addArrivalNoticeProducts(domain, arrivalNotice, updatedNewOrderProducts, user, tx)
+        }
 
-      for (const op of existingOrderProducts) {
-        await tx
-          .createQueryBuilder()
-          .update(OrderProduct)
-          .set({
-            batchId: op.batchId,
-            batchIdRef: op.batchIdRef,
-            manufactureDate: op.manufactureDate,
-            packQty: op.packQty,
-            packingType: op.packingType,
-            palletQty:  op.palletQty,
-            remark: op.remark,
-            totalUomValue: op.totalUomValue,
-            uom: op.uom,
-            uomValue: op.uomValue,
-            unitPrice: op.unitPrice,
-            updater: user
-          })
-          .where('id = :id', { id: op.id  })
-          .andWhere('domain_id = :domainId', {domainId : domain.id})
-          .execute()
+        for (const op of existingOrderProducts) {
+          await tx
+            .createQueryBuilder()
+            .update(OrderProduct)
+            .set({
+              batchId: op.batchId,
+              batchIdRef: op.batchIdRef,
+              manufactureDate: op.manufactureDate,
+              packQty: op.packQty,
+              packingType: op.packingType,
+              palletQty: op.palletQty,
+              remark: op.remark,
+              totalUomValue: op.totalUomValue,
+              uom: op.uom,
+              uomValue: op.uomValue,
+              unitPrice: op.unitPrice,
+              updater: user
+            })
+            .where('id = :id', { id: op.id })
+            .andWhere('domain_id = :domainId', { domainId: domain.id })
+            .execute()
         }
 
-      return true
-    }
+        return true
+      }
 
-    if (newOrderProducts?.length > 0) await addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts, user, tx)
+      if (newOrderProducts?.length > 0)
+        await addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts, user, tx)
 
-    if (existingOrderProducts?.length > 0) await editArrivalNoticeProducts(existingOrderProducts, user, tx)
+      if (existingOrderProducts?.length > 0) await editArrivalNoticeProducts(existingOrderProducts, user, tx)
 
-    // notification logics
-    const users: any[] = await getDomainUsers(arrivalNotice?.bizplace, tx)
+      // notification logics
+      const users: any[] = await getDomainUsers(arrivalNotice?.bizplace, tx)
 
-    if (users?.length && context.header?.referer) {
-      const receivers: any[] = users.map(user => user.id)
-      const msg = {
-        title: `Products are added/edited for ${arrivalNotice.name}`,
-        body: `Warehouse need your review for changes to be approved`,
-        url: context.header.referer,
-        data: { url: context.header.referer }
+      if (users?.length && context.header?.referer) {
+        const receivers: any[] = users.map(user => user.id)
+        const msg = {
+          title: `Products are added/edited for ${arrivalNotice.name}`,
+          body: `Warehouse need your review for changes to be approved`,
+          url: context.header.referer,
+          data: { url: context.header.referer }
+        }
+        /**
+         * @notes Temporary off sendNotification due to suspect of causing wms down
+         */
+
+        // await sendNotification({
+        //   receivers,
+        //   message: { ...msg }
+        // })
       }
-      /**
-       * @notes Temporary off sendNotification due to suspect of causing wms down
-       */
 
-      // await sendNotification({
-      //   receivers,
-      //   message: { ...msg }
-      // })
+      return true
+    } catch (error) {
+      throw new Error(error)
     }
-
-    return true
-  } catch (error) {
-    throw new Error(error)
   }
-}
 
   @Directive('@privilege(category: "order_customer", privilege: "mutation")')
   @Directive('@transaction')
@@ -270,7 +274,14 @@ export class ArrivalNoticeMutation {
     }
 
     await tx.getRepository(ArrivalNotice).update(existingArrivalNotice.id, arrivalNotice)
-    return await tx.getRepository(ArrivalNotice).findOne(existingArrivalNotice.id)
+
+    const updatedArrivalNotice: ArrivalNotice = await tx
+      .getRepository(ArrivalNotice)
+      .findOne({ where: { id: existingArrivalNotice.id }, relations: ['bizplace', 'domain'] })
+
+    webhookHandler(updatedArrivalNotice, updatedArrivalNotice.bizplace, WebhookEvents.ArrivalNoticeUpdated)
+
+    return updatedArrivalNotice
   }
 
   @Directive('@privilege(category: "order_customer", privilege: "mutation")')
@@ -688,7 +699,7 @@ export async function confirmArrivalNoticeFunction(
 
     let arrivalNotice: ArrivalNotice = await tx
       .getRepository(ArrivalNotice)
-      .findOne({ where: { id: foundArrivalNotice.id } })
+      .findOne({ where: { id: foundArrivalNotice.id }, relations: ['bizplace', 'domain'] })
 
     await tx
       .getRepository(OrderProduct)

package/server/service/arrival-notice/arrival-notice-types.ts

@@ -32,6 +32,9 @@ export class NewArrivalNotice {
   @Field()
   ownTransport: boolean
 
+  @Field({ nullable: true })
+  transportVehicle: string
+
   @Field({ nullable: true })
   crossDocking: boolean
 
@@ -151,6 +154,9 @@ export class ArrivalNoticePatch {
 
   @Field({ nullable: true })
   ownTransport: boolean
+  
+  @Field({ nullable: true })
+  transportVehicle: string
 
   @Field({ nullable: true })
   crossDocking: boolean
@@ -239,6 +245,9 @@ export class RawArrivalNotice {
   @Field()
   ownTransport: boolean
 
+  @Field({ nullable: true })
+  transportVehicle: string
+
   @Field({ nullable: true })
   productId?: string
 

package/server/service/arrival-notice/arrival-notice.ts

@@ -132,6 +132,10 @@ export class ArrivalNotice {
   @Field({ nullable: true })
   truckNo: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  transportVehicle: string
+
   @Column()
   @Field()
   status: string

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

@@ -4,6 +4,7 @@ import { EntityManager, getConnection, getRepository, In, Repository } from 'typ
 import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { ProductBundle } from '@things-factory/product-base'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { bulkReleaseGoodsAvailableItemsFunction, DraftReleaseGood, DraftReleaseGoodInfos, OrderProduct } from '../'
@@ -334,6 +335,9 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
                 if (settingValue > 1) {
                   createdReleaseGood = await receiveReleaseGood(createdReleaseGood.name, context, innerTx2)
                 }
+
+                webhookHandler(draftOrder, draftOrder.bizplace, WebhookEvents.DraftOrderConverted)
+                webhookHandler(createdReleaseGood, createdReleaseGood.bizplace, WebhookEvents.ReleaseOrderCreated)
               })
             } else {
               if (draftOrder.orderProducts.every(op => op.id === insufficient?.id)) {

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

@@ -1,14 +1,5 @@
-import {
-  FileUpload,
-  GraphQLUpload
-} from 'graphql-upload'
-import {
-  Arg,
-  Ctx,
-  Directive,
-  Mutation,
-  Resolver
-} from 'type-graphql'
+import { FileUpload, GraphQLUpload } from 'graphql-upload'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import {
   Brackets,
   EntityManager,
@@ -17,37 +8,22 @@ import {
   In,
   IsNull,
   Repository,
-  SelectQueryBuilder
+  SelectQueryBuilder,
+  getConnection
 } from 'typeorm'
-
-import {
-  Attachment,
-  createAttachments,
-  deleteAttachmentsByRef
-} from '@things-factory/attachment-base'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
+import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import {
-  Bizplace,
-  getPermittedBizplaces
-} from '@things-factory/biz-base'
+import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { GeoCountry } from '@things-factory/geography'
 import { generateId } from '@things-factory/id-rule-base'
 import { LastMileDelivery } from '@things-factory/integration-lmd'
-import {
-  Product,
-  ProductBundle,
-  ProductDetail
-} from '@things-factory/product-base'
+import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 // import { Location } from '@things-factory/warehouse-base'
-import {
-  DraftReleaseGood,
-  DraftReleaseGoodPatch,
-  NewDraftReleaseGood,
-  OrderProduct
-} from '../'
+import { DraftReleaseGood, DraftReleaseGoodPatch, NewDraftReleaseGood, OrderProduct } from '../'
 import {
   ATTACHMENT_TYPE,
   DRAFT_RELEASE_ORDER_STATUS,
@@ -81,6 +57,7 @@ export class DraftReleaseGoodMutation {
   ): Promise<DraftReleaseGood> {
     try {
       const { tx }: { tx: EntityManager } = context.state
+      const updateDraft = draftReleaseGood.id ? true : false
       const createdDraftReleaseGood: DraftReleaseGood = await upsertDraftReleaseGoodFunction(
         null,
         draftReleaseGood,
@@ -91,6 +68,12 @@ export class DraftReleaseGoodMutation {
         tx
       )
 
+      webhookHandler(
+        createdDraftReleaseGood,
+        createdDraftReleaseGood.bizplace,
+        updateDraft ? WebhookEvents.DraftOrderUpdated : WebhookEvents.DraftOrderCreated
+      )
+
       return createdDraftReleaseGood
     } catch (error) {
       throw error
@@ -604,7 +587,6 @@ export async function upsertDraftReleaseGoodProducts(
 }
 
 async function autoAssignLmd(domain, countryId, postalCode, bizplace) {
-
   let lmdResult: LastMileDelivery
   const qb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
     .createQueryBuilder('lmd')
@@ -621,7 +603,11 @@ async function autoAssignLmd(domain, countryId, postalCode, bizplace) {
   let lmdList = await qb.getMany()
 
   if (lmdList.length > 1) {
-    qb.andWhere('lmd.id IN (:...lmdIds)', { lmdIds: lmdList.map(lmd => { return lmd.id }) })
+    qb.andWhere('lmd.id IN (:...lmdIds)', {
+      lmdIds: lmdList.map(lmd => {
+        return lmd.id
+      })
+    })
   }
 
   qb.andWhere(

package/server/service/manifest/manifest-mutation.ts

@@ -1,35 +1,15 @@
 import i18next from 'i18next'
-import {
-  Arg,
-  Ctx,
-  Directive,
-  Mutation,
-  Resolver
-} from 'type-graphql'
-import {
-  In,
-  IsNull,
-  Not
-} from 'typeorm'
-
-import { triggerWebhook } from '@things-factory/integration-base'
-
-import {
-  DISPATCHMENT_STATUS,
-  MANIFEST_STATUS
-} from '../../constants'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { In, IsNull, Not } from 'typeorm'
+
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
+
+import { DISPATCHMENT_STATUS, MANIFEST_STATUS } from '../../constants'
 import { OrderNoGenerator } from '../../utils'
 import { OrderPackage } from '../order-package/order-package'
 import { ReleaseGood } from '../release-good/release-good'
-import {
-  Manifest,
-  ManifestStatus
-} from './manifest'
-import {
-  ManifestItem,
-  ManifestPatch,
-  NewManifest
-} from './manifest-type'
+import { Manifest, ManifestStatus } from './manifest'
+import { ManifestItem, ManifestPatch, NewManifest } from './manifest-type'
 
 @Resolver(Manifest)
 export class ManifestMutation {
@@ -174,7 +154,8 @@ export class ManifestMutation {
       throw new Error(i18next.t('error.tracking_no_already_scanned_before'))
     }
 
-    let transporter = foundOrderPackage.transporter?.toLowerCase() == 'ems' ? 'efmx' : foundOrderPackage.transporter?.toLowerCase()
+    let transporter =
+      foundOrderPackage.transporter?.toLowerCase() == 'ems' ? 'efmx' : foundOrderPackage.transporter?.toLowerCase()
 
     if (transporter !== shippingProvider?.toLowerCase()) {
       throw new Error(i18next.t('error.tracking_no_belongs_to_x', { x: foundOrderPackage.transporter }))
@@ -258,49 +239,48 @@ export class ManifestMutation {
     @Ctx() context: any
   ): Promise<Manifest> {
     const { domain, user, tx } = context.state
+    try {
+      const manifest: Manifest = await tx.getRepository(Manifest).findOne({
+        where: { domain, name, status: Not(MANIFEST_STATUS.CLOSED) }
+      })
+      if (!manifest) throw new Error(`Unable to find ${name}`)
+
+      let orderPackages: any[] = await tx.getRepository(OrderPackage).find({ where: { domain, manifest } })
+      orderPackages = orderPackages.map((opk: OrderPackage) => {
+        return {
+          ...opk,
+          dispatchmentStatus: DISPATCHMENT_STATUS.DISPATCHED,
+          updater: user
+        }
+      })
+      await tx.getRepository(OrderPackage).save(orderPackages)
 
-    const manifest: Manifest = await tx.getRepository(Manifest).findOne({
-      where: { domain, name, status: Not(MANIFEST_STATUS.CLOSED) }
-    })
-    if (!manifest) throw new Error(`Unable to find ${name}`)
+      let releaseGoods: any[] = await tx.getRepository(ReleaseGood).find({ where: { domain, manifest } })
 
-    let orderPackages: any[] = await tx.getRepository(OrderPackage).find({ where: { domain, manifest } })
-    orderPackages = orderPackages.map((opk: OrderPackage) => {
-      return {
-        ...opk,
-        dispatchmentStatus: DISPATCHMENT_STATUS.DISPATCHED,
-        updater: user
-      }
-    })
-    await tx.getRepository(OrderPackage).save(orderPackages)
+      releaseGoods = releaseGoods.map((releaseGood: ReleaseGood) => {
+        return {
+          ...releaseGood,
+          dispatchmentStatus: DISPATCHMENT_STATUS.DISPATCHED,
+          updater: user
+        }
+      })
+      await tx.getRepository(ReleaseGood).save(releaseGoods)
 
-    let releaseGoods: any[] = await tx.getRepository(ReleaseGood).find({ where: { domain, manifest } })
+      const bizplaceIds = [...new Set(orderPackages.map(itm => itm.bizplaceId))]
 
-    releaseGoods = releaseGoods.map((releaseGood: ReleaseGood) => {
-      return {
-        ...releaseGood,
-        dispatchmentStatus: DISPATCHMENT_STATUS.DISPATCHED,
+      const savedManifest = await tx.getRepository(Manifest).save({
+        ...manifest,
+        ...patch,
+        status: ManifestStatus.CLOSED,
+        dispatchedAt: new Date(),
         updater: user
-      }
-    })
-    await tx.getRepository(ReleaseGood).save(releaseGoods)
-
-    const bizplaceIds = [...new Set(orderPackages.map(itm => itm.bizplaceId))]
+      })
 
-    const savedManifest = await tx.getRepository(Manifest).save({
-      ...manifest,
-      ...patch,
-      status: ManifestStatus.CLOSED,
-      dispatchedAt: new Date(),
-      updater: user
-    })
+      webhookHandler(manifest.id, bizplaceIds, WebhookEvents.DispatchManifest)
 
-    try {
-      triggerWebhook(manifest.id, bizplaceIds, 'Dispatch Manifest', context)
+      return savedManifest
     } catch (e) {
       console.log(e)
     }
-
-    return savedManifest
   }
 }

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

@@ -24,6 +24,7 @@ import {
 } from '@things-factory/biz-base'
 import { GeoCountry } from '@things-factory/geography'
 import { generateId } from '@things-factory/id-rule-base'
+import { webhookHandler, WebhookEvents } from '@things-factory/integration-base'
 import { LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
@@ -235,6 +236,8 @@ export class ReleaseGoodMutation {
       awbAttachment
     )
 
+    webhookHandler(createdReleaseGood, createdReleaseGood.bizplace, WebhookEvents.ReleaseOrderCreated)
+
     return createdReleaseGood
   }
 
@@ -251,7 +254,7 @@ export class ReleaseGoodMutation {
     const { tx, domain, user } = context.state
     let foundReleaseGood = await tx.getRepository(ReleaseGood).findOne({
       where: { id: releaseGood.id, domain },
-      relations: ['shippingOrder']
+      relations: ['domain', 'bizplace', 'shippingOrder']
     })
 
     if (!foundReleaseGood) {
@@ -300,6 +303,8 @@ export class ReleaseGoodMutation {
       remark: releaseGood?.remark ? releaseGood.remark : null
     })
 
+    webhookHandler(foundReleaseGood, foundReleaseGood.bizplace, WebhookEvents.ReleaseOrderUpdated)
+
     return foundReleaseGood
   }
 
@@ -322,6 +327,8 @@ export class ReleaseGoodMutation {
       }
     }
 
+    webhookHandler(releaseGood, releaseGood.bizplace, WebhookEvents.ReleaseOrderConfirmed)
+
     return releaseGood
   }
 
@@ -1197,9 +1204,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   await tx.getRepository(OrderInventory).save(foundOIs)
 
   // 2. Update status of order vass
-  if (foundOVs && foundOVs.length 
-    && foundOVs.some( vas => vas.status != ORDER_VAS_STATUS.PENDING_APPROVE )
-  ) {
+  if (foundOVs && foundOVs.length && foundOVs.some(vas => vas.status != ORDER_VAS_STATUS.PENDING_APPROVE)) {
     foundOVs = foundOVs.map((orderVas: OrderVas) => {
       return {
         ...orderVas,
@@ -1258,7 +1263,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', 'lastMileDelivery']
+    relations: ['domain', 'bizplace', 'orderInventories', 'orderVass', 'lastMileDelivery']
   })
 
   if (!foundReleaseGood) throw new Error(`Release good order doesn't exists.`)
@@ -1286,9 +1291,7 @@ export async function receiveReleaseGood(name: string, context: any, tx: EntityM
   await tx.getRepository(OrderInventory).save(foundOIs)
 
   // 2. Update status of order vass
-  if (foundOVs && foundOVs.length 
-    && foundOVs.some( vas => vas.status != ORDER_VAS_STATUS.PENDING_APPROVE )
-  ) {
+  if (foundOVs && foundOVs.length && foundOVs.some(vas => vas.status != ORDER_VAS_STATUS.PENDING_APPROVE)) {
     foundOVs = foundOVs.map((orderVas: OrderVas) => {
       return {
         ...orderVas,
@@ -1664,8 +1667,6 @@ export async function bulkGenerateReleaseGood(
         updater: newReleaseGood?.updater || user
       }
 
-      
-
       let newOrderProduct: Partial<OrderProduct>
       if (!oi?.orderProduct) {
         newOrderProduct = {