@things-factory/marketplace-base 4.1.2 → 4.1.8

package/server/entities/index.ts

@@ -1,15 +1,16 @@
-import { MarketplaceProductVariationPrice } from './marketplace-product-variation-price'
-import { StoreReplenishment } from './store-replenishment'
-import { StoreReplenishmentItem } from './store-replenishment-item'
 import { MarketplaceOrder } from './marketplace-order'
 import { MarketplaceOrderItem } from './marketplace-order-item'
 import { MarketplaceOrderShipping } from './marketplace-order-shipping'
+import { MarketplaceOrderShippingItem } from './marketplace-order-shipping-item'
 import { MarketplaceProduct } from './marketplace-product'
 import { MarketplaceProductAttribute } from './marketplace-product-attribute'
 import { MarketplaceProductCategory } from './marketplace-product-category'
 import { MarketplaceProductVariation } from './marketplace-product-variation'
-import { MarketplaceRefundOrderItem } from './marketplace-refund-order-item'
+import { MarketplaceProductVariationPrice } from './marketplace-product-variation-price'
 import { MarketplaceRefundOrder } from './marketplace-refund-order'
+import { MarketplaceRefundOrderItem } from './marketplace-refund-order-item'
+import { StoreReplenishment } from './store-replenishment'
+import { StoreReplenishmentItem } from './store-replenishment-item'
 
 export const entities = [
   MarketplaceProductVariationPrice,
@@ -23,20 +24,22 @@ export const entities = [
   MarketplaceOrderItem,
   MarketplaceOrderShipping,
   MarketplaceRefundOrder,
-  MarketplaceRefundOrderItem
+  MarketplaceRefundOrderItem,
+  MarketplaceOrderShippingItem
 ]
 
 export {
-  MarketplaceProductVariationPrice,
-  StoreReplenishment,
-  StoreReplenishmentItem,
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem,
   MarketplaceProduct,
   MarketplaceProductAttribute,
   MarketplaceProductCategory,
   MarketplaceProductVariation,
-  MarketplaceOrder,
-  MarketplaceOrderItem,
-  MarketplaceOrderShipping,
+  MarketplaceProductVariationPrice,
   MarketplaceRefundOrder,
-  MarketplaceRefundOrderItem
+  MarketplaceRefundOrderItem,
+  StoreReplenishment,
+  StoreReplenishmentItem
 }

package/server/entities/marketplace-order-item.ts

@@ -1,9 +1,18 @@
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 
-import { MarketplaceOrder, MarketplaceOrderShipping, MarketplaceProductVariation } from '../entities'
+import { MarketplaceOrder, MarketplaceOrderShippingItem, MarketplaceProductVariation } from '../entities'
 
 @Entity()
 @Index(
@@ -24,8 +33,11 @@ export class MarketplaceOrderItem {
   @ManyToOne(type => MarketplaceOrder)
   marketplaceOrder: MarketplaceOrder
 
-  @ManyToOne(type => MarketplaceOrderShipping)
-  marketplaceOrderShipping: MarketplaceOrderShipping
+  @OneToMany(
+    type => MarketplaceOrderShippingItem,
+    marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderItem
+  )
+  marketplaceOrderShippingItems: MarketplaceOrderShippingItem[]
 
   @Column()
   name: string
@@ -45,7 +57,7 @@ export class MarketplaceOrderItem {
   @Column({ type: 'float', nullable: true })
   originalPrice: number
 
-  @Column({ type: 'float',  nullable: true })
+  @Column({ type: 'float', nullable: true })
   discount: number
 
   @Column({ nullable: true })

package/server/entities/marketplace-order-shipping-item.ts

@@ -0,0 +1,55 @@
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Product } from '@things-factory/product-base'
+import { Domain } from '@things-factory/shell'
+
+import { MarketplaceOrderItem, MarketplaceOrderShipping } from '../entities'
+
+@Entity()
+@Index(
+  'ix_marketplace-order-shipping-item_0',
+  (marketplaceOrderShippingItem: MarketplaceOrderShippingItem) => [
+    marketplaceOrderShippingItem.domain,
+    marketplaceOrderShippingItem.name
+  ],
+  { unique: true }
+)
+export class MarketplaceOrderShippingItem {
+  @PrimaryGeneratedColumn('uuid')
+  id: string
+
+  @ManyToOne(type => Domain)
+  domain: Domain
+
+  @ManyToOne(type => MarketplaceOrderItem)
+  marketplaceOrderItem: MarketplaceOrderItem
+
+  @ManyToOne(type => MarketplaceOrderShipping)
+  marketplaceOrderShipping: MarketplaceOrderShipping
+
+  @ManyToOne(type => Product, { nullable: true })
+  product: Product
+
+  @Column()
+  name: string
+
+  @Column({ type: 'int', nullable: true })
+  qty: number
+
+  @CreateDateColumn()
+  createdAt: Date
+
+  @UpdateDateColumn()
+  updatedAt: Date
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  creator: User
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  updater: User
+}

package/server/entities/marketplace-order-shipping.ts

@@ -14,7 +14,7 @@ import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Domain } from '@things-factory/shell'
 
-import { MarketplaceOrderItem } from '../entities'
+import { MarketplaceOrderShippingItem } from '../entities'
 
 @Entity()
 @Index(
@@ -35,8 +35,11 @@ export class MarketplaceOrderShipping {
   @Column()
   name: string
 
-  @OneToMany(type => MarketplaceOrderItem, marketplaceOrderItem => marketplaceOrderItem.marketplaceOrderShipping)
-  marketplaceOrderItems: MarketplaceOrderItem[]
+  @OneToMany(
+    type => MarketplaceOrderShippingItem,
+    marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderShipping
+  )
+  marketplaceOrderShippingItems: MarketplaceOrderShippingItem[]
 
   @ManyToOne(type => MarketplaceStore)
   marketplaceStore: MarketplaceStore
@@ -161,6 +164,9 @@ export class MarketplaceOrderShipping {
   @ManyToOne(type => FulfillmentCenter, { nullable: true })
   fulfillmentCenter: FulfillmentCenter
 
+  @Column({ nullable: true })
+  trackingUrl: String
+
   @CreateDateColumn()
   createdAt: Date
 

package/server/graphql/resolvers/index.ts

@@ -1,6 +1,7 @@
 export * from './marketplace-order'
 export * from './marketplace-order-item'
 export * from './marketplace-order-shipping'
+export * from './marketplace-order-shipping-item'
 export * from './marketplace-product'
 export * from './marketplace-product-attribute'
 export * from './marketplace-product-category'

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

@@ -29,8 +29,9 @@ export const autoInitialiseLogisticsByBatch = {
           },
           relations: [
             'marketplaceOrderItems',
-            'marketplaceOrderItems.marketplaceProductVariation',
-            'marketplaceOrderItems.marketplaceOrderShipping'
+            'marketplaceOrderItems.marketplaceOrderShippingItems',
+            'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+            'marketplaceOrderItems.marketplaceProductVariation'
           ]
         })
       } else {
@@ -44,8 +45,9 @@ export const autoInitialiseLogisticsByBatch = {
             },
             relations: [
               'marketplaceOrderItems',
-              'marketplaceOrderItems.marketplaceProductVariation',
-              'marketplaceOrderItems.marketplaceOrderShipping'
+              'marketplaceOrderItems.marketplaceOrderShippingItems',
+              'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+              'marketplaceOrderItems.marketplaceProductVariation'
             ]
           })
         } else {
@@ -57,8 +59,9 @@ export const autoInitialiseLogisticsByBatch = {
             },
             relations: [
               'marketplaceOrderItems',
-              'marketplaceOrderItems.marketplaceProductVariation',
-              'marketplaceOrderItems.marketplaceOrderShipping'
+              'marketplaceOrderItems.marketplaceOrderShippingItems',
+              'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+              'marketplaceOrderItems.marketplaceProductVariation'
             ]
           })
         }

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

