npm - @things-factory/marketplace-base - Versions diffs - 3.6.3 → 3.6.8 - Mend

@things-factory/marketplace-base 3.6.3 → 3.6.8

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

package/dist-server/entities/marketplace-order-shipping.js CHANGED Viewed

@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarketplaceOrderShipping = void 0;
-const auth_base_1 = require("@things-factory/auth-base");
-const shell_1 = require("@things-factory/shell");
 const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../entities");
 let MarketplaceOrderShipping = class MarketplaceOrderShipping {
 };
@@ -42,6 +42,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrderShipping.prototype, "orderNoRef", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrderShipping.prototype, "subOrderNoRef", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", String)
@@ -98,6 +102,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrderShipping.prototype, "transporter", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrderShipping.prototype, "ownTransporter", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
@@ -154,6 +162,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrderShipping.prototype, "trackingNo", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrderShipping.prototype, "ownTrackingNo", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)

package/dist-server/entities/marketplace-order-shipping.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,~~iDAA8C~~;~~AAC9C~~,~~qCASgB~~;~~AAChB~~,~~qFAA0E;AAC1E,~~0CAAkD;~~AAUlD~~,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;~~CA4HpC~~,CAAA;~~AA1HC~~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~~AA3HF~~,wBAAwB;IATpC,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,iCAAiC,EACjC,CAAC,wBAAkD,EAAE,EAAE,CAAC;QACtD,wBAAwB,CAAC,MAAM;QAC/B,wBAAwB,CAAC,IAAI;KAC9B,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,wBAAwB,~~CA4HpC~~;~~AA5HY~~,4DAAwB"}
1	+ {"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":"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"}

package/dist-server/entities/marketplace-order.js CHANGED Viewed

@@ -11,12 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarketplaceOrder = void 0;
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
+const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../entities");
-const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
 let MarketplaceOrder = class MarketplaceOrder {
 };
 __decorate([
@@ -87,10 +87,18 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrder.prototype, "trackingNo", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrder.prototype, "ownTrackingNo", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrder.prototype, "shippingProvider", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], MarketplaceOrder.prototype, "ownShippingProvider", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     __metadata("design:type", String)
@@ -115,6 +123,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], MarketplaceOrder.prototype, "otherInfoJSON", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Boolean)
+], MarketplaceOrder.prototype, "isSplitted", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)(),
     __metadata("design:type", Date)

package/dist-server/entities/marketplace-order.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,qFAA0E;AAC1E,iDAA8C;~~AAC9C~~,~~qCASgB;AAChB,~~0CAAkD;~~AAClD~~,~~qFAA2E;AAQ3E,~~IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;~~CAwF5B~~,CAAA;~~AAtFC~~;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0CAAgB,CAAC;kDAClB,0CAAgB,oBAAhB,0CAAgB;0DAAA;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,+BAAoB,EAAE,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;;+DAC1D;AAG7C;IADC,IAAA,gBAAM,GAAE;;8CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACZ;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACvB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,OAAO;oDAAA;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACH;AAGxB;IADC,IAAA,gBAAM,GAAE;;gDACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACL;AAGtB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2CAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACtC,2CAAiB,oBAAjB,2CAAiB;2DAAA;AAGpC;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACX,IAAI;wDAAA;AAGpB;IADC,IAAA,gBAAM,GAAE;8BACO,IAAI;wDAAA;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;~~AAvFF~~,gBAAgB;IAN5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,wBAAwB,EACxB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EACxF,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,gBAAgB,~~CAwF5B~~;~~AAxFY~~,4CAAgB"}
1	+ {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order/cancel-marketplace-order.js CHANGED Viewed

@@ -28,13 +28,32 @@ exports.cancelMarketplaceOrderResolver = {
         marketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).save(marketplaceOrder);
         const cancelStatuses = ['cancelled', 'canceled'];
         if (cancelStatuses.includes(marketplaceOrder.status) && (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.releaseOrderId)) {
-            const releaseOrderId = marketplaceOrder.releaseOrderId;
-            const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
-            const centerId = fulfillmentCenter.centerId;
-            const warehouseDomain = await tx.getRepository(shell_1.Domain).findOne({ where: { subdomain: centerId } });
-            const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
-            const customerBizplaceId = customerBizplaces[0].id;
-            await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId });
+            if (marketplaceOrder.isSplitted) {
+                const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
+                const centerId = fulfillmentCenter.centerId;
+                const warehouseDomain = await tx.getRepository(shell_1.Domain).findOne({ where: { subdomain: centerId } });
+                const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
+                const customerBizplaceId = customerBizplaces[0].id;
+                const { items: releaseOrders } = await integration_fulfillment_1.FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
+                    customerBizplaceId,
+                    refNo: marketplaceOrder.orderNo
+                });
+                if (releaseOrders === null || releaseOrders === void 0 ? void 0 : releaseOrders.length) {
+                    for (var a = 0; a < releaseOrders.length; a++) {
+                        const releaseOrderId = releaseOrders[a].id;
+                        await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId });
+                    }
+                }
+            }
+            else {
+                const releaseOrderId = marketplaceOrder.releaseOrderId;
+                const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
+                const centerId = fulfillmentCenter.centerId;
+                const warehouseDomain = await tx.getRepository(shell_1.Domain).findOne({ where: { subdomain: centerId } });
+                const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
+                const customerBizplaceId = customerBizplaces[0].id;
+                await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId });
+            }
         }
         return marketplaceOrder;
     }

