@things-factory/sales-base 7.0.1-beta.0 → 7.0.1-beta.12

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

@@ -5,13 +5,27 @@ import { EntityManager, getConnection, In, Repository } from 'typeorm'
 
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint, getDomainUsers, getMyBizplace, getOutletBizplace, getPermittedBizplaces } from '@things-factory/biz-base'
+import {
+  Bizplace,
+  ContactPoint,
+  getDomainUsers,
+  getMyBizplace,
+  getOutletBizplace,
+  getPermittedBizplaces
+} from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Product } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain, getRepository } from '@things-factory/shell'
 
-import { ORDER_NUMBER_RULE_TYPE, ORDER_NUMBER_SETTING_KEY, ORDER_PRODUCT_STATUS, ORDER_STATUS, ORDER_TYPES, ORDER_VAS_STATUS } from '../../constants'
+import {
+  ORDER_NUMBER_RULE_TYPE,
+  ORDER_NUMBER_SETTING_KEY,
+  ORDER_PRODUCT_STATUS,
+  ORDER_STATUS,
+  ORDER_TYPES,
+  ORDER_VAS_STATUS
+} from '../../constants'
 import { ATTACHMENT_TYPE } from '../../constants/attachment-type'
 import { ValidationError } from '../../errors'
 import { OrderNoGenerator } from '../../utils/order-no-generator'
@@ -50,7 +64,14 @@ export class ArrivalNoticeMutation {
     @Arg('files', type => [GraphQLUpload], { nullable: true }) files?: FileUpload[]
   ): Promise<ArrivalNotice> {
     const { tx } = context.state
-    const createdArrivalNotice: ArrivalNotice = await generateArrivalNoticeFunction(null, arrivalNotice, false, files, context, tx)
+    const createdArrivalNotice: ArrivalNotice = await generateArrivalNoticeFunction(
+      null,
+      arrivalNotice,
+      false,
+      files,
+      context,
+      tx
+    )
 
     return createdArrivalNotice
   }