@@ -4,7 +4,12 @@ import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketpl
 import { Domain } from '@things-factory/shell'
 
 import { MARKETPLACE_PLATFORM, ORDER_STATUS } from '../../../constants'
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} from '../../../entities'
 
 export const autoUpdateOrderReadyToShip = {
   async autoUpdateOrderReadyToShip(_: any, { companyDomainId }, context: any) {
@@ -27,7 +32,8 @@ export const autoUpdateOrderReadyToShip = {
         },
         relations: [
           'marketplaceOrderItems',
-          'marketplaceOrderItems.marketplaceOrderShipping',
+          'marketplaceOrderItems.marketplaceOrderShippingItems',
+          'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
           'marketplaceOrderItems.marketplaceProductVariation'
         ]
       })
@@ -43,9 +49,12 @@ export const autoUpdateOrderReadyToShip = {
         let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
 
         marketplaceOrder.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(
@@ -90,7 +99,8 @@ export const autoUpdateOrderReadyToShip = {
             shipmentProvider: shippingProvider,
             deliveryType,
             orderItemId,
-            trackingNo
+            trackingNo,
+            orderId: marketplaceOrder.name
           })
         }
 

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

@@ -1,13 +1,16 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, IsNull } from 'typeorm'
+import uuid from 'uuid/v4'
 
 import { User } from '@things-factory/auth-base'
 import { MarketplaceStore as MarketplaceStoreEntity } from '@things-factory/integration-marketplace'
+import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import {
   MarketplaceOrder as MarketplaceOrderEntity,
   MarketplaceOrderItem as MarketplaceOrderItemEntity,
   MarketplaceOrderShipping as MarketplaceOrderShippingEntity,
+  MarketplaceOrderShippingItem as MarketplaceOrderShippingItemEntity,
   MarketplaceProductVariation as MarketplaceProductVariationEntity
 } from '../../../entities'
 import { NoGenerator } from '../../../utils/no-generator'
