@things-factory/sales-base 4.3.333 → 4.3.335

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

@@ -1,9 +1,37 @@
-import { FileUpload, GraphQLUpload } from 'graphql-upload'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getConnection, getRepository, In, Not, Repository } from 'typeorm'
+import {
+  FileUpload,
+  GraphQLUpload
+} from 'graphql-upload'
+import {
+  Arg,
+  Ctx,
+  Directive,
+  Mutation,
+  Resolver
+} from 'type-graphql'
+import {
+  Brackets,
+  EntityManager,
+  getConnection,
+  getRepository,
+  ILike,
+  In,
+  Not,
+  Repository,
+  SelectQueryBuilder
+} from 'typeorm'
 
-import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { Application, ApplicationType, Partner, Role, User } from '@things-factory/auth-base'
+import {
+  Attachment,
+  createAttachments
+} from '@things-factory/attachment-base'
+import {
+  Application,
+  ApplicationType,
+  Partner,
+  Role,
+  User
+} from '@things-factory/auth-base'
 import {
   Bizplace,
   getCompanyBizplace,
@@ -14,15 +42,27 @@ import {
 } 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 { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 // import { sendNotification } from '@things-factory/notification'
-import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import {
+  ProductBundleSetting,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, ProductDetailStock } from '@things-factory/warehouse-base'
-import { editVas } from '../vas'
+import {
+  Inventory,
+  ProductDetailStock
+} from '@things-factory/warehouse-base'
 
 // import { NewOrderProduct } from '../order-product/order-product-types'
 import {
@@ -33,27 +73,40 @@ import {
   ORDER_NUMBER_SETTING_KEY,
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
-  ORDER_TYPES,
   ORDER_VAS_STATUS,
   PRODUCT_GROUP_TYPE
 } from '../../constants'
-import { EcommerceController, PowrupController, SellercraftController } from '../../controllers'
+import {
+  EcommerceController,
+  PowrupController,
+  SellercraftController
+} from '../../controllers'
 import { ValidationError } from '../../errors'
-import { InventoryUtil, OrderNoGenerator } from '../../utils'
+import {
+  InventoryUtil,
+  OrderNoGenerator
+} from '../../utils'
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
-import { confirmArrivalNoticeFunction, deleteArrivalNotice } from '../arrival-notice/arrival-notice-mutation'
+import {
+  confirmArrivalNoticeFunction,
+  deleteArrivalNotice
+} from '../arrival-notice/arrival-notice-mutation'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { OrderProduct } from '../order-product/order-product'
 import { OrderVasItem } from '../order-vas-item/order-vas-item'
 import { OrderVas } from '../order-vas/order-vas'
-import { NewReleaseGood, ReleaseGoodPatch, ShippingOrderInfoPatch } from '../release-good/release-good-types'
+import { OrderVasPatch } from '../order-vas/order-vas-types'
+import {
+  NewReleaseGood,
+  ReleaseGoodPatch,
+  ShippingOrderInfoPatch
+} from '../release-good/release-good-types'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
-import { Vas } from '../vas/vas'
+import { editVas } from '../vas'
 import { ReleaseGood } from './release-good'
 import { bulkReleaseGoodsAvailableItemsFunction } from './release-good-query'
-import { OrderVasPatch } from '../order-vas/order-vas-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodMutation {
@@ -203,6 +256,8 @@ export class ReleaseGoodMutation {
   async generateReleaseGood(
     @Ctx() context: any,
     @Arg('attachments', type => [GraphQLUpload], { nullable: true }) attachments?: FileUpload[],
+    @Arg('invoiceAttachment', type => [GraphQLUpload], { nullable: true }) invoiceAttachment?: FileUpload[],
+    @Arg('awbAttachment', type => [GraphQLUpload], { nullable: true }) awbAttachment?: FileUpload[],
     @Arg('releaseGood', type => NewReleaseGood, { nullable: true }) releaseGood?: NewReleaseGood,
     @Arg('orderVasPatch', type => [OrderVasPatch], { nullable: true }) orderVasPatch?: OrderVasPatch[],
     @Arg('shippingOrder', type => ShippingOrderPatch, { nullable: true }) shippingOrder?: ShippingOrderPatch,
@@ -218,7 +273,9 @@ export class ReleaseGoodMutation {
       attachments,
       context,
       tx,
-      orderVasPatch
+      orderVasPatch,
+      invoiceAttachment,
+      awbAttachment
     )
 
     return createdReleaseGood
@@ -501,7 +558,9 @@ export async function generateReleaseGoodFunction(
   attachments: FileUpload[],
   context: any,
   tx?: EntityManager,
-  orderVasPatch?: OrderVasPatch[]
+  orderVasPatch?: OrderVasPatch[],
+  invoiceAttachment?: FileUpload[],
+  awbAttachment?: FileUpload[]
 ): Promise<ReleaseGood> {
   try {
     const { domain, user }: { domain: Domain; user: User } = context.state
@@ -643,6 +702,19 @@ export async function generateReleaseGoodFunction(
       }
     })
 
+    let lmd: any = null
+    if (releaseGood?.lmdOption) {
+      const geoCountryRepo: Repository<GeoCountry> = tx?.getRepository(GeoCountry) || getRepository(GeoCountry)
+      let deliveryCountry: GeoCountry = releaseGood?.country
+        ? await geoCountryRepo.findOne({
+            where: [{ name: ILike(releaseGood?.country) }, { description: ILike(releaseGood?.country) }]
+          })
+        : null
+
+      //Assign LMD
+      lmd = await autoAssignLmd(domain, deliveryCountry?.id, releaseGood?.postalCode, bizplace)
+    }
+
     newReleaseGood = {
       ...newReleaseGood,
       name: roNoSetting
@@ -653,7 +725,7 @@ export async function generateReleaseGoodFunction(
       collectionOrderNo: releaseGood.collectionOrderNo,
       courierOption: releaseGood.courierOption,
       exportOption: releaseGood.exportOption,
-      ownTransport: releaseGood.ownTransport,
+      ownTransport: releaseGood.ownTransport || false,
       packingOption: releaseGood.packingOption,
       recall: releaseGood.recall,
       marketplaceOrderStatus: releaseGood?.marketplaceOrderStatus || null,
@@ -684,6 +756,7 @@ export async function generateReleaseGoodFunction(
           : shippingOrderInfo.billingPostalCode || null,
       billingState:
         releaseGood.type == 'b2c' ? releaseGood?.billingState || null : shippingOrderInfo.billingState || null,
+      district: releaseGood.type == 'b2c' ? releaseGood?.city : null,
       transporter: releaseGood?.transporter,
       trackingNo: releaseGood?.trackingNo,
       airwayBill: releaseGood?.airwayBill,
@@ -708,6 +781,8 @@ export async function generateReleaseGoodFunction(
       storeId: releaseGood?.storeId,
       routeId: releaseGood?.routeId,
       stopId: releaseGood?.stopId,
+      lmdOption: releaseGood?.lmdOption || null,
+      lastMileDelivery: lmd || null,
       creator: user,
       updater: user
     }
@@ -892,10 +967,13 @@ export async function generateReleaseGoodFunction(
     }
 
     // VAS
-    orderVasPatch = orderVasPatch.map(itm => {
-      return { ...itm, releaseGood: newReleaseGood }
-    })
-    await editVas(orderVasPatch, null, context)
+    if (orderVasPatch) {
+      orderVasPatch = orderVasPatch.map(itm => {
+        return { ...itm, releaseGood: newReleaseGood }
+      })
+      await editVas(orderVasPatch, null, context)
+    }
+
     // if (orderVass?.length) {
     //   orderVass = await Promise.all(
     //     orderVass.map(async orderVas => {
@@ -938,6 +1016,28 @@ export async function generateReleaseGoodFunction(
       await createAttachments(_, { attachments: files }, context)
     }
 
+    if (invoiceAttachment && invoiceAttachment.length > 0) {
+      const file: Attachment = {
+        file: invoiceAttachment[0],
+        refBy: newReleaseGood.id,
+        category: ATTACHMENT_TYPE.INVOICE
+      }
+      const invoiceAttachmentResult = await createAttachments(_, { attachments: [file] }, context)
+      await tx
+        .getRepository(ReleaseGood)
+        .update({ id: newReleaseGood.id }, { invoice: invoiceAttachmentResult[0].path })
+    }
+
+    if (awbAttachment && awbAttachment.length > 0) {
+      const file: Attachment = {
+        file: awbAttachment[0],
+        refBy: newReleaseGood.id,
+        category: ATTACHMENT_TYPE.AWB
+      }
+      const awbAttachmentResult = await createAttachments(_, { attachments: [file] }, context)
+      await tx.getRepository(ReleaseGood).update({ id: newReleaseGood.id }, { airwayBill: awbAttachmentResult[0].path })
+    }
+
     const directReceiveSetting: Setting = await tx.getRepository(Setting).findOne({
       where: { domain, category: 'id-rule', name: 'enable-direct-receive-release-order' }
     })
@@ -1826,3 +1926,68 @@ function formRawReleaseGoods(releaseGood, errorMsg) {
   }
   return rawReleaseGoods
 }
+
+async function autoAssignLmd(domain, countryId, postalCode, bizplace) {
+  let lmdResult: LastMileDelivery
+  const qb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
+    .createQueryBuilder('lmd')
+    .leftJoinAndSelect('lmd.lastMileDeliverySettings', 'lmds')
+    .innerJoinAndSelect('lmds.geoCountry', 'gc')
+    .leftJoinAndSelect(`lmd.lastMileDeliveryBizplaces`, `lmdb`)
+    .leftJoinAndSelect('lmdb.bizplace', 'bz')
+    .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('lmdb.bizplace_id = :bzId', { bzId: bizplace.id })
+    .orderBy('lmdb.bizplace_id', 'ASC')
+    .addOrderBy('lmds.include_postal_code')
+    .addOrderBy('lmd.rank', 'ASC')
+
+  lmdResult = await qb.getOne()
+
+  if (!lmdResult) {
+    const newQb: SelectQueryBuilder<LastMileDelivery> = getRepository(LastMileDelivery)
+      .createQueryBuilder('lmd')
+      .leftJoinAndSelect('lmd.lastMileDeliverySettings', 'lmds')
+      .innerJoinAndSelect('lmds.geoCountry', 'gc')
+      .leftJoinAndSelect(`lmd.lastMileDeliveryBizplaces`, `lmdb`)
+      .leftJoinAndSelect('lmdb.bizplace', 'bz')
+      .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('lmds.include_postal_code')
+      .addOrderBy('lmd.rank', 'ASC')
+
+    lmdResult = await newQb.getOne()
+  }
+
+  return lmdResult
+}

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

@@ -1,19 +1,60 @@
-import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { EntityManager, getRepository, In, Repository, SelectQueryBuilder } from 'typeorm'
+import {
+  Arg,
+  Args,
+  Ctx,
+  Directive,
+  FieldResolver,
+  Query,
+  Resolver,
+  Root
+} from 'type-graphql'
+import {
+  EntityManager,
+  getRepository,
+  In,
+  Repository,
+  SelectQueryBuilder
+} from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
-import { Bizplace, getCompanyBizplace, getMyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import {
+  checkUserBelongsDomain,
+  User
+} from '@things-factory/auth-base'
+import {
+  Bizplace,
+  getCompanyBizplace,
+  getMyBizplace,
+  getPermittedBizplaceIds
+} from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
-import { buildQuery, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
-import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
-
-import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
+import {
+  buildQuery,
+  Domain,
+  Filter,
+  ListParam,
+  Pagination,
+  Sorting
+} from '@things-factory/shell'
+import {
+  Inventory,
+  LOCATION_TYPE
+} from '@things-factory/warehouse-base'
+
+import {
+  ATTACHMENT_TYPE,
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS
+} from '../../constants'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ReleaseGood } from './release-good'
-import { NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
+import {
+  NewReleaseGood,
+  ReleasableInventoryList,
+  ReleaseGoodList
+} from './release-good-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodQuery {
@@ -224,6 +265,20 @@ export class ReleaseGoodQuery {
             category: ATTACHMENT_TYPE.DELIVERY_ORDER
           }
         })
+        const foundInvoiceAttachments: Attachment = await tx.getRepository(Attachment).findOne({
+          where: {
+            domain,
+            refBy: releaseGood.id,
+            category: ATTACHMENT_TYPE.INVOICE
+          }
+        })
+        const foundAwbAttachments: Attachment = await tx.getRepository(Attachment).findOne({
+          where: {
+            domain,
+            refBy: releaseGood.id,
+            category: ATTACHMENT_TYPE.AWB
+          }
+        })
 
         let invInfos = await Promise.all(
           orderInventories.map(async (orderInv: OrderInventory) => {
@@ -260,6 +315,8 @@ export class ReleaseGoodQuery {
         const result = {
           ...releaseGood,
           attachment: foundAttachments,
+          invoiceAttachment: foundInvoiceAttachments,
+          awbAttachment: foundAwbAttachments,
           shippingOrderInfo: {
             containerNo: shippingOrder?.containerNo || '',
             containerSize: shippingOrder?.containerSize || '',
@@ -298,6 +355,7 @@ export class ReleaseGoodQuery {
       const manifestedFilter = params.filters.find(param => param.name === 'manifested')
       const orderInfoFilter = params.filters.find(param => param.name === 'name')
       const typeFilter = params.filters.find(param => param.name === 'type')?.value
+      const lmdFilter = params.filters.find(param => param.name === 'lmdOption')
 
       if (await checkUserBelongsDomain(domain, user)) {
         if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
@@ -382,6 +440,27 @@ export class ReleaseGoodQuery {
         }
       }
 
+      if (lmdFilter) {
+        const lmdIdx = params.filters.findIndex(param => param.name === 'lmdOption')
+        if (lmdFilter.value == true) {
+          params.filters.splice(lmdIdx, 1)
+          params.filters.push({
+            name: 'lmdOption',
+            operator: 'is_not_null',
+            value: null,
+            relation: false
+          })
+        } else {
+          params.filters.splice(lmdIdx, 1)
+          params.filters.push({
+            name: 'lmdOption',
+            operator: 'is_null',
+            value: null,
+            relation: false
+          })
+        }
+      }
+
       const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
       if (fromDateParamIdx >= 0) {
         let fromDateVal = new Date(params.filters[fromDateParamIdx].value)

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

@@ -1,6 +1,15 @@
-import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
-
-import { Product, ProductDetail } from '@things-factory/product-base'
+import {
+  Field,
+  Float,
+  InputType,
+  Int,
+  ObjectType
+} from 'type-graphql'
+
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -398,6 +407,9 @@ export class NewReleaseGood {
 
   @Field({ nullable: true })
   ward: string
+
+  @Field({ nullable: true })
+  lmdOption: Boolean
 }
 
 @InputType()

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

@@ -1,4 +1,8 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import {
+  Field,
+  ID,
+  ObjectType
+} from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -15,7 +19,10 @@ import {
 
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import {
+  Bizplace,
+  ContactPoint
+} from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { LastMileDelivery } from '@things-factory/integration-lmd'
 import { Domain } from '@things-factory/shell'
@@ -411,6 +418,12 @@ export class ReleaseGood {
   @Field(type => [Attachment], { nullable: true })
   attachment?: Attachment[]
 
+  @Field(type => Attachment, { nullable: true })
+  invoiceAttachment?: Attachment[]
+
+  @Field(type => Attachment, { nullable: true })
+  awbAttachment?: Attachment[]
+
   @Field(type => [InventoryInfos], { nullable: true })
   inventoryInfos?: InventoryInfos[]