@things-factory/marketplace-base 3.7.10 → 3.8.3

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

@@ -43,6 +43,7 @@ export const syncMarketplaceOrder = {
         let marketplaceOrderItems = []
         let tracking_code = ''
         let deliveryProvider: string
+        let dropPickProvider: string
 
         if (marketplaceStore.platform == 'lazada') {
           if (order.trackingNo != '') {
@@ -62,7 +63,10 @@ export const syncMarketplaceOrder = {
             shippingProviderInfo[key] = value
           })
 
-          deliveryProvider = shippingProviderInfo.Delivery
+          dropPickProvider = shippingProviderInfo?.Pickup
+            ? shippingProviderInfo['Pickup']
+            : shippingProviderInfo['Drop-off']
+          deliveryProvider = shippingProviderInfo['Delivery']
         }
 
         let marketplaceOrder: MarketplaceOrder = new MarketplaceOrder()
@@ -80,6 +84,14 @@ export const syncMarketplaceOrder = {
         marketplaceOrder.domain = marketplaceStore.domain
         marketplaceOrder.buyerUsername = order.buyerUsername
         marketplaceOrder.payTime = order.payTime
+        marketplaceOrder.serviceFee = order.serviceFee
+        marketplaceOrder.commissionFee = order.commissionFee
+        marketplaceOrder.transactionFee = order.transactionFee
+        marketplaceOrder.shippingMode = order.shippingMode
+        marketplaceOrder.voucherAmount = order.voucherAmount
+        marketplaceOrder.totalRealeasedAmount = order.totalRealeasedAmount
+        marketplaceOrder.voucherCode = order.voucherCode
+        marketplaceOrder.shippingRebate = order.shippingRebate
 
         const existingMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
           where: { domain: marketplaceStore.domain, name: order.name },
@@ -107,49 +119,67 @@ export const syncMarketplaceOrder = {
             updater: user
           }
 
-          if (cancelStatuses.includes(marketplaceOrder.status) && marketplaceOrder?.releaseOrderId) {
-            if (existingMarketplaceOrder.isSplitted) {
-              const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
-              const centerId: string = fulfillmentCenter.centerId
-              const warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
-              const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
-              const customerBizplaceId: string = customerBizplaces[0].id
-
-              let { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
-                customerBizplaceId,
-                refNo: marketplaceOrder.orderNo
-              })
+          if (marketplaceOrder?.releaseOrderId) {
+            const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
+            const centerId: string = fulfillmentCenter.centerId
+            const warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
+            const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
+            const customerBizplaceId: string = customerBizplaces[0].id
 
-              releaseOrders = releaseOrders.filter(function (order) {
-                return !disallowCancelStatuses.includes(order.status)
-              })
+            let { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
+              customerBizplaceId,
+              refNo: marketplaceOrder.orderNo
+            })
 
-              if (releaseOrders?.length) {
-                for (var a = 0; a < releaseOrders.length; a++) {
-                  const releaseOrderId: string = releaseOrders[a].id
-                  await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId })
-                }
-              }
-            } else {
-              const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
-              const centerId: string = fulfillmentCenter.centerId
+            let releaseOrder = Object.assign({}, releaseOrders[0])
+            let patch = {
+              id: releaseOrder.id,
+              marketplaceOrderStatus: marketplaceOrder.status,
+              trackingNo: marketplaceOrder.trackingNo,
+              transporter: dropPickProvider ? dropPickProvider : marketplaceOrder.shippingProvider
+            }
+
+            await FulfillmentAPI.updateReleaseGoodDetails(fulfillmentCenter, {
+              customerBizplaceId,
+              releaseOrder: { ...patch },
+              shippingOrder: null
+            })
 
-              const warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
-              const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
-              const customerBizplaceId: string = customerBizplaces[0].id
+            if (cancelStatuses.includes(marketplaceOrder.status)) {
+              if (existingMarketplaceOrder.isSplitted) {
+                releaseOrders = releaseOrders.filter(function (order) {
+                  return !disallowCancelStatuses.includes(order.status)
+                })
 
-              const { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
-                customerBizplaceId,
-                refNo: marketplaceOrder.orderNo
-              })
+                if (releaseOrders?.length) {
+                  for (var a = 0; a < releaseOrders.length; a++) {
+                    const releaseOrderId: string = releaseOrders[a].id
+                    await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId })
+                  }
+                }
+              } else {
+                const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
+                const centerId: string = fulfillmentCenter.centerId
 
-              const releaseOrderStatus = releaseOrders[0].status
+                const warehouseDomain: Domain = await tx
+                  .getRepository(Domain)
+                  .findOne({ where: { subdomain: centerId } })
+                const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
+                const customerBizplaceId: string = customerBizplaces[0].id
 
-              if (!disallowCancelStatuses.includes(releaseOrderStatus)) {
-                await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, {
+                const { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
                   customerBizplaceId,
-                  releaseOrderId: releaseOrders[0].id
+                  refNo: marketplaceOrder.orderNo
                 })
+
+                const releaseOrderStatus = releaseOrders[0].status
+
+                if (!disallowCancelStatuses.includes(releaseOrderStatus)) {
+                  await FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, {
+                    customerBizplaceId,
+                    releaseOrderId: releaseOrders[0].id
+                  })
+                }
               }
             }
           }
