npm - @things-factory/marketplace-base - Versions diffs - 4.0.24 → 4.0.28 - Mend

@things-factory/marketplace-base 4.0.24 → 4.0.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/dist-server/graphql/types/marketplace-product-variation/new-marketplace-product-variation.js CHANGED Viewed

@@ -15,6 +15,7 @@ exports.NewMarketplaceProductVariation = (0, graphql_tag_1.default) `
     variationSku: String
     channelSku: String
     qty: Float
+    reserveQty: Float
     bufferQty: Float
     thresholdQty: Float
     costPrice: Float

package/dist-server/graphql/types/marketplace-product-variation/new-marketplace-product-variation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"new-marketplace-product-variation.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-product-variation/new-marketplace-product-variation.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,8BAA8B,GAAG,IAAA,qBAAG,EAAA~~;;;;;;;;;;;;;;;;;;;;;;CAsBhD~~,CAAA"}
1	+ {"version":3,"file":"new-marketplace-product-variation.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-product-variation/new-marketplace-product-variation.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,8BAA8B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;CAuBhD,CAAA"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "4.0.24",
+  "version": "4.0.28",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/integration-fulfillment": "^4.0.24",
-    "@things-factory/integration-marketplace": "^4.0.24",
-    "@things-factory/shell": "^4.0.24"
+    "@things-factory/integration-fulfillment": "^4.0.28",
+    "@things-factory/integration-marketplace": "^4.0.28",
+    "@things-factory/shell": "^4.0.28"
   },
-  "gitHead": "ba94f3effd113a235e78a34391dbcd259ed410b0"
+  "gitHead": "fc526e27ae290a6fa3f001ce7ee75a2904b1d363"
 }

package/server/entities/marketplace-product-variation.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 import {
   Column,
   CreateDateColumn,
@@ -10,8 +8,13 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn
 } from 'typeorm'
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
 import { MarketplaceProduct, MarketplaceProductVariationPrice } from '../entities'
 import { NoGenerator } from '../utils'
 @Entity()
 @Index(
   'ix_marketplace-product-variation_0',
@@ -33,6 +36,7 @@ export class MarketplaceProductVariation {
       this.name = productVariation.name ? productVariation.name.toString() : NoGenerator.id()
       this.description = productVariation.description
       this.qty = productVariation.qty
+      this.reserveQty = productVariation.reserveQty
       this.type = productVariation.type
       this.mrpPrice = productVariation.mrpPrice
       this.costPrice = productVariation.costPrice
@@ -91,6 +95,9 @@ export class MarketplaceProductVariation {
   @Column('float', { nullable: true })
   qty: number
+  @Column('float', { nullable: true })
+  reserveQty: number
   @Column({ nullable: true })
   type: string

package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { EntityManager, getRepository } from 'typeorm'
+import { getRepository } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
@@ -16,7 +16,7 @@ import { NoGenerator } from '../../../utils'
 export const syncAllMarketplaceOrder = {
   async syncAllMarketplaceOrder(_: any, { companyDomainId, fromDate, toDate, blackListStores }, context: any) {
-    const { user, tx }: { user: User; tx: EntityManager } = context.state
+    const { user }: { user: User } = context.state
     const companyDomain: Domain = await getRepository(Domain).findOne(companyDomainId)
@@ -127,14 +127,23 @@ export const syncAllMarketplaceOrder = {
                   otherInfoJSON.shippingProvider = deliveryProvider
                 }
+                marketplaceOrder = {
+                  ...existingMarketplaceOrder,
+                  ...marketplaceOrder,
+                  otherInfoJSON: otherInfoJSON ? JSON.stringify(otherInfoJSON) : null,
+                  updater: user
+                }
                 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 warehouseDomain: Domain = await getRepository(Domain).findOne({
+                    where: { subdomain: centerId }
+                  })
                   const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
-                  const customerBizplaceId: string = customerBizplaces[0].id
+                  const customerBizplaceId: string = customerBizplaces.find(
+                    customerBizplace => customerBizplace.company.domain.id == domain.id
+                  ).id
                   let { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
                     customerBizplaceId,
@@ -174,9 +183,9 @@ export const syncAllMarketplaceOrder = {
                       const fulfillmentCenter: FulfillmentCenter = marketplaceOrder.fulfillmentCenter
                       const centerId: string = fulfillmentCenter.centerId
-                      const warehouseDomain: Domain = await tx
-                        .getRepository(Domain)
-                        .findOne({ where: { subdomain: centerId } })
+                      const warehouseDomain: Domain = await getRepository(Domain).findOne({
+                        where: { subdomain: centerId }
+                      })
                       const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
                       const customerBizplaceId: string = customerBizplaces[0].id
@@ -380,43 +389,161 @@ export const syncAllMarketplaceOrder = {
                         nonMatchedOrderItems.push({ ...item })
                       }
                     })
-                    if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
+                    if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status)) {
+                      await Promise.all(
+                        nonMatchedOrderItems.map(async item => {
+                          if (foundVariation.sku) {
+                            let allVariations: MarketplaceProductVariation[] = await getRepository(
+                              MarketplaceProductVariation
+                            ).find({
+                              where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                              relations: [
+                                'domain',
+                                'marketplaceProduct',
+                                'marketplaceProduct.marketplaceStore',
+                                'marketplaceProduct.marketplaceStore.marketplaceDistributors'
+                              ]
+                            })
+                            let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                              variation =>
+                                variation.id != foundVariation.id &&
+                                variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                            )
+                            variationsFromOtherStores.map(async variation => {
+                              variation.reserveQty -= item.qty
+                              variation = await getRepository(MarketplaceProductVariation).save(variation)
+                            })
+                          }
+                          foundVariation.qty += item.qty
+                          foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
+                        })
+                      )
                       await getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
+                    }
-                    existingOrderItems = marketplaceOrderItems.map(item => {
-                      const matchedOrderItem = existingOrderItems.find(
-                        itm =>
-                          itm.name == item.name &&
-                          itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
-                      )
-                      if (matchedOrderItem) {
-                        return {
-                          ...matchedOrderItem,
-                          ...item,
-                          updater: user
+                    existingOrderItems = await Promise.all(
+                      marketplaceOrderItems.map(async item => {
+                        const matchedOrderItem = existingOrderItems.find(
+                          itm =>
+                            itm.name == item.name &&
+                            itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
+                        )
+                        if (matchedOrderItem) {
+                          if (foundVariation.sku) {
+                            let allVariations: MarketplaceProductVariation[] = await getRepository(
+                              MarketplaceProductVariation
+                            ).find({
+                              where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                              relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                            })
+                            let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                              variation =>
+                                variation.id != foundVariation.id &&
+                                variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                            )
+                            variationsFromOtherStores.map(async variation => {
+                              variation.reserveQty = existingMarketplaceOrder?.releaseOrderId
+                                ? variation.reserveQty + matchedOrderItem.qty
+                                : variation.reserveQty - item.qty + matchedOrderItem.qty
+                              variation = await getRepository(MarketplaceProductVariation).save(variation)
+                            })
+                          }
+                          foundVariation.qty = existingMarketplaceOrder?.releaseOrderId
+                            ? foundVariation.qty - matchedOrderItem.qty
+                            : foundVariation.qty + item.qty - matchedOrderItem.qty
+                          foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
+                          return {
+                            ...matchedOrderItem,
+                            ...item,
+                            updater: user
+                          }
                         }
-                      }
-                    })
+                      })
+                    )
                   } else {
-                    existingOrderItems = marketplaceOrderItems.map(item => {
-                      const matchedOrderItem = existingOrderItems.find(
-                        itm =>
-                          itm.name == item.name &&
-                          itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
-                      )
-                      if (matchedOrderItem) {
-                        return {
-                          ...matchedOrderItem,
-                          ...item,
-                          updater: user
+                    existingOrderItems = await Promise.all(
+                      marketplaceOrderItems.map(async item => {
+                        const matchedOrderItem = existingOrderItems.find(
+                          itm =>
+                            itm.name == item.name &&
+                            itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
+                        )
+                        if (matchedOrderItem) {
+                          if (foundVariation.sku) {
+                            let allVariations: MarketplaceProductVariation[] = await getRepository(
+                              MarketplaceProductVariation
+                            ).find({
+                              where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                              relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                            })
+                            let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                              variation =>
+                                variation.id != foundVariation.id &&
+                                variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                            )
+                            variationsFromOtherStores.map(async variation => {
+                              variation.reserveQty = existingMarketplaceOrder?.releaseOrderId
+                                ? variation.reserveQty + matchedOrderItem.qty
+                                : variation.reserveQty - item.qty + matchedOrderItem.qty
+                              variation = await getRepository(MarketplaceProductVariation).save(variation)
+                            })
+                          }
+                          foundVariation.qty = existingMarketplaceOrder?.releaseOrderId
+                            ? foundVariation.qty - matchedOrderItem.qty
+                            : foundVariation.qty + item.qty - matchedOrderItem.qty
+                          foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
+                          return {
+                            ...matchedOrderItem,
+                            ...item,
+                            updater: user
+                          }
+                        } else {
+                          if (foundVariation.sku) {
+                            let allVariations: MarketplaceProductVariation[] = await getRepository(
+                              MarketplaceProductVariation
+                            ).find({
+                              where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                              relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                            })
+                            let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                              variation =>
+                                variation.id != foundVariation.id &&
+                                variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                            )
+                            variationsFromOtherStores.map(async variation => {
+                              variation.reserveQty += item.qty
+                              variation = await getRepository(MarketplaceProductVariation).save(variation)
+                            })
+                          }
+                          foundVariation.qty -= item.qty
+                          foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
+                          return {
+                            ...item,
+                            updater: user
+                          }
                         }
-                      } else {
-                        return {
-                          ...item,
-                          updater: user
-                        }
-                      }
-                    })
+                      })
+                    )
                   }
                   marketplaceOrderItems = existingOrderItems
@@ -429,6 +556,30 @@ export const syncAllMarketplaceOrder = {
                   }
                 }
               } else {
+                if (foundVariation.sku) {
+                  let allVariations: MarketplaceProductVariation[] = await getRepository(
+                    MarketplaceProductVariation
+                  ).find({
+                    where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                    relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                  })
+                  let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                    variation =>
+                      variation.id != foundVariation.id &&
+                      variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                  )
+                  variationsFromOtherStores.map(async variation => {
+                    variation.reserveQty += item.qty
+                    variation = await getRepository(MarketplaceProductVariation).save(variation)
+                  })
+                }
+                foundVariation.qty -= item.qty
+                foundVariation = await getRepository(MarketplaceProductVariation).save(foundVariation)
                 if (order?.orderShipping) {
                   savedMarketplaceOrderShipping.totalWeight = orderTotalWeight
                   savedMarketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).save(

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

@@ -124,7 +124,9 @@ export const syncMarketplaceOrder = {
             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
+            const customerBizplaceId: string = customerBizplaces.find(
+              customerBizplace => customerBizplace.company.domain.id == domain.id
+            ).id
             let { items: releaseOrders }: any = await FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
               customerBizplaceId,
@@ -285,9 +287,10 @@ export const syncMarketplaceOrder = {
         let foundVariation
         for (var j = 0; j < order.orderItems.length; j++) {
           var item = order.orderItems[j]
-          foundVariation = await tx
-            .getRepository(MarketplaceProductVariation)
-            .findOne({ where: { domain: marketplaceStore.domain, variationId: item.variationId } })
+          foundVariation = await tx.getRepository(MarketplaceProductVariation).findOne({
+            where: { domain: marketplaceStore.domain, variationId: item.variationId },
+            relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+          })
           if (!foundVariation) {
             let newVariation: any = {
@@ -373,43 +376,161 @@ export const syncMarketplaceOrder = {
                   nonMatchedOrderItems.push({ ...item })
                 }
               })
-              if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
+              if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status)) {
+                await Promise.all(
+                  nonMatchedOrderItems.map(async item => {
+                    if (foundVariation.sku) {
+                      let allVariations: MarketplaceProductVariation[] = await tx
+                        .getRepository(MarketplaceProductVariation)
+                        .find({
+                          where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                          relations: [
+                            'domain',
+                            'marketplaceProduct',
+                            'marketplaceProduct.marketplaceStore',
+                            'marketplaceProduct.marketplaceStore.marketplaceDistributors'
+                          ]
+                        })
+                      let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                        variation =>
+                          variation.id != foundVariation.id &&
+                          variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                      )
+                      variationsFromOtherStores.map(async variation => {
+                        variation.reserveQty -= item.qty
+                        variation = await tx.getRepository(MarketplaceProductVariation).save(variation)
+                      })
+                    }
+                    foundVariation.qty += item.qty
+                    foundVariation = await tx.getRepository(MarketplaceProductVariation).save(foundVariation)
+                  })
+                )
                 await tx.getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
+              }
-              existingOrderItems = marketplaceOrderItems.map(item => {
-                const matchedOrderItem = existingOrderItems.find(
-                  itm =>
-                    itm.name == item.name &&
-                    itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
-                )
-                if (matchedOrderItem) {
-                  return {
-                    ...matchedOrderItem,
-                    ...item,
-                    updater: user
+              existingOrderItems = await Promise.all(
+                marketplaceOrderItems.map(async item => {
+                  const matchedOrderItem = existingOrderItems.find(
+                    itm =>
+                      itm.name == item.name &&
+                      itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
+                  )
+                  if (matchedOrderItem) {
+                    if (foundVariation.sku) {
+                      let allVariations: MarketplaceProductVariation[] = await tx
+                        .getRepository(MarketplaceProductVariation)
+                        .find({
+                          where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                          relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                        })
+                      let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                        variation =>
+                          variation.id != foundVariation.id &&
+                          variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                      )
+                      variationsFromOtherStores.map(async variation => {
+                        variation.reserveQty = existingMarketplaceOrder?.releaseOrderId
+                          ? variation.reserveQty + matchedOrderItem.qty
+                          : variation.reserveQty - item.qty + matchedOrderItem.qty
+                        variation = await tx.getRepository(MarketplaceProductVariation).save(variation)
+                      })
+                    }
+                    foundVariation.qty = existingMarketplaceOrder?.releaseOrderId
+                      ? foundVariation.qty - matchedOrderItem.qty
+                      : foundVariation.qty + item.qty - matchedOrderItem.qty
+                    foundVariation = await tx.getRepository(MarketplaceProductVariation).save(foundVariation)
+                    return {
+                      ...matchedOrderItem,
+                      ...item,
+                      updater: user
+                    }
                   }
-                }
-              })
+                })
+              )
             } else {
-              existingOrderItems = marketplaceOrderItems.map(item => {
-                const matchedOrderItem = existingOrderItems.find(
-                  itm =>
-                    itm.name == item.name &&
-                    itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
-                )
-                if (matchedOrderItem) {
-                  return {
-                    ...matchedOrderItem,
-                    ...item,
-                    updater: user
+              existingOrderItems = await Promise.all(
+                marketplaceOrderItems.map(async item => {
+                  const matchedOrderItem = existingOrderItems.find(
+                    itm =>
+                      itm.name == item.name &&
+                      itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
+                  )
+                  if (matchedOrderItem) {
+                    if (foundVariation.sku) {
+                      let allVariations: MarketplaceProductVariation[] = await tx
+                        .getRepository(MarketplaceProductVariation)
+                        .find({
+                          where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                          relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                        })
+                      let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                        variation =>
+                          variation.id != foundVariation.id &&
+                          variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                      )
+                      variationsFromOtherStores.map(async variation => {
+                        variation.reserveQty = existingMarketplaceOrder?.releaseOrderId
+                          ? variation.reserveQty + matchedOrderItem.qty
+                          : variation.reserveQty - item.qty + matchedOrderItem.qty
+                        variation = await tx.getRepository(MarketplaceProductVariation).save(variation)
+                      })
+                    }
+                    foundVariation.qty = existingMarketplaceOrder?.releaseOrderId
+                      ? foundVariation.qty - matchedOrderItem.qty
+                      : foundVariation.qty + item.qty - matchedOrderItem.qty
+                    foundVariation = await tx.getRepository(MarketplaceProductVariation).save(foundVariation)
+                    return {
+                      ...matchedOrderItem,
+                      ...item,
+                      updater: user
+                    }
+                  } else {
+                    if (foundVariation.sku) {
+                      let allVariations: MarketplaceProductVariation[] = await tx
+                        .getRepository(MarketplaceProductVariation)
+                        .find({
+                          where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                          relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                        })
+                      let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+                        variation =>
+                          variation.id != foundVariation.id &&
+                          variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+                      )
+                      variationsFromOtherStores.map(async variation => {
+                        variation.reserveQty += item.qty
+                        variation = await tx.getRepository(MarketplaceProductVariation).save(variation)
+                      })
+                    }
+                    foundVariation.qty -= item.qty
+                    foundVariation = await tx.getRepository(MarketplaceProductVariation).save(foundVariation)
+                    return {
+                      ...item,
+                      updater: user
+                    }
                   }
-                } else {
-                  return {
-                    ...item,
-                    updater: user
-                  }
-                }
-              })
+                })
+              )
             }
             marketplaceOrderItems = existingOrderItems
@@ -422,6 +543,30 @@ export const syncMarketplaceOrder = {
             }
           }
         } else {
+          if (foundVariation.sku) {
+            let allVariations: MarketplaceProductVariation[] = await tx
+              .getRepository(MarketplaceProductVariation)
+              .find({
+                where: { domain: foundVariation.domain, sku: foundVariation.sku },
+                relations: ['domain', 'marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+              })
+            let variationsFromOtherStores: MarketplaceProductVariation[] = allVariations.filter(
+              variation =>
+                variation.id != foundVariation.id &&
+                variation.marketplaceProduct.marketplaceStore.status != 'TERMINATED'
+            )
+            variationsFromOtherStores.map(async variation => {
+              variation.reserveQty += item.qty
+              variation = await tx.getRepository(MarketplaceProductVariation).save(variation)
+            })
+          }
+          foundVariation.qty -= item.qty
+          foundVariation = await tx.getRepository(MarketplaceProductVariation).save(foundVariation)
           if (order?.orderShipping) {
             savedMarketplaceOrderShipping.totalWeight = orderTotalWeight
             savedMarketplaceOrderShipping = await tx

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

@@ -17,7 +17,7 @@ export const marketplaceOrderShippingsResolver = {
       .innerJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
       .innerJoinAndSelect('MOS.marketplaceStore', 'MS')
       .innerJoinAndSelect('MOS.domain', 'domain')
-      .innerJoinAndSelect('MOS.creator', 'creator')
+      .leftJoinAndSelect('MOS.creator', 'creator')
       .leftJoinAndSelect('MOS.updater', 'updater')
     buildQuery(qb, params, context, false)

package/server/graphql/types/marketplace-product-variation/marketplace-product-variation-patch.ts CHANGED Viewed

@@ -14,6 +14,7 @@ export const MarketplaceProductVariationPatch = gql`
     type: String
     description: String
     qty: Float
+    reserveQty: Float
     bufferQty: Float
     thresholdQty: Float
     costPrice: Float

package/server/graphql/types/marketplace-product-variation/marketplace-product-variation.ts CHANGED Viewed

@@ -11,6 +11,7 @@ export const MarketplaceProductVariation = gql`
     variationSku: String
     channelSku: String
     qty: Float
+    reserveQty: Float
     bufferQty: Float
     thresholdQty: Float
     name: String

package/server/graphql/types/marketplace-product-variation/new-marketplace-product-variation.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export const NewMarketplaceProductVariation = gql`
     variationSku: String
     channelSku: String
     qty: Float
+    reserveQty: Float
     bufferQty: Float
     thresholdQty: Float
     costPrice: Float