@things-factory/marketplace-base 4.3.197 → 4.3.204

package/server/graphql/resolvers/index.ts

@@ -10,5 +10,6 @@ export * from './store-replenishment'
 export * from './store-replenishment-item'
 export * from './marketplace-refund-order'
 export * from './marketplace-report'
+export * from './marketplace-transaction-rate'
 
 export * from './marketplace-product-variation-price'

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

@@ -2,6 +2,7 @@ import { EntityManager, IsNull, SelectQueryBuilder } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
 import { User } from '@things-factory/auth-base'
+import { logger } from '@things-factory/env'
 import { MarketplaceStore as MarketplaceStoreEntity } from '@things-factory/integration-marketplace'
 import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
@@ -113,6 +114,10 @@ export async function generateMarketplaceOrder(
       marketplaceOrderItem.domain = domain
       marketplaceOrderItem.creator = user
 
+      if (foundVariation.sku) {
+        await updateQtyAndReserveQty(tx, foundVariation, newMarketplaceOrder, marketplaceOrderItem.qty)
+      }
+
       return marketplaceOrderItem
     })
   )
@@ -179,3 +184,109 @@ export async function generateMarketplaceOrder(
 
   return newMarketplaceOrder
 }
+
+export async function updateQtyAndReserveQtyBundle(tx, variation, domain, qty, marketplaceOrder) {
+  const productBundle: ProductBundle = await tx.getRepository(ProductBundle).findOne({
+    where: { sku: variation.sku, domain },
+    relations: ['productBundleSettings', 'productBundleSettings.product']
+  })
+
+  if (productBundle) {
+    for (let setting of productBundle.productBundleSettings) {
+      const mpvs: MarketplaceProductVariationEntity[] = await tx.getRepository(MarketplaceProductVariationEntity).find({
+        where: { domain, sku: setting.product.sku },
+        relations: ['domain']
+      })
+
+      for (let mpv of mpvs) {
+        try {
+          let updatedReserveQty = 0
+          let updatedQty = 0
+
+          if (qty > 0 && marketplaceOrder.marketplaceStore.reserveEnabled) {
+            updatedReserveQty += setting.bundleQty * qty
+          }
+
+          if (mpv.qty - setting.bundleQty * qty >= 0) {
+            updatedQty += setting.bundleQty * qty
+          }
+          await tx
+            .createQueryBuilder()
+            .update(MarketplaceProductVariationEntity)
+            .set({
+              qty: () => `COALESCE("qty", 0) - ${updatedQty}`,
+              reserveQty: () => `COALESCE("reserve_qty", 0) + ${updatedReserveQty}`
+            })
+            .where('id = :id', { id: mpv.id })
+            .execute()
+
+          let log = {
+            marketplaceOrder: marketplaceOrder.name,
+            releaseOrder: marketplaceOrder?.releaseOrderId,
+            mpvId: mpv.id,
+            sku: mpv?.sku,
+            qty: updatedQty,
+            reservedQty: updatedReserveQty,
+            bundleProduct: true
+          }
+          logger.info(`[reserveQty] ${JSON.stringify(log)}`)
+        } catch (e) {
+          logger.error(`[marketplace-base] ${e}`)
+        }
+      }
+    }
+  }
+}
+
+export async function updateQtyAndReserveQty(tx, foundVariation, marketplaceOrder, qty) {
+  let activeVariations: MarketplaceProductVariationEntity[] = await tx
+    .getRepository(MarketplaceProductVariationEntity)
+    .createQueryBuilder('mpv')
+    .innerJoin('mpv.marketplaceProduct', 'marketplaceProduct')
+    .innerJoin('marketplaceProduct.marketplaceStore', 'marketplaceStore')
+    .where('mpv.domain_id = :domainId', { domainId: marketplaceOrder.domain.id })
+    .andWhere('mpv.sku = :sku', { sku: foundVariation.sku })
+    .andWhere(`marketplaceStore.status != 'TERMINATED'`)
+    .getMany()
+
+  await updateQtyAndReserveQtyBundle(tx, foundVariation, marketplaceOrder.domain, qty, marketplaceOrder)
+
+  await Promise.all(
+    activeVariations.map(async variation => {
+      try {
+        let updatedReserveQty = 0
+        let updatedQty = 0
+
+        if (qty > 0 && marketplaceOrder.marketplaceStore.reserveEnabled) {
+          updatedReserveQty = qty
+        }
+        if (variation.qty - qty >= 0) {
+          updatedQty = qty
+        }
+
+        await tx
+          .createQueryBuilder()
+          .update(MarketplaceProductVariationEntity)
+          .set({
+            qty: () => `COALESCE("qty", 0) - ${updatedQty}`,
+            reserveQty: () => `COALESCE("reserve_qty", 0) + ${updatedReserveQty}`
+          })
+          .where('id = :id', { id: variation.id })
+          .execute()
+
+        let log = {
+          marketplaceOrder: marketplaceOrder.name,
+          releaseOrder: marketplaceOrder?.releaseOrderId,
+          mpvId: variation.id,
+          sku: variation?.sku,
+          qty: updatedQty,
+          reservedQty: updatedReserveQty,
+          bundle: false
+        }
+        logger.info(`[reserveQty] ${JSON.stringify(log)}`)
+      } catch (e) {
+        logger.error(`[marketplace-base] ${e}`)
+      }
+    })
+  )
+}

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

