@things-factory/marketplace-base 4.1.2 → 4.1.8

package/server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts

@@ -1,13 +1,16 @@
 import { EntityManager } from 'typeorm'
+import uuid from 'uuid/v4'
 
 import { User } from '@things-factory/auth-base'
 import { MarketplaceSetting, MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import {
   MarketplaceOrder,
   MarketplaceOrderItem,
   MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem,
   MarketplaceProductVariation
 } from '../../../entities'
 import { NoGenerator } from '../../../utils'
@@ -36,43 +39,74 @@ export const splitOrdersByBatch = {
       })
       if (!maxWeightSetting) throw new Error('marketplace_order_max_weight setting not found')
 
+      const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
+      if (!marketplaceOrderItems.every(marketplaceOrderItem => marketplaceOrderItem.marketplaceProductVariation.sku))
+        throw new Error('all items must be linked before split order')
+
       let originalMarketplaceOrderShipping: MarketplaceOrderShipping = await tx
         .getRepository(MarketplaceOrderShipping)
         .findOne({
-          where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore }
+          where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore },
+          relations: [
+            'marketplaceOrderShippingItems',
+            'marketplaceOrderShippingItems.product',
+            'marketplaceOrderShippingItems.product.productDetails',
+            'marketplaceOrderShippingItems.marketplaceOrderItem',
+            'marketplaceOrderShippingItems.marketplaceOrderItem.marketplaceProductVariation'
+          ]
         })
 
-      const originalMarketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-      let newMarketplaceOrderItems: MarketplaceOrderItem[] = []
+      const originalMarketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+        originalMarketplaceOrderShipping.marketplaceOrderShippingItems
+      let newMarketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = []
       let splittedShipmentItems: any[] = []
 
