@things-factory/marketplace-base 4.1.3 → 4.1.4

package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.js

@@ -10,7 +10,8 @@ exports.marketplaceOrdersForExport = {
             relations: [
                 'marketplaceStore',
                 'marketplaceOrderItems',
-                'marketplaceOrderItems.marketplaceOrderShipping',
+                'marketplaceOrderItems.marketplaceOrderShippingItems',
+                'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
                 'marketplaceOrderItems.marketplaceProductVariation'
             ]
         });
@@ -26,8 +27,9 @@ exports.marketplaceOrdersForExport = {
             const createdAt = order.orderCreatedAt;
             const updatedAt = order.orderUpdatedAt;
             mergedOrder = marketplaceOrderItems.map(orderItem => {
+                const marketplaceOrderShippingItems = orderItem.marketplaceOrderShippingItems;
                 const variationName = orderItem.marketplaceProductVariation.name;
-                const marketplaceOrderShipping = orderItem.marketplaceOrderShipping;
+                const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping;
                 const sku = orderItem.marketplaceProductVariation.sku;
                 const itemQty = orderItem.qty;
                 const trackingNo = marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.trackingNo;

package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-orders-for-export.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAC3C,gDAA0E;AAE7D,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAY;QACjE,MAAM,sBAAsB,GAAuB,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC;YAC5F,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE;YAC7B,SAAS,EAAE;gBACT,kBAAkB;gBAClB,uBAAuB;gBACvB,gDAAgD;gBAChD,mDAAmD;aACpD;SACF,CAAC,CAAA;QAEF,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,MAAM,OAAO,CAAC,GAAG,CACf,sBAAsB,CAAC,GAAG,CAAC,CAAC,KAAuB,EAAE,EAAE;YACrD,MAAM,qBAAqB,GAA2B,KAAK,CAAC,qBAAqB,CAAA;YACjF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,MAAM,gBAAgB,GAAW,KAAK,CAAC,gBAAgB,CAAA;YACvD,MAAM,oBAAoB,GAAG,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAA;YAC7D,MAAM,wBAAwB,GAAG,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAA;YAChE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YAC3B,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAA;YACtC,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAA;YAEtC,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBAClD,MAAM,aAAa,GAAW,SAAS,CAAC,2BAA2B,CAAC,IAAI,CAAA;gBACxE,MAAM,wBAAwB,GAAG,SAAS,CAAC,wBAAwB,CAAA;gBACnE,MAAM,GAAG,GAAW,SAAS,CAAC,2BAA2B,CAAC,GAAG,CAAA;gBAC7D,MAAM,OAAO,GAAW,SAAS,CAAC,GAAG,CAAA;gBACrC,MAAM,UAAU,GAAW,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,UAAU,CAAA;gBAE/D,MAAM,WAAW,GAAQ;oBACvB,OAAO;oBACP,oBAAoB;oBACpB,wBAAwB;oBACxB,GAAG;oBACH,aAAa;oBACb,UAAU;oBACV,gBAAgB;oBAChB,OAAO;oBACP,MAAM;oBACN,SAAS;oBACT,SAAS;iBACV,CAAA;gBACD,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CACH,CAAA;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;CACF,CAAA"}
+{"version":3,"file":"marketplace-orders-for-export.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders-for-export.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAE3C,gDAAwG;AAE3F,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAY;QACjE,MAAM,sBAAsB,GAAuB,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC;YAC5F,KAAK,EAAE,EAAE,IAAI,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE;YAC7B,SAAS,EAAE;gBACT,kBAAkB;gBAClB,uBAAuB;gBACvB,qDAAqD;gBACrD,8EAA8E;gBAC9E,mDAAmD;aACpD;SACF,CAAC,CAAA;QAEF,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,MAAM,OAAO,CAAC,GAAG,CACf,sBAAsB,CAAC,GAAG,CAAC,CAAC,KAAuB,EAAE,EAAE;YACrD,MAAM,qBAAqB,GAA2B,KAAK,CAAC,qBAAqB,CAAA;YACjF,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAA;YAC1B,MAAM,gBAAgB,GAAW,KAAK,CAAC,gBAAgB,CAAA;YACvD,MAAM,oBAAoB,GAAG,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAA;YAC7D,MAAM,wBAAwB,GAAG,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAA;YAChE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YAC3B,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAA;YACtC,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAA;YAEtC,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBAClD,MAAM,6BAA6B,GAAmC,SAAS,CAAC,6BAA6B,CAAA;gBAE7G,MAAM,aAAa,GAAW,SAAS,CAAC,2BAA2B,CAAC,IAAI,CAAA;gBACxE,MAAM,wBAAwB,GAAG,6BAA6B,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAA;gBAC1F,MAAM,GAAG,GAAW,SAAS,CAAC,2BAA2B,CAAC,GAAG,CAAA;gBAC7D,MAAM,OAAO,GAAW,SAAS,CAAC,GAAG,CAAA;gBACrC,MAAM,UAAU,GAAW,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,UAAU,CAAA;gBAE/D,MAAM,WAAW,GAAQ;oBACvB,OAAO;oBACP,oBAAoB;oBACpB,wBAAwB;oBACxB,GAAG;oBACH,aAAa;oBACb,UAAU;oBACV,gBAAgB;oBAChB,OAAO;oBACP,MAAM;oBACN,SAAS;oBACT,SAAS;iBACV,CAAA;gBACD,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CACH,CAAA;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js

@@ -21,9 +21,10 @@ exports.marketplaceOrdersResolver = {
         qb.leftJoinAndSelect('mo.domain', 'domain')
             .leftJoinAndSelect('mo.marketplaceStore', 'ms')
             .leftJoinAndSelect('mo.marketplaceOrderItems', 'mi')
+            .leftJoinAndSelect('mi.marketplaceOrderShippingItems', 'mosi')
             .leftJoinAndSelect('mi.marketplaceProductVariation', 'mpv')
             .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
-            .leftJoinAndSelect('mi.marketplaceOrderShipping', 'mos')
+            .leftJoinAndSelect('mosi.marketplaceOrderShipping', 'mos')
             .leftJoinAndSelect('mo.creator', 'creator')
             .leftJoinAndSelect('mo.updater', 'updater');
         if (postCodeSorter) {

package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;QAChF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE1E,IAAI,eAAe,IAAI,eAAe,CAAC,KAAK,IAAI,CAAC,EAAE;YACjD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;SACzE;QAED,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;SACtE;QAED,IAAI,EAAE,GAAyC,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACvG,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC;aACnD,iBAAiB,CAAC,gCAAgC,EAAE,KAAK,CAAC;aAC1D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,6BAA6B,EAAE,KAAK,CAAC;aACvD,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAE7C,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACrE;QAED,IAAI,SAAS,EAAE;YACb,EAAE,CAAC,QAAQ,CACT;;;;;;OAMD,EACC,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CACvC,CAAA;SACF;QAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;QAChF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE1E,IAAI,eAAe,IAAI,eAAe,CAAC,KAAK,IAAI,CAAC,EAAE;YACjD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;SACzE;QAED,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;SACtE;QAED,IAAI,EAAE,GAAyC,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACvG,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC;aACnD,iBAAiB,CAAC,kCAAkC,EAAE,MAAM,CAAC;aAC7D,iBAAiB,CAAC,gCAAgC,EAAE,KAAK,CAAC;aAC1D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,+BAA+B,EAAE,KAAK,CAAC;aACzD,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAE7C,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACrE;QAED,IAAI,SAAS,EAAE;YACb,EAAE,CAAC,QAAQ,CACT;;;;;;OAMD,EACC,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CACvC,CAAA;SACF;QAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order/split-orders-by-batch.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.splitOrdersByBatch = void 0;
+const v4_1 = __importDefault(require("uuid/v4"));
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const entities_1 = require("../../../entities");
 const utils_1 = require("../../../utils");
@@ -26,35 +30,55 @@ exports.splitOrdersByBatch = {
             });
             if (!maxWeightSetting)
                 throw new Error('marketplace_order_max_weight setting not found');
+            const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
+            if (!marketplaceOrderItems.every(marketplaceOrderItem => marketplaceOrderItem.marketplaceProductVariation.sku))
+                throw new Error('all items must be linked before split order');
             let originalMarketplaceOrderShipping = await tx
                 .getRepository(entities_1.MarketplaceOrderShipping)
                 .findOne({
-                where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore }
+                where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore },
+                relations: [
+                    'marketplaceOrderShippingItems',
+                    'marketplaceOrderShippingItems.product',
+                    'marketplaceOrderShippingItems.product.productDetails',
+                    'marketplaceOrderShippingItems.marketplaceOrderItem',
+                    'marketplaceOrderShippingItems.marketplaceOrderItem.marketplaceProductVariation'
+                ]
             });
-            const originalMarketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
-            let newMarketplaceOrderItems = [];
+            const originalMarketplaceOrderShippingItems = originalMarketplaceOrderShipping.marketplaceOrderShippingItems;
+            let newMarketplaceOrderShippingItems = [];
             let splittedShipmentItems = [];
-            for (let a = 0; a < originalMarketplaceOrderItems.length; a++) {
-                const marketplaceOrderItem = originalMarketplaceOrderItems[a];
-                for (let b = 0; b < marketplaceOrderItem.qty; b++) {
-                    const newItem = Object.assign(Object.assign({}, marketplaceOrderItem), { qty: 1 });
-                    newMarketplaceOrderItems.push(newItem);
+            for (let a = 0; a < originalMarketplaceOrderShippingItems.length; a++) {
+                const marketplaceOrderShippingItem = originalMarketplaceOrderShippingItems[a];
+                for (let b = 0; b < marketplaceOrderShippingItem.qty; b++) {
+                    const newItem = Object.assign(Object.assign({}, marketplaceOrderShippingItem), { qty: 1 });
+                    newMarketplaceOrderShippingItems.push(newItem);
                 }
             }
-            newMarketplaceOrderItems.sort(function (a, b) {
-                if (a.marketplaceProductVariation.primaryUnitValue < b.marketplaceProductVariation.primaryUnitValue)
+            newMarketplaceOrderShippingItems.sort(function (a, b) {
+                if (a.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue <
+                    b.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue)
                     return -1;
-                if (a.marketplaceProductVariation.primaryUnitValue > b.marketplaceProductVariation.primaryUnitValue)
+                if (a.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue >
+                    b.marketplaceOrderItem.marketplaceProductVariation.primaryUnitValue)
                     return 1;
                 return 0;
             });
-            for (let a = 0; a < newMarketplaceOrderItems.length; a++) {
-                const marketplaceOrderItem = newMarketplaceOrderItems[a];
-                const marketplaceProductVariation = marketplaceOrderItem.marketplaceProductVariation;
-                if (!marketplaceProductVariation.primaryUnitValue)
+            for (let a = 0; a < newMarketplaceOrderShippingItems.length; a++) {
+                let marketplaceOrderShippingItem = newMarketplaceOrderShippingItems[a];
+                const product = marketplaceOrderShippingItem.product;
+                const marketplaceOrderItem = marketplaceOrderShippingItem.marketplaceOrderItem;
+                const marketplaceProductVariations = await tx
+                    .getRepository(entities_1.MarketplaceProductVariation)
+                    .find({
+                    where: { domain: marketplaceOrder.domain, sku: product.sku },
+                    relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
+                });
+                const marketplaceProductVariation = marketplaceProductVariations.filter(mpv => mpv.marketplaceProduct.marketplaceStore.id == marketplaceOrder.marketplaceStore.id)[0];
+                if (!(marketplaceProductVariation === null || marketplaceProductVariation === void 0 ? void 0 : marketplaceProductVariation.primaryUnitValue))
                     throw new Error(marketplaceProductVariation.variationSku + ' weight is empty');
-                const primaryUnitValue = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2));
-                delete marketplaceOrderItem.id;
+                const primaryUnitValue = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2)) || 0;
+                delete marketplaceOrderShippingItem.id;
                 let newMarketplaceOrderShipping = new entities_1.MarketplaceOrderShipping();
                 newMarketplaceOrderShipping.name = utils_1.NoGenerator.orderShipping();
                 newMarketplaceOrderShipping.address1 = originalMarketplaceOrderShipping.address1;
@@ -79,12 +103,13 @@ exports.splitOrdersByBatch = {
                     newMarketplaceOrderShipping = await tx
                         .getRepository(entities_1.MarketplaceOrderShipping)
                         .save(newMarketplaceOrderShipping);
-                    marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
-                    marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
-                    marketplaceOrderItem.domain = marketplaceOrder.domain;
-                    marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo;
+                    marketplaceOrderShippingItem.name = (0, v4_1.default)();
+                    marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
+                    marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
+                    marketplaceOrderShippingItem.product = product;
+                    marketplaceOrderShippingItem.domain = marketplaceOrder.domain;
                     let splittedShipment = {
-                        shipments: [Object.assign({}, marketplaceOrderItem)],
+                        shipments: [Object.assign({}, marketplaceOrderShippingItem)],
                         totalWeight: primaryUnitValue
                     };
                     splittedShipmentItems.push(splittedShipment);
@@ -97,15 +122,19 @@ exports.splitOrdersByBatch = {
                             if (idx === splittedShipmentItems.length - 1) {
                                 let shipments = shipmentItem.shipments;
                                 shipments = shipments.map(async (shipment) => {
-                                    if (shipment.marketplaceProductVariation.id === marketplaceProductVariation.id) {
-                                        shipment.qty += marketplaceOrderItem.qty;
+                                    if (shipment.product.id === product.id) {
+                                        shipment.qty += marketplaceOrderShippingItem.qty;
                                     }
                                     else {
-                                        marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
-                                        marketplaceOrderItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping;
-                                        marketplaceOrderItem.domain = marketplaceOrder.domain;
-                                        marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo;
-                                        shipmentItem.shipments.push(Object.assign({}, marketplaceOrderItem));
+                                        const matchedProduct = shipments.find(shipment => shipment.product.id == product.id);
+                                        if (!matchedProduct) {
+                                            marketplaceOrderShippingItem.name = (0, v4_1.default)();
+                                            marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
+                                            marketplaceOrderShippingItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping;
+                                            marketplaceOrderShippingItem.product = product;
+                                            marketplaceOrderShippingItem.domain = marketplaceOrder.domain;
+                                            shipmentItem.shipments.push(Object.assign({}, marketplaceOrderShippingItem));
+                                        }
                                     }
                                     shipment.marketplaceOrderShipping.totalWeight = parseFloat((lastTotalWeight + primaryUnitValue).toFixed(2));
                                     await tx.getRepository(entities_1.MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping);
@@ -119,233 +148,33 @@ exports.splitOrdersByBatch = {
                         newMarketplaceOrderShipping = await tx
                             .getRepository(entities_1.MarketplaceOrderShipping)
                             .save(newMarketplaceOrderShipping);
-                        marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
-                        marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
-                        marketplaceOrderItem.domain = marketplaceOrder.domain;
-                        marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo;
+                        marketplaceOrderShippingItem.name = (0, v4_1.default)();
+                        marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
+                        marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
+                        marketplaceOrderShippingItem.product = product;
+                        marketplaceOrderShippingItem.domain = marketplaceOrder.domain;
                         let splittedShipment = {
-                            shipments: [Object.assign({}, marketplaceOrderItem)],
+                            shipments: [Object.assign({}, marketplaceOrderShippingItem)],
                             totalWeight: primaryUnitValue
                         };
                         splittedShipmentItems.push(splittedShipment);
                     }
                 }
             }
-            let savedMarketplaceOrderItems = [];
+            let savedMarketplaceOrderShippingItems = [];
             for (let a = 0; a < splittedShipmentItems.length; a++) {
                 const shipments = splittedShipmentItems[a].shipments;
                 for (let b = 0; b < shipments.length; b++) {
-                    savedMarketplaceOrderItems.push(shipments[b]);
+                    savedMarketplaceOrderShippingItems.push(shipments[b]);
                 }
             }
-            savedMarketplaceOrderItems = await tx.getRepository(entities_1.MarketplaceOrderItem).save(savedMarketplaceOrderItems);
-            await tx.getRepository(entities_1.MarketplaceOrderItem).delete(originalMarketplaceOrderItems.map(item => item.id));
+            savedMarketplaceOrderShippingItems = await tx
+                .getRepository(entities_1.MarketplaceOrderShippingItem)
+                .save(savedMarketplaceOrderShippingItems);
+            await tx
+                .getRepository(entities_1.MarketplaceOrderShippingItem)
+                .delete(originalMarketplaceOrderShippingItems.map(item => item.id));
             await tx.getRepository(entities_1.MarketplaceOrderShipping).delete(originalMarketplaceOrderShipping.id);
-            // if (marketplaceStore.platform === 'shopee') {
-            //   let marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-            //   if (marketplaceOrderItems.some(item => item.marketplaceProductVariation.primaryUnitValue == null)) {
-            //     throw new Error('some sku weight are empty')
-            //   }
-            //   marketplaceOrderItems.sort(function (a, b) {
-            //     if (
-            //       a.marketplaceProductVariation.primaryUnitValue * a.qty <
-            //       b.marketplaceProductVariation.primaryUnitValue * b.qty
-            //     )
-            //       return -1
-            //     if (
-            //       a.marketplaceProductVariation.primaryUnitValue * a.qty >
-            //       b.marketplaceProductVariation.primaryUnitValue * b.qty
-            //     )
-            //       return 1
-            //     return 0
-            //   })
-            //   let splittedShipmentItems: any[] = []
-            //   for (let j: number = 0; j < marketplaceOrderItems.length; j++) {
-            //     const marketplaceOrderItem: MarketplaceOrderItem = marketplaceOrderItems[j]
-            //     const marketplaceProductVariation: MarketplaceProductVariation =
-            //       marketplaceOrderItem.marketplaceProductVariation
-            //     const qty: number = marketplaceOrderItem.qty
-            //     const primaryValue: number = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2)) * qty
-            //     if (splittedShipmentItems.length == 0) {
-            //       let splittedShipment: any = {
-            //         shipments: [{ ...marketplaceOrderItem }],
-            //         totalWeight: primaryValue
-            //       }
-            //       splittedShipmentItems.push(splittedShipment)
-            //     } else {
-            //       let lastShipment: any = splittedShipmentItems[splittedShipmentItems.length - 1]
-            //       let lastTotalWeight: number = parseFloat(lastShipment.totalWeight.toFixed(2))
-            //       if (lastTotalWeight + primaryValue < parseFloat(maxWeightSetting.value)) {
-            //         splittedShipmentItems.map((shipmentItem, idx) => {
-            //           if (idx === splittedShipmentItems.length - 1) {
-            //             let shipments: any[] = shipmentItem.shipments
-            //             shipments = shipments.map(async shipment => {
-            //               if (shipment.marketplaceProductVariation.id === marketplaceProductVariation.id) {
-            //                 shipment.qty += marketplaceOrderItem.qty
-            //               } else {
-            //                 marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-            //                 marketplaceOrderItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping
-            //                 shipmentItem.shipments.push({ ...marketplaceOrderItem })
-            //               }
-            //               shipment.marketplaceOrderShipping.totalWeight = parseFloat(
-            //                 (lastTotalWeight + primaryValue).toFixed(2)
-            //               )
-            //               await tx.getRepository(MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping)
-            //             })
-            //             shipmentItem.totalWeight += primaryValue
-            //           }
-            //         })
-            //       } else {
-            //         let splittedShipment: any = {
-            //           shipments: [{ ...marketplaceOrderItem }],
-            //           totalWeight: primaryValue
-            //         }
-            //         splittedShipmentItems.push(splittedShipment)
-            //       }
-            //     }
-            //   }
-            //   let parcels: any[] = []
-            //   splittedShipmentItems.forEach(shipmentItem => {
-            //     parcels.push(
-            //       shipmentItem.shipments.map(shipment => {
-            //         return {
-            //           item_id: parseFloat(shipment.name),
-            //           variation_id: parseFloat(shipment.marketplaceProductVariation.variationId),
-            //           order_item_id: parseFloat(shipment.name),
-            //           promotion_group_id: 0
-            //         }
-            //       })
-            //     )
-            //   })
-            //   const splittedPackage: any = await StoreAPI.splitOrder(marketplaceStore, {
-            //     ordersn: marketplaceOrder.orderNo,
-            //     parcels
-            //   })
-            //   const packageLists: any[] = splittedPackage.packageList
-            //   for (let a: number = 0; a < packageLists.length; a++) {
-            //     const packageList: any = packageLists[a]
-            //     const packageNumber: string = packageList.packageNumber
-            //     const packageItems: any[] = packageList.items
-            //     for (let b: number = 0; b < marketplaceOrderItems.length; b++) {
-            //       let marketplaceOrderItem: any = marketplaceOrderItems[b]
-            //       if (packageItems.find(item => item.itemId === marketplaceOrderItem)) {
-            //         marketplaceOrderItem.packageId = packageNumber
-            //       }
-            //     }
-            //   }
-            //   await tx.getRepository(MarketplaceOrderItem).save(marketplaceOrderItems)
-            // } else {
-            //   let originalMarketplaceOrderShipping: MarketplaceOrderShipping = await tx
-            //     .getRepository(MarketplaceOrderShipping)
-            //     .findOne({
-            //       where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore }
-            //     })
-            //   const originalMarketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-            //   let newMarketplaceOrderItems: MarketplaceOrderItem[] = []
-            //   let splittedShipmentItems: any[] = []
-            //   for (let a: number = 0; a < originalMarketplaceOrderItems.length; a++) {
-            //     const marketplaceOrderItem: MarketplaceOrderItem = originalMarketplaceOrderItems[a]
-            //     for (let b: number = 0; b < marketplaceOrderItem.qty; b++) {
-            //       const newItem: MarketplaceOrderItem = {
-            //         ...marketplaceOrderItem,
-            //         qty: 1
-            //       }
-            //       newMarketplaceOrderItems.push(newItem)
-            //     }
-            //   }
-            //   newMarketplaceOrderItems.sort(function (a, b) {
-            //     if (a.marketplaceProductVariation.primaryUnitValue < b.marketplaceProductVariation.primaryUnitValue) return -1
-            //     if (a.marketplaceProductVariation.primaryUnitValue > b.marketplaceProductVariation.primaryUnitValue) return 1
-            //     return 0
-            //   })
-            //   for (let a: number = 0; a < newMarketplaceOrderItems.length; a++) {
-            //     const marketplaceOrderItem: MarketplaceOrderItem = newMarketplaceOrderItems[a]
-            //     const marketplaceProductVariation: MarketplaceProductVariation =
-            //       marketplaceOrderItem.marketplaceProductVariation
-            //     if (!marketplaceProductVariation.primaryUnitValue)
-            //       throw new Error(marketplaceProductVariation.variationSku + 'weight is empty')
-            //     const primaryUnitValue: number = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2))
-            //     delete marketplaceOrderItem.id
-            //     let newMarketplaceOrderShipping: MarketplaceOrderShipping = new MarketplaceOrderShipping()
-            //     newMarketplaceOrderShipping.name = NoGenerator.orderShipping()
-            //     newMarketplaceOrderShipping.address1 = originalMarketplaceOrderShipping.address1
-            //     newMarketplaceOrderShipping.address2 = originalMarketplaceOrderShipping.address2
-            //     newMarketplaceOrderShipping.address3 = originalMarketplaceOrderShipping.address3
-            //     newMarketplaceOrderShipping.address4 = originalMarketplaceOrderShipping.address4
-            //     newMarketplaceOrderShipping.address5 = originalMarketplaceOrderShipping.address5
-            //     newMarketplaceOrderShipping.attentionTo = originalMarketplaceOrderShipping.attentionTo
-            //     newMarketplaceOrderShipping.city = originalMarketplaceOrderShipping.city
-            //     newMarketplaceOrderShipping.country = originalMarketplaceOrderShipping.country
-            //     newMarketplaceOrderShipping.postCode = originalMarketplaceOrderShipping.postCode
-            //     newMarketplaceOrderShipping.phone1 = originalMarketplaceOrderShipping.phone1
-            //     newMarketplaceOrderShipping.phone2 = originalMarketplaceOrderShipping.phone2
-            //     newMarketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo
-            //     newMarketplaceOrderShipping.transporter = originalMarketplaceOrderShipping.transporter
-            //     newMarketplaceOrderShipping.marketplaceStore = marketplaceStore
-            //     newMarketplaceOrderShipping.creator = user
-            //     newMarketplaceOrderShipping.domain = marketplaceOrder.domain
-            //     newMarketplaceOrderShipping.weightUnit = 'KG'
-            //     if (splittedShipmentItems.length == 0) {
-            //       newMarketplaceOrderShipping.totalWeight = primaryUnitValue
-            //       newMarketplaceOrderShipping = await tx
-            //         .getRepository(MarketplaceOrderShipping)
-            //         .save(newMarketplaceOrderShipping)
-            //       marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-            //       marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
-            //       let splittedShipment: any = {
-            //         shipments: [{ ...marketplaceOrderItem }],
-            //         totalWeight: primaryUnitValue
-            //       }
-            //       splittedShipmentItems.push(splittedShipment)
-            //     } else {
-            //       let lastShipment: any = splittedShipmentItems[splittedShipmentItems.length - 1]
-            //       let lastTotalWeight: number = parseFloat(lastShipment.totalWeight.toFixed(2))
-            //       if (lastTotalWeight + primaryUnitValue < parseFloat(maxWeightSetting.value)) {
-            //         splittedShipmentItems.map((shipmentItem, idx) => {
-            //           if (idx === splittedShipmentItems.length - 1) {
-            //             let shipments: any[] = shipmentItem.shipments
-            //             shipments = shipments.map(async shipment => {
-            //               if (shipment.marketplaceProductVariation.id === marketplaceProductVariation.id) {
-            //                 shipment.qty += marketplaceOrderItem.qty
-            //               } else {
-            //                 marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-            //                 marketplaceOrderItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping
-            //                 shipmentItem.shipments.push({ ...marketplaceOrderItem })
-            //               }
-            //               shipment.marketplaceOrderShipping.totalWeight = parseFloat(
-            //                 (lastTotalWeight + primaryUnitValue).toFixed(2)
-            //               )
-            //               await tx.getRepository(MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping)
-            //             })
-            //             shipmentItem.totalWeight += primaryUnitValue
-            //           }
-            //         })
-            //       } else {
-            //         newMarketplaceOrderShipping.totalWeight = primaryUnitValue
-            //         newMarketplaceOrderShipping = await tx
-            //           .getRepository(MarketplaceOrderShipping)
-            //           .save(newMarketplaceOrderShipping)
-            //         marketplaceOrderItem.marketplaceOrder = marketplaceOrder
-            //         marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping
-            //         let splittedShipment: any = {
-            //           shipments: [{ ...marketplaceOrderItem }],
-            //           totalWeight: primaryUnitValue
-            //         }
-            //         splittedShipmentItems.push(splittedShipment)
-            //       }
-            //     }
-            //   }
-            //   let savedMarketplaceOrderItems: MarketplaceOrderItem[] = []
-            //   for (let a: number = 0; a < splittedShipmentItems.length; a++) {
-            //     const shipments: any[] = splittedShipmentItems[a].shipments
-            //     for (let b: number = 0; b < shipments.length; b++) {
-            //       savedMarketplaceOrderItems.push(shipments[b])
-            //     }
-            //   }
-            //   savedMarketplaceOrderItems = await tx.getRepository(MarketplaceOrderItem).save(savedMarketplaceOrderItems)
-            //   await tx.getRepository(MarketplaceOrderItem).delete(originalMarketplaceOrderItems.map(item => item.id))
-            //   await tx.getRepository(MarketplaceOrderShipping).delete(originalMarketplaceOrderShipping.id)
-            // }
             let marketplaceOrderShippings = await tx
                 .getRepository(entities_1.MarketplaceOrderShipping)
                 .find({ where: { domain, orderNoRef: marketplaceOrder.orderNo } });

package/dist-server/graphql/resolvers/marketplace-order/split-orders-by-batch.js.map

@@ -1 +1 @@
-{"version":3,"file":"split-orders-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"split-orders-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js

@@ -259,7 +259,9 @@ exports.syncAllMarketplaceOrder = {
                                     else {
                                         if (existingMarketplaceOrder === null || existingMarketplaceOrder === void 0 ? void 0 : existingMarketplaceOrder.marketplaceOrderItems) {
                                             let existingOrderShipping;
-                                            existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping;
+                                            existingOrderShipping =
+                                                existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShippingItems[0]
+                                                    .marketplaceOrderShipping;
                                             marketplaceOrderShipping = Object.assign(Object.assign(Object.assign({}, existingOrderShipping), marketplaceOrderShipping), { trackingNo: (order === null || order === void 0 ? void 0 : order.trackingNo) ? order.trackingNo : existingOrderShipping.trackingNo, updater: user });
                                             savedMarketplaceOrderShipping = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
                                         }
@@ -300,7 +302,6 @@ exports.syncAllMarketplaceOrder = {
                                 marketplaceOrderItem.marketplaceProductVariation = foundVariation;
                                 marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
                                 marketplaceOrderItem.trackingCode = order.trackingNo;
-                                marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping;
                                 marketplaceOrderItem.originalPrice = item.originalPrice;
                                 marketplaceOrderItem.discount = item.discount;
                                 marketplaceOrderItem.promotionId = item.promotionId;