@things-factory/marketplace-base 4.1.3 → 4.1.10

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'
@@ -117,8 +119,9 @@ export const syncAllMarketplaceOrder = {
                   'domain',
                   'fulfillmentCenter',
                   'marketplaceOrderItems',
-                  'marketplaceOrderItems.marketplaceProductVariation',
-                  'marketplaceOrderItems.marketplaceOrderShipping'
+                  'marketplaceOrderItems.marketplaceOrderShippingItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+                  'marketplaceOrderItems.marketplaceProductVariation'
                 ]
               })
 
@@ -194,7 +197,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 +221,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 +243,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 +329,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 +348,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 +379,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 +413,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 +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 })
 
@@ -436,7 +455,6 @@ export const syncAllMarketplaceOrder = {
                     return {
                       ...marketplaceOrderitem,
                       status: order.status,
-                      marketplaceProductVariation: foundVariation,
                       trackingCode: order.trackingNo
                     }
                   })
@@ -665,11 +683,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)
@@ -683,8 +700,6 @@ export const syncAllMarketplaceOrder = {
                       )
                     }
 
-                    foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
-
                     if (order?.orderShipping) {
                       savedMarketplaceOrderShipping.totalWeight = orderTotalWeight
                       savedMarketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).save(
@@ -698,6 +713,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
               }

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

@@ -1,4 +1,5 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, 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'
@@ -100,8 +102,9 @@ export const syncMarketplaceOrder = {
             'domain',
             'fulfillmentCenter',
             'marketplaceOrderItems',
-            'marketplaceOrderItems.marketplaceProductVariation',
-            'marketplaceOrderItems.marketplaceOrderShipping'
+            'marketplaceOrderItems.marketplaceOrderShippingItems',
+            'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+            'marketplaceOrderItems.marketplaceProductVariation'
           ]
         })
 
@@ -173,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
@@ -195,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
@@ -317,7 +324,9 @@ export const syncMarketplaceOrder = {
             } else {
               if (existingMarketplaceOrder?.marketplaceOrderItems) {
                 let existingOrderShipping: MarketplaceOrderShipping
-                existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping
+                existingOrderShipping =
+                  existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShippingItems[0]
+                    .marketplaceOrderShipping
 
                 marketplaceOrderShipping = {
                   ...existingOrderShipping,
@@ -346,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)
           }
@@ -378,7 +389,6 @@ export const syncMarketplaceOrder = {
           marketplaceOrderItem.marketplaceProductVariation = foundVariation
           marketplaceOrderItem.trackingCode = order.trackingNo
           marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-          marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
           marketplaceOrderItem.originalPrice = item.originalPrice
           marketplaceOrderItem.discount = item.discount
           marketplaceOrderItem.promotionId = item.promotionId
@@ -419,7 +429,6 @@ export const syncMarketplaceOrder = {
               return {
                 ...marketplaceOrderitem,
                 status: order.status,
-                marketplaceProductVariation: foundVariation,
                 trackingCode: order.trackingNo
               }
             })
@@ -676,6 +685,61 @@ export const syncMarketplaceOrder = {
         await tx.getRepository(MarketplaceOrder).save(marketplaceOrder)
         await tx.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 tx
+            .getRepository(MarketplaceOrderShippingItem)
+            .find({
+              where: { domain: marketplaceStore.domain, marketplaceOrderItem }
+            })
+
+          let product: Product = await tx.getRepository(Product).findOne({
+            where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku, deletedAt: IsNull() },
+            relations: ['productDetails']
+          })
+
+          let productBundle: ProductBundle
+          if (!product) {
+            productBundle = await tx.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 tx.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 tx.getRepository(MarketplaceOrderShippingItem).save(marketplaceOrderShippingItem)
+            }
+          }
+        }
+
         if (i == marketplaceOrders.length - 1) {
           lastOrderId = order.name
         }

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

@@ -1,18 +1,28 @@
 import { EntityManager } from 'typeorm'
 
 import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
+import { Domain } from '@things-factory/shell'
 
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} 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',
-        'marketplaceOrderItems.marketplaceOrderShipping',
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
         'marketplaceOrderItems.marketplaceProductVariation'
       ]
     })
