npm - @things-factory/marketplace-base - Versions diffs - 4.0.0-y.0 → 4.0.4 - Mend

@things-factory/marketplace-base 4.0.0-y.0 → 4.0.4

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

package/dist-server/constants/order.js CHANGED Viewed

@@ -5,6 +5,7 @@ exports.ORDER_STATUS = {
     CANCELLED: 'cancelled',
     COMPLETED: 'completed',
     DELIVERED: 'delivered',
+    PACKED: 'packed',
     PENDING: 'pending',
     READY_TO_SHIP: 'ready_to_ship',
     SHIPPED: 'shipped',

package/dist-server/constants/order.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"order.js","sourceRoot":"","sources":["../../server/constants/order.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,SAAS,EAAE,WAAW;IACtB,SAAS,EAAE,WAAW;IACtB,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,aAAa,EAAE,eAAe;IAC9B,OAAO,EAAE,SAAS;IAClB,kBAAkB,EAAE,oBAAoB;IACxC,MAAM,EAAE,QAAQ;CACjB,CAAA"}
1	+ {"version":3,"file":"order.js","sourceRoot":"","sources":["../../server/constants/order.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,SAAS,EAAE,WAAW;IACtB,SAAS,EAAE,WAAW;IACtB,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,aAAa,EAAE,eAAe;IAC9B,OAAO,EAAE,SAAS;IAClB,kBAAkB,EAAE,oBAAoB;IACxC,MAAM,EAAE,QAAQ;CACjB,CAAA"}

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

@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarketplaceOrderItem = void 0;
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../entities");
 let MarketplaceOrderItem = class MarketplaceOrderItem {
 };

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

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8C;~~AAC9C~~,~~qCAAsH;AACtH,~~0CAAqG;~~AAOrG~~,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;CAmEhC,CAAA;AAjEC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gDACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;oDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,sCAA2B,CAAC;8BAClB,sCAA2B;yEAAA;AAGxD;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2BAAgB,CAAC;8BAClB,2BAAgB;8DAAA;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mCAAwB,CAAC;8BAClB,mCAAwB;sEAAA;AAGlD;IADC,IAAA,gBAAM,GAAE;;kDACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;iDAC/B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACP;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACP;AAGpB;IADC,IAAA,gBAAM,GAAE;;oDACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACR;AAGnB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;qDAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;qDAAA;AAlEF,oBAAoB;IANhC,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,6BAA6B,EAC7B,CAAC,oBAA0C,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC,EACtG,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,oBAAoB,CAmEhC;AAnEY,oDAAoB"}
1	+ {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAAsH;AAEtH,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAqG;AAQrG,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;CAmEhC,CAAA;AAjEC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;gDACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;oDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,sCAA2B,CAAC;8BAClB,sCAA2B;yEAAA;AAGxD;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2BAAgB,CAAC;8BAClB,2BAAgB;8DAAA;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mCAAwB,CAAC;8BAClB,mCAAwB;sEAAA;AAGlD;IADC,IAAA,gBAAM,GAAE;;kDACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;iDAC/B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACP;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACP;AAGpB;IADC,IAAA,gBAAM,GAAE;;oDACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDACR;AAGnB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;uDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;qDAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;qDAAA;AAlEF,oBAAoB;IANhC,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,6BAA6B,EAC7B,CAAC,oBAA0C,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC,EACtG,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,oBAAoB,CAmEhC;AAnEY,oDAAoB"}

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([
@@ -56,8 +56,8 @@ __decorate([
     __metadata("design:type", Number)
 ], MarketplaceOrder.prototype, "itemCount", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", String)
+    (0, typeorm_1.Column)({ type: 'float', nullable: true }),
+    __metadata("design:type", Number)
 ], MarketplaceOrder.prototype, "totalAmount", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
@@ -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/auto-initialise-logistics-by-batch.js ADDED Viewed

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoInitialiseLogisticsByBatch = void 0;
+const typeorm_1 = require("typeorm");
+const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const shell_1 = require("@things-factory/shell");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+const get_logistics_param_1 = require("../marketplace-order/get-logistics-param");
+exports.autoInitialiseLogisticsByBatch = {
+    async autoInitialiseLogisticsByBatch(_, { companyDomainId }, context) {
+        const { user } = context.state;
+        const companyDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(companyDomainId);
+        // Step 1: get all available marketplace-store
+        const marketplaceStores = await integration_marketplace_1.StoreAPI.getMarketplaceStores(companyDomain);
+        for (var i = 0; i < (marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length); i++) {
+            const marketplaceStore = marketplaceStores[i];
+            let marketplaceOrders = [];
+            if (marketplaceStore.platform == constants_1.MARKETPLACE_PLATFORM.LAZADA) {
+                marketplaceOrders = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).find({
+                    where: {
+                        marketplaceStore,
+                        status: constants_1.ORDER_STATUS.PENDING
+                    },
+                    relations: [
+                        'marketplaceOrderItems',
+                        'marketplaceOrderItems.marketplaceProductVariation',
+                        'marketplaceOrderItems.marketplaceOrderShipping'
+                    ]
+                });
+            }
+            else {
+                if (marketplaceStore.isOwnTransport) {
+                    marketplaceOrders = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).find({
+                        where: {
+                            marketplaceStore,
+                            trackingNo: (0, typeorm_1.IsNull)(),
+                            ownTrackingNo: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
+                            status: constants_1.ORDER_STATUS.READY_TO_SHIP
+                        },
+                        relations: [
+                            'marketplaceOrderItems',
+                            'marketplaceOrderItems.marketplaceProductVariation',
+                            'marketplaceOrderItems.marketplaceOrderShipping'
+                        ]
+                    });
+                }
+                else {
+                    marketplaceOrders = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).find({
+                        where: {
+                            marketplaceStore,
+                            trackingNo: (0, typeorm_1.IsNull)(),
+                            status: constants_1.ORDER_STATUS.READY_TO_SHIP
+                        },
+                        relations: [
+                            'marketplaceOrderItems',
+                            'marketplaceOrderItems.marketplaceProductVariation',
+                            'marketplaceOrderItems.marketplaceOrderShipping'
+                        ]
+                    });
+                }
+            }
+            for (var j = 0; j < (marketplaceOrders === null || marketplaceOrders === void 0 ? void 0 : marketplaceOrders.length); j++) {
+                const marketplaceOrder = marketplaceOrders[j];
+                if (marketplaceStore.platform == constants_1.MARKETPLACE_PLATFORM.SHOPEE) {
+                    let fullLogisticsDetail = await get_logistics_param_1.getLogisticsParam.getLogisticsParam(_, { storeId: marketplaceStore.id, orderNo: marketplaceOrder.orderNo }, context);
+                    let deliveryType = {};
+                    if (fullLogisticsDetail.non_integrated) {
+                        deliveryType = {
+                            non_integrated: {
+                                trackingNo: marketplaceOrder.ownTrackingNo
+                            }
+                        };
+                    }
+                    else if (fullLogisticsDetail.dropoff) {
+                        const dropoff = fullLogisticsDetail.logisticsDetail.dropoff;
+                        deliveryType = {
+                            dropoff: {}
+                        };
+                        if (dropoff.branchId)
+                            deliveryType['dropoff'] = Object.assign(Object.assign({}, deliveryType['dropoff']), { branchId: dropoff.branchId });
+                        if (dropoff.senderRealName)
+                            deliveryType['dropoff'] = Object.assign(Object.assign({}, deliveryType['dropoff']), { senderRealName: dropoff.senderRealName });
+                        if (dropoff.trackingNo)
+                            deliveryType['dropoff'] = Object.assign(Object.assign({}, deliveryType['dropoff']), { trackingNo: dropoff.trackingNo });
+                    }
+                    else {
+                        return false;
+                    }
+                    await integration_marketplace_1.StoreAPI.initLogistics(marketplaceStore, { deliveryType, orderNo: marketplaceOrder.orderNo });
+                }
+                else if (marketplaceStore.platform == constants_1.MARKETPLACE_PLATFORM.LAZADA) {
+                    const shippingProviders = await integration_marketplace_1.StoreAPI.getStoreLogistics(marketplaceStore, {});
+                    const shippingProvider = shippingProviders[0].name;
+                    const deliveryType = 'dropship';
+                    const storeOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: marketplaceOrder.orderNo });
+                    const arrItemIds = storeOrder.orderItems.reduce((newItemID, item) => {
+                        return [...newItemID, ...item.name.split(',')];
+                    }, []);
+                    if ((storeOrder === null || storeOrder === void 0 ? void 0 : storeOrder.status) == 'pending' && deliveryType && arrItemIds.length > 0 && shippingProvider) {
+                        const storeOrderItemsPBM = await integration_marketplace_1.StoreAPI.setStoreOrderStatusPackedByMarketplace(marketplaceStore, {
+                            deliveryType,
+                            orderItemId: arrItemIds,
+                            shippingProvider
+                        });
+                        marketplaceOrder.trackingNo = storeOrderItemsPBM.trackingNumber[0] || '[]';
+                        marketplaceOrder.otherInfoJSON = JSON.stringify({
+                            deliveryType: deliveryType,
+                            shippingProvider: shippingProvider
+                        });
+                    }
+                    let updatedOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: marketplaceOrder.name });
+                    await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).save(Object.assign(Object.assign({}, marketplaceOrder), { status: updatedOrder.status, orderUpdatedAt: storeOrder.orderUpdatedAt }));
+                    for (let idx = 0; idx < marketplaceOrder.marketplaceOrderItems.length; idx++) {
+                        let matchItem = updatedOrder.orderItems.find(i => i.variationId == marketplaceOrder.marketplaceOrderItems[idx].marketplaceProductVariation.variationId);
+                        if (matchItem) {
+                            let targetMarketplaceOrderItem = Object.assign(Object.assign({}, marketplaceOrder.marketplaceOrderItems[idx]), { shippingProvider: matchItem.shippingProvider, trackingCode: matchItem.trackingNo, status: matchItem.status });
+                            await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderItem).save(targetMarketplaceOrderItem);
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+};
+//# sourceMappingURL=auto-initialise-logistics-by-batch.js.map

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

@@ -0,0 +1 @@

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

package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js ADDED Viewed

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoUpdateOrderReadyToShip = void 0;
+const typeorm_1 = require("typeorm");
+const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const shell_1 = require("@things-factory/shell");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+exports.autoUpdateOrderReadyToShip = {
+    async autoUpdateOrderReadyToShip(_, { companyDomainId }, context) {
+        const companyDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(companyDomainId);
+        // Step 1: get all available marketplace-store
+        const marketplaceStores = await integration_marketplace_1.StoreAPI.getMarketplaceStores(companyDomain);
+        const lazadaStores = marketplaceStores.filter(marketplaceStore => marketplaceStore.platform === constants_1.MARKETPLACE_PLATFORM.LAZADA);
+        for (var i = 0; i < (lazadaStores === null || lazadaStores === void 0 ? void 0 : lazadaStores.length); i++) {
+            const marketplaceStore = lazadaStores[i];
+            let marketplaceOrders = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).find({
+                where: {
+                    marketplaceStore,
+                    trackingNo: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
+                    status: constants_1.ORDER_STATUS.PACKED
+                },
+                relations: [
+                    'marketplaceOrderItems',
+                    'marketplaceOrderItems.marketplaceOrderShipping',
+                    'marketplaceOrderItems.marketplaceProductVariation'
+                ]
+            });
+            for (var j = 0; j < (marketplaceOrders === null || marketplaceOrders === void 0 ? void 0 : marketplaceOrders.length); j++) {
+                const marketplaceOrder = marketplaceOrders[j];
+                const otherInfo = JSON.parse(marketplaceOrder.otherInfoJSON);
+                const shippingProvider = otherInfo.shippingProvider;
+                const deliveryType = otherInfo.deliveryType;
+                let trackingInfoArr = [];
+                let marketplaceOrderShippings = [];
+                marketplaceOrder.marketplaceOrderItems.map(item => {
+                    if (item === null || item === void 0 ? void 0 : item.marketplaceOrderShipping) {
+                        marketplaceOrderShippings.push(item.marketplaceOrderShipping);
+                    }
+                });
+                const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
+                    return marketplaceOrderShippings.find(a => a.id === id);
+                });
+                if (uniqueMarketplaceOrderShippings.some(marketplaceOrderShipping => marketplaceOrderShipping.trackingNo != null)) {
+                    uniqueMarketplaceOrderShippings.map((orderShipping) => {
+                        if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.trackingNo) {
+                            const trackingNoInfo = JSON.parse(orderShipping.trackingNo);
+                            const orderTrackingNos = trackingNoInfo.map(item => item.tracking_code);
+                            const uniqueTrackingNos = [...new Set(orderTrackingNos)];
+                            let orderItemIds = [];
+                            if ((uniqueTrackingNos === null || uniqueTrackingNos === void 0 ? void 0 : uniqueTrackingNos.length) == 1) {
+                                orderItemIds = trackingNoInfo.map(item => item.order_item_id);
+                                trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] });
+                            }
+                            else {
+                                uniqueTrackingNos.map(trackingNo => {
+                                    orderItemIds = trackingNoInfo
+                                        .filter(info => info.tracking_code === trackingNo)
+                                        .map(filteredInfo => filteredInfo.order_item_id);
+                                    trackingInfoArr.push({ orderItemIds, trackingNo });
+                                });
+                            }
+                        }
+                    });
+                }
+                for (var i = 0; i < (trackingInfoArr === null || trackingInfoArr === void 0 ? void 0 : trackingInfoArr.length); i++) {
+                    const trackingInfo = trackingInfoArr[i];
+                    const trackingNo = trackingInfo.trackingNo;
+                    const orderItemId = trackingInfo.orderItemIds;
+                    await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
+                        shipmentProvider: shippingProvider,
+                        deliveryType,
+                        orderItemId,
+                        trackingNo
+                    });
+                }
+                const updatedOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: marketplaceOrder.name });
+                marketplaceOrder.status = updatedOrder.status;
+                marketplaceOrder.orderUpdatedAt = updatedOrder.orderUpdatedAt;
+                marketplaceOrder.trackingNo = updatedOrder.trackingNo;
+                marketplaceOrder.shippingProvider = updatedOrder.shippingProvider;
+                await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).save(marketplaceOrder);
+                for (let idx = 0; idx < marketplaceOrder.marketplaceOrderItems.length; idx++) {
+                    let matchItem = updatedOrder.orderItems.find(i => i.variationId == marketplaceOrder.marketplaceOrderItems[idx].marketplaceProductVariation.variationId);
+                    if (matchItem) {
+                        let targetMarketplaceOrderItem = Object.assign(Object.assign({}, marketplaceOrder.marketplaceOrderItems[idx]), { shippingProvider: matchItem.shippingProvider, trackingCode: matchItem.trackingNo, status: matchItem.status });
+                        await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderItem).save(targetMarketplaceOrderItem);
+                    }
+                }
+            }
+        }
+        return true;
+    }
+};
+//# sourceMappingURL=auto-update-order-ready-to-ship.js.map