package/dist-server/graphql/resolvers/marketplace-order/cancel-marketplace-order.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cancel-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/cancel-marketplace-order.ts"],"names":[],"mappings":";;;AAGA,uDAAyE;AACzE,qFAA2F;AAC3F,iDAA8C;AAE9C,gDAA0E;AAE7D,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAY;QACnE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;YACxF,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;YAC1B,SAAS,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,uBAAuB,CAAC;SAC9E,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAE3D,IAAI,qBAAqB,GAA2B,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACzG,IAAI,oBAAoB,GAAyB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;YAC7E,oBAAoB,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;YAC1C,oBAAoB,CAAC,MAAM,GAAG,WAAW,CAAA;YACzC,oBAAoB,CAAC,OAAO,GAAG,IAAI,CAAA;YAEnC,OAAO,oBAAoB,CAAA;QAC7B,CAAC,CAAC,CAAA;QACF,MAAM,EAAE,CAAC,aAAa,CAAC,+BAAoB,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QAExE,gBAAgB,CAAC,MAAM,GAAG,WAAW,CAAA;QACrC,gBAAgB,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;QACtC,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAA;QAC/B,gBAAgB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAElF,MAAM,cAAc,GAAa,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAC1D,IAAI,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,CAAA,EAAE;YACxF,MAAM,cAAc,GAAW,gBAAgB,CAAC,cAAc,CAAA;~~YAC9D~~,MAAM,iBAAiB,GAAsB,gBAAgB,CAAC,iBAAiB,CAAA;~~YAC~~/E,MAAM,QAAQ,GAAW,iBAAiB,CAAC,QAAQ,CAAA;~~YAEnD~~,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;~~YAC1G~~,MAAM,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;~~YACjF~~,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;~~YAC1D~~,MAAM,wCAAc,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,CAAC,CAAA;~~SACnG~~;QAED,OAAO,gBAAgB,CAAA;IACzB,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"cancel-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/cancel-marketplace-order.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js CHANGED Viewed

@@ -28,8 +28,13 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
         newMarketplaceOrderShipping.name = (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.shippingId)
             ? marketplaceOrderShipping.shippingId
             : no_generator_1.NoGenerator.orderShipping();
+        newMarketplaceOrderShipping.transporter =
+            (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.transporter) === '' ? null : marketplaceOrderShipping.transporter;
+        newMarketplaceOrderShipping.ownTransporter =
+            (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.transporter) === '' ? null : marketplaceOrderShipping.transporter;
         newMarketplaceOrderShipping.marketplaceStore = marketplaceStore;
         newMarketplaceOrderShipping.orderNoRef = newMarketplaceOrder.orderNo;
+        newMarketplaceOrderShipping.subOrderNoRef = newMarketplaceOrder.orderNo;
         newMarketplaceOrderShipping.domain = domain;
         newMarketplaceOrderShipping.creator = user;
         newMarketplaceOrderShipping = await tx

