@things-factory/worksheet-base 4.3.78 → 4.3.79-alpha.0

package/server/graphql/resolvers/worksheet/picking/activate-picking.ts

@@ -1,8 +1,7 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -27,42 +26,73 @@ export async function activatePicking(
   const worksheet = await worksheetController.activatePicking(worksheetNo)
   const companyDomain: Domain = worksheet?.bizplace.company.domain
 
-  // find for any existing marketplace store connections
-  const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-    relations: ['marketplaceDistributors']
-  })
-
   let releaseGood: ReleaseGood = worksheet.releaseGood
 
-  if (releaseGood.type === 'b2c') {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-    if (marketplaceStores?.length && !sellercraft) {
-      if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-        const worksheetDetails = worksheet.worksheetDetails
-        let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
-        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
-      }
-
-      const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        where: { orderNo: releaseGood.refNo, domain: companyDomain },
-        relations: ['marketplaceStore']
+  const orderSource: string = releaseGood.source
+  switch (orderSource) {
+    case ApplicationType.MMS:
+      // find for any existing marketplace store connections
+      const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+        where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+        relations: ['marketplaceDistributors']
       })
 
-      if (marketplaceOrder) {
-        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-
-        if (marketplaceStore.isAutoUpdateShipment) {
+      if (marketplaceStores?.length) {
+        if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+          const worksheetDetails = worksheet.worksheetDetails
+          let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
           const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-          await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+          await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+        }
+
+        const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: releaseGood.refNo, domain: companyDomain },
+          relations: ['marketplaceStore']
+        })
+
+        if (marketplaceOrder) {
+          const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+          if (marketplaceStore.isAutoUpdateShipment) {
+            const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+            await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+          }
         }
       }
-    }
+      break
+
+    default:
+      break
   }
 
+  // if (releaseGood.type === 'b2c') {
+  //   const sellercraft: Sellercraft = await tx
+  //     .getRepository(Sellercraft)
+  //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+  //   if (marketplaceStores?.length && !sellercraft) {
+  //     if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+  //       const worksheetDetails = worksheet.worksheetDetails
+  //       let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
+  //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+  //     }
+
+  //     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //       where: { orderNo: releaseGood.refNo, domain: companyDomain },
+  //       relations: ['marketplaceStore']
+  //     })
+
+  //     if (marketplaceOrder) {
+  //       const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+  //       if (marketplaceStore.isAutoUpdateShipment) {
+  //         const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //         await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+  //       }
+  //     }
+  //   }
+  // }
+
   return worksheet
 }

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -69,7 +69,7 @@ export async function completeBatchPicking(
 
         let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
           where: { id: releaseGood.id },
-          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
+          relations: ['orderProducts', 'orderProducts.product']
         })
 
         if (!foundReleaseGood?.packageId) {
@@ -112,7 +112,7 @@ export async function completeBatchPicking(
     })
 
     // loop to generate packing worksheet
-    for (var i: number = 0; i < uniqueRoNo.length; i++) {
+    for (let i: number = 0; i < uniqueRoNo.length; i++) {
       const releaseGoodNo: string = uniqueRoNo[i]
       const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
       await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -1,6 +1,6 @@
 import { EntityManager, getManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
@@ -81,149 +81,307 @@ export async function completePicking(
 
   await pickingWSCtrl.completePicking(releaseGoodNo)
 
-  if (releaseGood.type == 'b2c') {
-
-    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-    const initSCOrderShipment = async (sellercraft) => {
-      if (sellercraft) {
-
-        await getManager().transaction(async txMgr => {
-          const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
-
-          if (!releaseGood?.packageId) {
-            const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
-              where: { releaseGood },
-              relations: ['product', 'product.productDetails']
-            })
-            releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
-
-            if (releaseGood?.packageId) {
-              await txMgr.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+  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 })
+      const initSCOrderShipment = async sellercraft => {
+        if (sellercraft) {
+          await getManager().transaction(async txMgr => {
+            const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
+
+            if (!releaseGood?.packageId) {
+              const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
+                where: { releaseGood },
+                relations: ['product', 'product.productDetails']
+              })
+              releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+
+              if (releaseGood?.packageId) {
+                await txMgr
+                  .getRepository(ReleaseGood)
+                  .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+              }
             }
-          }
 
-          await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
-        })
+            await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+          })
+        }
       }
-    }
-
-    // asynchronouly call to initiate sellercraft order shipment/ RTS
-    initSCOrderShipment(sellercraft)
-
-    const companyDomain: Domain = releaseGood.bizplace.company.domain
-    let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-      where: { orderNo: releaseGood.refNo, domain: companyDomain },
-      relations: [
-        'marketplaceStore',
-        'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceOrderShippingItems',
-        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-      ]
-    })
 
