@things-factory/marketplace-base 4.3.208 → 4.3.210
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/graphql/resolvers/marketplace-order/get-order-document.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/get-order-document.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js +31 -38
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js.map +1 -1
- package/package.json +2 -2
- package/server/graphql/resolvers/marketplace-order/get-order-document.ts +1 -1
- package/server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts +38 -43
|
@@ -100,7 +100,7 @@ exports.getOrderDocumentResolver = {
|
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
else if (marketplaceStore.platform == 'lazada') {
|
|
103
|
-
const packageIds =
|
|
103
|
+
const packageIds = JSON.parse(marketplaceOrderShippings[0].packageId);
|
|
104
104
|
orderDocument = await integration_marketplace_1.StoreAPI.getStoreOrderDocument(marketplaceStore, { packageIds });
|
|
105
105
|
}
|
|
106
106
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-order-document.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/get-order-document.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-order-document.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/get-order-document.ts"],"names":[],"mappings":"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"}
|
package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initialiseLazadaLogisticsByBatch = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
5
6
|
const env_1 = require("@things-factory/env");
|
|
6
7
|
const entities_1 = require("../../../entities");
|
|
@@ -9,14 +10,13 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
9
10
|
try {
|
|
10
11
|
const { domain, tx } = context.state;
|
|
11
12
|
await Promise.all(patches.map(async (patch) => {
|
|
12
|
-
var _a, _b
|
|
13
|
+
var _a, _b;
|
|
13
14
|
const foundMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
|
|
14
15
|
where: { id: patch.id },
|
|
15
16
|
relations: [
|
|
16
17
|
'marketplaceStore',
|
|
17
18
|
'marketplaceOrderItems',
|
|
18
19
|
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
19
|
-
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
20
20
|
'marketplaceOrderItems.marketplaceProductVariation',
|
|
21
21
|
'domain'
|
|
22
22
|
]
|
|
@@ -29,19 +29,18 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
29
29
|
const arrItemIds = storeOrder.orderItems.reduce((newItemID, item) => {
|
|
30
30
|
return [...newItemID, ...item.name.split(',')];
|
|
31
31
|
}, []);
|
|
32
|
+
const marketplaceOrderShippings = await tx
|
|
33
|
+
.getRepository(entities_1.MarketplaceOrderShipping)
|
|
34
|
+
.find({
|
|
35
|
+
where: { orderNoRef: foundMarketplaceOrder.orderNo, domain: foundMarketplaceOrder.domain },
|
|
36
|
+
relations: ['marketplaceOrderShippingItems', 'marketplaceOrderShippingItems.marketplaceOrderItem']
|
|
37
|
+
});
|
|
32
38
|
if ((storeOrder === null || storeOrder === void 0 ? void 0 : storeOrder.status) == 'pending' &&
|
|
33
39
|
patch.deliveryType &&
|
|
34
40
|
arrItemIds.length > 0 &&
|
|
35
41
|
patch.shippingProvider) {
|
|
36
|
-
const marketplaceOrderShippings = await tx
|
|
37
|
-
.getRepository(entities_1.MarketplaceOrderShipping)
|
|
38
|
-
.find({
|
|
39
|
-
where: { orderNoRef: foundMarketplaceOrder.orderNo, domain: foundMarketplaceOrder.domain },
|
|
40
|
-
relations: ['marketplaceOrderShippingItems', 'marketplaceOrderShippingItems.marketplaceOrderItem']
|
|
41
|
-
});
|
|
42
42
|
const fullOrderItemList = [];
|
|
43
|
-
|
|
44
|
-
const orderItemList = [];
|
|
43
|
+
for (let mos of marketplaceOrderShippings) {
|
|
45
44
|
for (let item of mos.marketplaceOrderShippingItems) {
|
|
46
45
|
let count = item.qty;
|
|
47
46
|
let list = item.marketplaceOrderItem.name.split(',');
|
|
@@ -49,37 +48,38 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
49
48
|
if (fullOrderItemList.find(oil => oil == list[i]))
|
|
50
49
|
count++;
|
|
51
50
|
else {
|
|
52
|
-
orderItemList.push(list[i]);
|
|
53
51
|
fullOrderItemList.push(list[i]);
|
|
54
52
|
}
|
|
55
53
|
}
|
|
56
54
|
}
|
|
57
|
-
|
|
58
|
-
orderItemList,
|
|
59
|
-
orderId: storeOrder.orderNo,
|
|
60
|
-
shippingId: mos.id
|
|
61
|
-
};
|
|
62
|
-
});
|
|
55
|
+
}
|
|
63
56
|
const logisticByPackage = await integration_marketplace_1.StoreAPI.getStoreLogisticsByPackage(marketplaceStore, {
|
|
64
57
|
orderId: storeOrder.orderNo,
|
|
65
58
|
orderItemIds: fullOrderItemList
|
|
66
59
|
});
|
|
67
60
|
const shippingProviderCode = (_a = logisticByPackage.results.find(r => r.name == patch.shippingProvider)) === null || _a === void 0 ? void 0 : _a.providerCode;
|
|
68
61
|
const storeOrderItemsPBM = await integration_marketplace_1.StoreAPI.setStoreOrderStatusPackedByMarketplace(marketplaceStore, {
|
|
69
|
-
packOrderList,
|
|
62
|
+
packOrderList: [{ orderId: storeOrder.orderNo, orderItemList: fullOrderItemList }],
|
|
70
63
|
deliveryType: patch.deliveryType,
|
|
71
64
|
shippingAllocateType: logisticByPackage.shippingAllocateType,
|
|
72
65
|
shippingProviderCode: shippingProviderCode
|
|
73
66
|
});
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
await tx.getRepository(entities_1.MarketplaceOrderShipping).update({
|
|
67
|
+
if (storeOrderItemsPBM.packOrderList && storeOrderItemsPBM.packOrderList.length) {
|
|
68
|
+
const orderPackage = storeOrderItemsPBM.packOrderList[0];
|
|
69
|
+
const packageIds = JSON.stringify(orderPackage.orderItemList.map(oil => {
|
|
70
|
+
return oil.packageId;
|
|
71
|
+
}));
|
|
72
|
+
const trackingNos = JSON.stringify(orderPackage.orderItemList.map(oil => {
|
|
73
|
+
return oil.trackingNumber;
|
|
74
|
+
}));
|
|
75
|
+
await tx.getRepository(entities_1.MarketplaceOrderShipping).update({
|
|
76
|
+
id: (0, typeorm_1.In)(marketplaceOrderShippings.map(mos => {
|
|
77
|
+
return mos.id;
|
|
78
|
+
}))
|
|
79
|
+
}, { packageId: packageIds, trackingNo: trackingNos });
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
throw new Error(`packing error: ${JSON.stringify(storeOrderItemsPBM)}`);
|
|
83
83
|
}
|
|
84
84
|
////// mockup function to simulate pending order
|
|
85
85
|
// const storeOrderItemsPBM = await mock_setStoreOrderStatusPackedByMarketplace(marketplaceStore, {
|
|
@@ -92,18 +92,10 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
92
92
|
shippingProvider: patch.shippingProvider
|
|
93
93
|
});
|
|
94
94
|
}
|
|
95
|
-
let ownTrackingNo = (
|
|
95
|
+
let ownTrackingNo = (_b = marketplaceOrderShippings[0]) === null || _b === void 0 ? void 0 : _b.ownTrackingNo;
|
|
96
96
|
if (ownTrackingNo) {
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
.find({
|
|
100
|
-
where: {
|
|
101
|
-
orderNoRef: foundMarketplaceOrder.orderNo,
|
|
102
|
-
domain: foundMarketplaceOrder.domain
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
const packages = marketplaceOrderShippings.map(mos => {
|
|
106
|
-
return { packageId: mos.packageId };
|
|
97
|
+
const packages = JSON.parse(marketplaceOrderShippings[0].packageId).map(packageId => {
|
|
98
|
+
return { packageId: packageId };
|
|
107
99
|
});
|
|
108
100
|
try {
|
|
109
101
|
await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, { packages });
|
|
@@ -126,6 +118,7 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
126
118
|
return true;
|
|
127
119
|
}
|
|
128
120
|
catch (error) {
|
|
121
|
+
env_1.logger.error(error.message);
|
|
129
122
|
return false;
|
|
130
123
|
}
|
|
131
124
|
}
|
package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialise-lazada-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts"],"names":[],"mappings":";;;AAAA,qFAAoF;AACpF,6CAA4C;AAE5C,gDAAoG;AAEvF,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,gCAAgC,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACtE,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YACpC,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;;gBACxB,MAAM,qBAAqB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;oBAC/F,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;oBACvB,SAAS,EAAE;wBACT,kBAAkB;wBAClB,uBAAuB;wBACvB,qDAAqD;wBACrD,
|
|
1
|
+
{"version":3,"file":"initialise-lazada-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.210",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,5 +28,5 @@
|
|
|
28
28
|
"@things-factory/product-base": "^4.3.204",
|
|
29
29
|
"@things-factory/shell": "^4.3.179"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "b4d6d4be8e4fe505d754df98a4632097d5451119"
|
|
32
32
|
}
|
|
@@ -118,7 +118,7 @@ export const getOrderDocumentResolver = {
|
|
|
118
118
|
]
|
|
119
119
|
}
|
|
120
120
|
} else if (marketplaceStore.platform == 'lazada') {
|
|
121
|
-
const packageIds =
|
|
121
|
+
const packageIds = JSON.parse(marketplaceOrderShippings[0].packageId)
|
|
122
122
|
orderDocument = await StoreAPI.getStoreOrderDocument(marketplaceStore, { packageIds })
|
|
123
123
|
} else {
|
|
124
124
|
orderDocument = await StoreAPI.getStoreOrderDocument(marketplaceStore, { docRefNo, docType })
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { In } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
|
|
2
4
|
import { logger } from '@things-factory/env'
|
|
3
5
|
|
|
@@ -15,7 +17,6 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
15
17
|
'marketplaceStore',
|
|
16
18
|
'marketplaceOrderItems',
|
|
17
19
|
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
18
|
-
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
19
20
|
'marketplaceOrderItems.marketplaceProductVariation',
|
|
20
21
|
'domain'
|
|
21
22
|
]
|
|
@@ -30,40 +31,32 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
30
31
|
return [...newItemID, ...item.name.split(',')]
|
|
31
32
|
}, [])
|
|
32
33
|
|
|
34
|
+
const marketplaceOrderShippings: MarketplaceOrderShipping[] = await tx
|
|
35
|
+
.getRepository(MarketplaceOrderShipping)
|
|
36
|
+
.find({
|
|
37
|
+
where: { orderNoRef: foundMarketplaceOrder.orderNo, domain: foundMarketplaceOrder.domain },
|
|
38
|
+
relations: ['marketplaceOrderShippingItems', 'marketplaceOrderShippingItems.marketplaceOrderItem']
|
|
39
|
+
})
|
|
40
|
+
|
|
33
41
|
if (
|
|
34
42
|
storeOrder?.status == 'pending' &&
|
|
35
43
|
patch.deliveryType &&
|
|
36
44
|
arrItemIds.length > 0 &&
|
|
37
45
|
patch.shippingProvider
|
|
38
46
|
) {
|
|
39
|
-
const marketplaceOrderShippings: MarketplaceOrderShipping[] = await tx
|
|
40
|
-
.getRepository(MarketplaceOrderShipping)
|
|
41
|
-
.find({
|
|
42
|
-
where: { orderNoRef: foundMarketplaceOrder.orderNo, domain: foundMarketplaceOrder.domain },
|
|
43
|
-
relations: ['marketplaceOrderShippingItems', 'marketplaceOrderShippingItems.marketplaceOrderItem']
|
|
44
|
-
})
|
|
45
|
-
|
|
46
47
|
const fullOrderItemList = []
|
|
47
|
-
|
|
48
|
-
const orderItemList = []
|
|
48
|
+
for (let mos of marketplaceOrderShippings) {
|
|
49
49
|
for (let item of mos.marketplaceOrderShippingItems) {
|
|
50
50
|
let count = item.qty
|
|
51
51
|
let list = item.marketplaceOrderItem.name.split(',')
|
|
52
52
|
for (let i = 0; i < count; i++) {
|
|
53
53
|
if (fullOrderItemList.find(oil => oil == list[i])) count++
|
|
54
54
|
else {
|
|
55
|
-
orderItemList.push(list[i])
|
|
56
55
|
fullOrderItemList.push(list[i])
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
}
|
|
60
|
-
|
|
61
|
-
return {
|
|
62
|
-
orderItemList,
|
|
63
|
-
orderId: storeOrder.orderNo,
|
|
64
|
-
shippingId: mos.id
|
|
65
|
-
}
|
|
66
|
-
})
|
|
59
|
+
}
|
|
67
60
|
|
|
68
61
|
const logisticByPackage = await StoreAPI.getStoreLogisticsByPackage(marketplaceStore, {
|
|
69
62
|
orderId: storeOrder.orderNo,
|
|
@@ -75,26 +68,37 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
75
68
|
)?.providerCode
|
|
76
69
|
|
|
77
70
|
const storeOrderItemsPBM = await StoreAPI.setStoreOrderStatusPackedByMarketplace(marketplaceStore, {
|
|
78
|
-
packOrderList,
|
|
71
|
+
packOrderList: [{ orderId: storeOrder.orderNo, orderItemList: fullOrderItemList }],
|
|
79
72
|
deliveryType: patch.deliveryType,
|
|
80
73
|
shippingAllocateType: logisticByPackage.shippingAllocateType,
|
|
81
74
|
shippingProviderCode: shippingProviderCode
|
|
82
75
|
})
|
|
83
76
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
77
|
+
if (storeOrderItemsPBM.packOrderList && storeOrderItemsPBM.packOrderList.length) {
|
|
78
|
+
const orderPackage = storeOrderItemsPBM.packOrderList[0]
|
|
79
|
+
const packageIds = JSON.stringify(
|
|
80
|
+
orderPackage.orderItemList.map(oil => {
|
|
81
|
+
return oil.packageId
|
|
82
|
+
})
|
|
83
|
+
)
|
|
84
|
+
const trackingNos = JSON.stringify(
|
|
85
|
+
orderPackage.orderItemList.map(oil => {
|
|
86
|
+
return oil.trackingNumber
|
|
87
|
+
})
|
|
88
|
+
)
|
|
87
89
|
|
|
88
|
-
for (let packOrder of uniquePackOrderList) {
|
|
89
|
-
let orderPackage: any
|
|
90
|
-
for (let pack of storeOrderItemsPBM.packOrderList) {
|
|
91
|
-
let tempPackage = pack.orderItemList.find(oil => oil.orderItemId == packOrder.orderItemList[0])
|
|
92
|
-
if (tempPackage) orderPackage = tempPackage
|
|
93
|
-
}
|
|
94
90
|
await tx.getRepository(MarketplaceOrderShipping).update(
|
|
95
|
-
{
|
|
96
|
-
|
|
91
|
+
{
|
|
92
|
+
id: In(
|
|
93
|
+
marketplaceOrderShippings.map(mos => {
|
|
94
|
+
return mos.id
|
|
95
|
+
})
|
|
96
|
+
)
|
|
97
|
+
},
|
|
98
|
+
{ packageId: packageIds, trackingNo: trackingNos }
|
|
97
99
|
)
|
|
100
|
+
} else {
|
|
101
|
+
throw new Error(`packing error: ${JSON.stringify(storeOrderItemsPBM)}`)
|
|
98
102
|
}
|
|
99
103
|
|
|
100
104
|
////// mockup function to simulate pending order
|
|
@@ -110,21 +114,11 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
110
114
|
})
|
|
111
115
|
}
|
|
112
116
|
|
|
113
|
-
let ownTrackingNo =
|
|
114
|
-
foundMarketplaceOrder?.marketplaceOrderItems[0]?.marketplaceOrderShippingItems[0]?.marketplaceOrderShipping
|
|
115
|
-
?.ownTrackingNo
|
|
117
|
+
let ownTrackingNo = marketplaceOrderShippings[0]?.ownTrackingNo
|
|
116
118
|
|
|
117
119
|
if (ownTrackingNo) {
|
|
118
|
-
const marketplaceOrderShippings
|
|
119
|
-
|
|
120
|
-
.find({
|
|
121
|
-
where: {
|
|
122
|
-
orderNoRef: foundMarketplaceOrder.orderNo,
|
|
123
|
-
domain: foundMarketplaceOrder.domain
|
|
124
|
-
}
|
|
125
|
-
})
|
|
126
|
-
const packages = marketplaceOrderShippings.map(mos => {
|
|
127
|
-
return { packageId: mos.packageId }
|
|
120
|
+
const packages = JSON.parse(marketplaceOrderShippings[0].packageId).map(packageId => {
|
|
121
|
+
return { packageId: packageId }
|
|
128
122
|
})
|
|
129
123
|
try {
|
|
130
124
|
await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, { packages })
|
|
@@ -163,6 +157,7 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
163
157
|
)
|
|
164
158
|
return true
|
|
165
159
|
} catch (error) {
|
|
160
|
+
logger.error(error.message)
|
|
166
161
|
return false
|
|
167
162
|
}
|
|
168
163
|
}
|