package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts"],"names":[],"mappings":";;;~~AAIA~~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~~AAnED~~,~~4DAmEC~~"}
1	+ {"version":3,"file":"generate-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order/index.js CHANGED Viewed

@@ -25,12 +25,14 @@ const marketplace_orders_for_batch_init_1 = require("./marketplace-orders-for-ba
 const marketplace_orders_for_export_1 = require("./marketplace-orders-for-export");
 const set_marketplace_order_delivered_1 = require("./set-marketplace-order-delivered");
 const set_marketplace_order_failed_delivery_1 = require("./set-marketplace-order-failed-delivery");
+const set_own_shipping_provider_by_orders_1 = require("./set-own-shipping-provider-by-orders");
 const split_orders_by_batch_1 = require("./split-orders-by-batch");
 const sync_all_marketplace_order_1 = require("./sync-all-marketplace-order");
 const sync_marketplace_order_1 = require("./sync-marketplace-order");
+const update_marketplace_order_1 = require("./update-marketplace-order");
 const update_order_ready_to_ship_1 = require("./update-order-ready-to-ship");
 exports.MarketplaceOrderResolver = {
     Query: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, marketplace_orders_1.marketplaceOrdersResolver), marketplace_order_1.marketplaceOrderResolver), get_order_document_1.getOrderDocumentResolver), get_etrax_order_document_1.getETraxOrderDocumentResolver), get_store_logistics_1.getStoreLogistics), get_logistics_param_1.getLogisticsParam), get_branch_list_1.getBranchList), get_address_list_1.getAddressList), get_time_slot_1.getTimeSlot), marketplace_orders_for_export_1.marketplaceOrdersForExport), marketplace_orders_for_batch_init_1.marketplaceOrdersForBatchInitResolver), dashboard_marketplace_orders_1.dashboardMarketplaceOrdersResolver), dashboard_marketplace_sales_1.dashboardMarketplaceSalesResolver), dashboard_marketplace_sales_average_1.dashboardMarketplaceSalesAverageResolver),