@@ -25,54 +35,82 @@ export const updateOrderReadyToShip = {
     let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
 
     foundMarketplaceOrder.marketplaceOrderItems.map(item => {
-      if (item?.marketplaceOrderShipping) {
-        marketplaceOrderShippings.push(item.marketplaceOrderShipping)
-      }
+      const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = item.marketplaceOrderShippingItems
+      marketplaceOrderShippingItems.map(itm => {
+        if (itm?.marketplaceOrderShipping) {
+          marketplaceOrderShippings.push(itm.marketplaceOrderShipping)
+        }
+      })
     })
 
     const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
       return marketplaceOrderShippings.find(a => a.id === id)
     })
 
-    if (uniqueMarketplaceOrderShippings.some(marketplaceOrderShipping => marketplaceOrderShipping.trackingNo != null)) {
-      uniqueMarketplaceOrderShippings.map((orderShipping: MarketplaceOrderShipping) => {
-        if (orderShipping?.trackingNo) {
-          const trackingNoInfo: any[] = JSON.parse(orderShipping.trackingNo)
-          const orderTrackingNos: string[] = trackingNoInfo.map(item => item.tracking_code)
-          const uniqueTrackingNos = [...new Set(orderTrackingNos)]
-
-          let orderItemIds: string[] = []
-
-          if (uniqueTrackingNos?.length == 1) {
-            orderItemIds = trackingNoInfo.map(item => item.order_item_id)
-            trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] })
-          } else {
-            uniqueTrackingNos.map(trackingNo => {
-              orderItemIds = trackingNoInfo
-                .filter(info => info.tracking_code === trackingNo)
-                .map(filteredInfo => filteredInfo.order_item_id)
-
-              trackingInfoArr.push({ orderItemIds, trackingNo })
-            })
+    if (marketplaceStore.platform === 'lazada') {
+      if (
+        uniqueMarketplaceOrderShippings.some(marketplaceOrderShipping => marketplaceOrderShipping.trackingNo != null)
+      ) {
+        uniqueMarketplaceOrderShippings.map((orderShipping: MarketplaceOrderShipping) => {
+          if (orderShipping?.trackingNo) {
+            const trackingNoInfo: any[] = JSON.parse(orderShipping.trackingNo)
+            const orderTrackingNos: string[] = trackingNoInfo.map(item => item.tracking_code)
+            const uniqueTrackingNos = [...new Set(orderTrackingNos)]
+
+            let orderItemIds: string[] = []
+
+            if (uniqueTrackingNos?.length == 1) {
+              orderItemIds = trackingNoInfo.map(item => item.order_item_id)
+              trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] })
+            } else {
+              uniqueTrackingNos.map(trackingNo => {
+                orderItemIds = trackingNoInfo
+                  .filter(info => info.tracking_code === trackingNo)
+                  .map(filteredInfo => filteredInfo.order_item_id)
+
+                trackingInfoArr.push({ orderItemIds, trackingNo })
+              })
+            }
           }
-        }
-      })
-    }
-
-    for (var i = 0; i < trackingInfoArr?.length; i++) {
-      const trackingInfo = trackingInfoArr[i]
-      const trackingNo = trackingInfo.trackingNo
-      const orderItemId = trackingInfo.orderItemIds
+        })
+      }
 