@@ -173,11 +203,11 @@ export const syncMarketplaceOrder = {
           marketplaceOrderShipping.attentionTo = orderShipping.attentionTo
           marketplaceOrderShipping.city = orderShipping.city
           marketplaceOrderShipping.country = orderShipping.country
-          marketplaceOrderShipping.state = orderShipping?.state
+          marketplaceOrderShipping.state = orderShipping?.state || null
           marketplaceOrderShipping.postCode = orderShipping.postCode
           marketplaceOrderShipping.phone1 = orderShipping.phone1
           marketplaceOrderShipping.phone2 = orderShipping.phone2
-          marketplaceOrderShipping.trackingNo = order?.trackingNo
+          marketplaceOrderShipping.trackingNo = order?.trackingNo || null
           marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo
           marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo
           marketplaceOrderShipping.marketplaceStore = marketplaceStore
@@ -212,7 +242,7 @@ export const syncMarketplaceOrder = {
                   phone1: orderShipping.phone1,
                   phone2: orderShipping.phone2,
                   email: orderShipping?.email,
-                  trackingNo: order.trackingNo,
+                  trackingNo: order?.trackingNo,
                   shippingFee: orderShipping.shippingFee,
                   actualShippingFee: orderShipping.actualShippingFee,
                   marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher,
@@ -231,7 +261,11 @@ export const syncMarketplaceOrder = {
                 marketplaceOrderShipping = {
                   ...existingOrderShipping,
                   ...marketplaceOrderShipping,
-                  trackingNo: order?.trackingNo ? order.trackingNo : existingOrderShipping.trackingNo,
+                  trackingNo: marketplaceOrderShipping?.trackingNo
+                    ? marketplaceOrderShipping.trackingNo
+                    : existingOrderShipping?.trackingNo
+                    ? existingOrderShipping.trackingNo
+                    : marketplaceOrderShipping.trackingNo,
                   updater: user
                 }
 
@@ -283,9 +317,23 @@ export const syncMarketplaceOrder = {
           marketplaceOrderItem.discount = item.discount
           marketplaceOrderItem.promotionId = item.promotionId
           marketplaceOrderItem.creator = user
-          if (marketplaceStore.platform === 'lazada' && item.paymentFee) {
-            marketplaceOrderItem.paymentFee = item.paymentFee
-          }
+          marketplaceOrderItem.paymentFee = item.paymentFee || null
+          marketplaceOrderItem.commissionFee = item.commissionFee || null
+          marketplaceOrderItem.shippingFeePaidByCustomer = item.shippingFeePaidByCustomer || null
+          marketplaceOrderItem.itemPriceCredit = item.itemPriceCredit || null
+          marketplaceOrderItem.promotionalCharges = item.promotionalCharges || null
+          marketplaceOrderItem.ordersMarketplaceFeesTotal = item.ordersMarketplaceFeesTotal || null
+          marketplaceOrderItem.ordersSalesTotal = item.ordersSalesTotal || null
+          marketplaceOrderItem.ordersMarketingFeesTotal = item.ordersMarketingFeesTotal || null
+          marketplaceOrderItem.ordersLogisticsTotal = item.ordersLogisticsTotal || null
+          marketplaceOrderItem.marketplaceBonus = item.marketplaceBonus
+          marketplaceOrderItem.marketplaceBonusSeller = item.marketplaceBonusSeller
+          marketplaceOrderItem.shippingFeeDiscountMarketplace = item.shippingFeeDiscountMarketplace
+          marketplaceOrderItem.shippingFeeDiscountSeller = item.shippingFeeDiscountSeller
+          marketplaceOrderItem.promotionalChargesFlexiCombo = item.promotionalChargesFlexiCombo
+          marketplaceOrderItem.autoShippingSubsidyMarketplace = item.autoShippingSubsidyMarketplace
+          marketplaceOrderItem.originalShippingFee = item.originalShippingFee
+          marketplaceOrderItem.taxAmount = item.taxAmount
 
           marketplaceOrderItems.push({ ...marketplaceOrderItem })
 
@@ -299,9 +347,7 @@ export const syncMarketplaceOrder = {
             existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
 
             marketplaceOrderItems = existingOrderItems.filter(
-              itm =>
-                itm.name == item.name &&
-                itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
+              itm => itm.name == item.name && itm.marketplaceProductVariation.variationId == item.variationId
             )
             marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderitem => {
               return {
@@ -327,7 +373,7 @@ export const syncMarketplaceOrder = {
                   nonMatchedOrderItems.push({ ...item })
                 }
               })
-              if (nonMatchedOrderItems.length > 0 && cancelStatuses.includes(marketplaceOrder.status))
+              if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
                 await tx.getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
 
               existingOrderItems = marketplaceOrderItems.map(item => {

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

@@ -1,21 +1,42 @@
-import { ListParam, convertListParams } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { buildQuery, ListParam } from '@things-factory/shell'
+
 import { MarketplaceOrderShipping } from '../../../entities'
 
 export const marketplaceOrderShippingsResolver = {
   async marketplaceOrderShippings(_: any, params: ListParam, context: any) {
-    const convertedParams = convertListParams(params)
-    const [items, total] = await getRepository(MarketplaceOrderShipping).findAndCount({
-      ...convertedParams,
-      relations: [
-        'domain',
-        'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceProductVariation',
-        'marketplaceStore',
-        'creator',
-        'updater'
-      ]
-    })
+    let dateFilter = params.filters.filter(filter => filter.name == 'createdAt')
+
+    params.filters = params.filters.filter(x => x.name != 'createdAt')
+
+    const qb: SelectQueryBuilder<MarketplaceOrderShipping> = getRepository(MarketplaceOrderShipping)
+      .createQueryBuilder('MOS')
+      .innerJoinAndSelect('MOS.marketplaceOrderItems', 'MOI')
+      .innerJoinAndSelect('MOI.marketplaceOrder', 'MO')
+      .innerJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
+      .innerJoinAndSelect('MOS.marketplaceStore', 'MS')
+      .innerJoinAndSelect('MOS.domain', 'domain')
+      .innerJoinAndSelect('MOS.creator', 'creator')
+      .leftJoinAndSelect('MOS.updater', 'updater')
+
+    buildQuery(qb, params, context, false)
+
+    if (dateFilter) {
+      if (dateFilter[0].operator == 'between') {
+        qb.andWhere('MO.orderCreatedAt BETWEEN :begin AND :end', {
+          begin: dateFilter[0].value[0],
+          end: dateFilter[0].value[1]
+        })
+      } else if (dateFilter[0].operator == 'gte') {
+        qb.andWhere('MO.orderCreatedAt >= :begin', { begin: dateFilter[0].value })
+      } else if (dateFilter[0].operator == 'lte') {
+        qb.andWhere('MO.orderCreatedAt <= :begin', { begin: dateFilter[0].value })
+      }
+    }
+
+    const [items, total] = await qb.getManyAndCount()
+
     return { items, total }
   }
 }

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

@@ -8,8 +8,16 @@ export const updateMarketplaceOrderShipping = {
       relations: ['marketplaceStore']
     })
 
+    if (!marketplaceOrderShipping) throw new Error(`Shipping not exist`)
+
     marketplaceOrderShipping.ownTrackingNo = patch.trackingNo
 
+    if (marketplaceOrderShipping.marketplaceStore.platform == 'lazada') {
+      if (patch?.trackingNo) {
+        patch.trackingNo = marketplaceOrderShipping.trackingNo
+      }
+    }
+
     marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShippingEntity).save({
       ...marketplaceOrderShipping,
       ...patch,

package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts

@@ -26,6 +26,7 @@ export const marketplaceSalesReportsResolver = {
     qb.leftJoinAndSelect('moi.domain', 'domain')
       .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
       .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
+      .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
       .leftJoinAndSelect('mo.marketplaceStore', 'ms')
       .leftJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
       .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
@@ -69,6 +70,7 @@ export const marketplaceSalesReportsResolver = {
 
     items = items.map(item => {
       return {
+        fulfilmentCenter: item.fc_name,
         orderNo: item.mo_name,
         orderCreatedAt: item.mo_order_created_at,
         buyerUsername: item.mo_buyer_username,
@@ -81,9 +83,10 @@ export const marketplaceSalesReportsResolver = {
         promotionId: item.moi_promotion_id,
         originalPrice: item.moi_original_price,
         paidPrice: item.moi_paid_price,
-        sku: item.mpv_name,
+        sku: item.mpv_sku,
         qty: item.moi_qty,
-        variationSku: item.mpv_variation_sku,
+        variationId: item.mpv_variation_id,
+        variationName: item.mpv_name,
         productName: item.mp_name,
         productSku: item.mp_isku,
         productDiscount: item.moi_discount,
@@ -91,7 +94,34 @@ export const marketplaceSalesReportsResolver = {
         shippingFee: item.mos_shipping_fee,
         actualShippingFee: item.mos_actual_shipping_fee,
         marketplaceShippingFeeVoucher: item.mos_marketplace_shipping_fee_voucher,
-        sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher
+        sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher,
+        voucherAmount: item.mo_voucher_amount,
+        shippingRebate: item.mo_shipping_rebate,
+        commissionFee: item.mo_commission_fee,
+        serviceFee: item.mo_service_fee,
+        transactionFee: item.mo_transaction_fee,
+        totalRealeasedAmount: item.mo_total_realeased_amount,
+        voucherCode: item.mo_voucher_code,
+        shippingMode: item.mo_shipping_mode,
+        status: item.mo_status,
+        shippingFeePaidByCustomer: item.moi_shipping_fee_paid_by_customer,
+        promotionalCharges: item.moi_promotional_charges,
+        ordersMarketplaceFeesTotal: item.moi_orders_marketplace_fees_total,
+        ordersMarketingFeesTotal: item.moi_orders_marketing_fees_total,
+        ordersSalesTotal: item.moi_orders_sales_total,
+        ordersLogisticsTotal: item.moi_orders_logistics_total,
+        itemPriceCredit: item.moi_item_price_credit,
+        marketplaceBonus: item.moi_marketplace_bonus + item.moi_marketplace_bonus_seller,
+        marketplaceBonusSeller: item.moi_marketplace_bonus_seller,
+        shippingFeeDiscountMarketplace: item.moi_shipping_fee_discount_marketplace,
+        shippingFeeDiscountSeller: item.moi_shipping_fee_discount_seller,
+        promotionalChargesFlexiCombo: item.moi_promotional_charges_flexi_combo,
+        autoShippingSubsidyMarketplace: item.moi_auto_shipping_subsidy_marketplace,
+        grandTotal: item.moi_orders_marketplace_fees_total + item.moi_orders_marketing_fees_total + item.moi_orders_sales_total + item.moi_orders_logistics_total,
+        originalShippingFee: item.moi_original_shipping_fee,
+        taxAmount: item.moi_tax_amount,
+        itemCommissionFee: item.moi_commission_fee,
+        variationSku: item.mpv_variation_sku
       }
     })
 

package/server/graphql/types/marketplace-report/marketplace-sales-report.ts

@@ -2,6 +2,16 @@ import gql from 'graphql-tag'
 
 export const MarketplaceSalesReport = gql`
   type MarketplaceSalesReport {
+    fulfilmentCenter: String
+    voucherAmount: Float
+    shippingRebate: Float
+    commissionFee: Float
+    serviceFee: Float
+    transactionFee: String
+    totalRealeasedAmount: Float
+    voucherCode: String
+    shippingMode: String
+    status: String
     orderNo: String
     orderCreatedAt: String
     buyerUsername: String
@@ -16,7 +26,8 @@ export const MarketplaceSalesReport = gql`
     paidPrice: Float
     sku: String
     qty: Int
-    variationSku: String
+    variationId: String
+    variationName: String
     productName: String
     productSku: String
     productDiscount: Float
@@ -25,5 +36,24 @@ export const MarketplaceSalesReport = gql`
     actualShippingFee: Float
     marketplaceShippingFeeVoucher: Float
     sellerShippingFeeVoucher: Float
+    shippingFeePaidByCustomer: Float
+    promotionalCharges: Float
+    ordersMarketplaceFeesTotal: Float
+    ordersMarketingFeesTotal: Float
+    ordersSalesTotal: Float
+    ordersLogisticsTotal: Float
+    itemPriceCredit: Float
+    marketplaceBonus: Float
+    marketplaceBonusSeller: Float
+    shippingFeeDiscountMarketplace: Float
+    shippingFeeDiscountSeller: Float
+    promotionalChargesFlexiCombo: Float
+    autoShippingSubsidyMarketplace: Float
+    grandTotal: Float
+    originalShippingFee: Float
+    taxAmount: Float
+    fulfillmentCenter: String
+    variationSku: String
+    itemCommissionFee: Float
   }
 `