-    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_marketplace_order_1.generateMarketplaceOrderResolver), initialise_logistics_1.initialiseLogistics), initialise_logistics_by_batch_1.initialiseLogisticsByBatch), set_marketplace_order_delivered_1.setMarketplaceOrderDelivered), set_marketplace_order_failed_delivery_1.setMarketplaceOrderFailedDelivery), sync_marketplace_order_1.syncMarketplaceOrder), sync_all_marketplace_order_1.syncAllMarketplaceOrder), update_order_ready_to_ship_1.updateOrderReadyToShip), delete_marketplace_orders_1.deleteMarketplaceOrders), initialise_shopee_logistics_by_batch_1.initialiseShopeeLogisticsByBatch), initialise_lazada_logistics_by_batch_1.initialiseLazadaLogisticsByBatch), cancel_marketplace_order_1.cancelMarketplaceOrderResolver), split_orders_by_batch_1.splitOrdersByBatch)
+    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_marketplace_order_1.generateMarketplaceOrderResolver), initialise_logistics_1.initialiseLogistics), initialise_logistics_by_batch_1.initialiseLogisticsByBatch), set_marketplace_order_delivered_1.setMarketplaceOrderDelivered), set_marketplace_order_failed_delivery_1.setMarketplaceOrderFailedDelivery), sync_marketplace_order_1.syncMarketplaceOrder), sync_all_marketplace_order_1.syncAllMarketplaceOrder), update_order_ready_to_ship_1.updateOrderReadyToShip), delete_marketplace_orders_1.deleteMarketplaceOrders), initialise_shopee_logistics_by_batch_1.initialiseShopeeLogisticsByBatch), initialise_lazada_logistics_by_batch_1.initialiseLazadaLogisticsByBatch), cancel_marketplace_order_1.cancelMarketplaceOrderResolver), split_orders_by_batch_1.splitOrdersByBatch), update_marketplace_order_1.updateMarketplaceOrder), set_own_shipping_provider_by_orders_1.setOwnShippingProviderByOrdersResolver)
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/marketplace-order/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/index.ts"],"names":[],"mappings":";;;AAAA,yEAA2E;AAC3E,iFAAmF;AACnF,+EAAiF;AACjF,+FAAgG;AAChG,2EAAqE;AACrE,6EAA+E;AAC/E,yDAAmD;AACnD,uDAAiD;AACjD,yEAAyG;~~AAsDhG~~,~~8GAtDA~~,wDAA6B,~~OAsDA~~;~~AArDtC~~,+DAAyD;AACzD,6DAA+D;AAC/D,+DAAyD;AACzD,mDAA6C;AAC7C,iGAAyF;AACzF,iEAA4D;AAC5D,mFAA4E;AAC5E,iGAAyF;AACzF,2DAA8D;AAC9D,6DAAgE;AAChE,2FAA2F;AAC3F,mFAA4E;AAC5E,uFAAgF;AAChF,mGAA2F;AAC3F,mEAA4D;AAC5D,6EAAsE;AACtE,qEAA+D;AAC/D,6EAAqE;AAExD,QAAA,wBAAwB,GAAG;IACtC,KAAK,0MACA,8CAAyB,GACzB,4CAAwB,GACxB,6CAAwB,GACxB,wDAA6B,GAC7B,uCAAiB,GACjB,uCAAiB,GACjB,+BAAa,GACb,iCAAc,GACd,2BAAW,GACX,0DAA0B,GAC1B,yEAAqC,GACrC,iEAAkC,GAClC,+DAAiC,GACjC,8EAAwC,CAC5C;IACD,QAAQ,~~4LACH~~,6DAAgC,GAChC,0CAAmB,GACnB,0DAA0B,GAC1B,8DAA4B,GAC5B,yEAAiC,GACjC,6CAAoB,GACpB,oDAAuB,GACvB,mDAAsB,GACtB,mDAAuB,GACvB,uEAAgC,GAChC,uEAAgC,GAChC,yDAA8B,GAC9B,0CAAkB,~~CACtB~~;CACF,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/index.ts"],"names":[],"mappings":";;;AAAA,yEAA2E;AAC3E,iFAAmF;AACnF,+EAAiF;AACjF,+FAAgG;AAChG,2EAAqE;AACrE,6EAA+E;AAC/E,yDAAmD;AACnD,uDAAiD;AACjD,yEAAyG;AA0DhG,8GA1DA,wDAA6B,OA0DA;AAzDtC,+DAAyD;AACzD,6DAA+D;AAC/D,+DAAyD;AACzD,mDAA6C;AAC7C,iGAAyF;AACzF,iEAA4D;AAC5D,mFAA4E;AAC5E,iGAAyF;AACzF,2DAA8D;AAC9D,6DAAgE;AAChE,2FAA2F;AAC3F,mFAA4E;AAC5E,uFAAgF;AAChF,mGAA2F;AAC3F,+FAA8F;AAC9F,mEAA4D;AAC5D,6EAAsE;AACtE,qEAA+D;AAC/D,yEAAmE;AACnE,6EAAqE;AAExD,QAAA,wBAAwB,GAAG;IACtC,KAAK,0MACA,8CAAyB,GACzB,4CAAwB,GACxB,6CAAwB,GACxB,wDAA6B,GAC7B,uCAAiB,GACjB,uCAAiB,GACjB,+BAAa,GACb,iCAAc,GACd,2BAAW,GACX,0DAA0B,GAC1B,yEAAqC,GACrC,iEAAkC,GAClC,+DAAiC,GACjC,8EAAwC,CAC5C;IACD,QAAQ,wNACH,6DAAgC,GAChC,0CAAmB,GACnB,0DAA0B,GAC1B,8DAA4B,GAC5B,yEAAiC,GACjC,6CAAoB,GACpB,oDAAuB,GACvB,mDAAsB,GACtB,mDAAuB,GACvB,uEAAgC,GAChC,uEAAgC,GAChC,yDAA8B,GAC9B,0CAAkB,GAClB,iDAAsB,GACtB,4EAAsC,CAC1C;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js CHANGED Viewed

@@ -20,8 +20,10 @@ exports.initialiseLogisticsByBatch = {
                 throw new Error('No order is found');
             marketplaceOrderShipping.trackingNo = patch === null || patch === void 0 ? void 0 : patch.trackingNo;
             marketplaceOrderShipping.transporter = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
+            marketplaceOrderShipping.ownTransporter = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
             await tx.getRepository(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
-            marketplaceOrder.shippingProvider = patch.shippingProvider;
+            marketplaceOrder.shippingProvider = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
+            marketplaceOrder.ownShippingProvider = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
             marketplaceOrder.trackingNo = patch === null || patch === void 0 ? void 0 : patch.trackingNo;
             await tx.getRepository(entities_1.MarketplaceOrder).save(marketplaceOrder);
         }));

