@things-factory/sales-base 4.3.75 → 4.3.79-alpha.0

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

@@ -3,7 +3,7 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, getConnection, getRepository, In, Not, Repository } from 'typeorm'
 
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { Partner, Role, User } from '@things-factory/auth-base'
+import { ApplicationType, Partner, Role, User } from '@things-factory/auth-base'
 import {
   Bizplace,
   getDomainUsers,
@@ -14,7 +14,6 @@ import {
 import { generateId } from '@things-factory/id-rule-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Sftp } from '@things-factory/integration-sftp'
 import { MarketplaceOrder, MarketplaceProductVariation } from '@things-factory/marketplace-base'
 // import { sendNotification } from '@things-factory/notification'
 import { Product, ProductBundleSetting } from '@things-factory/product-base'
@@ -485,20 +484,18 @@ export async function generateReleaseGoodFunction(
     await InventoryUtil.validateWarehousePartnersProductsQuantity(domain, bizplace, orderInventories, context, tx)
     /** End Validate Release Order Product Quantity Section */
 
-    if (releaseGood.type == 'b2c') {
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-      let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-        where: { domain: bizplace.domain }
-      })
-
-      if (sellercraft) {
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
         await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
-      } else if (customerAvailableSftp) {
-      } else {
+        break
+
+      case ApplicationType.MMS:
         const refNo: string = releaseGood.refNo
         const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
           where: {
@@ -532,9 +529,62 @@ export async function generateReleaseGoodFunction(
             throw new Error('Existing release order found')
           }
         }
-      }
+        break
+
+      default:
+        break
     }
 
+    // if (releaseGood.type == 'b2c') {
+    //   const sellercraft: Sellercraft = await tx
+    //     .getRepository(Sellercraft)
+    //     .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+    //   let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+    //     where: { domain: bizplace.domain }
+    //   })
+
+    //   if (sellercraft) {
+    //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    //     await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
+    //   } else if (customerAvailableSftp) {
+    //   } else {
+    //     const refNo: string = releaseGood.refNo
+    //     const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+    //       where: {
+    //         domain: warehouseDomain,
+    //         refNo,
+    //         status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
+    //       },
+    //       relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+    //     })
+
+    //     if (foundReleaseGood) {
+    //       const customerCompanyDomain: Domain = foundReleaseGood.bizplace.company.domain
+    //       const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+    //         where: { orderNo: refNo, domain: customerCompanyDomain }
+    //       })
+
+    //       // Need to restructure the validation
+    //       if (marketplaceOrder?.isSplitted) {
+    //         const refNo2: string = releaseGood.refNo2
+    //         const foundSplittedReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+    //           where: {
+    //             domain: warehouseDomain,
+    //             refNo2,
+    //             status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
+    //           },
+    //           relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+    //         })
+
+    //         if (foundSplittedReleaseGood) throw new Error('Existing release order found')
+    //       } else {
+    //         throw new Error('Existing release order found')
+    //       }
+    //     }
+    //   }
+    // }
+
     let newReleaseGood: ReleaseGood = new ReleaseGood()
 
     /** Generate Shipping Order */
@@ -887,16 +937,28 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   let foundOVs: OrderVas[] = foundReleaseGood.orderVass
   let customerBizplace: Bizplace = foundReleaseGood.bizplace
   const companyDomain: Domain = customerBizplace?.company.domain
-  const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-    where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
-    relations: ['domain']
-  })
 
-  if (foundReleaseGood.type == 'b2c') {
-    if (sellercraft) {
+  const orderSource: string = foundReleaseGood.source
+  switch (orderSource) {
+    case ApplicationType.SELLERCRAFT:
+      const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+        where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
+        relations: ['domain']
+      })
+
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
-    } else {
+      if (foundReleaseGood.type == 'b2c') {
+        foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, {
+          ...foundReleaseGood,
+          orderProducts: foundOPs
+        })
+      } else if (foundReleaseGood.type == 'b2b') {
+        await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
+      }
+
+      break
+
+    case ApplicationType.MMS:
       // find for any existing marketplace store connections
       let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
         where: { domain: companyDomain, status: 'ACTIVE' },
@@ -959,16 +1021,94 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
         const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
         await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain)
       }
-    }
-  }
+      break
 
-  if (foundReleaseGood.type == 'b2b') {
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
-    }
+    default:
+      break
   }
 