-      await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
-        shipmentProvider: shippingProvider,
-        deliveryType,
-        orderItemId,
-        trackingNo
-      })
+      for (var i = 0; i < trackingInfoArr?.length; i++) {
+        const trackingInfo = trackingInfoArr[i]
+        const trackingNo = trackingInfo.trackingNo
+        const orderItemId = trackingInfo.orderItemIds
+
+        const res = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
+          shipmentProvider: shippingProvider,
+          deliveryType,
+          orderItemId,
+          trackingNo
+        })
+      }
+    } else {
+      let mos = uniqueMarketplaceOrderShippings.filter(mos => mos.trackingNo != null || mos.ownTrackingNo != null)
+      if (mos.length > 0) {
+        let trackingNo = mos[0].ownTrackingNo
+        const note = mos[0].trackingUrl || trackingNo
+
+        const res = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
+          orderId,
+          trackingUrl: mos[0].trackingUrl || '',
+          trackingNo,
+          order: foundMarketplaceOrder,
+          note
+        })
+
+        if (marketplaceStore.platform === 'woocommerce') {
+          await StoreAPI.updateOrderStatus(marketplaceStore, {
+            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-shipping.ts

@@ -1,20 +1,25 @@
 import { getRepository } from 'typeorm'
+
 import { MarketplaceOrderShipping } from '../../../entities'
 
 export const marketplaceOrderShippingResolver = {
   async marketplaceOrderShipping(_: any, { name }, context: any) {
     const repository = getRepository(MarketplaceOrderShipping)
 
-    return await getRepository(MarketplaceOrderShipping).findOne({
+    const items: MarketplaceOrderShipping = await repository.findOne({
       where: { domain: context.state.domain, name },
       relations: [
         'domain',
         'creator',
         'updater',
-        'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceProductVariation',
-        'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct'
+        'marketplaceOrderShippingItems',
+        'marketplaceOrderShippingItems.product',
+        'marketplaceOrderShippingItems.marketplaceOrderItem',
+        'marketplaceOrderShippingItems.marketplaceOrderItem.marketplaceProductVariation',
+        'marketplaceOrderShippingItems.marketplaceOrderItem.marketplaceProductVariation.marketplaceProduct'
       ]
     })
+
+    return items
   }
 }

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-order-shipping-item/create-marketplace-order-shipping-item.ts

@@ -0,0 +1,14 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const createMarketplaceOrderShippingItem = {
+  async createMarketplaceOrderShippingItem(_: any, { marketplaceOrderShippingItem }, context: any) {
+    return await getRepository(MarketplaceOrderShippingItem).save({
+      ...marketplaceOrderShippingItem,
+      domain: context.state.domain,
+      creator: context.state.user,
+      updater: context.state.user
+    })
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-item.ts

@@ -0,0 +1,10 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const deleteMarketplaceOrderShippingItem = {
+  async deleteMarketplaceOrderShippingItem(_: any, { name }, context: any) {
+    await getRepository(MarketplaceOrderShippingItem).delete({ domain: context.state.domain, name })
+    return true
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/delete-marketplace-order-shipping-items.ts

@@ -0,0 +1,13 @@
+import { getRepository, In } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const deleteMarketplaceOrderShippingItems = {
+  async deleteMarketplaceOrderShippingItems(_: any, { names }, context: any) {
+    await getRepository(MarketplaceOrderShippingItem).delete({
+      domain: context.state.domain,
+      name: In(names)
+    })
+    return true
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/index.ts

@@ -0,0 +1,20 @@
+import { createMarketplaceOrderShippingItem } from './create-marketplace-order-shipping-item'
+import { deleteMarketplaceOrderShippingItem } from './delete-marketplace-order-shipping-item'
+import { deleteMarketplaceOrderShippingItems } from './delete-marketplace-order-shipping-items'
+import { marketplaceOrderShippingItemResolver } from './marketplace-order-shipping-item'
+import { updateMarketplaceOrderShippingItem } from './update-marketplace-order-shipping-item'
+import { updateMultipleMarketplaceOrderShippingItem } from './update-multiple-marketplace-order-shipping-item'
+
+export const MarketplaceOrderShippingItemResolver = {
+  Query: {
+    ...marketplaceOrderShippingItemResolver,
+    ...marketplaceOrderShippingItemResolver
+  },
+  Mutation: {
+    ...updateMarketplaceOrderShippingItem,
+    ...updateMultipleMarketplaceOrderShippingItem,
+    ...createMarketplaceOrderShippingItem,
+    ...deleteMarketplaceOrderShippingItem,
+    ...deleteMarketplaceOrderShippingItems
+  }
+}

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

@@ -0,0 +1,21 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const marketplaceOrderShippingItemResolver = {
+  async marketplaceOrderShippingItem(_: any, { name }, context: any) {
+    const repository = getRepository(MarketplaceOrderShippingItem)
+
+    return await getRepository(MarketplaceOrderShippingItem).findOne({
+      where: { domain: context.state.domain, name },
+      relations: [
+        'domain',
+        'creator',
+        'updater',
+        'marketplaceOrderItem',
+        'marketplaceOrderItem.marketplaceProductVariation',
+        'marketplaceOrderItem.marketplaceProductVariation.marketplaceProduct'
+      ]
+    })
+  }
+}