npm - @things-factory/worksheet-base - Versions diffs - 4.3.538 → 4.3.539 - Mend

@things-factory/worksheet-base 4.3.538 → 4.3.539

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 (4) hide show

package/dist-server/controllers/ecommerce/sellercraft-controller.js CHANGED Viewed

@@ -14,7 +14,10 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
         let sellercraftSetting = sellercraft.sellercraftSetting;
         let disablePackOrder = (sellercraftSetting === null || sellercraftSetting === void 0 ? void 0 : sellercraftSetting.disablePackOrder) && (sellercraftSetting === null || sellercraftSetting === void 0 ? void 0 : sellercraftSetting.disablePackOrder) == 1 ? true : false;
         if (!disablePackOrder) {
-            const orderProducts = releaseGood.orderProducts;
+            //sourceData contains the original order products
+            const sourceData = JSON.parse(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.sourceData);
+            const orderProducts = sourceData === null || sourceData === void 0 ? void 0 : sourceData.orderProducts;
+            const editedOrderProducts = releaseGood.orderProducts;
             let sellercraftOPs = [];
             sellercraftOPs = orderProducts.map(orderProduct => {
                 const product = orderProduct.product;
@@ -47,6 +50,38 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
                 const orderPack = await integration_sellercraft_1.SellercraftAPI.packMarketplaceOrder(sellercraft, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: this === null || this === void 0 ? void 0 : this.domain, user: this === null || this === void 0 ? void 0 : this.user } } }));
                 if (orderPack === null || orderPack === void 0 ? void 0 : orderPack.packages) {
                     const packages = orderPack.packages;
+                    const createOrderPackageItems = (orderProducts, orderPackage, items) => {
+                        return items
+                            .map(itm => {
+                            var _a;
+                            const { sku, qty, product, releaseQty } = itm;
+                            const idx = orderProducts.findIndex(op => op.product.sku == sku || op.product.sku == (product === null || product === void 0 ? void 0 : product.sku));
+                            const matchedOrderProduct = idx !== -1 ? orderProducts[idx] : undefined;
+                            const matchedOrderPackageItem = (_a = orderPackage === null || orderPackage === void 0 ? void 0 : orderPackage.orderPackageItems) === null || _a === void 0 ? void 0 : _a.find(itm => itm.orderProductId === (matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.id));
+                            if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
+                                return null;
+                            }
+                            const commonProperties = {
+                                orderProduct: matchedOrderProduct,
+                                status: sales_base_1.ORDER_STATUS.PROCESSING,
+                                orderPackage: orderPackage,
+                                domain: releaseGood.domain,
+                                bizplace: releaseGood.bizplace,
+                                creator: this.user,
+                                updater: this.user,
+                                productDetail: matchedOrderProduct.productDetail
+                            };
+                            // If an existing order package item is found, update its release quantity
+                            if (matchedOrderPackageItem) {
+                                return Object.assign(Object.assign({}, commonProperties), { id: matchedOrderPackageItem.id, name: matchedOrderPackageItem.name, releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0) });
+                            }
+                            // Update release quantity of the matched order product
+                            orderProducts[idx].releaseQty = (orderProducts[idx].releaseQty || 0) - (qty || 0);
+                            // Return a new order package item if no existing item was found
+                            return Object.assign(Object.assign({}, commonProperties), { name: sales_base_1.OrderNoGenerator.orderPackageItem(), releaseQty: qty || releaseQty });
+                        })
+                            .filter(item => item != null);
+                    };
                     await Promise.all(packages.map(async (pkg) => {
                         const items = pkg.items;
                         const orderPackage = {
@@ -57,27 +92,29 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
                             domain: releaseGood.domain,
                             bizplace: releaseGood.bizplace,
                             creator: releaseGood.creator,
-                            updater: releaseGood.updater
+                            updater: releaseGood.updater,
+                            originalPackResponse: JSON.stringify(pkg)
                         };
                         let savedOrderPackage = await this.trxMgr.getRepository(sales_base_1.OrderPackage).save(orderPackage);
-                        const orderPackageItems = items.map(itm => {
-                            const { sku, qty } = itm;
-                            const matchedOrderProduct = orderProducts.find(op => op.product.sku == sku);
-                            return {
-                                name: sales_base_1.OrderNoGenerator.orderPackageItem(),
-                                orderProduct: matchedOrderProduct,
-                                status: sales_base_1.ORDER_STATUS.PROCESSING,
-                                releaseQty: qty,
-                                orderPackage: savedOrderPackage,
-                                domain: releaseGood.domain,
-                                bizplace: releaseGood.bizplace,
-                                creator: releaseGood.creator,
-                                updater: releaseGood.updater,
-                                productDetail: matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.productDetail
-                            };
-                        });
+                        const orderPackageItems = createOrderPackageItems(editedOrderProducts, savedOrderPackage, items);
                         await this.trxMgr.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
                     }));