@@ -47,7 +50,7 @@ export async function generateMarketplaceOrder(
   const itemCount: number = marketplaceOrder.marketplaceOrderItems?.length
 
   newMarketplaceOrder.name = marketplaceOrder?.name ? marketplaceOrder.name : NoGenerator.marketplaceOrder()
-  marketplaceOrder.itemCount = itemCount
+  newMarketplaceOrder.itemCount = itemCount
   newMarketplaceOrder.marketplaceStore = marketplaceStore
   newMarketplaceOrder.domain = domain
   newMarketplaceOrder.creator = user
@@ -92,8 +95,67 @@ export async function generateMarketplaceOrder(
         foundVariation = newVariation
       }
 
+      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']
+        })
+      }
+
+      let existingMarketplaceOrderItem: MarketplaceOrderItemEntity = await tx
+        .getRepository(MarketplaceOrderItemEntity)
+        .findOne({
+          where: { domain: marketplaceStore.domain, name: orderItem.orderItemId }
+        })
+
+      let existingMarketplaceOrderShippingItems: MarketplaceOrderShippingItemEntity[] = []
+
+      if (existingMarketplaceOrderItem) {
+        existingMarketplaceOrderShippingItems = await tx.getRepository(MarketplaceOrderShippingItemEntity).find({
+          where: { domain: marketplaceStore.domain, marketplaceOrderItem: existingMarketplaceOrderItem }
+        })
+      }
+
+      if (existingMarketplaceOrderShippingItems && existingMarketplaceOrderShippingItems?.length) {
+      } else {
+        if (productBundle) {
+          const productBundleSettings: ProductBundleSetting[] = productBundle.productBundleSettings
+          let marketplaceOrderShippingItems: MarketplaceOrderShippingItemEntity[] = []
+          productBundleSettings.map(productBundleSetting => {
+            let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
+              new MarketplaceOrderShippingItemEntity()
+            marketplaceOrderShippingItem.name = uuid()
+            marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty
+            marketplaceOrderShippingItem.domain = marketplaceStore.domain
+            marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+            marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping
+            marketplaceOrderShippingItem.product = productBundleSetting.product
+
+            marketplaceOrderShippingItems.push(marketplaceOrderShippingItem)
+          })
+
+          await tx.getRepository(MarketplaceOrderShippingItemEntity).save(marketplaceOrderShippingItems)
+        } else {
+          let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
+            new MarketplaceOrderShippingItemEntity()
+          marketplaceOrderShippingItem.name = uuid()
+          marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty
+          marketplaceOrderShippingItem.domain = marketplaceStore.domain
+          marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+          marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping
+          marketplaceOrderShippingItem.product = product ? product : null
+
+          await tx.getRepository(MarketplaceOrderShippingItemEntity).save(marketplaceOrderShippingItem)
+        }
+      }
+
       marketplaceOrderItem.marketplaceProductVariation = foundVariation
-      if (newMarketplaceOrderShipping) marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
       marketplaceOrderItem.name = orderItem.orderItemId
       marketplaceOrderItem.marketplaceOrder = newMarketplaceOrder
       marketplaceOrderItem.domain = domain

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

@@ -1,4 +1,5 @@
 import { EntityManager, In } from 'typeorm'
+
 import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
 
 export const getETraxOrderDocumentResolver = {
@@ -17,7 +18,8 @@ export async function getETraxOrderDocumentFunction(orderNo: string[], context:
       'marketplaceStore',
       'marketplaceOrderItems',
       'marketplaceOrderItems.marketplaceOrder',
-      'marketplaceOrderItems.marketplaceOrderShipping'
+      'marketplaceOrderItems.marketplaceOrderShippingItems',
+      'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
     ]
   })
   if (foundMarketplaceOrders?.length === 0) throw new Error('No order is found')
@@ -29,7 +31,8 @@ export async function getETraxOrderDocumentFunction(orderNo: string[], context:
   let airwayBills: any[] = []
   marketplaceOrderItems.map((item: any) => {
     const orderNo: string = item[0].marketplaceOrder.orderNo
-    const marketplaceOrderShipping: MarketplaceOrderShipping = item[0].marketplaceOrderShipping
+    const marketplaceOrderShipping: MarketplaceOrderShipping =
+      item[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping
     if (marketplaceOrderShipping) {
       const airwayBill: string = marketplaceOrderShipping.airwayBill
       if (airwayBill != null) {

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/initialise-logistics-by-batch.ts

@@ -27,6 +27,8 @@ export const initialiseLogisticsByBatch = {
         marketplaceOrderShipping.trackingNo = patch?.trackingNo
         marketplaceOrderShipping.transporter = patch?.shippingProvider
         marketplaceOrderShipping.ownTransporter = patch?.shippingProvider
+        marketplaceOrderShipping.ownTrackingNo = patch.ownTrackingNo || patch?.trackingNo
+        marketplaceOrderShipping.trackingUrl = patch?.trackingUrl
         await tx.getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
 
         marketplaceOrder.shippingProvider = patch?.shippingProvider

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')