package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"initialise-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.ts"],"names":[],"mappings":";;;AAIA,gDAA8E;AAEjE,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QAChE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsC,OAAO,CAAC,KAAK,CAAA;QAErE,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACxB,IAAI,wBAAwB,GAA6B,MAAM,EAAE;iBAC9D,aAAa,CAAC,mCAAwB,CAAC;iBACvC,OAAO,CAAC;gBACP,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;gBACvB,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEJ,IAAI,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;gBACxF,KAAK,EAAE,EAAE,OAAO,EAAE,wBAAwB,CAAC,UAAU,EAAE;gBACvD,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEF,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAE3D,wBAAwB,CAAC,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAA;YACvD,wBAAwB,CAAC,WAAW,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,gBAAgB,CAAA;YAC9D,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAwB,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;YAE/E,gBAAgB,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAA;~~YAC1D~~,gBAAgB,CAAC,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAA;YAE/C,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACjE,CAAC,CAAC,CACH,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"initialise-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.ts"],"names":[],"mappings":";;;AAIA,gDAA8E;AAEjE,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QAChE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsC,OAAO,CAAC,KAAK,CAAA;QAErE,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACxB,IAAI,wBAAwB,GAA6B,MAAM,EAAE;iBAC9D,aAAa,CAAC,mCAAwB,CAAC;iBACvC,OAAO,CAAC;gBACP,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;gBACvB,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEJ,IAAI,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;gBACxF,KAAK,EAAE,EAAE,OAAO,EAAE,wBAAwB,CAAC,UAAU,EAAE;gBACvD,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEF,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAE3D,wBAAwB,CAAC,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAA;YACvD,wBAAwB,CAAC,WAAW,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,gBAAgB,CAAA;YAC9D,wBAAwB,CAAC,cAAc,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,gBAAgB,CAAA;YACjE,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAwB,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;YAE/E,gBAAgB,CAAC,gBAAgB,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,gBAAgB,CAAA;YAC3D,gBAAgB,CAAC,mBAAmB,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,gBAAgB,CAAA;YAC9D,gBAAgB,CAAC,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAA;YAE/C,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACjE,CAAC,CAAC,CACH,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.js CHANGED Viewed

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initialiseShopeeLogisticsByBatch = void 0;
-const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const typeorm_1 = require("typeorm");
+const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const entities_1 = require("../../../entities");
 exports.initialiseShopeeLogisticsByBatch = {
     async initialiseShopeeLogisticsByBatch(_, { patches }, context) {
         await Promise.all(patches.map(async (patch) => {
-            const foundMarketplaceOrder = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).findOne({
+            let foundMarketplaceOrder = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).findOne({
                 where: { id: patch.id },
                 relations: ['marketplaceStore', 'marketplaceOrderItems']
             });

package/dist-server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"initialise-shopee-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.ts"],"names":[],"mappings":";;;AAAA,~~qFAAoF~~;~~AACpF~~,~~qCAAuC~~;~~AACvC~~,gDAAoD;AAEvC,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,gCAAgC,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACtE,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACxB,~~MAAM~~,qBAAqB,GAAqB,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;~~gBAC5F~~,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;gBACvB,SAAS,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,CAAC;aACzD,CAAC,CAAA;YACF,IAAI,CAAC,qBAAqB;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAEhE,MAAM,OAAO,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,EAAE,CAAA;YACzD,MAAM,gBAAgB,GAAqB,MAAM,kCAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;YACtF,MAAM,UAAU,GAAG,MAAM,kCAAQ,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YAE7F,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,KAAI,eAAe,IAAI,KAAK,CAAC,YAAY,EAAE;gBAC/D,IAAI,YAAY,GAAG,EAAE,CAAA;gBACrB,IAAI,KAAK,CAAC,YAAY,IAAI,QAAQ,KAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,CAAA,KAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,CAAA,EAAE;oBAC7E,YAAY,GAAG;wBACb,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;4BACpB,SAAS,EAAE,KAAK,CAAC,SAAS;4BAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;yBACjC;qBACF,CAAA;iBACF;qBAAM,IAAI,KAAK,CAAC,YAAY,IAAI,SAAS,EAAE;oBAC1C,YAAY,GAAG;wBACb,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE;qBACzB,CAAA;oBAED,IAAI,KAAK,CAAC,QAAQ;wBAChB,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,mCAAQ,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,KAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAE,CAAA;oBACtG,IAAI,KAAK,CAAC,cAAc;wBACtB,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,mCAC3B,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,KACnC,cAAc,EAAE,KAAK,CAAC,cAAc,GACrC,CAAA;oBACH,IAAI,KAAK,CAAC,UAAU;wBAClB,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,mCAAQ,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,KAAE,UAAU,EAAE,KAAK,CAAC,UAAU,GAAE,CAAA;iBAC3G;qBAAM,IAAI,KAAK,CAAC,YAAY,IAAI,gBAAgB,EAAE;oBACjD,YAAY,GAAG;wBACb,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE;qBACzB,CAAA;oBAED,IAAI,KAAK,CAAC,UAAU;wBAClB,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,mCAAQ,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,KAAE,UAAU,EAAE,KAAK,CAAC,UAAU,GAAE,CAAA;iBAC3G;qBAAM;oBACL,OAAO,KAAK,CAAA;iBACb;gBAED,MAAM,kCAAQ,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;aACzF;QACH,CAAC,CAAC,CACH,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"initialise-shopee-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order/set-own-shipping-provider-by-orders.js ADDED Viewed

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setOwnShippingProviderByOrdersResolver = void 0;
+const entities_1 = require("../../../entities");
+exports.setOwnShippingProviderByOrdersResolver = {
+    async setOwnShippingProviderByOrders(_, { patches }, context) {
+        const { user, tx } = context.state;
+        await Promise.all(patches.map(async (patch) => {
+            let marketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
+                where: { id: patch.id },
+                relations: ['marketplaceStore']
+            });
+            if (!marketplaceOrder)
+                throw new Error('No order is found');
+            let marketplaceOrderShippings = await tx
+                .getRepository(entities_1.MarketplaceOrderShipping)
+                .find({
+                where: { orderNoRef: marketplaceOrder.orderNo },
+                relations: ['marketplaceStore']
+            });
+            marketplaceOrder.ownShippingProvider = patch === null || patch === void 0 ? void 0 : patch.ownShippingProvider;
+            await tx.getRepository(entities_1.MarketplaceOrder).save(marketplaceOrder);
+            marketplaceOrderShippings = marketplaceOrderShippings.map(marketplaceOrderShipping => {
+                return Object.assign(Object.assign({}, marketplaceOrderShipping), { ownTransporter: patch === null || patch === void 0 ? void 0 : patch.ownShippingProvider });
+            });
+            await tx.getRepository(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShippings);
+        }));
+        return true;
+    }
+};
+//# sourceMappingURL=set-own-shipping-provider-by-orders.js.map

package/dist-server/graphql/resolvers/marketplace-order/set-own-shipping-provider-by-orders.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"set-own-shipping-provider-by-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/set-own-shipping-provider-by-orders.ts"],"names":[],"mappings":";;;AAIA,gDAA8E;AAEjE,QAAA,sCAAsC,GAAG;IACpD,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACpE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsC,OAAO,CAAC,KAAK,CAAA;QAErE,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACxB,IAAI,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;gBACxF,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;gBACvB,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEF,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;YAE3D,IAAI,yBAAyB,GAA+B,MAAM,EAAE;iBACjE,aAAa,CAAC,mCAAwB,CAAC;iBACvC,IAAI,CAAC;gBACJ,KAAK,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE;gBAC/C,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEJ,gBAAgB,CAAC,mBAAmB,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,mBAAmB,CAAA;YAEjE,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAE/D,yBAAyB,GAAG,yBAAyB,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE;gBACnF,uCACK,wBAAwB,KAC3B,cAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,mBAAmB,IAC3C;YACH,CAAC,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAwB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAClF,CAAC,CAAC,CACH,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

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

@@ -26,205 +26,338 @@ exports.splitOrdersByBatch = {
             });
             if (!maxWeightSetting)
                 throw new Error('marketplace_order_max_weight setting not found');