-    if (!sellercraft && marketplaceOrder) {
-      const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-      let eTraxOption: boolean
+      // asynchronouly call to initiate sellercraft order shipment/ RTS
+      initSCOrderShipment(sellercraft)
+      break
+
+    case ApplicationType.MMS:
+      const companyDomain: Domain = releaseGood.bizplace.company.domain
+      let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+        where: { orderNo: releaseGood.refNo, domain: companyDomain },
+        relations: [
+          'marketplaceStore',
+          'marketplaceOrderItems',
+          'marketplaceOrderItems.marketplaceOrderShippingItems',
+          'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+        ]
+      })
+
+      if (marketplaceOrder) {
+        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+        let eTraxOption: boolean
+
+        if (marketplaceStore.isAutoUpdateShipment) {
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+          await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
+        }
 
-      if (marketplaceStore.isAutoUpdateShipment) {
-        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
-      }
+        if (!marketplaceOrder)
+          throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
+        eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
+
+        // if eTrax option is true
+        if (eTraxOption) {
+          const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
+
+          // access every marketplaceOrderItems for shipping information you need
+          // trigger the controller from integration-lmd that trigger the API, build the parameters needed
+          // for etrax didn't support multi awb per order
+          const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+            marketplaceOrderItems[0].marketplaceOrderShippingItems
+          const marketplaceOrderShipping: MarketplaceOrderShipping =
+            marketplaceOrderShippingItems[0].marketplaceOrderShipping
+          const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
+            where: {
+              domain,
+              platform: 'eTrax'
+            }
+          })
+
+          //Get which transporter to use
+          const marketplaceTransporter: MarketplaceTransporter = await tx
+            .getRepository(MarketplaceTransporter)
+            .findOne({
+              where: { marketplaceStore: marketplaceOrder.marketplaceStore },
+              relations: ['pickupTransporter', 'deliveryTransporter']
+            })
 
-      if (!marketplaceOrder)
-        throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
-      eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
-
-      // if eTrax option is true
-      if (eTraxOption) {
-        const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-
-        // access every marketplaceOrderItems for shipping information you need
-        // trigger the controller from integration-lmd that trigger the API, build the parameters needed
-        // for etrax didn't support multi awb per order
-        const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
-          marketplaceOrderItems[0].marketplaceOrderShippingItems
-        const marketplaceOrderShipping: MarketplaceOrderShipping =
-          marketplaceOrderShippingItems[0].marketplaceOrderShipping
-        const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
-          where: {
-            domain,
-            platform: 'eTrax'
+          const resp = await LastMileAPI.createShipmentRequest(lmd, {
+            orderNo: marketplaceOrder.orderNo,
+            clientId: lmd.clientId,
+            clientType: lmd.clientType,
+            clientName: lmd.clientName,
+            transporterId: marketplaceTransporter.pickupTransporter.transporterId,
+            pickupName: warehouseContactPoint.name,
+            pickupAddress1: warehouseContactPoint.address,
+            pickupAddress2: warehouseContactPoint.address2,
+            pickupPostcode: warehouseContactPoint.postCode,
+            pickupState: warehouseContactPoint.state,
+            pickupCity: warehouseContactPoint.city,
+            pickupPhone: warehouseContactPoint.phone,
+            pickupEmail: warehouseContactPoint.email,
+            name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
+            address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
+            address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
+            postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
+            city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
+            state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
+            phone: marketplaceOrderShipping.phone1 || '',
+            email: marketplaceOrderShipping.email || '',
+            attentionTo: marketplaceOrderShipping.attentionTo,
+            quantity: marketplaceOrderItems.length
+          })
+
+          const delay = (ms: number) => {
+            return new Promise(resolve => setTimeout(resolve, ms))
           }
-        })
-
-        //Get which transporter to use
-        const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({
-          where: { marketplaceStore: marketplaceOrder.marketplaceStore },
-          relations: ['pickupTransporter', 'deliveryTransporter']
-        })
-
-        const resp = await LastMileAPI.createShipmentRequest(lmd, {
-          orderNo: marketplaceOrder.orderNo,
-          clientId: lmd.clientId,
-          clientType: lmd.clientType,
-          clientName: lmd.clientName,
-          transporterId: marketplaceTransporter.pickupTransporter.transporterId,
-          pickupName: warehouseContactPoint.name,
-          pickupAddress1: warehouseContactPoint.address,
-          pickupAddress2: warehouseContactPoint.address2,
-          pickupPostcode: warehouseContactPoint.postCode,
-          pickupState: warehouseContactPoint.state,
-          pickupCity: warehouseContactPoint.city,
-          pickupPhone: warehouseContactPoint.phone,
-          pickupEmail: warehouseContactPoint.email,
-          name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
-          address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
-          address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
-          postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
-          city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
-          state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
-          phone: marketplaceOrderShipping.phone1 || '',
-          email: marketplaceOrderShipping.email || '',
-          attentionTo: marketplaceOrderShipping.attentionTo,
-          quantity: marketplaceOrderItems.length
-        })
-
-        const delay = (ms: number) => {
-          return new Promise(resolve => setTimeout(resolve, ms))
-        }
 