@@ -202,7 +223,9 @@ export class ArrivalNoticeMutation {
     @Arg('arrivalNotice', type => ArrivalNoticePatch) arrivalNotice: ArrivalNoticePatch
   ): Promise<ArrivalNotice> {
     const { domain, tx } = context.state
-    let existingArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({ where: { name: arrivalNotice.name, domain: { id: domain.id } } })
+    let existingArrivalNotice = await tx
+      .getRepository(ArrivalNotice)
+      .findOne({ where: { name: arrivalNotice.name, domain: { id: domain.id } } })
 
     if (!existingArrivalNotice) {
       throw new Error('Existing Arrival Notice not found.')
@@ -229,12 +252,18 @@ export class ArrivalNoticeMutation {
     let opStatus = ORDER_PRODUCT_STATUS.PENDING_RECEIVE
     let anStatus = ORDER_STATUS.PENDING_RECEIVE
 
-    const foundBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+    const foundBizplace: Bizplace = await tx
+      .getRepository(Bizplace)
+      .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
 
     if (!foundBizplace) throw new Error('company not found')
 
     // to check whether the raw data are valid
-    const validatedArrivalNotices: RawArrivalNotice[] = await validateBulkArrivalNoticesFunction(rawArrivalNotices, bizplaceId, tx)
+    const validatedArrivalNotices: RawArrivalNotice[] = await validateBulkArrivalNoticesFunction(
+      rawArrivalNotices,
+      bizplaceId,
+      tx
+    )
 
     // check for custom GAN order no setting
     const ganNoSetting: Setting = await tx.getRepository(Setting).findOne({
@@ -258,10 +287,12 @@ export class ArrivalNoticeMutation {
 
     // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
     if (ganProcessingSetting) {
-      let setting = !isNaN(partnerGanProcessingSetting?.value) ? partnerGanProcessingSetting?.value : ganProcessingSetting.value
+      let setting = !isNaN(Number(partnerGanProcessingSetting?.value))
+        ? partnerGanProcessingSetting?.value
+        : ganProcessingSetting.value
 
       // CONFIRM to assign if setting value is 1
-      if (setting == 1) {
+      if (Number(setting) == 1) {
         opStatus = ORDER_PRODUCT_STATUS.ARRIVED
         anStatus = ORDER_STATUS.ARRIVED
       }
@@ -295,7 +326,9 @@ export class ArrivalNoticeMutation {
           // save new arrival notice
           const createdArrivalNotice: ArrivalNotice = await childTx.getRepository(ArrivalNotice).save({
             ...arrivalNotices[i],
-            name: ganNoSetting ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} }) : OrderNoGenerator.arrivalNotice(),
+            name: ganNoSetting
+              ? await generateId({ domain, type: ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} })
+              : OrderNoGenerator.arrivalNotice(),
             domain,
             bizplace: foundBizplace,
             status: ORDER_STATUS.PENDING,
@@ -337,10 +370,14 @@ export class ArrivalNoticeMutation {
     if (createdArrivalNoticeIds.length && createdOrderProductIds.length) {
       await getConnection().transaction(async childTx => {
         // update arrivalNotices status to PENDING_RECEIVE
-        await childTx.getRepository(ArrivalNotice).update({ id: In(createdArrivalNoticeIds) }, { status: anStatus, updater: user })
+        await childTx
+          .getRepository(ArrivalNotice)
+          .update({ id: In(createdArrivalNoticeIds) }, { status: anStatus, updater: user })
 
         // update orderProducts status to PENDING_RECEIVE
-        await childTx.getRepository(OrderProduct).update({ id: In(createdOrderProductIds) }, { status: opStatus, updater: user })
+        await childTx
+          .getRepository(OrderProduct)
+          .update({ id: In(createdOrderProductIds) }, { status: opStatus, updater: user })
 
         finalArrivalNoticeList = await childTx.getRepository(ArrivalNotice).find({
           where: { id: In(createdArrivalNoticeIds) },
@@ -362,7 +399,12 @@ export class ArrivalNoticeMutation {
   }
 }
 
-export async function deleteArrivalNotice(tx: EntityManager, name: string, user: User, domain: Domain): Promise<boolean> {
+export async function deleteArrivalNotice(
+  tx: EntityManager,
+  name: string,
+  user: User,
+  domain: Domain
+): Promise<boolean> {
   let foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
     where: { domain: { id: domain.id }, name },
     relations: ['bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'collectionOrders', 'creator', 'updater']
@@ -523,7 +565,7 @@ export async function generateArrivalNoticeFunction(
   }
 
   if (files?.length) {
-    const attachments: Attachment[] = files.map(attachment => {
+    const attachments: Partial<Attachment>[] = files.map(attachment => {
       return {
         file: attachment,
         refType: ATTACHMENT_TYPE.GAN,
@@ -537,12 +579,26 @@ export async function generateArrivalNoticeFunction(
   return createdArrivalNotice
 }
 
-export async function confirmArrivalNoticeFunction(name: string, context: any, tx?: EntityManager): Promise<ArrivalNotice> {
+export async function confirmArrivalNoticeFunction(
+  name: string,
+  context: any,
+  tx?: EntityManager
+): Promise<ArrivalNotice> {
   const { user, domain } = context.state
 
   const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
     where: { domain: { id: domain.id }, name, status: ORDER_STATUS.PENDING },
-    relations: ['bizplace', 'bizplace.domain', 'releaseGood', 'orderProducts', 'orderProducts.product', 'orderVass', 'orderVass.vas', 'creator', 'updater']
+    relations: [
+      'bizplace',
+      'bizplace.domain',
+      'releaseGood',
+      'orderProducts',
+      'orderProducts.product',
+      'orderVass',
+      'orderVass.vas',
+      'creator',
+      'updater'
+    ]
   })
 
   let foundOPs: OrderProduct[] = foundArrivalNotice.orderProducts
@@ -568,10 +624,12 @@ export async function confirmArrivalNoticeFunction(name: string, context: any, t
       }
     })
 
-    let setting = !isNaN(partnerGanProcessingSetting?.value) ? partnerGanProcessingSetting?.value : ganProcessingSetting.value
+    let setting = !isNaN(Number(partnerGanProcessingSetting?.value))
+      ? partnerGanProcessingSetting?.value
+      : ganProcessingSetting.value
 
     // CONFIRM to assign if setting value is 1
-    if (setting == 1) {
+    if (Number(setting) == 1) {
       opStatus = ORDER_PRODUCT_STATUS.ARRIVED
       anStatus = ORDER_STATUS.ARRIVED
       ovStatus = ORDER_VAS_STATUS.ARRIVED
@@ -648,7 +706,11 @@ export async function confirmArrivalNoticeFunction(name: string, context: any, t
   return arrivalNotice
 }
 
-export async function receiveArrivalNoticeFunction(_: any, name: string, context: ResolverContext): Promise<ArrivalNotice> {
+export async function receiveArrivalNoticeFunction(
+  _: any,
+  name: string,
+  context: ResolverContext
+): Promise<ArrivalNotice> {
   const { user, domain, tx } = context.state
   try {
     const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
@@ -681,10 +743,12 @@ export async function receiveArrivalNoticeFunction(_: any, name: string, context
         }
       })
 
-      let setting = !isNaN(partnerGanProcessingSetting?.value) ? partnerGanProcessingSetting?.value : ganProcessingSetting.value
+      let setting = !isNaN(Number(partnerGanProcessingSetting?.value))
+        ? partnerGanProcessingSetting?.value
+        : ganProcessingSetting.value
 
       // RECEIVE to assign if setting value is 2
-      if (setting == 2) {
+      if (Number(setting) == 2) {
         opStatus = ORDER_PRODUCT_STATUS.ARRIVED
         anStatus = ORDER_STATUS.ARRIVED
         ovStatus = ORDER_VAS_STATUS.ARRIVED
@@ -765,7 +829,11 @@ export async function receiveArrivalNoticeFunction(_: any, name: string, context
   }
 }
 
-export async function checkArrivedNoticeFunction(name: string, context: any, tx?: EntityManager): Promise<ArrivalNotice> {
+export async function checkArrivedNoticeFunction(
+  name: string,
+  context: any,
+  tx?: EntityManager
+): Promise<ArrivalNotice> {
   const { user, domain } = context.state
   try {
     const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
@@ -847,7 +915,12 @@ export async function checkArrivedNoticeFunction(name: string, context: any, tx?
   }
 }
 
-export async function rejectArrivalNotice(tx: EntityManager, name: string, remark: string, context: any): Promise<ArrivalNotice> {
+export async function rejectArrivalNotice(
+  tx: EntityManager,
+  name: string,
+  remark: string,
+  context: any
+): Promise<ArrivalNotice> {
   const { user, domain } = context.state
 
   const foundArrivalNotice: ArrivalNotice = await tx.getRepository(ArrivalNotice).findOne({
@@ -921,7 +994,13 @@ export async function rejectArrivalNotice(tx: EntityManager, name: string, remar
   return foundArrivalNotice
 }
 
-export async function addArrivalNoticeProducts(domain: Domain, arrivalNotice: ArrivalNotice, newOrderProducts: any[], user: User, tx?: EntityManager): Promise<void> {
+export async function addArrivalNoticeProducts(
+  domain: Domain,
+  arrivalNotice: ArrivalNotice,
+  newOrderProducts: any[],
+  user: User,
+  tx?: EntityManager
+): Promise<void> {
   const productRepo: Repository<Product> = tx?.getRepository(Product) || getRepository(Product)
   const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
 
@@ -950,7 +1029,11 @@ export async function addArrivalNoticeProducts(domain: Domain, arrivalNotice: Ar
   await orderProductRepo.save(createdOrderProducts)
 }
 
-export async function editArrivalNoticeProducts(existingOrderProducts: (OrderProduct | OrderProductPatch)[], user: User, tx?: EntityManager): Promise<void> {
+export async function editArrivalNoticeProducts(
+  existingOrderProducts: (OrderProduct | OrderProductPatch)[],
+  user: User,
+  tx?: EntityManager
+): Promise<void> {
   const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
 
   const updatedOrderProducts: OrderProduct[] = await Promise.all(
@@ -974,7 +1057,17 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
 
     const idx: number = arrivalNotices.findIndex(an => {
       // consider these attributes if they are exist in "item"
-      const comparison = ['refNo2', 'refNo3', 'truckNo', 'ownTransport', 'container', 'containerNo', 'containerSize', 'looseItem', 'importCargo']
+      const comparison = [
+        'refNo2',
+        'refNo3',
+        'truckNo',
+        'ownTransport',
+        'container',
+        'containerNo',
+        'containerSize',
+        'looseItem',
+        'importCargo'
+      ]
 
       let a: any = {},
         b: any = {}
@@ -1010,7 +1103,11 @@ function extractArrivalNotices(rawArrivalNotices): Partial<ArrivalNotice[]> {
 
     if (idx >= 0) {
       const duplicateSkuIdx: number = arrivalNotices[idx].orderProducts.findIndex(
-        op => op.sku === raw.sku && op.packingType === raw.packingType && op.packingSize === raw.packingSize && op.batchId === raw.batchId
+        op =>
+          op.sku === raw.sku &&
+          op.packingType === raw.packingType &&
+          op.packingSize === raw.packingSize &&
+          op.batchId === raw.batchId
       )
 
       if (duplicateSkuIdx >= 0) arrivalNotices[idx].orderProducts[duplicateSkuIdx].packQty += raw.packQty

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

@@ -209,7 +209,7 @@ export class ClaimMutation {
         ...patch,
         bizplace: bizplace,
         updater: context.state.user
-      })
+      } as any)
 
       const claimOrders = await Promise.all(
         newClaimOrders.map(async (ClaimOrder: ClaimOrder) => {
@@ -263,7 +263,7 @@ export class ClaimMutation {
           domain: context.state.domain,
           creator: context.state.user,
           updater: context.state.user
-        })
+        } as any)
 
         results.push(result)
       }
@@ -278,7 +278,7 @@ export class ClaimMutation {
           ...claim,
           ...newRecord,
           updater: context.state.user
-        })
+        } as any)
 
         results.push(result)
       }

package/server/service/delivery-order/delivery-order-mutation.ts

@@ -42,7 +42,7 @@ export class DeliveryOrderMutation {
   ): Promise<DeliveryOrder> {
     const { tx, domain, user } = context.state
 
-    return await createDeliveryOrder(orderInfo, customerBizplace, targetInventories, file, domain, user, tx)
+    return await createDeliveryOrder(orderInfo, customerBizplace as any, targetInventories, file, domain, user, tx)
   }
 
   @Directive('@transaction')
@@ -101,7 +101,7 @@ export class DeliveryOrderMutation {
     return await generateDeliveryOrder(
       orderInfo,
       targetInventories as any,
-      customerBizplace,
+      customerBizplace as any,
       releaseGood as any,
       domain,
       user,
@@ -205,7 +205,7 @@ export class DeliveryOrderMutation {
         const foundTruck: TransportVehicle = deliveryOrder.transportVehicle
         await tx.getRepository(TransportVehicle).save({
           ...foundTruck,
-          status: TRUCK_STATUS.IDLE,
+          status: TRUCK_STATUS.AVAILABLE,
           updater: user
         })
       }
@@ -783,7 +783,7 @@ export async function createDeliveryOrder(
   }
 
   // #3 save other destination info in Contact Point if there's any
-  let foundCP: ContactPoint = {}
+  let foundCP: ContactPoint = {} as any
   if (orderInfo?.otherDestination) {
     foundCP = {
       domain,
@@ -797,7 +797,7 @@ export async function createDeliveryOrder(
       type: orderInfo.contactType,
       creator: user,
       updater: user
-    }
+    } as any
     foundCP = await tx.getRepository(ContactPoint).save(foundCP)
   } else {
     foundCP = await tx.getRepository(ContactPoint).findOne({
@@ -853,7 +853,7 @@ export async function createDeliveryOrder(
       }
     })
   )
-  await orderInventoryRepo.save(targetInventories)
+  await orderInventoryRepo.save(targetInventories as any)
 
   // if (file?.length) {
   //   const attachments: Attachment[] = file.map(attachment => {

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

@@ -213,7 +213,7 @@ export class DraftReleaseGoodMutation {
 
       const roNoSetting: Setting = await settingRepo.findOne({
         where: {
-          dodomain: { id: domain.id },
+          domain: { id: domain.id },
           name: ORDER_NUMBER_SETTING_KEY.RO_NUMBER_RULE
         }
       })
@@ -522,7 +522,7 @@ export async function createDraftReleaseGoodFunction(
 
   // // 4. Create Attachments
   if (files?.length) {
-    const attachments: Attachment[] = files.map(attachment => {
+    const attachments: Partial<Attachment>[] = files.map(attachment => {
       return {
         file: attachment,
         refType: ATTACHMENT_TYPE.DGRN,
@@ -609,7 +609,7 @@ export async function updateDraftReleaseGoodFunction(
 
   // // 5. Add New Attachment
   if (files?.length > 0) {
-    const attachments: Attachment[] = files.map(attachment => {
+    const attachments: Partial<Attachment>[] = files.map(attachment => {
       return {
         file: attachment,
         refType: ATTACHMENT_TYPE.DGRN,
@@ -634,14 +634,15 @@ export async function upsertDraftReleaseGoodProducts(
   try {
     let orderProducts: OrderProduct[] = []
 
-    const draftReleaseGoodRepo: Repository<Product> =
+    const draftReleaseGoodRepo: Repository<DraftReleaseGood> =
       tx?.getRepository(DraftReleaseGood) || getRepository(DraftReleaseGood)
-    const bizplaceRepo: Repository<Product> = tx?.getRepository(Bizplace) || getRepository(Bizplace)
+    const bizplaceRepo: Repository<Bizplace> = tx?.getRepository(Bizplace) || getRepository(Bizplace)
     const orderProductRepo: Repository<OrderProduct> = tx?.getRepository(OrderProduct) || getRepository(OrderProduct)
     const productRepo: Repository<Product> = tx?.getRepository(Product) || getRepository(Product)
-    const productBundleRepo: Repository<Product> = tx?.getRepository(ProductBundle) || getRepository(ProductBundle)
+    const productBundleRepo: Repository<ProductBundle> =
+      tx?.getRepository(ProductBundle) || getRepository(ProductBundle)
 
-    draftReleaseGood = await draftReleaseGoodRepo.findOne({
+    draftReleaseGood = (await draftReleaseGoodRepo.findOne({
       where: { id: draftReleaseGood.id },
       relations: [
         'orderProducts',
@@ -650,7 +651,7 @@ export async function upsertDraftReleaseGoodProducts(
         'orderProducts.creator',
         'orderProducts.updater'
       ]
-    })
+    })) as any
 
     // Remove all existing order products that do not exist in current input
     let removeOP = draftReleaseGood.orderProducts.filter(
@@ -748,8 +749,8 @@ export async function upsertDraftReleaseGoodProducts(
         updatePatch['packingType'] = op?.packingType
           ? op.packingType
           : product?.packingType
-          ? product.packingType
-          : productBundle.packingType
+            ? product.packingType
+            : productBundle.packingType
         updatePatch['uom'] = op?.uom ? op.uom : product?.primaryUnit ? product.primaryUnit : 'UNIT'
         updatePatch['uomValue'] = op?.uomValue ? op.uomValue : product?.primaryValue ? product.primaryValue : 0
 

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

@@ -245,7 +245,7 @@ export async function getDraftReleaseGoodFunction(_: any, name: any, context: an
     const { domain, user, bizplace }: { domain: Domain; user: User; bizplace: Bizplace } = context.state
 
     let permittedBizplaces = await getPermittedBizplaces(domain, user)
-    let result = await tx.getRepository(DraftReleaseGood).findOne({
+    let result: any = await tx.getRepository(DraftReleaseGood).findOne({
       where: { domain: { id: domain.id }, name, bizplace: { id: In(permittedBizplaces.map(biz => biz.id)) } },
       relations: [
         'releaseGood',

package/server/service/inventory-check/inventory-check-mutation.ts

@@ -24,7 +24,7 @@ export class InventoryCheckMutation {
       domain: context.state.domain,
       creator: context.state.user,
       updater: context.state.user
-    })
+    } as any)
   }
 
   @Mutation(returns => InventoryCheck)

package/server/service/order-inventory/order-inventory-query.ts

@@ -236,7 +236,7 @@ export class OrderInventoryQuery {
 
       if (patches[i]?.batchId != null) {
         const worksheet: OrderInventory[] = await getRepository(OrderInventory).find({
-          where: { inventory: foundExistingPallet?.id, status: 'PICKING' }
+          where: { inventory: foundExistingPallet?.id as any, status: 'PICKING' }
         })
 
         if (worksheet.length > 0) {

package/server/service/order-product/order-product.ts

@@ -1,5 +1,15 @@
 import { Field, Float, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
@@ -29,12 +39,24 @@ import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-r
 ])
 @Index(
   'ix_order-product_2',
-  (orderProduct: OrderProduct) => [orderProduct.bizplace, orderProduct.retailReplenishmentOrder, orderProduct.product, orderProduct.batchId, orderProduct.packingType],
+  (orderProduct: OrderProduct) => [
+    orderProduct.bizplace,
+    orderProduct.retailReplenishmentOrder,
+    orderProduct.product,
+    orderProduct.batchId,
+    orderProduct.packingType
+  ],
   { unique: true }
 )
 @Index(
   'ix_order-product_3',
-  (orderProduct: OrderProduct) => [orderProduct.bizplace, orderProduct.purchaseOrder, orderProduct.product, orderProduct.batchId, orderProduct.uom],
+  (orderProduct: OrderProduct) => [
+    orderProduct.bizplace,
+    orderProduct.purchaseOrder,
+    orderProduct.product,
+    orderProduct.batchId,
+    orderProduct.uom
+  ],
   { unique: true }
 )
 @Index('ix_order-product_4', (orderProduct: OrderProduct) => [orderProduct.draftReleaseGood], { unique: false })
@@ -155,7 +177,7 @@ export class OrderProduct {
   @Field(type => ProductDetail)
   productDetail: ProductDetail
 
-  @RelationId((orderProduct: ProductDetail) => orderProduct.productDetail)
+  @RelationId((orderProduct: OrderProduct) => orderProduct.productDetail)
   productDetailId: string
 
   @ManyToOne(type => ProductBundle, { nullable: true })