-            if (marketplaceStore.platform === 'shopee') {
-                let marketplaceOrderItems = 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 = [];
-                for (let j = 0; j < marketplaceOrderItems.length; j++) {
-                    const marketplaceOrderItem = marketplaceOrderItems[j];
-                    const marketplaceProductVariation = marketplaceOrderItem.marketplaceProductVariation;
-                    const qty = marketplaceOrderItem.qty;
-                    const primaryValue = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2)) * qty;
-                    if (splittedShipmentItems.length == 0) {
-                        let splittedShipment = {
-                            shipments: [Object.assign({}, marketplaceOrderItem)],
-                            totalWeight: primaryValue
-                        };
-                        splittedShipmentItems.push(splittedShipment);
-                    }
-                    else {
-                        let lastShipment = splittedShipmentItems[splittedShipmentItems.length - 1];
-                        let lastTotalWeight = parseFloat(lastShipment.totalWeight.toFixed(2));
-                        if (lastTotalWeight + primaryValue < parseFloat(maxWeightSetting.value)) {
-                            splittedShipmentItems.map((shipmentItem, idx) => {
-                                if (idx === splittedShipmentItems.length - 1) {
-                                    let shipments = 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(Object.assign({}, marketplaceOrderItem));
-                                        }
-                                        shipment.marketplaceOrderShipping.totalWeight = parseFloat((lastTotalWeight + primaryValue).toFixed(2));
-                                        await tx.getRepository(entities_1.MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping);
-                                    });
-                                    shipmentItem.totalWeight += primaryValue;
-                                }
-                            });
-                        }
-                        else {
-                            let splittedShipment = {
-                                shipments: [Object.assign({}, marketplaceOrderItem)],
-                                totalWeight: primaryValue
-                            };
-                            splittedShipmentItems.push(splittedShipment);
-                        }
-                    }
-                }
-                let parcels = [];
-                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 = await integration_marketplace_1.StoreAPI.splitOrder(marketplaceStore, {
-                    ordersn: marketplaceOrder.orderNo,
-                    parcels
-                });
-                const packageLists = splittedPackage.packageList;
-                for (let a = 0; a < packageLists.length; a++) {
-                    const packageList = packageLists[a];
-                    const packageNumber = packageList.packageNumber;
-                    const packageItems = packageList.items;
-                    for (let b = 0; b < marketplaceOrderItems.length; b++) {
-                        let marketplaceOrderItem = marketplaceOrderItems[b];
-                        if (packageItems.find(item => item.itemId === marketplaceOrderItem)) {
-                            marketplaceOrderItem.packageId = packageNumber;
-                        }
-                    }
+            let originalMarketplaceOrderShipping = await tx
+                .getRepository(entities_1.MarketplaceOrderShipping)
+                .findOne({
+                where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore }
+            });
+            const originalMarketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
+            let newMarketplaceOrderItems = [];
+            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);
                 }