@@ -5,7 +5,11 @@ import { dashboardMarketplaceOrdersResolver } from './dashboard-marketplace-orde
 import { dashboardMarketplaceSalesResolver } from './dashboard-marketplace-sales'
 import { dashboardMarketplaceSalesAverageResolver } from './dashboard-marketplace-sales-average'
 import { deleteMarketplaceOrders } from './delete-marketplace-orders'
-import { generateMarketplaceOrderResolver } from './generate-marketplace-order'
+import {
+  generateMarketplaceOrderResolver,
+  updateQtyAndReserveQty,
+  updateQtyAndReserveQtyBundle
+} from './generate-marketplace-order'
 import { getAddressList } from './get-address-list'
 import { getBranchList } from './get-branch-list'
 import { getETraxOrderDocumentFunction, getETraxOrderDocumentResolver } from './get-etrax-order-document'
@@ -27,10 +31,10 @@ import { setOwnShippingProviderByOrdersResolver } from './set-own-shipping-provi
 import { splitOrdersByBatch } from './split-orders-by-batch'
 import { syncAllMarketplaceOrder } from './sync-all-marketplace-order'
 import { syncMarketplaceOrder } from './sync-marketplace-order'
+import { syncMarketplaceOrdersByPlatform } from './sync-marketplace-orders-by-platform'
+import { syncShopeeAwb } from './sync-shopee-awb'
 import { updateMarketplaceOrder } from './update-marketplace-order'
 import { updateOrderReadyToShip } from './update-order-ready-to-ship'