-        if (resp.Status === 'SUCCESS') {
-          //Success
-          let awbObtained = false
-          let retry = 0
-          while (!awbObtained) {
-            const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-              where: { releaseOrderId: releaseGood.id },
-              relations: [
-                'marketplaceStore',
-                'marketplaceOrderItems',
-                'marketplaceOrderItems.marketplaceOrderShippingItems',
-                'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-              ]
-            })
-            const orderShipping =
-              marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping
-            if (orderShipping?.airwayBill) {
-              awbObtained = true
-            }
-            await delay(5000)
-            //Timeout after 15sec
-            if (++retry > 3) {
-              break
+          if (resp.Status === 'SUCCESS') {
+            //Success
+            let awbObtained = false
+            let retry = 0
+            while (!awbObtained) {
+              const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+                where: { releaseOrderId: releaseGood.id },
+                relations: [
+                  'marketplaceStore',
+                  'marketplaceOrderItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+                ]
+              })
+              const orderShipping =
+                marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping
+              if (orderShipping?.airwayBill) {
+                awbObtained = true
+              }
+              await delay(5000)
+              //Timeout after 15sec
+              if (++retry > 3) {
+                break
+              }
             }
+          } else {
+            if (resp?.AWBurl && resp?.TrackingNo)
+              await tx
+                .getRepository(MarketplaceOrderShipping)
+                .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })
+            else throw resp
           }
-        } else {
-          if (resp?.AWBurl && resp?.TrackingNo)
-            await tx
-              .getRepository(MarketplaceOrderShipping)
-              .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })
-          else throw resp
         }
       }
-    }
+      break
+
+    default:
+      break
   }
 