-                await tx.getRepository(entities_1.MarketplaceOrderItem).save(marketplaceOrderItems);
             }
-            else {
-                let originalMarketplaceOrderShipping = await tx
-                    .getRepository(entities_1.MarketplaceOrderShipping)
-                    .findOne({
-                    where: { domain, orderNoRef: marketplaceOrder.orderNo, marketplaceStore: marketplaceOrder.marketplaceStore }
-                });
-                const originalMarketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
-                let newMarketplaceOrderItems = [];
-                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);
-                    }
+            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 = 0; a < newMarketplaceOrderItems.length; a++) {
+                const marketplaceOrderItem = newMarketplaceOrderItems[a];
+                const marketplaceProductVariation = marketplaceOrderItem.marketplaceProductVariation;
+                if (!marketplaceProductVariation.primaryUnitValue)
+                    throw new Error(marketplaceProductVariation.variationSku + ' weight is empty');
+                const primaryUnitValue = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2));
+                delete marketplaceOrderItem.id;
+                let newMarketplaceOrderShipping = new entities_1.MarketplaceOrderShipping();
+                newMarketplaceOrderShipping.name = utils_1.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(entities_1.MarketplaceOrderShipping)
+                        .save(newMarketplaceOrderShipping);
+                    marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
+                    marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
+                    marketplaceOrderItem.domain = marketplaceOrder.domain;
+                    marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo;
+                    let splittedShipment = {
+                        shipments: [Object.assign({}, marketplaceOrderItem)],
+                        totalWeight: primaryUnitValue
+                    };
+                    splittedShipmentItems.push(splittedShipment);
                 }
