@things-factory/marketplace-base 4.1.6 → 4.1.13

package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts

@@ -1,4 +1,5 @@
-import { getRepository } from 'typeorm'
+import { getRepository, IsNull } from 'typeorm'
+import uuid from 'uuid/v4'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
@@ -11,6 +12,7 @@ import {
   MarketplaceOrder,
   MarketplaceOrderItem,
   MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem,
   MarketplaceProductVariation
 } from '../../../entities'
 import { NoGenerator } from '../../../utils'
@@ -28,9 +30,8 @@ export const syncAllMarketplaceOrder = {
     if (marketplaceStores?.length === 0) throw new Error('No active marketplace store')
     let whiteListStores: MarketplaceStore[] = marketplaceStores
 
-    blackListStores = blackListStores.split(',')
-
-    if (blackListStores && blackListStores?.length) {
+    if (blackListStores) {
+      blackListStores = blackListStores.split(',')
       whiteListStores = marketplaceStores.filter(store => blackListStores.indexOf(store.name) < 0)
     }
 
@@ -117,8 +118,9 @@ export const syncAllMarketplaceOrder = {
                   'domain',
                   'fulfillmentCenter',
                   'marketplaceOrderItems',
-                  'marketplaceOrderItems.marketplaceProductVariation',
-                  'marketplaceOrderItems.marketplaceOrderShipping'
+                  'marketplaceOrderItems.marketplaceOrderShippingItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+                  'marketplaceOrderItems.marketplaceProductVariation'
                 ]
               })
 