+  // const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+  //   where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
+  //   relations: ['domain']
+  // })
+
+  // if (foundReleaseGood.type == 'b2c') {
+  //   if (sellercraft) {
+  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+  //     foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
+  //   } else {
+  //     // find for any existing marketplace store connections
+  //     let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+  //       where: { domain: companyDomain, status: 'ACTIVE' },
+  //       relations: ['marketplaceDistributors']
+  //     })
+
+  //     const foundMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //       where: { domain: companyDomain, orderNo: foundReleaseGood.refNo },
+  //       relations: ['marketplaceStore']
+  //     })
+
+  //     let matchedMarketplaceStore: MarketplaceStore
+  //     if (foundMarketplaceOrder) {
+  //       matchedMarketplaceStore = marketplaceStores.filter(
+  //         marketplaceStore => marketplaceStore.id == foundMarketplaceOrder.marketplaceStore.id
+  //       )[0]
+  //     }
+
+  //     let combinedOrderInventories: any[] = foundOIs.map(oi => {
+  //       return {
+  //         sku: oi.product.sku,
+  //         releaseQty: oi.releaseQty
+  //       }
+  //     })
+
+  //     if (foundBundleInfo?.length) {
+  //       foundBundleInfo.map(bundle => {
+  //         combinedOrderInventories.push({
+  //           sku: bundle.sku,
+  //           releaseQty: bundle.releaseQty
+  //         })
+  //       })
+  //     }
+
+  //     for (let oi of combinedOrderInventories) {
+  //       let foundMarketplaceProductVariations: MarketplaceProductVariation[] = await tx
+  //         .getRepository(MarketplaceProductVariation)
+  //         .find({
+  //           where: { domain: companyDomain, sku: oi.sku },
+  //           relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+  //         })
+
+  //       if (foundMarketplaceProductVariations) {
+  //         await Promise.all(
+  //           foundMarketplaceProductVariations.map(async variation => {
+  //             if (variation.marketplaceProduct.marketplaceStore.reserveEnabled) {
+  //               variation.reserveQty -= oi.releaseQty
+  //             }
+
+  //             await tx.getRepository(MarketplaceProductVariation).save(variation)
+  //           })
+  //         )
+  //       }
+  //     }
+
+  //     if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+  //       marketplaceStores = marketplaceStores.filter(marketplaceStore => marketplaceStore.isAutoUpdateStockQty)
+  //       let productIds: string[] = foundOIs.map(oi => oi.product.id)
+  //       productIds = Array.from(new Set([...productIds]))
+  //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain)
+  //     }
+  //   }
+  // }
+
+  // if (foundReleaseGood.type == 'b2b') {
+  //   if (sellercraft) {
+  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+  //     await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
+  //   }
+  // }
+
   // 1. RO Status change (PENDING => PENDING_RECEIVE)
   const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).save({
     ...foundReleaseGood,
@@ -1183,15 +1323,32 @@ export async function rejectReleaseGood(
   }
 
   if (foundOPs && foundOPs.length) {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+        if (sellercraft) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+        }
+        break
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+      default:
+        break
     }
 
+    // const sellercraft: Sellercraft = await tx
+    //   .getRepository(Sellercraft)
+    //   .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+    // if (sellercraft) {
+    //   const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    //   await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
+    // }
+
     await tx.getRepository(OrderProduct).save(
       await Promise.all(
         foundOPs.map(async (op: OrderProduct) => {
@@ -1288,6 +1445,7 @@ export async function bulkGenerateReleaseGood(
       phone1: releaseGood?.phone1 || null,
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
+      source: releaseGood?.source || null,
       airwayBill: releaseGood?.airwayBill,
       refNo: releaseGood.refNo,
       refNo2: releaseGood.refNo2,
@@ -1296,8 +1454,8 @@ export async function bulkGenerateReleaseGood(
       ownTransport: releaseGood?.ownTransport || false,
       orderMethod: ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
-      creator: user,
-      updater: user
+      creator: releaseGood?.creator || user,
+      updater: releaseGood?.updater || user
     }
 
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
@@ -1370,8 +1528,8 @@ export async function bulkGenerateReleaseGood(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        creator: user,
-        updater: user
+        creator: newReleaseGood?.creator || user,
+        updater: newReleaseGood?.updater || user
       }
 
       let newOrderProduct: Partial<OrderProduct>
@@ -1393,8 +1551,8 @@ export async function bulkGenerateReleaseGood(
           actualPalletQty: 0,
           status: ORDER_PRODUCT_STATUS.ASSIGNED,
           releaseGood: newReleaseGood,
-          creator: user,
-          updater: user
+          creator: newReleaseGood?.creator || user,
+          updater: newReleaseGood?.updater || user
         }
 
         newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
@@ -1403,7 +1561,7 @@ export async function bulkGenerateReleaseGood(
           ...oi.orderProduct,
           totalUomValue: `${oi.orderProduct.releaseUomValue} ${oi.orderProduct.uom}`,
           status: ORDER_PRODUCT_STATUS.ASSIGNED,
-          updater: user
+          updater: newReleaseGood?.updater || user
         })
       }
 

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

@@ -95,8 +95,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: ReleaseOrderType,
     default: ReleaseOrderType.B2B
   })
@@ -167,15 +167,13 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: DispatchmentStatus,
     default: DispatchmentStatus.READY_TO_DISPATCH
   })
   dispatchmentStatus: DispatchmentStatus
 
-
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   refNo: String
@@ -443,6 +441,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   stopId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  source: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   manifestedAt: Date
@@ -457,6 +459,12 @@ export class ReleaseGood {
   @Field({ nullable: true })
   orderRemark: Boolean
 
+  @Field({ nullable:true })
+  totalInventoriesByBin: Number
+
+  @Field({ nullable:true })
+  isOrderInventoryBin: Boolean
+
   @Field({ nullable: true })
   invStatus: String