@things-factory/marketplace-base 4.3.460 → 4.3.464

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

@@ -7,7 +7,8 @@ import {
   MarketplaceOrder,
   MarketplaceOrderItem,
   MarketplaceOrderShipping,
-  MarketplaceOrderShippingItem
+  MarketplaceOrderShippingItem,
+  MarketplaceOrderPackage
 } from '../../../entities'
 import { getETraxOrderDocumentFunction } from '../marketplace-order'
 
@@ -23,142 +24,134 @@ export const getOrderDocumentResolver = {
         'marketplaceStore',
         'marketplaceOrderItems',
         'marketplaceOrderItems.marketplaceOrderShippingItems',
-        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+        'marketplaceOrderPackages',
+        'marketplaceOrderPackages.marketplaceOrderPackageItems'
       ]
     })
     if (foundMarketplaceOrders?.length === 0) throw new Error('No order is found')
 
-    let orderDocument: any[] = []
-    // 1. check marketplace store has etrax option?
-    const eTraxOption: boolean = foundMarketplaceOrders[0].marketplaceStore.eTrax
-
-    if (eTraxOption) {
-      orderDocument = await getETraxOrderDocumentFunction(orderNo, context, tx)
-    } else {
-      const marketplaceOrderItems: MarketplaceOrderItem[] = foundMarketplaceOrders.map(
-        (order: any) => order.marketplaceOrderItems
-      )
-
-      // let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
-      // marketplaceOrderItems.map((item, idx) => {
-      //   const marketplaceOrderShipping = item[idx].marketplaceOrderShipping
-
-      //   if (marketplaceOrderShipping) {
-      //     marketplaceOrderShippings.push(marketplaceOrderShipping)
-      //   }
-      // })
-
-      // const uniqueMarketplaceOrderShippings: MarketplaceOrderShipping[] = Array.from(
-      //   new Set(marketplaceOrderShippings.map(a => a.id))
-      // ).map(id => {
-      //   return marketplaceOrderShippings.find(a => a.id === id)
-      // })
-
-      // if (uniqueMarketplaceOrderShippings.length > 0) {
-      //   uniqueMarketplaceOrderShippings.map((marketplaceOrderShipping: MarketplaceOrderShipping) => {
-      //     if (docType === 'invoice') {
-      //       if (marketplaceOrderShipping?.invoice) {
-      //         const invoice: any = {
-      //           airwayBill: marketplaceOrderShipping.invoice,
-      //           file: marketplaceOrderShipping.invoice
-      //         }
-      //         orderDocument.push(invoice)
-      //       }
-      //     } else {
-      //       if (marketplaceOrderShipping?.airwayBill) {
-      //         const airwayBill: any = {
-      //           airwayBill: marketplaceOrderShipping.airwayBill,
-      //           file: marketplaceOrderShipping.airwayBill
-      //         }
-      //         orderDocument.push(airwayBill)
-      //       }
-      //     }
-      //   })
-      let docRefNo: any[] = []
-      marketplaceOrderItems.map((item: any) => {
-        let orderDocNo: any[] = []
-        orderDocNo = item.map(oi => oi.docRefNo)
-        if (orderDocNo[0].indexOf(',') > -1) {
-          orderDocNo = orderDocNo[0].split(',')
-        }
-        Array.prototype.push.apply(docRefNo, orderDocNo)
-      })
-
-      // remove repeated docRefNo
-      docRefNo = docRefNo.filter((value, index) => docRefNo.indexOf(value) === index)
-
-      const storeId = foundMarketplaceOrders.map((order: MarketplaceOrder) => order.marketplaceStore.id)
-      const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId[0])
+    for (let i = 0; i < foundMarketplaceOrders.length; i++) {
+      const foundMarketplaceOrder = foundMarketplaceOrders[i]
+      const hasMop = foundMarketplaceOrder.marketplaceOrderPackages.length > 0 ? true : false
 
-      let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
-      marketplaceOrderItems.map((item, idx) => {
-        const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] = item[idx].marketplaceOrderShippingItems
-        marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
-          const marketplaceOrderShipping = marketplaceOrderShippingItem.marketplaceOrderShipping
-
-          if (marketplaceOrderShipping) {
-            marketplaceOrderShippings.push(marketplaceOrderShipping)
-          }
-        })
-      })
-
-      let uniqueMarketplaceOrderShippings: MarketplaceOrderShipping[] = Array.from(
-        new Set(marketplaceOrderShippings.map(a => a.id))
-      ).map(id => {
-        return marketplaceOrderShippings.find(a => a.id === id)
-      })
-
-      if (marketplaceStore.platform == 'shopee' && v2) {
-        if (uniqueMarketplaceOrderShippings[0]?.airwayBill) {
-          orderDocument = [
-            {
-              orderNo: uniqueMarketplaceOrderShippings[0].orderNoRef,
-              airwayBill: uniqueMarketplaceOrderShippings[0].airwayBill
+      if (hasMop) {
+        const hasAirwayBill = foundMarketplaceOrder.marketplaceOrderPackages.find(
+          pkg => pkg.airwayBill !== undefined && pkg.airwayBill !== null
+        )
+        if (hasAirwayBill) {
+          let orderDocument = await fetchLmdAwb(foundMarketplaceOrder)
+          return orderDocument
+        } else {
+          let orderDocument: any[] = []
+          const eTraxOption: boolean = foundMarketplaceOrder.marketplaceStore.eTrax
+
+          if (eTraxOption) {
+            orderDocument = await getETraxOrderDocumentFunction(orderNo, context, tx)
+          } else {
+            const marketplaceOrderItems: MarketplaceOrderItem[] = foundMarketplaceOrder.marketplaceOrderItems
+
+            let docRefNo: any[] = []
+            marketplaceOrderItems.map((item: any) => {
+              let orderDocNo: any[] = []
+              orderDocNo = item.docRefNo
+              if (orderDocNo[0].indexOf(',') > -1) {
+                orderDocNo = orderDocNo[0].split(',')
+              }
+              Array.prototype.push.apply(docRefNo, orderDocNo)
+            })
+
+            // remove repeated docRefNo
+            docRefNo = docRefNo.filter((value, index) => docRefNo.indexOf(value) === index)
+
+            const storeId = foundMarketplaceOrder.marketplaceStore.id
+            const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId[0])
+
+            let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
+            marketplaceOrderItems.map((item, idx) => {
+              const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+                item[idx].marketplaceOrderShippingItems
+              marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
+                const marketplaceOrderShipping = marketplaceOrderShippingItem.marketplaceOrderShipping
+
+                if (marketplaceOrderShipping) {
+                  marketplaceOrderShippings.push(marketplaceOrderShipping)
+                }
+              })
+            })
+
+            let uniqueMarketplaceOrderShippings: MarketplaceOrderShipping[] = Array.from(
+              new Set(marketplaceOrderShippings.map(a => a.id))
+            ).map(id => {
+              return marketplaceOrderShippings.find(a => a.id === id)
+            })
+
+            if (marketplaceStore.platform == 'shopee' && v2) {
+              if (uniqueMarketplaceOrderShippings[0]?.airwayBill) {
+                orderDocument = [
+                  {
+                    orderNo: uniqueMarketplaceOrderShippings[0].orderNoRef,
+                    airwayBill: uniqueMarketplaceOrderShippings[0].airwayBill
+                  }
+                ]
+              }
+            } else if (marketplaceStore.platform == 'lazada') {
+              const packageIds = JSON.parse(marketplaceOrderShippings[0].packageId)
+              orderDocument = await StoreAPI.getStoreOrderDocument(marketplaceStore, { packageIds })
+            } else {
+              orderDocument = await StoreAPI.getStoreOrderDocument(marketplaceStore, { docRefNo, docType })
             }
-          ]
-        }
-      } else if (marketplaceStore.platform == 'lazada') {
-        const packageIds = JSON.parse(marketplaceOrderShippings[0].packageId)
-        orderDocument = await StoreAPI.getStoreOrderDocument(marketplaceStore, { packageIds })
-      } else {
-        orderDocument = await StoreAPI.getStoreOrderDocument(marketplaceStore, { docRefNo, docType })
-      }
 
-      if (docType === 'invoice') {
-        uniqueMarketplaceOrderShippings = uniqueMarketplaceOrderShippings.map(
-          (marketplaceOrderShipping: MarketplaceOrderShipping) => {
-            return {
-              ...marketplaceOrderShipping,
-              invoice: orderDocument?.length
-                ? orderDocument[0]?.airwayBill
-                  ? orderDocument[0].airwayBill
-                  : orderDocument[0].file
-                : null
-            }
-          }
-        )
-      } else {
-        uniqueMarketplaceOrderShippings = uniqueMarketplaceOrderShippings.map(
-          (marketplaceOrderShipping: MarketplaceOrderShipping) => {
-            return {
-              ...marketplaceOrderShipping,
-              airwayBill: orderDocument?.length
-                ? orderDocument[0]?.airwayBill
-                  ? orderDocument[0].airwayBill
-                  : orderDocument[0].file
-                : null
+            if (docType === 'invoice') {
+              uniqueMarketplaceOrderShippings = uniqueMarketplaceOrderShippings.map(
+                (marketplaceOrderShipping: MarketplaceOrderShipping) => {
+                  return {
+                    ...marketplaceOrderShipping,
+                    invoice: orderDocument?.length
+                      ? orderDocument[0]?.airwayBill
+                        ? orderDocument[0].airwayBill
+                        : orderDocument[0].file
+                      : null
+                  }
+                }
+              )
+            } else {
+              uniqueMarketplaceOrderShippings = uniqueMarketplaceOrderShippings.map(
+                (marketplaceOrderShipping: MarketplaceOrderShipping) => {
+                  return {
+                    ...marketplaceOrderShipping,
+                    airwayBill: orderDocument?.length
+                      ? orderDocument[0]?.airwayBill
+                        ? orderDocument[0].airwayBill
+                        : orderDocument[0].file
+                      : null
+                  }
+                }
+              )
             }
+
+            tx.getRepository(MarketplaceOrderShipping).save(uniqueMarketplaceOrderShippings)
           }
-        )
+        }
       }
-
-      tx.getRepository(MarketplaceOrderShipping).save(uniqueMarketplaceOrderShippings)
     }