-import { syncShopeeAwb } from './sync-shopee-awb'
-import { syncMarketplaceOrdersByPlatform } from './sync-marketplace-orders-by-platform'
 
 export const MarketplaceOrderResolver = {
   Query: {
@@ -72,4 +76,4 @@ export const MarketplaceOrderResolver = {
   }
 }
 
-export { getETraxOrderDocumentFunction }
+export { getETraxOrderDocumentFunction, updateQtyAndReserveQty, updateQtyAndReserveQtyBundle }

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

@@ -302,6 +302,7 @@ export const syncMarketplaceOrder = {
               marketplaceOrderShipping.phone1 = orderShipping.phone1
               marketplaceOrderShipping.phone2 = orderShipping.phone2
               marketplaceOrderShipping.trackingNo = order?.trackingNo || null
+              marketplaceOrderShipping.packageId = orderShipping.packageId || null
               marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo
               marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo
               marketplaceOrderShipping.marketplaceStore = marketplaceStore
@@ -917,7 +918,7 @@ async function updateQtyAndReserveQty(
         .execute()
 
       // reserve qty log
-  
+
       try {
         let log = {
           marketplaceOrder: marketplaceOrder.name,

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

@@ -98,7 +98,9 @@ export const updateOrderReadyToShip = {
           trackingUrl: mos[0].trackingUrl || '',
           trackingNo,
           order: foundMarketplaceOrder,
-          note
+          note,
+          transporter: mos[0].ownTransporter,
+          packageId: mos[0].packageId
         })
 
         if (marketplaceStore.platform === 'woocommerce') {

package/server/graphql/resolvers/marketplace-transaction-rate/delete-marketplace-transaction-rates.ts

@@ -0,0 +1,15 @@
+import { getRepository, In } from 'typeorm'
+import { MarketplaceTransactionRate } from '../../../entities'
+
+export const deleteMarketplaceTransactionRates = {
+  async deleteMarketplaceTransactionRates(_: any, { ids }, context: any) {
+    const { domain, user } = context.state
+
+    await getRepository(MarketplaceTransactionRate).delete({ 
+        domain,
+        id: In(ids)
+    })
+    
+    return true
+  }
+}

package/server/graphql/resolvers/marketplace-transaction-rate/index.ts

@@ -0,0 +1,13 @@
+import { marketplaceTransactionRatesResolver } from './marketplace-transaction-rates'
+import { updateMultipleMarketplaceTransactionRate } from './update-multiple-marketplace-transaction-rate'
+import { deleteMarketplaceTransactionRates }from './delete-marketplace-transaction-rates'
+
+export const marketplaceTransactionRateResolver = {
+  Query: {
+    ...marketplaceTransactionRatesResolver
+  },
+  Mutation: {
+    ...updateMultipleMarketplaceTransactionRate,
+    ...deleteMarketplaceTransactionRates
+  }
+}

package/server/graphql/resolvers/marketplace-transaction-rate/marketplace-transaction-rates.ts

@@ -0,0 +1,15 @@
+import { convertListParams, ListParam } from '@things-factory/shell'
+import { getRepository } from 'typeorm'
+import { MarketplaceTransactionRate } from '../../../entities'
+
+export const marketplaceTransactionRatesResolver = {
+  async marketplaceTransactionRates(_: any, params: ListParam, context: any) {
+    const convertedParams = convertListParams(params, context.state.domain.id)
+    const [items, total] = await getRepository(MarketplaceTransactionRate).findAndCount({
+      ...convertedParams,
+      relations: ['marketplaceStore', 'domain', 'creator', 'updater']
+    })
+
+    return { items, total }
+  }
+}

package/server/graphql/resolvers/marketplace-transaction-rate/update-multiple-marketplace-transaction-rate.ts

@@ -0,0 +1,47 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceTransactionRate } from '../../../entities'
+
+export const updateMultipleMarketplaceTransactionRate = {
+  async updateMultipleMarketplaceTransactionRate(_: any, { patches }, context: any) {
+    const { domain, user } = context.state
+
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const marketplaceTransactionRateRepo = getRepository(MarketplaceTransactionRate)
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await marketplaceTransactionRateRepo.save({
+          ...newRecord,
+          name: `${newRecord.brand} (${newRecord.paymentMethod})`,
+          domain: domain,
+          creator: user,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const marketplaceTransactionRate = await marketplaceTransactionRateRepo.findOne({ domain, id: newRecord.id })
+
+        const result = await marketplaceTransactionRateRepo.save({
+          ...marketplaceTransactionRate,
+          ...newRecord,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+}

package/server/graphql/types/index.ts

@@ -11,3 +11,4 @@ export * from './marketplace-product-variation-price'
 export * from './marketplace-refund-order'
 export * from './marketplace-report'
 export * from './marketplace-order-shipping-item'
+export * from './marketplace-transaction-rate'

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

@@ -25,6 +25,10 @@ export const MarketplaceOrderItem = gql`
     promotionId: String
     paymentFee: Float
     platformFee: Float
+    serviceFee: Float
+    brand: String
+    transactionRateType: String
+    transactionRate: Float
     updater: User
     creator: User
     updatedAt: String

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

@@ -11,6 +11,7 @@ export const MarketplaceOrderShipping = gql`
     marketplaceStore: MarketplaceStore
     orderNoRef: String
     subOrderNoRef: String
+    packageId: String
     shippingId: String
     billingAddress: String
     address1: String

package/server/graphql/types/marketplace-transaction-rate/index.ts

@@ -0,0 +1,20 @@
+import gql from 'graphql-tag'
+
+export * from './marketplace-transaction-rate'
+export * from './marketplace-transaction-rate-list'
+export * from './marketplace-transaction-rate-patch'
+
+export const MarketplaceTransactionRateResolver = gql`
+  extend type Query {
+    marketplaceTransactionRates(
+      filters: [Filter]
+      pagination: Pagination
+      sortings: [Sorting]
+    ): MarketplaceTransactionRateList
+  }
+
+  extend type Mutation {
+    updateMultipleMarketplaceTransactionRate(patches: [MarketplaceTransactionRatePatch]!): [MarketplaceTransactionRate]
+    deleteMarketplaceTransactionRates (ids: [String]!): Boolean
+  }
+`

package/server/graphql/types/marketplace-transaction-rate/marketplace-transaction-rate-list.ts

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

package/server/graphql/types/marketplace-transaction-rate/marketplace-transaction-rate-patch.ts

@@ -0,0 +1,13 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceTransactionRatePatch = gql`
+  input MarketplaceTransactionRatePatch {
+    id: String
+    brand: String
+    paymentMethod: String
+    rateType: String
+    rate: Float
+    marketplaceStore: ObjectRef
+    cuFlag: String
+  }
+`

package/server/graphql/types/marketplace-transaction-rate/marketplace-transaction-rate.ts

@@ -0,0 +1,18 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceTransactionRate = gql`
+  type MarketplaceTransactionRate {
+    id: String
+    name: String
+    domain: Domain
+    brand: String
+    paymentMethod: String
+    rateType: String
+    rate: Float
+    marketplaceStore: MarketplaceStore
+    createdAt: Date
+    updatedAt: Date
+    creator: User
+    updater: User
+  }
+`

package/server/index.ts

@@ -5,3 +5,4 @@ export * from './migrations'
 export * from './graphql'
 export * from './middlewares'
 export * from './utils'
+export { updateQtyAndReserveQty, updateQtyAndReserveQtyBundle } from './graphql/resolvers/marketplace-order'

package/dist-server/entities/marketplace-setting.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"marketplace-setting.js","sourceRoot":"","sources":["../../server/entities/marketplace-setting.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,qFAA0E;AAC1E,iDAA8C;AAC9C,qCAAsH;AAY/G,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAiC9B,CAAA;AAhCC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;8CACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;kDAAA;AAEd;IAAC,IAAA,gBAAM,GAAE;;gDACG;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACR;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACX;AAEhB;IAAC,IAAA,gBAAM,GAAE;;iDACI;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0CAAgB,CAAC;kDAClB,0CAAgB,oBAAhB,0CAAgB;4DAAA;AAElC;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;qDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;qDAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;mDAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;mDAAA;AAhCF,kBAAkB;IAV9B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,0BAA0B,EAC1B,CAAC,kBAAsC,EAAE,EAAE,CAAC;QAC1C,kBAAkB,CAAC,MAAM;QACzB,kBAAkB,CAAC,gBAAgB;QACnC,kBAAkB,CAAC,IAAI;KACxB,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,kBAAkB,CAiC9B;AAjCY,gDAAkB"}