+  // if (releaseGood.type == 'b2c') {
+  //   const sellercraft: Sellercraft = await tx
+  //     .getRepository(Sellercraft)
+  //     .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+  //   const initSCOrderShipment = async sellercraft => {
+  //     if (sellercraft) {
+  //       await getManager().transaction(async txMgr => {
+  //         const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
+
+  //         if (!releaseGood?.packageId) {
+  //           const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
+  //             where: { releaseGood },
+  //             relations: ['product', 'product.productDetails']
+  //           })
+  //           releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+
+  //           if (releaseGood?.packageId) {
+  //             await txMgr
+  //               .getRepository(ReleaseGood)
+  //               .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+  //           }
+  //         }
+
+  //         await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+  //       })
+  //     }
+  //   }
+
+  //   // asynchronouly call to initiate sellercraft order shipment/ RTS
+  //   initSCOrderShipment(sellercraft)
+
+  //   const companyDomain: Domain = releaseGood.bizplace.company.domain
+  //   let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //     where: { orderNo: releaseGood.refNo, domain: companyDomain },
+  //     relations: [
+  //       'marketplaceStore',
+  //       'marketplaceOrderItems',
+  //       'marketplaceOrderItems.marketplaceOrderShippingItems',
+  //       'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+  //     ]
+  //   })
+
+  //   if (!sellercraft && marketplaceOrder) {
+  //     const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+  //     let eTraxOption: boolean
+
+  //     if (marketplaceStore.isAutoUpdateShipment) {
+  //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+  //       await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
+  //     }
+
+  //     if (!marketplaceOrder)
+  //       throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
+  //     eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
+
+  //     // if eTrax option is true
+  //     if (eTraxOption) {
+  //       const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
+
+  //       // access every marketplaceOrderItems for shipping information you need
+  //       // trigger the controller from integration-lmd that trigger the API, build the parameters needed
+  //       // for etrax didn't support multi awb per order
+  //       const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+  //         marketplaceOrderItems[0].marketplaceOrderShippingItems
+  //       const marketplaceOrderShipping: MarketplaceOrderShipping =
+  //         marketplaceOrderShippingItems[0].marketplaceOrderShipping
+  //       const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
+  //         where: {
+  //           domain,
+  //           platform: 'eTrax'
+  //         }
+  //       })
+
+  //       //Get which transporter to use
+  //       const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({
+  //         where: { marketplaceStore: marketplaceOrder.marketplaceStore },
+  //         relations: ['pickupTransporter', 'deliveryTransporter']
+  //       })
+
+  //       const resp = await LastMileAPI.createShipmentRequest(lmd, {
+  //         orderNo: marketplaceOrder.orderNo,
+  //         clientId: lmd.clientId,
+  //         clientType: lmd.clientType,
+  //         clientName: lmd.clientName,
+  //         transporterId: marketplaceTransporter.pickupTransporter.transporterId,
+  //         pickupName: warehouseContactPoint.name,
+  //         pickupAddress1: warehouseContactPoint.address,
+  //         pickupAddress2: warehouseContactPoint.address2,
+  //         pickupPostcode: warehouseContactPoint.postCode,
+  //         pickupState: warehouseContactPoint.state,
+  //         pickupCity: warehouseContactPoint.city,
+  //         pickupPhone: warehouseContactPoint.phone,
+  //         pickupEmail: warehouseContactPoint.email,
+  //         name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
+  //         address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
+  //         address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
+  //         postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
+  //         city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
+  //         state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
+  //         phone: marketplaceOrderShipping.phone1 || '',
+  //         email: marketplaceOrderShipping.email || '',
+  //         attentionTo: marketplaceOrderShipping.attentionTo,
+  //         quantity: marketplaceOrderItems.length
+  //       })
+
+  //       const delay = (ms: number) => {
+  //         return new Promise(resolve => setTimeout(resolve, ms))
+  //       }
+
+  //       if (resp.Status === 'SUCCESS') {
+  //         //Success
+  //         let awbObtained = false
+  //         let retry = 0
+  //         while (!awbObtained) {
+  //           const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //             where: { releaseOrderId: releaseGood.id },
+  //             relations: [
+  //               'marketplaceStore',
+  //               'marketplaceOrderItems',
+  //               'marketplaceOrderItems.marketplaceOrderShippingItems',
+  //               'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+  //             ]
+  //           })
+  //           const orderShipping =
+  //             marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping
+  //           if (orderShipping?.airwayBill) {
+  //             awbObtained = true
+  //           }
+  //           await delay(5000)
+  //           //Timeout after 15sec
+  //           if (++retry > 3) {
+  //             break
+  //           }
+  //         }
+  //       } else {
+  //         if (resp?.AWBurl && resp?.TrackingNo)
+  //           await tx
+  //             .getRepository(MarketplaceOrderShipping)
+  //             .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })
+  //         else throw resp
+  //       }
+  //     }
+  //   }
+  // }
+
   if (releaseGood.packingOption) {
     const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
     await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)

package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ArrivalNotice } from '@things-factory/sales-base'
@@ -33,24 +33,54 @@ export const completePutawayResolver = {
     // search for any active marketplace connection
     const companyDomain: Domain = arrivalNotice.bizplace.company.domain
     const customerDomain: Domain = arrivalNotice.bizplace.domain
-    const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-      where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-      relations: ['marketplaceDistributors']
-    })
 
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
+    const orderSource: string = arrivalNotice.source
+    switch (orderSource) {
+      case ApplicationType.SELLERCRAFT:
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
-    }
+        if (sellercraft) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
+        }
+        break
+
+      case ApplicationType.MMS:
+        const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+          where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+          relations: ['marketplaceDistributors']
+        })
+
+        if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+          await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
+        }
+        break
 
-    if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-      const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-      await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
+      default:
+        break
     }
+
+    // const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+    //   where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+    //   relations: ['marketplaceDistributors']
+    // })
+
+    // const sellercraft: Sellercraft = await tx
+    //   .getRepository(Sellercraft)
+    //   .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
+
+    // if (sellercraft) {
+    //   const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+    //   await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
+    // }
+
+    // if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+    //   const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+    //   await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
+    // }
   }
 }