-      for (let a: number = 0; a < originalMarketplaceOrderItems.length; a++) {
-        const marketplaceOrderItem: MarketplaceOrderItem = originalMarketplaceOrderItems[a]
+      for (let a: number = 0; a < originalMarketplaceOrderShippingItems.length; a++) {
+        const marketplaceOrderShippingItem: MarketplaceOrderShippingItem = originalMarketplaceOrderShippingItems[a]
 
-        for (let b: number = 0; b < marketplaceOrderItem.qty; b++) {
-          const newItem: MarketplaceOrderItem = {
-            ...marketplaceOrderItem,
+        for (let b: number = 0; b < marketplaceOrderShippingItem.qty; b++) {
+          const newItem: MarketplaceOrderShippingItem = {
+            ...marketplaceOrderShippingItem,
             qty: 1
           }
-          newMarketplaceOrderItems.push(newItem)
+          newMarketplaceOrderShippingItems.push(newItem)
         }
       }
 
-      newMarketplaceOrderItems.sort(function (a, b) {
-        if (a.marketplaceProductVariation.primaryUnitValue < b.marketplaceProductVariation.primaryUnitValue) return -1
-        if (a.marketplaceProductVariation.primaryUnitValue > b.marketplaceProductVariation.primaryUnitValue) return 1
+      newMarketplaceOrderShippingItems.sort(function (a, b) {
+        if (
+          a.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue <
+          b.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue
+        )
+          return -1
+        if (
+          a.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue >
+          b.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue
+        )
+          return 1
         return 0
       })
 
-      for (let a: number = 0; a < newMarketplaceOrderItems.length; a++) {
-        const marketplaceOrderItem: MarketplaceOrderItem = newMarketplaceOrderItems[a]
-        const marketplaceProductVariation: MarketplaceProductVariation =
-          marketplaceOrderItem.marketplaceProductVariation
-        if (!marketplaceProductVariation.primaryUnitValue)
+      for (let a: number = 0; a < newMarketplaceOrderShippingItems.length; a++) {
+        let marketplaceOrderShippingItem: MarketplaceOrderShippingItem = newMarketplaceOrderShippingItems[a]
+        const product: Product = marketplaceOrderShippingItem.product
+        const marketplaceOrderItem: MarketplaceOrderItem = marketplaceOrderShippingItem.marketplaceOrderItem
+        const marketplaceProductVariations: MarketplaceProductVariation[] = await tx
+          .getRepository(MarketplaceProductVariation)
+          .find({
+            where: { domain: marketplaceOrder.domain, sku: product.sku },
+            relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+          })
+        const marketplaceProductVariation: MarketplaceProductVariation = marketplaceProductVariations.filter(
+          mpv => mpv.marketplaceProduct.marketplaceStore.id == marketplaceOrder.marketplaceStore.id
+        )[0]
+
+        if (!marketplaceProductVariation?.primaryUnitValue)
           throw new Error(marketplaceProductVariation.variationSku + ' weight is empty')
-        const primaryUnitValue: number = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2))
 
-        delete marketplaceOrderItem.id
+        const primaryUnitValue: number = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2)) || 0
+
+        delete marketplaceOrderShippingItem.id
 
         let newMarketplaceOrderShipping: MarketplaceOrderShipping = new MarketplaceOrderShipping()
         newMarketplaceOrderShipping.name = NoGenerator.orderShipping()
@@ -101,13 +135,14 @@ export const splitOrdersByBatch = {
             .getRepository(MarketplaceOrderShipping)
             .save(newMarketplaceOrderShipping)
 
-          marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-          marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
-          marketplaceOrderItem.domain = marketplaceOrder.domain
-          marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo
+          marketplaceOrderShippingItem.name = uuid()
+          marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+          marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping
+          marketplaceOrderShippingItem.product = product
+          marketplaceOrderShippingItem.domain = marketplaceOrder.domain
 
           let splittedShipment: any = {
-            shipments: [{ ...marketplaceOrderItem }],
+            shipments: [{ ...marketplaceOrderShippingItem }],
             totalWeight: primaryUnitValue
           }
           splittedShipmentItems.push(splittedShipment)
@@ -120,14 +155,18 @@ export const splitOrdersByBatch = {
                 let shipments: any[] = shipmentItem.shipments
 
                 shipments = shipments.map(async shipment => {
-                  if (shipment.marketplaceProductVariation.id === marketplaceProductVariation.id) {
-                    shipment.qty += marketplaceOrderItem.qty
+                  if (shipment.product.id === product.id) {
+                    shipment.qty += marketplaceOrderShippingItem.qty
                   } else {
-                    marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-                    marketplaceOrderItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping
-                    marketplaceOrderItem.domain = marketplaceOrder.domain
-                    marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo
-                    shipmentItem.shipments.push({ ...marketplaceOrderItem })
+                    const matchedProduct = shipments.find(shipment => shipment.product.id == product.id)
+                    if (!matchedProduct) {
+                      marketplaceOrderShippingItem.name = uuid()
+                      marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+                      marketplaceOrderShippingItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping
+                      marketplaceOrderShippingItem.product = product
+                      marketplaceOrderShippingItem.domain = marketplaceOrder.domain
+                      shipmentItem.shipments.push({ ...marketplaceOrderShippingItem })
+                    }
                   }
 
                   shipment.marketplaceOrderShipping.totalWeight = parseFloat(
@@ -146,13 +185,14 @@ export const splitOrdersByBatch = {
               .getRepository(MarketplaceOrderShipping)
               .save(newMarketplaceOrderShipping)
 
-            marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-            marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
-            marketplaceOrderItem.domain = marketplaceOrder.domain
-            marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo
+            marketplaceOrderShippingItem.name = uuid()
+            marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+            marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping
+            marketplaceOrderShippingItem.product = product
+            marketplaceOrderShippingItem.domain = marketplaceOrder.domain
 
             let splittedShipment: any = {
-              shipments: [{ ...marketplaceOrderItem }],
+              shipments: [{ ...marketplaceOrderShippingItem }],
               totalWeight: primaryUnitValue
             }
             splittedShipmentItems.push(splittedShipment)
@@ -160,260 +200,24 @@ export const splitOrdersByBatch = {
         }
       }
 
-      let savedMarketplaceOrderItems: MarketplaceOrderItem[] = []
+      let savedMarketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = []
       for (let a: number = 0; a < splittedShipmentItems.length; a++) {
         const shipments: any[] = splittedShipmentItems[a].shipments
         for (let b: number = 0; b < shipments.length; b++) {
-          savedMarketplaceOrderItems.push(shipments[b])
+          savedMarketplaceOrderShippingItems.push(shipments[b])
         }
       }
 
-      savedMarketplaceOrderItems = await tx.getRepository(MarketplaceOrderItem).save(savedMarketplaceOrderItems)
+      savedMarketplaceOrderShippingItems = await tx
+        .getRepository(MarketplaceOrderShippingItem)
+        .save(savedMarketplaceOrderShippingItems)
 
-      await tx.getRepository(MarketplaceOrderItem).delete(originalMarketplaceOrderItems.map(item => item.id))
+      await tx
+        .getRepository(MarketplaceOrderShippingItem)
+        .delete(originalMarketplaceOrderShippingItems.map(item => item.id))
 
       await tx.getRepository(MarketplaceOrderShipping).delete(originalMarketplaceOrderShipping.id)
 
-      // if (marketplaceStore.platform === 'shopee') {
-      //   let marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-
-      //   if (marketplaceOrderItems.some(item => item.marketplaceProductVariation.primaryUnitValue == null)) {
-      //     throw new Error('some sku weight are empty')
-      //   }
-
-      //   marketplaceOrderItems.sort(function (a, b) {
-      //     if (
-      //       a.marketplaceProductVariation.primaryUnitValue * a.qty <
-      //       b.marketplaceProductVariation.primaryUnitValue * b.qty
-      //     )
-      //       return -1
-      //     if (
-      //       a.marketplaceProductVariation.primaryUnitValue * a.qty >
-      //       b.marketplaceProductVariation.primaryUnitValue * b.qty
-      //     )
-      //       return 1
-      //     return 0
-      //   })
-
-      //   let splittedShipmentItems: any[] = []
-      //   for (let j: number = 0; j < marketplaceOrderItems.length; j++) {
-      //     const marketplaceOrderItem: MarketplaceOrderItem = marketplaceOrderItems[j]
-      //     const marketplaceProductVariation: MarketplaceProductVariation =
-      //       marketplaceOrderItem.marketplaceProductVariation
-      //     const qty: number = marketplaceOrderItem.qty
-      //     const primaryValue: number = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2)) * qty
-
-      //     if (splittedShipmentItems.length == 0) {
-      //       let splittedShipment: any = {
-      //         shipments: [{ ...marketplaceOrderItem }],
-      //         totalWeight: primaryValue
-      //       }
-      //       splittedShipmentItems.push(splittedShipment)
-      //     } else {
-      //       let lastShipment: any = splittedShipmentItems[splittedShipmentItems.length - 1]
-      //       let lastTotalWeight: number = parseFloat(lastShipment.totalWeight.toFixed(2))
-      //       if (lastTotalWeight + primaryValue < parseFloat(maxWeightSetting.value)) {
-      //         splittedShipmentItems.map((shipmentItem, idx) => {
-      //           if (idx === splittedShipmentItems.length - 1) {
-      //             let shipments: any[] = shipmentItem.shipments
-
-      //             shipments = shipments.map(async shipment => {
-      //               if (shipment.marketplaceProductVariation.id === marketplaceProductVariation.id) {
-      //                 shipment.qty += marketplaceOrderItem.qty
-      //               } else {
-      //                 marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-      //                 marketplaceOrderItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping
-      //                 shipmentItem.shipments.push({ ...marketplaceOrderItem })
-      //               }
-
-      //               shipment.marketplaceOrderShipping.totalWeight = parseFloat(
-      //                 (lastTotalWeight + primaryValue).toFixed(2)
-      //               )
-      //               await tx.getRepository(MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping)
-      //             })
-
-      //             shipmentItem.totalWeight += primaryValue
-      //           }
-      //         })
-      //       } else {
-      //         let splittedShipment: any = {
-      //           shipments: [{ ...marketplaceOrderItem }],
-      //           totalWeight: primaryValue
-      //         }
-      //         splittedShipmentItems.push(splittedShipment)
-      //       }
-      //     }
-      //   }
-
-      //   let parcels: any[] = []
-
-      //   splittedShipmentItems.forEach(shipmentItem => {
-      //     parcels.push(
-      //       shipmentItem.shipments.map(shipment => {
-      //         return {
-      //           item_id: parseFloat(shipment.name),
-      //           variation_id: parseFloat(shipment.marketplaceProductVariation.variationId),
-      //           order_item_id: parseFloat(shipment.name),
-      //           promotion_group_id: 0
-      //         }
-      //       })
-      //     )
-      //   })
-
-      //   const splittedPackage: any = await StoreAPI.splitOrder(marketplaceStore, {
-      //     ordersn: marketplaceOrder.orderNo,
-      //     parcels
-      //   })
-
-      //   const packageLists: any[] = splittedPackage.packageList
-
-      //   for (let a: number = 0; a < packageLists.length; a++) {
-      //     const packageList: any = packageLists[a]
-      //     const packageNumber: string = packageList.packageNumber
-      //     const packageItems: any[] = packageList.items
-      //     for (let b: number = 0; b < marketplaceOrderItems.length; b++) {
-      //       let marketplaceOrderItem: any = marketplaceOrderItems[b]
-      //       if (packageItems.find(item => item.itemId === marketplaceOrderItem)) {
-      //         marketplaceOrderItem.packageId = packageNumber
-      //       }
-      //     }
-      //   }
-
-      //   await tx.getRepository(MarketplaceOrderItem).save(marketplaceOrderItems)
-      // } else {
-      //   let originalMarketplaceOrderShipping: MarketplaceOrderShipping = await tx
-      //     .getRepository(MarketplaceOrderShipping)
-      //     .findOne({
-      //       where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore }
-      //     })
-
-      //   const originalMarketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-      //   let newMarketplaceOrderItems: MarketplaceOrderItem[] = []
-      //   let splittedShipmentItems: any[] = []
-
-      //   for (let a: number = 0; a < originalMarketplaceOrderItems.length; a++) {
-      //     const marketplaceOrderItem: MarketplaceOrderItem = originalMarketplaceOrderItems[a]
-
-      //     for (let b: number = 0; b < marketplaceOrderItem.qty; b++) {
-      //       const newItem: MarketplaceOrderItem = {
-      //         ...marketplaceOrderItem,
-      //         qty: 1
-      //       }
-      //       newMarketplaceOrderItems.push(newItem)
-      //     }
-      //   }
-
-      //   newMarketplaceOrderItems.sort(function (a, b) {
-      //     if (a.marketplaceProductVariation.primaryUnitValue < b.marketplaceProductVariation.primaryUnitValue) return -1
-      //     if (a.marketplaceProductVariation.primaryUnitValue > b.marketplaceProductVariation.primaryUnitValue) return 1
-      //     return 0
-      //   })
-
-      //   for (let a: number = 0; a < newMarketplaceOrderItems.length; a++) {
-      //     const marketplaceOrderItem: MarketplaceOrderItem = newMarketplaceOrderItems[a]
-      //     const marketplaceProductVariation: MarketplaceProductVariation =
-      //       marketplaceOrderItem.marketplaceProductVariation
-      //     if (!marketplaceProductVariation.primaryUnitValue)
-      //       throw new Error(marketplaceProductVariation.variationSku + 'weight is empty')
-      //     const primaryUnitValue: number = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2))
-
-      //     delete marketplaceOrderItem.id
-
-      //     let newMarketplaceOrderShipping: MarketplaceOrderShipping = new MarketplaceOrderShipping()
-      //     newMarketplaceOrderShipping.name = NoGenerator.orderShipping()
-      //     newMarketplaceOrderShipping.address1 = originalMarketplaceOrderShipping.address1
-      //     newMarketplaceOrderShipping.address2 = originalMarketplaceOrderShipping.address2
-      //     newMarketplaceOrderShipping.address3 = originalMarketplaceOrderShipping.address3
-      //     newMarketplaceOrderShipping.address4 = originalMarketplaceOrderShipping.address4
-      //     newMarketplaceOrderShipping.address5 = originalMarketplaceOrderShipping.address5
-      //     newMarketplaceOrderShipping.attentionTo = originalMarketplaceOrderShipping.attentionTo
-      //     newMarketplaceOrderShipping.city = originalMarketplaceOrderShipping.city
-      //     newMarketplaceOrderShipping.country = originalMarketplaceOrderShipping.country
-      //     newMarketplaceOrderShipping.postCode = originalMarketplaceOrderShipping.postCode
-      //     newMarketplaceOrderShipping.phone1 = originalMarketplaceOrderShipping.phone1
-      //     newMarketplaceOrderShipping.phone2 = originalMarketplaceOrderShipping.phone2
-      //     newMarketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo
-      //     newMarketplaceOrderShipping.transporter = originalMarketplaceOrderShipping.transporter
-      //     newMarketplaceOrderShipping.marketplaceStore = marketplaceStore
-      //     newMarketplaceOrderShipping.creator = user
-      //     newMarketplaceOrderShipping.domain = marketplaceOrder.domain
-      //     newMarketplaceOrderShipping.weightUnit = 'KG'
-
-      //     if (splittedShipmentItems.length == 0) {
-      //       newMarketplaceOrderShipping.totalWeight = primaryUnitValue
-
-      //       newMarketplaceOrderShipping = await tx
-      //         .getRepository(MarketplaceOrderShipping)
-      //         .save(newMarketplaceOrderShipping)
-
-      //       marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-      //       marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
-
-      //       let splittedShipment: any = {
-      //         shipments: [{ ...marketplaceOrderItem }],
-      //         totalWeight: primaryUnitValue
-      //       }
-      //       splittedShipmentItems.push(splittedShipment)
-      //     } else {
-      //       let lastShipment: any = splittedShipmentItems[splittedShipmentItems.length - 1]
-      //       let lastTotalWeight: number = parseFloat(lastShipment.totalWeight.toFixed(2))
-      //       if (lastTotalWeight + primaryUnitValue < parseFloat(maxWeightSetting.value)) {
-      //         splittedShipmentItems.map((shipmentItem, idx) => {
-      //           if (idx === splittedShipmentItems.length - 1) {
-      //             let shipments: any[] = shipmentItem.shipments
-
-      //             shipments = shipments.map(async shipment => {
-      //               if (shipment.marketplaceProductVariation.id === marketplaceProductVariation.id) {
-      //                 shipment.qty += marketplaceOrderItem.qty
-      //               } else {
-      //                 marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-      //                 marketplaceOrderItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping
-      //                 shipmentItem.shipments.push({ ...marketplaceOrderItem })
-      //               }
-
-      //               shipment.marketplaceOrderShipping.totalWeight = parseFloat(
-      //                 (lastTotalWeight + primaryUnitValue).toFixed(2)
-      //               )
-      //               await tx.getRepository(MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping)
-      //             })
-
-      //             shipmentItem.totalWeight += primaryUnitValue
-      //           }
-      //         })
-      //       } else {
-      //         newMarketplaceOrderShipping.totalWeight = primaryUnitValue
-
-      //         newMarketplaceOrderShipping = await tx
-      //           .getRepository(MarketplaceOrderShipping)
-      //           .save(newMarketplaceOrderShipping)
-
-      //         marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-      //         marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
-
-      //         let splittedShipment: any = {
-      //           shipments: [{ ...marketplaceOrderItem }],
-      //           totalWeight: primaryUnitValue
-      //         }
-      //         splittedShipmentItems.push(splittedShipment)
-      //       }
-      //     }
-      //   }
-
-      //   let savedMarketplaceOrderItems: MarketplaceOrderItem[] = []
-      //   for (let a: number = 0; a < splittedShipmentItems.length; a++) {
-      //     const shipments: any[] = splittedShipmentItems[a].shipments
-      //     for (let b: number = 0; b < shipments.length; b++) {
-      //       savedMarketplaceOrderItems.push(shipments[b])
-      //     }
-      //   }
-
-      //   savedMarketplaceOrderItems = await tx.getRepository(MarketplaceOrderItem).save(savedMarketplaceOrderItems)
-
-      //   await tx.getRepository(MarketplaceOrderItem).delete(originalMarketplaceOrderItems.map(item => item.id))
-
-      //   await tx.getRepository(MarketplaceOrderShipping).delete(originalMarketplaceOrderShipping.id)
-      // }
-
       let marketplaceOrderShippings: MarketplaceOrderShipping[] = await tx
         .getRepository(MarketplaceOrderShipping)
         .find({ where: { domain, orderNoRef: marketplaceOrder.orderNo } })

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

@@ -117,8 +117,9 @@ export const syncAllMarketplaceOrder = {
                   'domain',
                   'fulfillmentCenter',
                   'marketplaceOrderItems',
-                  'marketplaceOrderItems.marketplaceProductVariation',
-                  'marketplaceOrderItems.marketplaceOrderShipping'
+                  'marketplaceOrderItems.marketplaceOrderShippingItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+                  'marketplaceOrderItems.marketplaceProductVariation'
                 ]
               })
 
@@ -236,7 +237,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 +323,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,
@@ -339,12 +342,18 @@ export const syncAllMarketplaceOrder = {
                   } else {
                     if (existingMarketplaceOrder?.marketplaceOrderItems) {
                       let existingOrderShipping: MarketplaceOrderShipping
-                      existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping
+                      existingOrderShipping =
+                        existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShippingItems[0]
+                          .marketplaceOrderShipping
 
                       marketplaceOrderShipping = {
                         ...existingOrderShipping,
                         ...marketplaceOrderShipping,
-                        trackingNo: order?.trackingNo ? order.trackingNo : existingOrderShipping.trackingNo,
+                        trackingNo: marketplaceOrderShipping?.trackingNo
+                          ? marketplaceOrderShipping.trackingNo
+                          : existingOrderShipping?.trackingNo
+                          ? existingOrderShipping.trackingNo
+                          : marketplaceOrderShipping.trackingNo,
                         updater: user
                       }
 
@@ -364,10 +373,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)
                 }
@@ -393,9 +407,8 @@ export const syncAllMarketplaceOrder = {
                 marketplaceOrderItem.status = marketplaceOrder.status
                 marketplaceOrderItem.docRefNo = item.docRefNo
                 marketplaceOrderItem.marketplaceProductVariation = foundVariation
-                marketplaceOrderItem.marketplaceOrder = marketplaceOrder
                 marketplaceOrderItem.trackingCode = order.trackingNo
-                marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
+                marketplaceOrderItem.marketplaceOrder = marketplaceOrder
                 marketplaceOrderItem.originalPrice = item.originalPrice
                 marketplaceOrderItem.discount = item.discount
                 marketplaceOrderItem.promotionId = item.promotionId
@@ -416,7 +429,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 })
 
@@ -665,11 +678,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)