package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"auto-update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AAEpD,qFAAoF;AACpF,iDAA8C;AAE9C,kDAAuE;AACvE,gDAAoG;AAEvF,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,EAAE,OAAY;QACxE,MAAM,aAAa,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAElF,8CAA8C;QAC9C,MAAM,iBAAiB,GAAuB,MAAM,kCAAQ,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAA;QAChG,MAAM,YAAY,GAAuB,iBAAiB,CAAC,MAAM,CAC/D,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,KAAK,gCAAoB,CAAC,MAAM,CAC9E,CAAA;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,gBAAgB,GAAqB,YAAY,CAAC,CAAC,CAAC,CAAA;YAE1D,IAAI,iBAAiB,GAAuB,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC;gBACrF,KAAK,EAAE;oBACL,gBAAgB;oBAChB,UAAU,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC;oBACzB,MAAM,EAAE,wBAAY,CAAC,MAAM;iBAC5B;gBACD,SAAS,EAAE;oBACT,uBAAuB;oBACvB,gDAAgD;oBAChD,mDAAmD;iBACpD;aACF,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;gBAClD,MAAM,gBAAgB,GAAqB,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAE/D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBAC5D,MAAM,gBAAgB,GAAW,SAAS,CAAC,gBAAgB,CAAA;gBAC3D,MAAM,YAAY,GAAW,SAAS,CAAC,YAAY,CAAA;gBAEnD,IAAI,eAAe,GAAU,EAAE,CAAA;gBAC/B,IAAI,yBAAyB,GAA+B,EAAE,CAAA;gBAE9D,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAChD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,wBAAwB,EAAE;wBAClC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;qBAC9D;gBACH,CAAC,CAAC,CAAA;gBAEF,MAAM,+BAA+B,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CACvG,EAAE,CAAC,EAAE;oBACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBACzD,CAAC,CACF,CAAA;gBAED,IACE,+BAA+B,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC,wBAAwB,CAAC,UAAU,IAAI,IAAI,CAAC,EAC7G;oBACA,+BAA+B,CAAC,GAAG,CAAC,CAAC,aAAuC,EAAE,EAAE;wBAC9E,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,EAAE;4BAC7B,MAAM,cAAc,GAAU,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;4BAClE,MAAM,gBAAgB,GAAa,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;4BACjF,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAA;4BAExD,IAAI,YAAY,GAAa,EAAE,CAAA;4BAE/B,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,KAAI,CAAC,EAAE;gCAClC,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;gCAC7D,eAAe,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;6BACzE;iCAAM;gCACL,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;oCACjC,YAAY,GAAG,cAAc;yCAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,UAAU,CAAC;yCACjD,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;oCAElD,eAAe,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAA;gCACpD,CAAC,CAAC,CAAA;6BACH;yBACF;oBACH,CAAC,CAAC,CAAA;iBACH;gBAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;oBAChD,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,CAAA;oBACvC,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAA;oBAC1C,MAAM,WAAW,GAAG,YAAY,CAAC,YAAY,CAAA;oBAE7C,MAAM,kCAAQ,CAAC,8BAA8B,CAAC,gBAAgB,EAAE;wBAC9D,gBAAgB,EAAE,gBAAgB;wBAClC,YAAY;wBACZ,WAAW;wBACX,UAAU;qBACX,CAAC,CAAA;iBACH;gBAED,MAAM,YAAY,GAAG,MAAM,kCAAQ,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAA;gBAEvG,gBAAgB,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAA;gBAC7C,gBAAgB,CAAC,cAAc,GAAG,YAAY,CAAC,cAAc,CAAA;gBAC7D,gBAAgB,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAA;gBACrD,gBAAgB,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAA;gBACjE,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAE5D,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;oBAC5E,IAAI,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,2BAA2B,CAAC,WAAW,CAC1G,CAAA;oBAED,IAAI,SAAS,EAAE;wBACb,IAAI,0BAA0B,mCACzB,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAC9C,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,EAC5C,YAAY,EAAE,SAAS,CAAC,UAAU,EAClC,MAAM,EAAE,SAAS,CAAC,MAAM,GACzB,CAAA;wBAED,MAAM,IAAA,uBAAa,EAAC,+BAAoB,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;qBAC3E;iBACF;aACF;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancelMarketplaceOrderResolver = void 0;
-const shell_1 = require("@things-factory/shell");
 const biz_base_1 = require("@things-factory/biz-base");
 const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../../../entities");
 exports.cancelMarketplaceOrderResolver = {
     async cancelMarketplaceOrder(_, { orderNo, patch }, context) {
@@ -18,7 +18,7 @@ exports.cancelMarketplaceOrderResolver = {
             let marketplaceOrderItem = Object.assign({}, orderItem);
             marketplaceOrderItem.reason = patch.remark;
             marketplaceOrderItem.status = 'cancelled';
-            marketplaceOrder.updater = user;
+            marketplaceOrderItem.updater = user;
             return marketplaceOrderItem;
         });
         await tx.getRepository(entities_1.MarketplaceOrderItem).save(marketplaceOrderItems);
@@ -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":";;;~~AAAA~~,~~iDAA8C;AAE9C,~~uDAAyE;AACzE,qFAA2F;~~AAE3F~~,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,~~gBAAgB~~,CAAC,OAAO,GAAG,IAAI,CAAA;~~YAE/B~~,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

@@ -1,33 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getETraxOrderDocumentFunction = exports.MarketplaceOrderResolver = void 0;
-const marketplace_order_1 = require("./marketplace-order");
-const marketplace_orders_1 = require("./marketplace-orders");
-const get_order_document_1 = require("./get-order-document");
-const get_etrax_order_document_1 = require("./get-etrax-order-document");
-Object.defineProperty(exports, "getETraxOrderDocumentFunction", { enumerable: true, get: function () { return get_etrax_order_document_1.getETraxOrderDocumentFunction; } });
-const get_store_logistics_1 = require("./get-store-logistics");
-const get_branch_list_1 = require("./get-branch-list");
-const get_address_list_1 = require("./get-address-list");
-const get_time_slot_1 = require("./get-time-slot");
-const get_logistics_param_1 = require("./get-logistics-param");
-const marketplace_orders_for_export_1 = require("./marketplace-orders-for-export");
-const marketplace_orders_for_batch_init_1 = require("./marketplace-orders-for-batch-init");
+const auto_initialise_logistics_by_batch_1 = require("./auto-initialise-logistics-by-batch");
+const auto_update_order_ready_to_ship_1 = require("./auto-update-order-ready-to-ship");
+const cancel_marketplace_order_1 = require("./cancel-marketplace-order");
 const dashboard_marketplace_orders_1 = require("./dashboard-marketplace-orders");
 const dashboard_marketplace_sales_1 = require("./dashboard-marketplace-sales");
 const dashboard_marketplace_sales_average_1 = require("./dashboard-marketplace-sales-average");
+const delete_marketplace_orders_1 = require("./delete-marketplace-orders");
 const generate_marketplace_order_1 = require("./generate-marketplace-order");
-const sync_marketplace_order_1 = require("./sync-marketplace-order");
-const sync_all_marketplace_order_1 = require("./sync-all-marketplace-order");
+const get_address_list_1 = require("./get-address-list");
+const get_branch_list_1 = require("./get-branch-list");
+const get_etrax_order_document_1 = require("./get-etrax-order-document");
+Object.defineProperty(exports, "getETraxOrderDocumentFunction", { enumerable: true, get: function () { return get_etrax_order_document_1.getETraxOrderDocumentFunction; } });
+const get_logistics_param_1 = require("./get-logistics-param");
+const get_order_document_1 = require("./get-order-document");
+const get_store_logistics_1 = require("./get-store-logistics");
+const get_time_slot_1 = require("./get-time-slot");
+const initialise_lazada_logistics_by_batch_1 = require("./initialise-lazada-logistics-by-batch");
 const initialise_logistics_1 = require("./initialise-logistics");
 const initialise_logistics_by_batch_1 = require("./initialise-logistics-by-batch");
 const initialise_shopee_logistics_by_batch_1 = require("./initialise-shopee-logistics-by-batch");
-const initialise_lazada_logistics_by_batch_1 = require("./initialise-lazada-logistics-by-batch");
+const marketplace_order_1 = require("./marketplace-order");
+const marketplace_orders_1 = require("./marketplace-orders");
+const marketplace_orders_for_batch_init_1 = require("./marketplace-orders-for-batch-init");
+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");
-const delete_marketplace_orders_1 = require("./delete-marketplace-orders");
-const cancel_marketplace_order_1 = require("./cancel-marketplace-order");
 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({}, generate_marketplace_order_1.generateMarketplaceOrderResolver), initialise_logistics_1.initialiseLogistics), initialise_logistics_by_batch_1.initialiseLogisticsByBatch), 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)
