@things-factory/marketplace-base 4.3.210 → 4.3.212
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.js +16 -0
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js +12 -12
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/marketplace-order.js +4 -0
- package/dist-server/graphql/types/marketplace-order/marketplace-order.js.map +1 -1
- package/package.json +3 -3
- package/server/entities/marketplace-order.ts +12 -0
- package/server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts +12 -11
- package/server/graphql/types/marketplace-order/marketplace-order.ts +4 -0
|
@@ -79,6 +79,22 @@ __decorate([
|
|
|
79
79
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
80
80
|
__metadata("design:type", String)
|
|
81
81
|
], MarketplaceOrder.prototype, "remark", void 0);
|
|
82
|
+
__decorate([
|
|
83
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
84
|
+
__metadata("design:type", String)
|
|
85
|
+
], MarketplaceOrder.prototype, "remark2", void 0);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
88
|
+
__metadata("design:type", String)
|
|
89
|
+
], MarketplaceOrder.prototype, "remark3", void 0);
|
|
90
|
+
__decorate([
|
|
91
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
92
|
+
__metadata("design:type", String)
|
|
93
|
+
], MarketplaceOrder.prototype, "remark4", void 0);
|
|
94
|
+
__decorate([
|
|
95
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
96
|
+
__metadata("design:type", String)
|
|
97
|
+
], MarketplaceOrder.prototype, "remark5", void 0);
|
|
82
98
|
__decorate([
|
|
83
99
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
84
100
|
__metadata("design:type", Boolean)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;AAY3C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;
|
|
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/initialise-lazada-logistics-by-batch.js
CHANGED
|
@@ -35,21 +35,20 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
35
35
|
where: { orderNoRef: foundMarketplaceOrder.orderNo, domain: foundMarketplaceOrder.domain },
|
|
36
36
|
relations: ['marketplaceOrderShippingItems', 'marketplaceOrderShippingItems.marketplaceOrderItem']
|
|
37
37
|
});
|
|
38
|
+
let packageIds;
|
|
38
39
|
if ((storeOrder === null || storeOrder === void 0 ? void 0 : storeOrder.status) == 'pending' &&
|
|
39
40
|
patch.deliveryType &&
|
|
40
41
|
arrItemIds.length > 0 &&
|
|
41
42
|
patch.shippingProvider) {
|
|
42
43
|
const fullOrderItemList = [];
|
|
43
|
-
for (let
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
fullOrderItemList.push(list[i]);
|
|
52
|
-
}
|
|
44
|
+
for (let item of foundMarketplaceOrder.marketplaceOrderItems) {
|
|
45
|
+
let count = item.qty;
|
|
46
|
+
let list = item.name.split(',');
|
|
47
|
+
for (let i = 0; i < count; i++) {
|
|
48
|
+
if (fullOrderItemList.find(oil => oil == list[i]))
|
|
49
|
+
count++;
|
|
50
|
+
else {
|
|
51
|
+
fullOrderItemList.push(list[i]);
|
|
53
52
|
}
|
|
54
53
|
}
|
|
55
54
|
}
|
|
@@ -66,7 +65,7 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
66
65
|
});
|
|
67
66
|
if (storeOrderItemsPBM.packOrderList && storeOrderItemsPBM.packOrderList.length) {
|
|
68
67
|
const orderPackage = storeOrderItemsPBM.packOrderList[0];
|
|
69
|
-
|
|
68
|
+
packageIds = JSON.stringify(orderPackage.orderItemList.map(oil => {
|
|
70
69
|
return oil.packageId;
|
|
71
70
|
}));
|
|
72
71
|
const trackingNos = JSON.stringify(orderPackage.orderItemList.map(oil => {
|
|
@@ -94,7 +93,8 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
94
93
|
}
|
|
95
94
|
let ownTrackingNo = (_b = marketplaceOrderShippings[0]) === null || _b === void 0 ? void 0 : _b.ownTrackingNo;
|
|
96
95
|
if (ownTrackingNo) {
|
|
97
|
-
const
|
|
96
|
+
const uniquePackageIds = [...new Set(JSON.parse(packageIds))];
|
|
97
|
+
const packages = uniquePackageIds.map(packageId => {
|
|
98
98
|
return { packageId: packageId };
|
|
99
99
|
});
|
|
100
100
|
try {
|
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,qCAA4B;AAE5B,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,mDAAmD;wBACnD,QAAQ;qBACT;iBACF,CAAC,CAAA;gBACF,IAAI,CAAC,qBAAqB;oBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBAEhE,MAAM,OAAO,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,EAAE,CAAA;gBACzD,MAAM,gBAAgB,GAAqB,MAAM,kCAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;gBACtF,MAAM,UAAU,GAAG,MAAM,kCAAQ,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAE7F,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;oBAClE,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;gBAChD,CAAC,EAAE,EAAE,CAAC,CAAA;gBAEN,MAAM,yBAAyB,GAA+B,MAAM,EAAE;qBACrE,aAAa,CAAC,mCAAwB,CAAC;qBACvC,IAAI,CAAC;oBACJ,KAAK,EAAE,EAAE,UAAU,EAAE,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,qBAAqB,CAAC,MAAM,EAAE;oBAC1F,SAAS,EAAE,CAAC,+BAA+B,EAAE,oDAAoD,CAAC;iBACnG,CAAC,CAAA;gBAEF,IACE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,KAAI,SAAS;oBAC/B,KAAK,CAAC,YAAY;oBAClB,UAAU,CAAC,MAAM,GAAG,CAAC;oBACrB,KAAK,CAAC,gBAAgB,EACtB;oBACA,MAAM,iBAAiB,GAAG,EAAE,CAAA;oBAC5B,KAAK,IAAI,
|
|
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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"}
|
|
@@ -22,6 +22,10 @@ exports.MarketplaceOrder = (0, graphql_tag_1.default) `
|
|
|
22
22
|
paymentMethod: String
|
|
23
23
|
type: String
|
|
24
24
|
remark: String
|
|
25
|
+
remark2: String
|
|
26
|
+
remark3: String
|
|
27
|
+
remark4: String
|
|
28
|
+
remark5: String
|
|
25
29
|
giftOption: Boolean
|
|
26
30
|
voucherCode: String
|
|
27
31
|
discountValue: String
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ClC,CAAA"}
|
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.212",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@things-factory/integration-fulfillment": "^4.3.190",
|
|
27
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
27
|
+
"@things-factory/integration-marketplace": "^4.3.212",
|
|
28
28
|
"@things-factory/product-base": "^4.3.204",
|
|
29
29
|
"@things-factory/shell": "^4.3.179"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "16651f95d911fe112b0e4e92dc5c1c1c219a19ee"
|
|
32
32
|
}
|
|
@@ -72,6 +72,18 @@ export class MarketplaceOrder {
|
|
|
72
72
|
@Column({ nullable: true })
|
|
73
73
|
remark: string
|
|
74
74
|
|
|
75
|
+
@Column({ nullable: true })
|
|
76
|
+
remark2: string
|
|
77
|
+
|
|
78
|
+
@Column({ nullable: true })
|
|
79
|
+
remark3: string
|
|
80
|
+
|
|
81
|
+
@Column({ nullable: true })
|
|
82
|
+
remark4: string
|
|
83
|
+
|
|
84
|
+
@Column({ nullable: true })
|
|
85
|
+
remark5: string
|
|
86
|
+
|
|
75
87
|
@Column({ nullable: true })
|
|
76
88
|
giftOption: Boolean
|
|
77
89
|
|
|
@@ -38,6 +38,8 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
38
38
|
relations: ['marketplaceOrderShippingItems', 'marketplaceOrderShippingItems.marketplaceOrderItem']
|
|
39
39
|
})
|
|
40
40
|
|
|
41
|
+
let packageIds: string
|
|
42
|
+
|
|
41
43
|
if (
|
|
42
44
|
storeOrder?.status == 'pending' &&
|
|
43
45
|
patch.deliveryType &&
|
|
@@ -45,15 +47,13 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
45
47
|
patch.shippingProvider
|
|
46
48
|
) {
|
|
47
49
|
const fullOrderItemList = []
|
|
48
|
-
for (let
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
fullOrderItemList.push(list[i])
|
|
56
|
-
}
|
|
50
|
+
for (let item of foundMarketplaceOrder.marketplaceOrderItems) {
|
|
51
|
+
let count = item.qty
|
|
52
|
+
let list = item.name.split(',')
|
|
53
|
+
for (let i = 0; i < count; i++) {
|
|
54
|
+
if (fullOrderItemList.find(oil => oil == list[i])) count++
|
|
55
|
+
else {
|
|
56
|
+
fullOrderItemList.push(list[i])
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
}
|
|
@@ -76,7 +76,7 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
76
76
|
|
|
77
77
|
if (storeOrderItemsPBM.packOrderList && storeOrderItemsPBM.packOrderList.length) {
|
|
78
78
|
const orderPackage = storeOrderItemsPBM.packOrderList[0]
|
|
79
|
-
|
|
79
|
+
packageIds = JSON.stringify(
|
|
80
80
|
orderPackage.orderItemList.map(oil => {
|
|
81
81
|
return oil.packageId
|
|
82
82
|
})
|
|
@@ -117,7 +117,8 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
117
117
|
let ownTrackingNo = marketplaceOrderShippings[0]?.ownTrackingNo
|
|
118
118
|
|
|
119
119
|
if (ownTrackingNo) {
|
|
120
|
-
const
|
|
120
|
+
const uniquePackageIds = [...new Set(JSON.parse(packageIds))]
|
|
121
|
+
const packages = uniquePackageIds.map(packageId => {
|
|
121
122
|
return { packageId: packageId }
|
|
122
123
|
})
|
|
123
124
|
try {
|