@things-factory/marketplace-base 4.1.4 → 4.1.6
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.
- package/dist-server/entities/marketplace-order-shipping.js +4 -0
- package/dist-server/entities/marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js +2 -1
- package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js +11 -5
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js +2 -0
- package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js +52 -30
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/index.js +1 -1
- package/dist-server/graphql/types/marketplace-order/logistics-info.js +1 -0
- package/dist-server/graphql/types/marketplace-order/logistics-info.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js +1 -0
- package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map +1 -1
- package/package.json +6 -6
- package/server/entities/marketplace-order-shipping.ts +3 -0
- package/server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.ts +2 -1
- package/server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts +17 -7
- package/server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.ts +2 -0
- package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts +59 -34
- package/server/graphql/types/marketplace-order/index.ts +1 -1
- package/server/graphql/types/marketplace-order/logistics-info.ts +1 -0
- package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts +1 -0
|
@@ -199,6 +199,10 @@ __decorate([
|
|
|
199
199
|
(0, typeorm_1.ManyToOne)(type => integration_fulfillment_1.FulfillmentCenter, { nullable: true }),
|
|
200
200
|
__metadata("design:type", typeof (_c = typeof integration_fulfillment_1.FulfillmentCenter !== "undefined" && integration_fulfillment_1.FulfillmentCenter) === "function" ? _c : Object)
|
|
201
201
|
], MarketplaceOrderShipping.prototype, "fulfillmentCenter", void 0);
|
|
202
|
+
__decorate([
|
|
203
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
204
|
+
__metadata("design:type", String)
|
|
205
|
+
], MarketplaceOrderShipping.prototype, "trackingUrl", void 0);
|
|
202
206
|
__decorate([
|
|
203
207
|
(0, typeorm_1.CreateDateColumn)(),
|
|
204
208
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAA0D;AAW1D,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-shipping.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,8 @@ exports.autoUpdateOrderReadyToShip = {
|
|
|
75
75
|
shipmentProvider: shippingProvider,
|
|
76
76
|
deliveryType,
|
|
77
77
|
orderItemId,
|
|
78
|
-
trackingNo
|
|
78
|
+
trackingNo,
|
|
79
|
+
orderId: marketplaceOrder.name
|
|
79
80
|
});
|
|
80
81
|
}
|
|
81
82
|
const updatedOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: marketplaceOrder.name });
|
package/dist-server/graphql/resolvers/marketplace-order/auto-update-order-ready-to-ship.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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":"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
|
|
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":"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"}
|
|
@@ -22,7 +22,7 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
|
|
|
22
22
|
let newMarketplaceOrder = Object.assign({}, marketplaceOrder);
|
|
23
23
|
const itemCount = (_a = marketplaceOrder.marketplaceOrderItems) === null || _a === void 0 ? void 0 : _a.length;
|
|
24
24
|
newMarketplaceOrder.name = (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.name) ? marketplaceOrder.name : no_generator_1.NoGenerator.marketplaceOrder();
|
|
25
|
-
|
|
25
|
+
newMarketplaceOrder.itemCount = itemCount;
|
|
26
26
|
newMarketplaceOrder.marketplaceStore = marketplaceStore;
|
|
27
27
|
newMarketplaceOrder.domain = domain;
|
|
28
28
|
newMarketplaceOrder.creator = user;
|
|
@@ -71,11 +71,17 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
|
|
|
71
71
|
relations: ['productBundleSettings', 'productBundleSettings.product']
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
|
-
let
|
|
75
|
-
.getRepository(entities_1.
|
|
76
|
-
.
|
|
77
|
-
where: { domain: marketplaceStore.domain,
|
|
74
|
+
let existingMarketplaceOrderItem = await tx
|
|
75
|
+
.getRepository(entities_1.MarketplaceOrderItem)
|
|
76
|
+
.findOne({
|
|
77
|
+
where: { domain: marketplaceStore.domain, name: orderItem.orderItemId }
|
|
78
78
|
});
|
|
79
|
+
let existingMarketplaceOrderShippingItems = [];
|
|
80
|
+
if (existingMarketplaceOrderItem) {
|
|
81
|
+
existingMarketplaceOrderShippingItems = await tx.getRepository(entities_1.MarketplaceOrderShippingItem).find({
|
|
82
|
+
where: { domain: marketplaceStore.domain, marketplaceOrderItem: existingMarketplaceOrderItem }
|
|
83
|
+
});
|
|
84
|
+
}
|
|
79
85
|
if (existingMarketplaceOrderShippingItems && (existingMarketplaceOrderShippingItems === null || existingMarketplaceOrderShippingItems === void 0 ? void 0 : existingMarketplaceOrderShippingItems.length)) {
|
|
80
86
|
}
|
|
81
87
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,qCAA+C;AAC/C,iDAA0B;AAI1B,+DAA2F;AAG3F,gDAM0B;AAC1B,8DAAyD;AAE5C,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,gBAAgB,EAAE,EAAE,OAAY;QACvE,MAAM,EACJ,MAAM,EACN,IAAI,EACJ,EAAE,EACF,gBAAgB,EACjB,GAAgG,OAAO,CAAC,KAAK,CAAA;QAC9G,MAAM,uBAAuB,GAA2B,MAAM,wBAAwB,CACpF,CAAC,EACD,gBAAgB,EAChB,MAAM,EACN,gBAAgB,EAChB,IAAI,EACJ,EAAE,CACH,CAAA;QAED,OAAO,uBAAuB,CAAA;IAChC,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,wBAAwB,CAC5C,CAAM,EACN,gBAAqB,EACrB,MAAc,EACd,gBAAwC,EACxC,IAAU,EACV,EAAkB;;IAElB,IAAI,qBAAqB,GAAiC,EAAE,CAAA;IAE5D,IAAI,mBAAmB,GAA2B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAA;IACrF,MAAM,SAAS,GAAW,MAAA,gBAAgB,CAAC,qBAAqB,0CAAE,MAAM,CAAA;IAExE,mBAAmB,CAAC,IAAI,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,EAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,0BAAW,CAAC,gBAAgB,EAAE,CAAA;IAC1G,
|
|
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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"}
|
|
@@ -21,6 +21,8 @@ exports.initialiseLogisticsByBatch = {
|
|
|
21
21
|
marketplaceOrderShipping.trackingNo = patch === null || patch === void 0 ? void 0 : patch.trackingNo;
|
|
22
22
|
marketplaceOrderShipping.transporter = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
|
|
23
23
|
marketplaceOrderShipping.ownTransporter = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
|
|
24
|
+
marketplaceOrderShipping.ownTrackingNo = patch === null || patch === void 0 ? void 0 : patch.ownTrackingNo;
|
|
25
|
+
marketplaceOrderShipping.trackingUrl = patch === null || patch === void 0 ? void 0 : patch.trackingUrl;
|
|
24
26
|
await tx.getRepository(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
25
27
|
marketplaceOrder.shippingProvider = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
|
|
26
28
|
marketplaceOrder.ownShippingProvider = patch === null || patch === void 0 ? void 0 : patch.shippingProvider;
|
package/dist-server/graphql/resolvers/marketplace-order/initialise-logistics-by-batch.js.map
CHANGED
|
@@ -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,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"}
|
|
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,wBAAwB,CAAC,aAAa,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAA;YAC7D,wBAAwB,CAAC,WAAW,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAA;YACzD,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"}
|
|
@@ -33,38 +33,60 @@ exports.updateOrderReadyToShip = {
|
|
|
33
33
|
const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
|
|
34
34
|
return marketplaceOrderShippings.find(a => a.id === id);
|
|
35
35
|
});
|
|
36
|
-
if (
|
|
37
|
-
uniqueMarketplaceOrderShippings.
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
36
|
+
if (marketplaceStore.platform === 'lazada') {
|
|
37
|
+
if (uniqueMarketplaceOrderShippings.some(marketplaceOrderShipping => marketplaceOrderShipping.trackingNo != null)) {
|
|
38
|
+
uniqueMarketplaceOrderShippings.map((orderShipping) => {
|
|
39
|
+
if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.trackingNo) {
|
|
40
|
+
const trackingNoInfo = JSON.parse(orderShipping.trackingNo);
|
|
41
|
+
const orderTrackingNos = trackingNoInfo.map(item => item.tracking_code);
|
|
42
|
+
const uniqueTrackingNos = [...new Set(orderTrackingNos)];
|
|
43
|
+
let orderItemIds = [];
|
|
44
|
+
if ((uniqueTrackingNos === null || uniqueTrackingNos === void 0 ? void 0 : uniqueTrackingNos.length) == 1) {
|
|
45
|
+
orderItemIds = trackingNoInfo.map(item => item.order_item_id);
|
|
46
|
+
trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] });
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
uniqueTrackingNos.map(trackingNo => {
|
|
50
|
+
orderItemIds = trackingNoInfo
|
|
51
|
+
.filter(info => info.tracking_code === trackingNo)
|
|
52
|
+
.map(filteredInfo => filteredInfo.order_item_id);
|
|
53
|
+
trackingInfoArr.push({ orderItemIds, trackingNo });
|
|
54
|
+
});
|
|
55
|
+
}
|
|
46
56
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
for (var i = 0; i < (trackingInfoArr === null || trackingInfoArr === void 0 ? void 0 : trackingInfoArr.length); i++) {
|
|
60
|
+
const trackingInfo = trackingInfoArr[i];
|
|
61
|
+
const trackingNo = trackingInfo.trackingNo;
|
|
62
|
+
const orderItemId = trackingInfo.orderItemIds;
|
|
63
|
+
const res = await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
64
|
+
shipmentProvider: shippingProvider,
|
|
65
|
+
deliveryType,
|
|
66
|
+
orderItemId,
|
|
67
|
+
trackingNo
|
|
68
|
+
});
|
|
69
|
+
}
|
|
57
70
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
71
|
+
else {
|
|
72
|
+
let mos = uniqueMarketplaceOrderShippings.filter(mos => mos.trackingNo != null || mos.ownTrackingNo != null);
|
|
73
|
+
if (mos.length > 0) {
|
|
74
|
+
let trackingNo = mos[0].ownTrackingNo;
|
|
75
|
+
const note = mos[0].trackingUrl || trackingNo;
|
|
76
|
+
const res = await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
77
|
+
orderId: orderNo,
|
|
78
|
+
trackingUrl: mos[0].trackingUrl || '',
|
|
79
|
+
trackingNo,
|
|
80
|
+
order: foundMarketplaceOrder,
|
|
81
|
+
note
|
|
82
|
+
});
|
|
83
|
+
if (marketplaceStore.platform === 'woocommerce') {
|
|
84
|
+
await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
|
|
85
|
+
orderId: orderNo,
|
|
86
|
+
status: 'READY_TO_SHIP'
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
}
|
|
68
90
|
}
|
|
69
91
|
const updatedOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: orderNo });
|
|
70
92
|
foundMarketplaceOrder.status = updatedOrder.status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts"],"names":[],"mappings":";;;AAEA,qFAAoF;AAEpF,gDAK0B;AAEb,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,EAAE,gBAAgB,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,OAAY;QAC5F,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QACnD,IAAI,qBAAqB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;YAC7F,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;YACxB,SAAS,EAAE;gBACT,kBAAkB;gBAClB,uBAAuB;gBACvB,qDAAqD;gBACrD,8EAA8E;gBAC9E,mDAAmD;aACpD;SACF,CAAC,CAAA;QACF,IAAI,CAAC,qBAAqB;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAEhE,MAAM,OAAO,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,EAAE,CAAA;QACzD,MAAM,gBAAgB,GAAqB,MAAM,kCAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAEtF,IAAI,eAAe,GAAU,EAAE,CAAA;QAC/B,IAAI,yBAAyB,GAA+B,EAAE,CAAA;QAE9D,qBAAqB,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACrD,MAAM,6BAA6B,GAAmC,IAAI,CAAC,6BAA6B,CAAA;YACxG,6BAA6B,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACtC,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,wBAAwB,EAAE;oBACjC,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;iBAC7D;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,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,CAAC,EAAE,CAAC,EAAE;YAC7G,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QACzD,CAAC,CAAC,CAAA;QAEF,IAAI,+BAA+B,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC,wBAAwB,CAAC,UAAU,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ exports.MarketplaceOrderResolver = (0, graphql_tag_1.default) `
|
|
|
43
43
|
toDate: String
|
|
44
44
|
blackListStores: String
|
|
45
45
|
): Boolean
|
|
46
|
-
updateOrderReadyToShip(shippingProvider: String
|
|
46
|
+
updateOrderReadyToShip(shippingProvider: String, deliveryType: String, orderNo: String!): Boolean @transaction
|
|
47
47
|
initialiseLogistics(deliveryType: LogisticsInit, orderNo: String!): Boolean @transaction
|
|
48
48
|
initialiseLogisticsByBatch(patches: [LogisticsInfo]!): Boolean @transaction
|
|
49
49
|
initialiseShopeeLogisticsByBatch(patches: [LogisticsInfo]!): Boolean
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logistics-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/logistics-info.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"logistics-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/logistics-info.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwB/B,CAAA"}
|
package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwD1C,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.6",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/integration-fulfillment": "^4.1.
|
|
28
|
-
"@things-factory/integration-marketplace": "^4.1.
|
|
29
|
-
"@things-factory/product-base": "^4.1.
|
|
30
|
-
"@things-factory/shell": "^4.1.
|
|
27
|
+
"@things-factory/integration-fulfillment": "^4.1.6",
|
|
28
|
+
"@things-factory/integration-marketplace": "^4.1.6",
|
|
29
|
+
"@things-factory/product-base": "^4.1.6",
|
|
30
|
+
"@things-factory/shell": "^4.1.6"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "3b0bbe1cd54f9585579fb85c64cce3338b45fa30"
|
|
33
33
|
}
|
|
@@ -164,6 +164,9 @@ export class MarketplaceOrderShipping {
|
|
|
164
164
|
@ManyToOne(type => FulfillmentCenter, { nullable: true })
|
|
165
165
|
fulfillmentCenter: FulfillmentCenter
|
|
166
166
|
|
|
167
|
+
@Column({ nullable: true })
|
|
168
|
+
trackingUrl: String
|
|
169
|
+
|
|
167
170
|
@CreateDateColumn()
|
|
168
171
|
createdAt: Date
|
|
169
172
|
|
|
@@ -50,7 +50,7 @@ export async function generateMarketplaceOrder(
|
|
|
50
50
|
const itemCount: number = marketplaceOrder.marketplaceOrderItems?.length
|
|
51
51
|
|
|
52
52
|
newMarketplaceOrder.name = marketplaceOrder?.name ? marketplaceOrder.name : NoGenerator.marketplaceOrder()
|
|
53
|
-
|
|
53
|
+
newMarketplaceOrder.itemCount = itemCount
|
|
54
54
|
newMarketplaceOrder.marketplaceStore = marketplaceStore
|
|
55
55
|
newMarketplaceOrder.domain = domain
|
|
56
56
|
newMarketplaceOrder.creator = user
|
|
@@ -108,19 +108,28 @@ export async function generateMarketplaceOrder(
|
|
|
108
108
|
})
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
let
|
|
112
|
-
.getRepository(
|
|
113
|
-
.
|
|
114
|
-
where: { domain: marketplaceStore.domain,
|
|
111
|
+
let existingMarketplaceOrderItem: MarketplaceOrderItemEntity = await tx
|
|
112
|
+
.getRepository(MarketplaceOrderItemEntity)
|
|
113
|
+
.findOne({
|
|
114
|
+
where: { domain: marketplaceStore.domain, name: orderItem.orderItemId }
|
|
115
115
|
})
|
|
116
116
|
|
|
117
|
+
let existingMarketplaceOrderShippingItems: MarketplaceOrderShippingItemEntity[] = []
|
|
118
|
+
|
|
119
|
+
if (existingMarketplaceOrderItem) {
|
|
120
|
+
existingMarketplaceOrderShippingItems = await tx.getRepository(MarketplaceOrderShippingItemEntity).find({
|
|
121
|
+
where: { domain: marketplaceStore.domain, marketplaceOrderItem: existingMarketplaceOrderItem }
|
|
122
|
+
})
|
|
123
|
+
}
|
|
124
|
+
|
|
117
125
|
if (existingMarketplaceOrderShippingItems && existingMarketplaceOrderShippingItems?.length) {
|
|
118
126
|
} else {
|
|
119
127
|
if (productBundle) {
|
|
120
128
|
const productBundleSettings: ProductBundleSetting[] = productBundle.productBundleSettings
|
|
121
129
|
let marketplaceOrderShippingItems: MarketplaceOrderShippingItemEntity[] = []
|
|
122
130
|
productBundleSettings.map(productBundleSetting => {
|
|
123
|
-
let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
|
|
131
|
+
let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
|
|
132
|
+
new MarketplaceOrderShippingItemEntity()
|
|
124
133
|
marketplaceOrderShippingItem.name = uuid()
|
|
125
134
|
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty
|
|
126
135
|
marketplaceOrderShippingItem.domain = marketplaceStore.domain
|
|
@@ -133,7 +142,8 @@ export async function generateMarketplaceOrder(
|
|
|
133
142
|
|
|
134
143
|
await tx.getRepository(MarketplaceOrderShippingItemEntity).save(marketplaceOrderShippingItems)
|
|
135
144
|
} else {
|
|
136
|
-
let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
|
|
145
|
+
let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
|
|
146
|
+
new MarketplaceOrderShippingItemEntity()
|
|
137
147
|
marketplaceOrderShippingItem.name = uuid()
|
|
138
148
|
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty
|
|
139
149
|
marketplaceOrderShippingItem.domain = marketplaceStore.domain
|
|
@@ -27,6 +27,8 @@ export const initialiseLogisticsByBatch = {
|
|
|
27
27
|
marketplaceOrderShipping.trackingNo = patch?.trackingNo
|
|
28
28
|
marketplaceOrderShipping.transporter = patch?.shippingProvider
|
|
29
29
|
marketplaceOrderShipping.ownTransporter = patch?.shippingProvider
|
|
30
|
+
marketplaceOrderShipping.ownTrackingNo = patch?.ownTrackingNo
|
|
31
|
+
marketplaceOrderShipping.trackingUrl = patch?.trackingUrl
|
|
30
32
|
await tx.getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
|
|
31
33
|
|
|
32
34
|
marketplaceOrder.shippingProvider = patch?.shippingProvider
|
|
@@ -43,42 +43,67 @@ export const updateOrderReadyToShip = {
|
|
|
43
43
|
return marketplaceOrderShippings.find(a => a.id === id)
|
|
44
44
|
})
|
|
45
45
|
|
|
46
|
-
if (
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
orderItemIds =
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
orderItemIds
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
46
|
+
if (marketplaceStore.platform === 'lazada') {
|
|
47
|
+
if (
|
|
48
|
+
uniqueMarketplaceOrderShippings.some(marketplaceOrderShipping => marketplaceOrderShipping.trackingNo != null)
|
|
49
|
+
) {
|
|
50
|
+
uniqueMarketplaceOrderShippings.map((orderShipping: MarketplaceOrderShipping) => {
|
|
51
|
+
if (orderShipping?.trackingNo) {
|
|
52
|
+
const trackingNoInfo: any[] = JSON.parse(orderShipping.trackingNo)
|
|
53
|
+
const orderTrackingNos: string[] = trackingNoInfo.map(item => item.tracking_code)
|
|
54
|
+
const uniqueTrackingNos = [...new Set(orderTrackingNos)]
|
|
55
|
+
|
|
56
|
+
let orderItemIds: string[] = []
|
|
57
|
+
|
|
58
|
+
if (uniqueTrackingNos?.length == 1) {
|
|
59
|
+
orderItemIds = trackingNoInfo.map(item => item.order_item_id)
|
|
60
|
+
trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] })
|
|
61
|
+
} else {
|
|
62
|
+
uniqueTrackingNos.map(trackingNo => {
|
|
63
|
+
orderItemIds = trackingNoInfo
|
|
64
|
+
.filter(info => info.tracking_code === trackingNo)
|
|
65
|
+
.map(filteredInfo => filteredInfo.order_item_id)
|
|
66
|
+
|
|
67
|
+
trackingInfoArr.push({ orderItemIds, trackingNo })
|
|
68
|
+
})
|
|
69
|
+
}
|
|
66
70
|
}
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
for (var i = 0; i < trackingInfoArr?.length; i++) {
|
|
72
|
-
const trackingInfo = trackingInfoArr[i]
|
|
73
|
-
const trackingNo = trackingInfo.trackingNo
|
|
74
|
-
const orderItemId = trackingInfo.orderItemIds
|
|
71
|
+
})
|
|
72
|
+
}
|
|
75
73
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
orderItemId
|
|
80
|
-
|
|
81
|
-
|
|
74
|
+
for (var i = 0; i < trackingInfoArr?.length; i++) {
|
|
75
|
+
const trackingInfo = trackingInfoArr[i]
|
|
76
|
+
const trackingNo = trackingInfo.trackingNo
|
|
77
|
+
const orderItemId = trackingInfo.orderItemIds
|
|
78
|
+
|
|
79
|
+
const res = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
80
|
+
shipmentProvider: shippingProvider,
|
|
81
|
+
deliveryType,
|
|
82
|
+
orderItemId,
|
|
83
|
+
trackingNo
|
|
84
|
+
})
|
|
85
|
+
}
|
|
86
|
+
} else {
|
|
87
|
+
let mos = uniqueMarketplaceOrderShippings.filter(mos => mos.trackingNo != null || mos.ownTrackingNo != null)
|
|
88
|
+
if (mos.length > 0) {
|
|
89
|
+
let trackingNo = mos[0].ownTrackingNo
|
|
90
|
+
const note = mos[0].trackingUrl || trackingNo
|
|
91
|
+
|
|
92
|
+
const res = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
93
|
+
orderId: orderNo,
|
|
94
|
+
trackingUrl: mos[0].trackingUrl || '',
|
|
95
|
+
trackingNo,
|
|
96
|
+
order: foundMarketplaceOrder,
|
|
97
|
+
note
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
if (marketplaceStore.platform === 'woocommerce') {
|
|
101
|
+
await StoreAPI.updateOrderStatus(marketplaceStore, {
|
|
102
|
+
orderId: orderNo,
|
|
103
|
+
status: 'READY_TO_SHIP'
|
|
104
|
+
})
|
|
105
|
+
}
|
|
106
|
+
}
|
|
82
107
|
}
|
|
83
108
|
|
|
84
109
|
const updatedOrder = await StoreAPI.getStoreOrder(marketplaceStore, { orderId: orderNo })
|
|
@@ -29,7 +29,7 @@ export const MarketplaceOrderResolver = gql`
|
|
|
29
29
|
toDate: String
|
|
30
30
|
blackListStores: String
|
|
31
31
|
): Boolean
|
|
32
|
-
updateOrderReadyToShip(shippingProvider: String
|
|
32
|
+
updateOrderReadyToShip(shippingProvider: String, deliveryType: String, orderNo: String!): Boolean @transaction
|
|
33
33
|
initialiseLogistics(deliveryType: LogisticsInit, orderNo: String!): Boolean @transaction
|
|
34
34
|
initialiseLogisticsByBatch(patches: [LogisticsInfo]!): Boolean @transaction
|
|
35
35
|
initialiseShopeeLogisticsByBatch(patches: [LogisticsInfo]!): Boolean
|