+    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(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), auto_initialise_logistics_by_batch_1.autoInitialiseLogisticsByBatch), auto_update_order_ready_to_ship_1.autoUpdateOrderReadyToShip)
 };
 //# 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,~~2DAA8D~~;~~AAC9D~~,~~6DAAgE~~;~~AAChE~~,~~6DAA~~+D;AAC/D,yEAAyG;~~AAsDhG~~,~~8GAtD+B~~,wDAA6B,~~OAsD/B~~;~~AArDtC~~,+DAAyD;AACzD,~~uDAAiD~~;~~AACjD,yDAAmD~~;~~AACnD~~,mDAA6C;AAC7C~~,+DAAyD~~;~~AACzD~~,mFAA4E;AAC5E,2FAA2F;AAC3F,~~iFAAmF~~;~~AACnF,+EAAiF~~;~~AACjF~~,+~~FAAgG~~;~~AAEhG~~,~~6EAA+E~~;~~AAC/E~~,qEAA+D;AAC/D,~~6EAAsE~~;~~AACtE~~,~~iEAA4D;AAC5D,mFAA4E;AAC5E,iGAAyF;AACzF,iGAAyF;AACzF,~~6EAAqE;~~AACrE~~,~~2EAAqE;AACrE,yEAA2E;AAE9D,~~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,~~kJACH~~,6DAAgC,GAChC,0CAAmB,GACnB,0DAA0B,GAC1B,6CAAoB,GACpB,oDAAuB,GACvB,mDAAsB,GACtB,mDAAuB,GACvB,uEAAgC,GAChC,uEAAgC,GAChC,yDAA8B,~~CAClC~~;CACF,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/index.ts"],"names":[],"mappings":";;;AAAA,6FAAqF;AACrF,uFAA8E;AAC9E,yEAA2E;AAC3E,iFAAmF;AACnF,+EAAiF;AACjF,+FAAgG;AAChG,2EAAqE;AACrE,6EAA+E;AAC/E,yDAAmD;AACnD,uDAAiD;AACjD,yEAAyG;AA4DhG,8GA5DA,wDAA6B,OA4DA;AA3DtC,+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,oPACH,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,GACtC,mEAA8B,GAC9B,4DAA0B,CAC9B;CACF,CAAA"}