@@ -194,7 +196,9 @@ export const syncAllMarketplaceOrder = {
                       let patch = {
                         id: releaseOrder.id,
                         marketplaceOrderStatus: marketplaceOrder.status,
-                        trackingNo: foundMarketplaceOrderShipping?.trackingNo
+                        trackingNo: foundMarketplaceOrderShipping?.trackingNo == '[]'
+                          ? foundMarketplaceOrderShipping.ownTrackingNo : 
+                          foundMarketplaceOrderShipping?.trackingNo
                           ? foundMarketplaceOrderShipping.trackingNo
                           : foundMarketplaceOrderShipping.ownTrackingNo,
                         transporter: dropPickProvider ? dropPickProvider : marketplaceOrder.shippingProvider
@@ -216,7 +220,9 @@ export const syncAllMarketplaceOrder = {
                     let patch = {
                       id: releaseOrder.id,
                       marketplaceOrderStatus: marketplaceOrder.status,
-                      trackingNo: foundMarketplaceOrderShipping?.trackingNo
+                      trackingNo: foundMarketplaceOrderShipping?.trackingNo == '[]'
+                        ? foundMarketplaceOrderShipping.ownTrackingNo : 
+                        foundMarketplaceOrderShipping?.trackingNo
                         ? foundMarketplaceOrderShipping.trackingNo
                         : foundMarketplaceOrderShipping.ownTrackingNo,
                       transporter: dropPickProvider ? dropPickProvider : marketplaceOrder.shippingProvider
@@ -236,7 +242,7 @@ export const syncAllMarketplaceOrder = {
                       })
 
                       if (releaseOrders?.length) {
-                        for (var a = 0; a < releaseOrders.length; a++) {
+                        for (let a = 0; a < releaseOrders.length; a++) {
                           const releaseOrderId: string = releaseOrders[a].id
                           await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, {
                             customerBizplaceId,
@@ -322,10 +328,12 @@ export const syncAllMarketplaceOrder = {
                         attentionTo: orderShipping.attentionTo,
                         city: orderShipping.city,
                         country: orderShipping.country,
+                        state: orderShipping?.state,
                         postCode: orderShipping.postCode,
                         phone1: orderShipping.phone1,
                         phone2: orderShipping.phone2,
-                        trackingNo: order.trackingNo,
+                        email: orderShipping?.email,
+                        trackingNo: order?.trackingNo,
                         shippingFee: orderShipping.shippingFee,
                         actualShippingFee: orderShipping.actualShippingFee,
                         marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher,
@@ -346,7 +354,11 @@ export const syncAllMarketplaceOrder = {
                       marketplaceOrderShipping = {
                         ...existingOrderShipping,
                         ...marketplaceOrderShipping,
-                        trackingNo: order?.trackingNo ? order.trackingNo : existingOrderShipping.trackingNo,
+                        trackingNo: marketplaceOrderShipping?.trackingNo
+                          ? marketplaceOrderShipping.trackingNo
+                          : existingOrderShipping?.trackingNo
+                          ? existingOrderShipping.trackingNo
+                          : marketplaceOrderShipping.trackingNo,
                         updater: user
                       }
 
@@ -366,10 +378,15 @@ export const syncAllMarketplaceOrder = {
               let foundVariations = []
               for (var j = 0; j < order.orderItems.length; j++) {
                 var item = order.orderItems[j]
-                let foundVariation = await getRepository(MarketplaceProductVariation).findOne({
-                  where: { domain: marketplaceStore.domain, variationId: item.variationId }
+                let foundVariationsQuery = await getRepository(MarketplaceProductVariation).find({
+                  where: { domain: marketplaceStore.domain, variationId: item.variationId },
+                  relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
                 })
 
+                let foundVariation = foundVariationsQuery.filter(
+                  fv => fv.marketplaceProduct.marketplaceStore.id == marketplaceStore.id
+                )[0]
+
                 if (foundVariation) {
                   foundVariations.push(foundVariation)
                 }
@@ -380,7 +397,8 @@ export const syncAllMarketplaceOrder = {
                     name: item.variationName,
                     variationSku: item.variationSku,
                     channelSku: item.sku,
-                    status: 'INACTIVE'
+                    status: 'INACTIVE',
+                    domain: marketplaceStore.domain
                   }
 
                   await getRepository(MarketplaceProductVariation).save(newVariation)
@@ -395,8 +413,8 @@ export const syncAllMarketplaceOrder = {
                 marketplaceOrderItem.status = marketplaceOrder.status
                 marketplaceOrderItem.docRefNo = item.docRefNo
                 marketplaceOrderItem.marketplaceProductVariation = foundVariation
-                marketplaceOrderItem.marketplaceOrder = marketplaceOrder
                 marketplaceOrderItem.trackingCode = order.trackingNo
+                marketplaceOrderItem.marketplaceOrder = marketplaceOrder
                 marketplaceOrderItem.originalPrice = item.originalPrice
                 marketplaceOrderItem.discount = item.discount
                 marketplaceOrderItem.promotionId = item.promotionId
@@ -417,7 +435,7 @@ export const syncAllMarketplaceOrder = {
                 marketplaceOrderItem.promotionalChargesFlexiCombo = item.promotionalChargesFlexiCombo
                 marketplaceOrderItem.autoShippingSubsidyMarketplace = item.autoShippingSubsidyMarketplace
                 marketplaceOrderItem.originalShippingFee = item.originalShippingFee
-                marketplaceOrderItem.taxAmount = item.autoShippingSubsidyMarketplace
+                marketplaceOrderItem.taxAmount = item.taxAmount
 
                 marketplaceOrderItems.push({ ...marketplaceOrderItem })
 
@@ -426,10 +444,12 @@ export const syncAllMarketplaceOrder = {
               }
 
               if (existingMarketplaceOrder) {
+                let existingOrderItems: MarketplaceOrderItem[] = []
+                existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
+      
+                existingOrderItems = await checkUpdateItemId(existingOrderItems, marketplaceOrderItems)
+      
                 if (existingMarketplaceOrder.isSplitted) {
-                  let existingOrderItems: MarketplaceOrderItem[] = []
-                  existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
-
                   marketplaceOrderItems = existingOrderItems.filter(
                     itm => itm.name == item.name && itm.marketplaceProductVariation.variationId == item.variationId
                   )
@@ -437,14 +457,10 @@ export const syncAllMarketplaceOrder = {
                     return {
                       ...marketplaceOrderitem,
                       status: order.status,
-                      marketplaceProductVariation: foundVariation,
                       trackingCode: order.trackingNo
                     }
                   })
                 } else {
-                  let existingOrderItems: MarketplaceOrderItem[] = []
-                  existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
-
                   if (existingOrderItems.length > marketplaceOrderItems.length) {
                     let nonMatchedOrderItems = []
                     existingOrderItems.map(item => {
@@ -666,11 +682,10 @@ export const syncAllMarketplaceOrder = {
                         relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
                       })
 
-                      let item = order.orderItems.find(e => e.variationId == foundVariation.variationId)
                       let activeVariations: MarketplaceProductVariation[] = allVariations.filter(
                         variation => variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
                       )
-
+                      let item = order.orderItems.find(e => e.variationId == foundVariation.variationId)
                       await Promise.all(
                         activeVariations.map(async variation => {
                           await calculateReserveQtyForBundle(variation, marketplaceOrder.domain, item.qty)
@@ -684,8 +699,6 @@ export const syncAllMarketplaceOrder = {
                       )
                     }
 
-                    foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
-
                     if (order?.orderShipping) {
                       savedMarketplaceOrderShipping.totalWeight = orderTotalWeight
                       savedMarketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).save(
@@ -699,6 +712,62 @@ export const syncAllMarketplaceOrder = {
               await getRepository(MarketplaceOrder).save(marketplaceOrder)
               await getRepository(MarketplaceOrderItem).save(marketplaceOrderItems)
 
+              for (let i = 0; i < marketplaceOrderItems.length; i++) {
+                const marketplaceOrderItem: MarketplaceOrderItem = marketplaceOrderItems[i]
+                const marketplaceProductVariation: MarketplaceProductVariation =
+                  marketplaceOrderItem.marketplaceProductVariation
+                let existingMarketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = await getRepository(
+                  MarketplaceOrderShippingItem
+                ).find({
+                  where: { domain: marketplaceStore.domain, marketplaceOrderItem }
+                })
+
+                let product: Product = await getRepository(Product).findOne({
+                  where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku, deletedAt: IsNull() },
+                  relations: ['productDetails']
+                })
+
+                let productBundle: ProductBundle
+                if (!product) {
+                  productBundle = await getRepository(ProductBundle).findOne({
+                    where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku },
+                    relations: ['productBundleSettings', 'productBundleSettings.product']
+                  })
+                }
+
+                if (existingMarketplaceOrderShippingItems && existingMarketplaceOrderShippingItems?.length) {
+                } else {
+                  if (productBundle) {
+                    const productBundleSettings: ProductBundleSetting[] = productBundle.productBundleSettings
+                    let marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = []
+                    productBundleSettings.map(productBundleSetting => {
+                      let marketplaceOrderShippingItem: MarketplaceOrderShippingItem =
+                        new MarketplaceOrderShippingItem()
+                      marketplaceOrderShippingItem.name = uuid()
+                      marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty
+                      marketplaceOrderShippingItem.domain = marketplaceStore.domain
+                      marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+                      marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
+                      marketplaceOrderShippingItem.product = productBundleSetting.product
+
+                      marketplaceOrderShippingItems.push(marketplaceOrderShippingItem)
+                    })
+
+                    await getRepository(MarketplaceOrderShippingItem).save(marketplaceOrderShippingItems)
+                  } else {
+                    let marketplaceOrderShippingItem: MarketplaceOrderShippingItem = new MarketplaceOrderShippingItem()
+                    marketplaceOrderShippingItem.name = uuid()
+                    marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty
+                    marketplaceOrderShippingItem.domain = marketplaceStore.domain
+                    marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+                    marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
+                    marketplaceOrderShippingItem.product = product ? product : null
+
+                    await getRepository(MarketplaceOrderShippingItem).save(marketplaceOrderShippingItem)
+                  }
+                }
+              }
+
               if (m == marketplaceOrders.length - 1) {
                 lastOrderId = order.name
               }
@@ -786,3 +855,18 @@ async function calculateReserveQtyForBundle(variation, domain, qty, operator = '
     }
   }
 }
+
+
+function checkUpdateItemId(existingOrderItems, marketplaceOrderItems) {
+  for (let item of marketplaceOrderItems) {
+    let existingItem = existingOrderItems.find(i => i.name ==  item.name)
+
+    if (!existingItem) {
+      let existingItemByVariation = existingOrderItems.find(i => i.marketplaceProductVariation.id ==  item.marketplaceProductVariation.id)
+      existingOrderItems = existingOrderItems.filter(i => i != existingItemByVariation)
+      existingItemByVariation.name = item.name
+      existingOrderItems.push(existingItemByVariation)
+    }
+  }
+  return existingOrderItems
+}

package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts

@@ -176,7 +176,9 @@ export const syncMarketplaceOrder = {
                 let patch = {
                   id: releaseOrder.id,
                   marketplaceOrderStatus: marketplaceOrder.status,
-                  trackingNo: foundMarketplaceOrderShipping?.trackingNo
+                  trackingNo: foundMarketplaceOrderShipping?.trackingNo == '[]'
+                    ? foundMarketplaceOrderShipping.ownTrackingNo : 
+                    foundMarketplaceOrderShipping?.trackingNo
                     ? foundMarketplaceOrderShipping.trackingNo
                     : foundMarketplaceOrderShipping.ownTrackingNo,
                   transporter: dropPickProvider ? dropPickProvider : marketplaceOrder.shippingProvider
@@ -198,7 +200,9 @@ export const syncMarketplaceOrder = {
               let patch = {
                 id: releaseOrder.id,
                 marketplaceOrderStatus: marketplaceOrder.status,
-                trackingNo: foundMarketplaceOrderShipping?.trackingNo
+                trackingNo: foundMarketplaceOrderShipping?.trackingNo == '[]'
+                  ? foundMarketplaceOrderShipping.ownTrackingNo : 
+                  foundMarketplaceOrderShipping?.trackingNo
                   ? foundMarketplaceOrderShipping.trackingNo
                   : foundMarketplaceOrderShipping.ownTrackingNo,
                 transporter: dropPickProvider ? dropPickProvider : marketplaceOrder.shippingProvider
@@ -351,11 +355,13 @@ export const syncMarketplaceOrder = {
         let foundVariations = []
         for (var j = 0; j < order.orderItems.length; j++) {
           var item = order.orderItems[j]
-          let foundVariation = await tx.getRepository(MarketplaceProductVariation).findOne({
+          let foundVariationsQuery = await tx.getRepository(MarketplaceProductVariation).find({
             where: { domain: marketplaceStore.domain, variationId: item.variationId },
             relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
           })
 
+          let foundVariation = foundVariationsQuery.filter(fv => fv.marketplaceProduct.marketplaceStore.id == marketplaceStore.id)[0]
+
           if (foundVariation) {
             foundVariations.push(foundVariation)
           }
@@ -366,7 +372,8 @@ export const syncMarketplaceOrder = {
               name: item.variationName,
               variationSku: item.variationSku,
               channelSku: item.sku,
-              status: 'INACTIVE'
+              status: 'INACTIVE',
+              domain: marketplaceStore.domain
             }
 
             await tx.getRepository(MarketplaceProductVariation).save(newVariation)
@@ -412,10 +419,12 @@ export const syncMarketplaceOrder = {
         }
 
         if (existingMarketplaceOrder) {
-          if (existingMarketplaceOrder.isSplitted) {
-            let existingOrderItems: MarketplaceOrderItem[] = []
-            existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
+          let existingOrderItems: MarketplaceOrderItem[] = []
+          existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
+
+          existingOrderItems = await checkUpdateItemId(existingOrderItems, marketplaceOrderItems)
 
+          if (existingMarketplaceOrder.isSplitted) {
             marketplaceOrderItems = existingOrderItems.filter(
               itm => itm.name == item.name && itm.marketplaceProductVariation.variationId == item.variationId
             )
@@ -423,14 +432,10 @@ export const syncMarketplaceOrder = {
               return {
                 ...marketplaceOrderitem,
                 status: order.status,
-                marketplaceProductVariation: foundVariation,
                 trackingCode: order.trackingNo
               }
             })
           } else {
-            let existingOrderItems: MarketplaceOrderItem[] = []
-            existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
-
             if (existingOrderItems.length > marketplaceOrderItems.length) {
               let nonMatchedOrderItems = []
               existingOrderItems.map(item => {
@@ -816,3 +821,17 @@ async function calculateReserveQtyForBundle(tx, variation, domain, qty, operator
     }
   }
 }
+
+function checkUpdateItemId(existingOrderItems, marketplaceOrderItems) {
+  for (let item of marketplaceOrderItems) {
+    let existingItem = existingOrderItems.find(i => i.name ==  item.name)
+
+    if (!existingItem) {
+      let existingItemByVariation = existingOrderItems.find(i => i.marketplaceProductVariation.id ==  item.marketplaceProductVariation.id)
+      existingOrderItems = existingOrderItems.filter(i => i != existingItemByVariation)
+      existingItemByVariation.name = item.name
+      existingOrderItems.push(existingItemByVariation)
+    }
+  }
+  return existingOrderItems
+}

package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts

@@ -1,6 +1,7 @@
 import { EntityManager } from 'typeorm'
 
 import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
+import { Domain } from '@things-factory/shell'
 
 import {
   MarketplaceOrder,
@@ -10,10 +11,13 @@ import {
 } from '../../../entities'
 
 export const updateOrderReadyToShip = {
-  async updateOrderReadyToShip(_: any, { shippingProvider, deliveryType, orderNo }, context: any) {
+  async updateOrderReadyToShip(_: any, { shippingProvider, deliveryType, orderNo, orderId, domainId }, context: any) {
     const { tx }: { tx: EntityManager } = context.state
+
+    const domain: Domain = await tx.getRepository(Domain).findOne(domainId)
+
     let foundMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-      where: { name: orderNo },
+      where: { name: orderId, orderNo, domain },
       relations: [
         'marketplaceStore',
         'marketplaceOrderItems',
@@ -90,7 +94,7 @@ export const updateOrderReadyToShip = {
         const note = mos[0].trackingUrl || trackingNo
 
         const res = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
-          orderId: orderNo,
+          orderId,
           trackingUrl: mos[0].trackingUrl || '',
           trackingNo,
           order: foundMarketplaceOrder,
@@ -99,14 +103,14 @@ export const updateOrderReadyToShip = {
 
         if (marketplaceStore.platform === 'woocommerce') {
           await StoreAPI.updateOrderStatus(marketplaceStore, {
-            orderId: orderNo,
+            orderId,
             status: 'READY_TO_SHIP'
           })
         }
       }
     }
 
-    const updatedOrder = await StoreAPI.getStoreOrder(marketplaceStore, { orderId: orderNo })
+    const updatedOrder = await StoreAPI.getStoreOrder(marketplaceStore, { orderId })
 
     foundMarketplaceOrder.status = updatedOrder.status
     foundMarketplaceOrder.orderUpdatedAt = updatedOrder.orderUpdatedAt

package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.ts

@@ -12,7 +12,8 @@ export const marketplaceOrderShippingsResolver = {
 
     const qb: SelectQueryBuilder<MarketplaceOrderShipping> = getRepository(MarketplaceOrderShipping)
       .createQueryBuilder('MOS')
-      .innerJoinAndSelect('MOS.marketplaceOrderItems', 'MOI')
+      .innerJoinAndSelect('MOS.marketplaceOrderShippingItems', 'MOSI')
+      .innerJoinAndSelect('MOSI.marketplaceOrderItem', 'MOI')
       .innerJoinAndSelect('MOI.marketplaceOrder', 'MO')
       .innerJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
       .innerJoinAndSelect('MOS.marketplaceStore', 'MS')

package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts

@@ -24,7 +24,8 @@ export const marketplaceSalesReportsResolver = {
     let qb: SelectQueryBuilder<MarketplaceOrderItem> = getRepository(MarketplaceOrderItem).createQueryBuilder('moi')
     buildQuery(qb, params, context)
     qb.leftJoinAndSelect('moi.domain', 'domain')
-      .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
+      .leftJoinAndSelect('moi.marketplaceOrderShippingItems', 'mosi')
+      .leftJoinAndSelect('mosi.marketplaceOrderShipping', 'mos')
       .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
       .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
       .leftJoinAndSelect('mo.marketplaceStore', 'ms')

package/server/graphql/types/marketplace-order/index.ts

@@ -23,13 +23,14 @@ export const MarketplaceOrderResolver = gql`
     generateMarketplaceOrder(marketplaceOrder: NewMarketplaceOrder!): MarketplaceOrder @transaction
     cancelMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
     syncMarketplaceOrder(storeId: String!, fromDate: String, toDate: String): Boolean @transaction
-    syncAllMarketplaceOrder(
-      companyDomainId: String
-      fromDate: String
-      toDate: String
-      blackListStores: String
-    ): Boolean
-    updateOrderReadyToShip(shippingProvider: String, deliveryType: String, orderNo: String!): Boolean @transaction
+    syncAllMarketplaceOrder(companyDomainId: String, fromDate: String, toDate: String, blackListStores: String): Boolean
+    updateOrderReadyToShip(
+      shippingProvider: String
+      deliveryType: String
+      orderNo: String!
+      orderId: String!
+      domainId: String!
+    ): Boolean @transaction
     initialiseLogistics(deliveryType: LogisticsInit, orderNo: String!): Boolean @transaction
     initialiseLogisticsByBatch(patches: [LogisticsInfo]!): Boolean @transaction
     initialiseShopeeLogisticsByBatch(patches: [LogisticsInfo]!): Boolean