-                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 = 0; a < newMarketplaceOrderItems.length; a++) {
-                    const marketplaceOrderItem = newMarketplaceOrderItems[a];
-                    const marketplaceProductVariation = marketplaceOrderItem.marketplaceProductVariation;
-                    if (!marketplaceProductVariation.primaryUnitValue)
-                        throw new Error(marketplaceProductVariation.variationSku + 'weight is empty');
-                    const primaryUnitValue = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2));
-                    delete marketplaceOrderItem.id;
-                    let newMarketplaceOrderShipping = new entities_1.MarketplaceOrderShipping();
-                    newMarketplaceOrderShipping.name = utils_1.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) {
+                else {
+                    let lastShipment = splittedShipmentItems[splittedShipmentItems.length - 1];
+                    let lastTotalWeight = parseFloat(lastShipment.totalWeight.toFixed(2));
+                    if (lastTotalWeight + primaryUnitValue < parseFloat(maxWeightSetting.value)) {
+                        splittedShipmentItems.map((shipmentItem, idx) => {
+                            if (idx === splittedShipmentItems.length - 1) {
+                                let shipments = 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;
+                                        marketplaceOrderItem.domain = marketplaceOrder.domain;
+                                        marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo;
+                                        shipmentItem.shipments.push(Object.assign({}, marketplaceOrderItem));
+                                    }
+                                    shipment.marketplaceOrderShipping.totalWeight = parseFloat((lastTotalWeight + primaryUnitValue).toFixed(2));
+                                    await tx.getRepository(entities_1.MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping);
+                                });
+                                shipmentItem.totalWeight += primaryUnitValue;
+                            }
+                        });
+                    }
+                    else {
                         newMarketplaceOrderShipping.totalWeight = primaryUnitValue;
                         newMarketplaceOrderShipping = await tx
                             .getRepository(entities_1.MarketplaceOrderShipping)
                             .save(newMarketplaceOrderShipping);
                         marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
                         marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
+                        marketplaceOrderItem.domain = marketplaceOrder.domain;
+                        marketplaceOrderItem.docRefNo = marketplaceOrder.orderNo;
                         let splittedShipment = {
                             shipments: [Object.assign({}, marketplaceOrderItem)],
                             totalWeight: primaryUnitValue
                         };
                         splittedShipmentItems.push(splittedShipment);
                     }
-                    else {
-                        let lastShipment = splittedShipmentItems[splittedShipmentItems.length - 1];
-                        let lastTotalWeight = parseFloat(lastShipment.totalWeight.toFixed(2));
-                        if (lastTotalWeight + primaryUnitValue < parseFloat(maxWeightSetting.value)) {
-                            splittedShipmentItems.map((shipmentItem, idx) => {
-                                if (idx === splittedShipmentItems.length - 1) {
-                                    let shipments = 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(Object.assign({}, marketplaceOrderItem));
-                                        }
-                                        shipment.marketplaceOrderShipping.totalWeight = parseFloat((lastTotalWeight + primaryUnitValue).toFixed(2));
-                                        await tx.getRepository(entities_1.MarketplaceOrderShipping).save(shipment.marketplaceOrderShipping);
-                                    });
-                                    shipmentItem.totalWeight += primaryUnitValue;
-                                }
-                            });
-                        }
-                        else {
-                            newMarketplaceOrderShipping.totalWeight = primaryUnitValue;
-                            newMarketplaceOrderShipping = await tx
-                                .getRepository(entities_1.MarketplaceOrderShipping)
-                                .save(newMarketplaceOrderShipping);
-                            marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
-                            marketplaceOrderItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
-                            let splittedShipment = {
-                                shipments: [Object.assign({}, marketplaceOrderItem)],
-                                totalWeight: primaryUnitValue
-                            };
-                            splittedShipmentItems.push(splittedShipment);
-                        }
-                    }
                 }
-                let savedMarketplaceOrderItems = [];
-                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]);
-                    }
+            }
+            let savedMarketplaceOrderItems = [];
+            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]);
                 }
-                savedMarketplaceOrderItems = await tx.getRepository(entities_1.MarketplaceOrderItem).save(savedMarketplaceOrderItems);
-                await tx.getRepository(entities_1.MarketplaceOrderItem).delete(originalMarketplaceOrderItems.map(item => item.id));
-                await tx.getRepository(entities_1.MarketplaceOrderShipping).delete(originalMarketplaceOrderShipping.id);
             }
+            savedMarketplaceOrderItems = await tx.getRepository(entities_1.MarketplaceOrderItem).save(savedMarketplaceOrderItems);
+            await tx.getRepository(entities_1.MarketplaceOrderItem).delete(originalMarketplaceOrderItems.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 } });
+            marketplaceOrderShippings = marketplaceOrderShippings.map((marketplaceOrderShipping, idx) => {
+                return Object.assign(Object.assign({}, marketplaceOrderShipping), { subOrderNoRef: marketplaceOrderShipping.orderNoRef + ' - ' + (idx + 1) + '/' + marketplaceOrderShippings.length });
+            });
+            await tx.getRepository(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShippings);
+            let newMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
+                where: { id: patch.id }
+            });
+            newMarketplaceOrder.isSplitted = true;
+            await tx.getRepository(entities_1.MarketplaceOrder).save(newMarketplaceOrder);
         }
         return true;
     }