+                    const unassignedOrderProducts = editedOrderProducts.filter(op => {
+                        return op.releaseQty > 0 || !packages.some(pkg => pkg.items.some(itm => itm.sku === op.product.sku));
+                    });
+                    if ((unassignedOrderProducts === null || unassignedOrderProducts === void 0 ? void 0 : unassignedOrderProducts.length) > 0) {
+                        const orderPackages = await this.trxMgr.getRepository(sales_base_1.OrderPackage).find({
+                            where: { releaseGood: releaseGood.id },
+                            relations: ['orderPackageItems']
+                        });
+                        let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
+                            return (currentOrderPackage === null || currentOrderPackage === void 0 ? void 0 : currentOrderPackage.orderPackageItems.length) < (minOrderPackage === null || minOrderPackage === void 0 ? void 0 : minOrderPackage.orderPackageItems.length)
+                                ? currentOrderPackage
+                                : minOrderPackage;
+                        }, orderPackages[0]);
+                        const unassignedPackageItems = createOrderPackageItems(unassignedOrderProducts, selectedOrderPackage, unassignedOrderProducts);
+                        await this.trxMgr.getRepository(sales_base_1.OrderPackageItem).save(unassignedPackageItems);
+                    }
                     roUpdateFields = {
                         packageId: packages[0].packageId,
                         marketPackCallSuccess: new Date(),

package/dist-server/controllers/ecommerce/sellercraft-controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.538",
+  "version": "4.3.539",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -36,7 +36,7 @@
     "@things-factory/integration-sftp": "^4.3.536",
     "@things-factory/marketplace-base": "^4.3.537",
     "@things-factory/notification": "^4.3.535",
-    "@things-factory/sales-base": "^4.3.537",
+    "@things-factory/sales-base": "^4.3.539",
     "@things-factory/setting-base": "^4.3.535",
     "@things-factory/shell": "^4.3.535",
     "@things-factory/transport-base": "^4.3.535",
@@ -45,5 +45,5 @@
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "756261225586464ae03d30b47f5d1af3bfd39405"
+  "gitHead": "8fdf33aa63de77d8aea7eb1c3d718bac33e9ec08"
 }

package/server/controllers/ecommerce/sellercraft-controller.ts CHANGED Viewed

