@things-factory/marketplace-base 4.1.3 → 4.1.4

package/server/graphql/resolvers/marketplace-order/get-order-document.ts

@@ -1,6 +1,13 @@
-import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
 import { EntityManager, In } from 'typeorm'
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
+
+import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
+
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} from '../../../entities'
 import { getETraxOrderDocumentFunction } from '../marketplace-order'
 
 export const getOrderDocumentResolver = {
@@ -8,7 +15,12 @@ export const getOrderDocumentResolver = {
     const { tx }: { tx: EntityManager } = context.state
     const foundMarketplaceOrders: MarketplaceOrder[] = await tx.getRepository(MarketplaceOrder).find({
       where: { orderNo: In(orderNo) },
-      relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
+      relations: [
+        'marketplaceStore',
+        'marketplaceOrderItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+      ]
     })
     if (foundMarketplaceOrders?.length === 0) throw new Error('No order is found')
 
@@ -78,11 +90,14 @@ export const getOrderDocumentResolver = {
 
       let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
       marketplaceOrderItems.map((item, idx) => {
-        const marketplaceOrderShipping = item[idx].marketplaceOrderShipping
+        const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = item[idx].marketplaceOrderShippingItems
+        marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
+          const marketplaceOrderShipping = marketplaceOrderShippingItem.marketplaceOrderShipping
 
-        if (marketplaceOrderShipping) {
-          marketplaceOrderShippings.push(marketplaceOrderShipping)
-        }
+          if (marketplaceOrderShipping) {
+            marketplaceOrderShippings.push(marketplaceOrderShipping)
+          }
+        })
       })
 
       let uniqueMarketplaceOrderShippings: MarketplaceOrderShipping[] = Array.from(

package/server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts

@@ -1,5 +1,6 @@
 import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
+
+import { MarketplaceOrder, MarketplaceOrderItem } from '../../../entities'
 
 export const initialiseLazadaLogisticsByBatch = {
   async initialiseLazadaLogisticsByBatch(_: any, { patches }, context: any) {
@@ -12,7 +13,8 @@ export const initialiseLazadaLogisticsByBatch = {
             relations: [
               'marketplaceStore',
               'marketplaceOrderItems',
-              'marketplaceOrderItems.marketplaceOrderShipping',
+              'marketplaceOrderItems.marketplaceOrderShippingItems',
+              'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
               'marketplaceOrderItems.marketplaceProductVariation'
             ]
           })

package/server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.ts

@@ -1,5 +1,7 @@
-import { convertListParams, ListParam } from '@things-factory/shell'
 import { getRepository } from 'typeorm'
+
+import { convertListParams, ListParam } from '@things-factory/shell'
+
 import { MarketplaceOrder } from '../../../entities'
 import { getLogisticsParam } from '../marketplace-order/get-logistics-param'
 
@@ -15,8 +17,9 @@ export const marketplaceOrdersForBatchInitResolver = {
         'domain',
         'marketplaceStore',
         'marketplaceOrderItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
         'marketplaceOrderItems.marketplaceProductVariation',
-        'marketplaceOrderItems.marketplaceOrderShipping',
         'creator',
         'updater'
       ]

package/server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.ts

@@ -1,5 +1,6 @@
 import { getRepository, In } from 'typeorm'
-import { MarketplaceOrder, MarketplaceOrderItem } from '../../../entities'
+
+import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShippingItem } from '../../../entities'
 
 export const marketplaceOrdersForExport = {
   async marketplaceOrdersForExport(_: any, { orderNos }, context: any) {
@@ -8,7 +9,8 @@ export const marketplaceOrdersForExport = {
       relations: [
         'marketplaceStore',
         'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceOrderShipping',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
         'marketplaceOrderItems.marketplaceProductVariation'
       ]
     })
@@ -27,8 +29,10 @@ export const marketplaceOrdersForExport = {
         const updatedAt = order.orderUpdatedAt
 
         mergedOrder = marketplaceOrderItems.map(orderItem => {
+          const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = orderItem.marketplaceOrderShippingItems
+
           const variationName: string = orderItem.marketplaceProductVariation.name
-          const marketplaceOrderShipping = orderItem.marketplaceOrderShipping
+          const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping
           const sku: string = orderItem.marketplaceProductVariation.sku
           const itemQty: number = orderItem.qty
           const trackingNo: string = marketplaceOrderShipping?.trackingNo

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

@@ -25,9 +25,10 @@ export const marketplaceOrdersResolver = {
     qb.leftJoinAndSelect('mo.domain', 'domain')
       .leftJoinAndSelect('mo.marketplaceStore', 'ms')
       .leftJoinAndSelect('mo.marketplaceOrderItems', 'mi')
+      .leftJoinAndSelect('mi.marketplaceOrderShippingItems', 'mosi')
       .leftJoinAndSelect('mi.marketplaceProductVariation', 'mpv')
       .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
-      .leftJoinAndSelect('mi.marketplaceOrderShipping', 'mos')
+      .leftJoinAndSelect('mosi.marketplaceOrderShipping', 'mos')
       .leftJoinAndSelect('mo.creator', 'creator')
       .leftJoinAndSelect('mo.updater', 'updater')
 

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

@@ -339,7 +339,9 @@ export const syncAllMarketplaceOrder = {
                   } else {
                     if (existingMarketplaceOrder?.marketplaceOrderItems) {
                       let existingOrderShipping: MarketplaceOrderShipping
-                      existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping
+                      existingOrderShipping =
+                        existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShippingItems[0]
+                          .marketplaceOrderShipping
 
                       marketplaceOrderShipping = {
                         ...existingOrderShipping,
@@ -395,7 +397,6 @@ export const syncAllMarketplaceOrder = {
                 marketplaceOrderItem.marketplaceProductVariation = foundVariation
                 marketplaceOrderItem.marketplaceOrder = marketplaceOrder
                 marketplaceOrderItem.trackingCode = order.trackingNo
-                marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
                 marketplaceOrderItem.originalPrice = item.originalPrice
                 marketplaceOrderItem.discount = item.discount
                 marketplaceOrderItem.promotionId = item.promotionId