+  }
+}
 
-    if (orderDocument?.length) {
-      orderDocument[0].isShopeeV2 = v2
+export async function fetchLmdAwb(marketplaceOrder) {
+  let foundMarketplaceOrderPackages: MarketplaceOrderPackage[] = marketplaceOrder.marketplaceOrderPackages
+  foundMarketplaceOrderPackages = foundMarketplaceOrderPackages.map(
+    (marketplaceOrderPackage: MarketplaceOrderPackage) => {
+      return {
+        ...marketplaceOrderPackage,
+        airwayBill: marketplaceOrderPackage.airwayBill.length
+          ? marketplaceOrderPackage?.airwayBill
+            ? marketplaceOrderPackage.airwayBill
+            : null
+          : null
+      }
     }
+  )
 
-    return orderDocument
-  }
+  return foundMarketplaceOrderPackages
 }

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

@@ -13,6 +13,8 @@ import { RESERVE_QTY_ORDER_STATUSES } from '../../../constants/reserve-qty-order
 import {
   MarketplaceOrder,
   MarketplaceOrderItem,
+  MarketplaceOrderPackage,
+  MarketplaceOrderPackageItem,
   MarketplaceOrderShipping,
   MarketplaceOrderShippingItem,
   MarketplaceProductVariation
@@ -456,6 +458,8 @@ export const syncMarketplaceOrder = {
               marketplaceOrderItem.autoShippingSubsidyMarketplace = item.autoShippingSubsidyMarketplace
               marketplaceOrderItem.originalShippingFee = item.originalShippingFee
               marketplaceOrderItem.taxAmount = item.taxAmount
+              marketplaceOrderItem.orderId =
+                item?.orderItemId != null || item?.orderItemId != undefined ? item.orderItemId : item.name
 
               marketplaceOrderItems.push({ ...marketplaceOrderItem })
 
@@ -694,6 +698,49 @@ export const syncMarketplaceOrder = {
               }
             }
 
+            // Save marketplaceOrderPackage and marketplaceOrderPacakgeItem in the db
+            if (marketplaceStore.platform === 'shopee') {
+              let marketplaceOrderPackage: MarketplaceOrderPackage = new MarketplaceOrderPackage()
+              let marketplaceOrderPackageItem: MarketplaceOrderPackageItem = new MarketplaceOrderPackageItem()
+
+              let existMarketplacePackages: MarketplaceOrderPackage[] = await tx
+                .getRepository(MarketplaceOrderPackage)
+                .find({ where: { marketplaceOrder: marketplaceOrder.id } })
+
+              if (existMarketplacePackages?.length > 0) return
+
+              for (let j = 0; j < order.packageList.length; j++) {
+                let marketplacePackage = order.packageList[j]
+                let packageItems = marketplacePackage.packageItem
+                let marketplaceOrderItem
+
+                marketplaceOrderPackage.name = order.name
+                marketplaceOrderPackage.packageId = marketplacePackage.packageId
+                marketplaceOrderPackage.transporter = marketplacePackage.transporter
+                marketplaceOrderPackage.marketplaceOrder = marketplaceOrder
+                marketplaceOrderPackage.domain = domain
+
+                // use insert instead of save
+                await tx.getRepository(MarketplaceOrderPackage).insert(marketplaceOrderPackage)
+
+                for (let i = 0; i < packageItems.length; i++) {
+                  let packageItem = packageItems[i]
+                  marketplaceOrderItem = marketplaceOrderItems.find(itm => {
+                    return itm.orderId == packageItem.orderItemId
+                  })
+
+                  marketplaceOrderPackageItem.name = marketplaceOrderItem.name
+                  marketplaceOrderPackageItem.qty = marketplaceOrderItem.qty
+                  marketplaceOrderPackageItem.domain = domain
+                  marketplaceOrderPackageItem.marketplaceOrderPackage = marketplaceOrderPackage
+                  marketplaceOrderPackageItem.marketplaceOrderItem = marketplaceOrderItem
+
+                  // use insert
+                  await tx.getRepository(MarketplaceOrderPackageItem).insert(marketplaceOrderPackageItem)
+                }
+              }
+            }
+
             if (i == marketplaceOrders.length - 1) {
               lastOrderId = order.name
             }

package/server/graphql/types/index.ts

@@ -12,3 +12,5 @@ export * from './marketplace-refund-order'
 export * from './marketplace-report'
 export * from './marketplace-order-shipping-item'
 export * from './marketplace-transaction-rate'
+export * from './marketplace-order-package-item'
+export * from './marketplace-order-package'

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

@@ -8,6 +8,7 @@ export const MarketplaceOrderPatch = gql`
     fulfillmentCenter: ObjectRef
     marketplaceStore: ObjectRef
     marketplaceOrderItems: [ObjectRef]
+    marketplaceOrderPackages: [ObjectRef]
     remark: String
     description: String
   }

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

@@ -7,6 +7,7 @@ export const MarketplaceOrder = gql`
     domain: Domain
     marketplaceStore: MarketplaceStore
     marketplaceOrderItems: [MarketplaceOrderItem]
+    marketplaceOrderPackages: [MarketplaceOrderPackage]
     fulfillmentCenter: FulfillmentCenter
     description: String
     orderNo: String

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

@@ -7,6 +7,7 @@ export const MarketplaceOrderItem = gql`
     domain: Domain
     marketplaceOrder: MarketplaceOrder
     marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
+    marketplaceOrderPackageItems: [MarketplaceOrderPackageItem]
     marketplaceProductVariation: MarketplaceProductVariation
     orderType: String
     cancelBy: String
@@ -38,6 +39,7 @@ export const MarketplaceOrderItem = gql`
     transactionRateType: String
     transactionRate: Float
     ordersSalesTotal: Float
+    orderId: String
     updater: User
     creator: User
     updatedAt: String

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

@@ -0,0 +1,3 @@
+export * from './marketplace-order-package'
+export * from './marketplace-order-package-list'
+export * from './marketplace-order-package-patch'

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

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderPackageList = gql`
+  type MarketplaceOrderPackageList {
+    items: [MarketplaceOrderPackage]
+    total: Int
+  }
+`

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

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderPackagePatch = gql`
+  input MarketplaceOrderPackagePatch {
+    id: String
+    name: String
+    packageId: String
+    transporter: String
+    trackingNo: String
+    airwayBill: String
+    invoice: String
+    status: String
+    marketplaceOrder: ObjectRef
+    marketplaceOrderPackageItems: [ObjectRef]
+  }
+`

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

@@ -0,0 +1,19 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderPackage = gql`
+  type MarketplaceOrderPackage {
+    id: String
+    name: String
+    domain: Domain
+    marketplaceOrder: MarketplaceOrder
+    marketplaceOrderPackageItems: [MarketplaceOrderPackageItem]
+    packageId: String
+    transporter: String
+    trackingNo: String
+    airwayBill: String
+    invoice: String
+    status: String
+    updatedAt: String
+    createdAt: String
+  }
+`

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

@@ -0,0 +1,3 @@
+export * from './marketplace-order-package-item'
+export * from './marketplace-order-package-item-list'
+export * from './marketplace-order-package-item-patch'

package/server/graphql/types/marketplace-order-package-item/marketplace-order-package-item-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderPackageItemList = gql`
+  type MarketplaceOrderPackageItemList {
+    items: [MarketplaceOrderPackageItem]
+    total: Int
+  }
+`

package/server/graphql/types/marketplace-order-package-item/marketplace-order-package-item-patch.ts

@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderPackageItemPatch = gql`
+  input MarketplaceOrderPackageItemPatch {
+    id: String
+    name: String
+    qty: Float
+  }
+`

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

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderPackageItem = gql`
+  type MarketplaceOrderPackageItem {
+    id: String
+    name: String
+    domain: Domain
+    marketplaceOrderPackage: MarketplaceOrderPackage
+    marketplaceOrderItem: MarketplaceOrderItem
+    qty: Float
+    updatedAt: String
+    createdAt: String
+  }
+`