@@ -28,7 +28,10 @@ export class SellercraftController extends WorksheetController {
       sellercraftSetting?.disablePackOrder && sellercraftSetting?.disablePackOrder == 1 ? true : false
     if (!disablePackOrder) {
-      const orderProducts: OrderProduct[] = releaseGood.orderProducts
+      //sourceData contains the original order products
+      const sourceData = JSON.parse(releaseGood?.sourceData)
+      const orderProducts: OrderProduct[] = sourceData?.orderProducts
+      const editedOrderProducts: OrderProduct[] = releaseGood.orderProducts
       let sellercraftOPs: any[] = []
       sellercraftOPs = orderProducts.map(orderProduct => {
@@ -74,6 +77,55 @@ export class SellercraftController extends WorksheetController {
         if (orderPack?.packages) {
           const packages: any[] = orderPack.packages
+          const createOrderPackageItems = (orderProducts: OrderProduct[], orderPackage: OrderPackage, items: any[]) => {
+            return items
+              .map(itm => {
+                const { sku, qty, product, releaseQty } = itm
+                const idx = orderProducts.findIndex(op => op.product.sku == sku || op.product.sku == product?.sku)
+                const matchedOrderProduct = idx !== -1 ? orderProducts[idx] : undefined
+                const matchedOrderPackageItem: OrderPackageItem = orderPackage?.orderPackageItems?.find(
+                  itm => itm.orderProductId === matchedOrderProduct?.id
+                )
+                if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
+                  return null
+                }
+                const commonProperties = {
+                  orderProduct: matchedOrderProduct,
+                  status: ORDER_STATUS.PROCESSING,
+                  orderPackage: orderPackage,
+                  domain: releaseGood.domain,
+                  bizplace: releaseGood.bizplace,
+                  creator: this.user,
+                  updater: this.user,
+                  productDetail: matchedOrderProduct.productDetail
+                }
+                // If an existing order package item is found, update its release quantity
+                if (matchedOrderPackageItem) {
+                  return {
+                    ...commonProperties,
+                    id: matchedOrderPackageItem.id,
+                    name: matchedOrderPackageItem.name,
+                    releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0)
+                  }
+                }
+                // Update release quantity of the matched order product
+                orderProducts[idx].releaseQty = (orderProducts[idx].releaseQty || 0) - (qty || 0)
+                // Return a new order package item if no existing item was found
+                return {
+                  ...commonProperties,
+                  name: OrderNoGenerator.orderPackageItem(),
+                  releaseQty: qty || releaseQty
+                }
+              })
+              .filter(item => item != null)
+          }
           await Promise.all(
             packages.map(async pkg => {
@@ -86,33 +138,45 @@ export class SellercraftController extends WorksheetController {
                 domain: releaseGood.domain,
                 bizplace: releaseGood.bizplace,
                 creator: releaseGood.creator,
-                updater: releaseGood.updater
+                updater: releaseGood.updater,
+                originalPackResponse: JSON.stringify(pkg)
               }
               let savedOrderPackage: OrderPackage = await this.trxMgr.getRepository(OrderPackage).save(orderPackage)
-              const orderPackageItems: OrderPackageItem[] = items.map(itm => {
-                const { sku, qty } = itm
-                const matchedOrderProduct: OrderProduct = orderProducts.find(op => op.product.sku == sku)
-                return {
-                  name: OrderNoGenerator.orderPackageItem(),
-                  orderProduct: matchedOrderProduct,
-                  status: ORDER_STATUS.PROCESSING,
-                  releaseQty: qty,
-                  orderPackage: savedOrderPackage,
-                  domain: releaseGood.domain,
-                  bizplace: releaseGood.bizplace,
-                  creator: releaseGood.creator,
-                  updater: releaseGood.updater,
-                  productDetail: matchedOrderProduct?.productDetail
-                }
-              })
+              const orderPackageItems: OrderPackageItem[] = createOrderPackageItems(
+                editedOrderProducts,
+                savedOrderPackage,
+                items
+              )
               await this.trxMgr.getRepository(OrderPackageItem).save(orderPackageItems)
             })
           )
+          const unassignedOrderProducts: OrderProduct[] = editedOrderProducts.filter(op => {
+            return op.releaseQty > 0 || !packages.some(pkg => pkg.items.some(itm => itm.sku === op.product.sku))
+          })
+          if (unassignedOrderProducts?.length > 0) {
+            const orderPackages: OrderPackage[] = await this.trxMgr.getRepository(OrderPackage).find({
+              where: { releaseGood: releaseGood.id },
+              relations: ['orderPackageItems']
+            })
+            let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
+              return currentOrderPackage?.orderPackageItems.length < minOrderPackage?.orderPackageItems.length
+                ? currentOrderPackage
+                : minOrderPackage
+            }, orderPackages[0])
+            const unassignedPackageItems: OrderPackageItem[] = createOrderPackageItems(
+              unassignedOrderProducts,
+              selectedOrderPackage,
+              unassignedOrderProducts
+            )
+            await this.trxMgr.getRepository(OrderPackageItem).save(unassignedPackageItems)
+          }
           roUpdateFields = {
             packageId: packages[0].packageId,
             marketPackCallSuccess: new Date(),