@things-factory/marketplace-base 5.0.0-alpha.7 → 5.0.0-y.0
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 +1 -1
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js +16 -8
- package/dist-server/graphql/resolvers/marketplace-order/generate-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.js +15 -6
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/split-orders-by-batch.js +8 -15
- package/dist-server/graphql/resolvers/marketplace-order/split-orders-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +90 -48
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-product/marketplace-products.js +3 -2
- package/dist-server/graphql/resolvers/marketplace-product/marketplace-products.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/index.js +7 -2
- package/dist-server/graphql/types/marketplace-order/index.js.map +1 -1
- package/dist-server/utils/no-generator.js +3 -6
- package/dist-server/utils/no-generator.js.map +1 -1
- package/package.json +7 -6
- package/server/entities/marketplace-order.ts +1 -1
- package/server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts +18 -6
- package/server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.ts +18 -10
- package/server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts +10 -14
- package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +10 -2
- package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +100 -52
- package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts +1 -1
- package/server/graphql/resolvers/marketplace-product/marketplace-products.ts +5 -2
- package/server/graphql/types/marketplace-order/index.ts +7 -2
- package/server/utils/no-generator.ts +3 -3
|
@@ -189,7 +189,7 @@ __decorate([
|
|
|
189
189
|
], MarketplaceOrder.prototype, "updater", void 0);
|
|
190
190
|
MarketplaceOrder = __decorate([
|
|
191
191
|
(0, typeorm_1.Entity)(),
|
|
192
|
-
(0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [marketplaceOrder.domain, marketplaceOrder.name], { unique: true })
|
|
192
|
+
(0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [marketplaceOrder.domain, marketplaceOrder.name, marketplaceOrder.marketplaceStore], { unique: true })
|
|
193
193
|
], MarketplaceOrder);
|
|
194
194
|
exports.MarketplaceOrder = MarketplaceOrder;
|
|
195
195
|
//# sourceMappingURL=marketplace-order.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.generateMarketplaceOrder = exports.generateMarketplaceOrderResolver = void 0;
|
|
7
4
|
const typeorm_1 = require("typeorm");
|
|
8
|
-
const
|
|
5
|
+
const uuid_1 = require("uuid");
|
|
9
6
|
const product_base_1 = require("@things-factory/product-base");
|
|
10
7
|
const entities_1 = require("../../../entities");
|
|
11
8
|
const no_generator_1 = require("../../../utils/no-generator");
|
|
@@ -50,9 +47,20 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
|
|
|
50
47
|
marketplaceOrderItems = await Promise.all(marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderItems.map(async (orderItem) => {
|
|
51
48
|
let marketplaceOrderItem = Object.assign({}, orderItem);
|
|
52
49
|
const marketplaceProductVariation = orderItem.marketplaceProductVariation;
|
|
53
|
-
|
|
50
|
+
const qb = await tx
|
|
54
51
|
.getRepository(entities_1.MarketplaceProductVariation)
|
|
55
|
-
.
|
|
52
|
+
.createQueryBuilder('mpv')
|
|
53
|
+
.leftJoin('mpv.marketplaceProduct', 'mp')
|
|
54
|
+
.leftJoin('mp.marketplaceStore', 'ms')
|
|
55
|
+
.where('mpv.domain_id = :domainId')
|
|
56
|
+
.andWhere('mpv.variation_id = :variationId')
|
|
57
|
+
.andWhere('ms.id = :marketplaceStoreId')
|
|
58
|
+
.setParameters({
|
|
59
|
+
domainId: domain.id,
|
|
60
|
+
variationId: marketplaceProductVariation.variationId,
|
|
61
|
+
marketplaceStoreId: marketplaceStore.id
|
|
62
|
+
});
|
|
63
|
+
let foundVariation = await qb.getOne();
|
|
56
64
|
if (!foundVariation) {
|
|
57
65
|
let newVariation = Object.assign({}, marketplaceProductVariation);
|
|
58
66
|
newVariation.status = 'ACTIVE';
|
|
@@ -94,7 +102,7 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
|
|
|
94
102
|
let marketplaceOrderShippingItems = [];
|
|
95
103
|
productBundleSettings.map(productBundleSetting => {
|
|
96
104
|
let marketplaceOrderShippingItem = new entities_1.MarketplaceOrderShippingItem();
|
|
97
|
-
marketplaceOrderShippingItem.name = (0,
|
|
105
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
98
106
|
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty;
|
|
99
107
|
marketplaceOrderShippingItem.domain = marketplaceStore.domain;
|
|
100
108
|
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
@@ -106,7 +114,7 @@ async function generateMarketplaceOrder(_, marketplaceOrder, domain, marketplace
|
|
|
106
114
|
}
|
|
107
115
|
else {
|
|
108
116
|
let marketplaceOrderShippingItem = new entities_1.MarketplaceOrderShippingItem();
|
|
109
|
-
marketplaceOrderShippingItem.name = (0,
|
|
117
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
110
118
|
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty;
|
|
111
119
|
marketplaceOrderShippingItem.domain = marketplaceStore.domain;
|
|
112
120
|
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/generate-marketplace-order.ts"],"names":[],"mappings":"
|
|
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/marketplace-orders-for-batch-init.js
CHANGED
|
@@ -19,15 +19,24 @@ exports.marketplaceOrdersForBatchInitResolver = {
|
|
|
19
19
|
'updater'
|
|
20
20
|
] }));
|
|
21
21
|
items = await Promise.all(items.map(async (itm) => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
try {
|
|
23
|
+
if (itm.marketplaceStore.platform == 'shopee' && itm.status === 'ready_to_ship') {
|
|
24
|
+
let fullLogisticsDetail = await get_logistics_param_1.getLogisticsParam.getLogisticsParam(_, { storeId: itm.marketplaceStore.id, orderNo: itm.orderNo }, context);
|
|
25
|
+
return Object.assign(Object.assign({}, itm), { fullLogisticsDetail });
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
return itm;
|
|
29
|
+
}
|
|
25
30
|
}
|
|
26
|
-
|
|
27
|
-
|
|
31
|
+
catch (e) {
|
|
32
|
+
/**
|
|
33
|
+
* To handle the case when any order was cancelled in marketplace
|
|
34
|
+
* but not synced, it will cause an error which blocks process
|
|
35
|
+
*/
|
|
36
|
+
return null;
|
|
28
37
|
}
|
|
29
38
|
}));
|
|
30
|
-
return { items: items.filter(itm => itm), total };
|
|
39
|
+
return { items: items.filter(itm => itm && itm != null), total };
|
|
31
40
|
}
|
|
32
41
|
};
|
|
33
42
|
//# sourceMappingURL=marketplace-orders-for-batch-init.js.map
|
package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-orders-for-batch-init.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,iDAAoE;AAEpE,gDAAoD;AACpD,kFAA4E;AAE/D,QAAA,qCAAqC,GAAG;IACnD,KAAK,CAAC,6BAA6B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACzE,MAAM,eAAe,GAAG,IAAA,yBAAiB,kCACpC,MAAM,KACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,eAAe,CAAC,IACtE,CAAA;QACF,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,YAAY,iCAClE,eAAe,KAClB,SAAS,EAAE;gBACT,QAAQ;gBACR,kBAAkB;gBAClB,uBAAuB;gBACvB,qDAAqD;gBACrD,8EAA8E;gBAC9E,mDAAmD;gBACnD,SAAS;gBACT,SAAS;aACV,IACD,CAAA;QAEF,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CACvB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAQ,EAAE,EAAE;YAC3B,IAAI,GAAG,CAAC,gBAAgB,CAAC,QAAQ,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"marketplace-orders-for-batch-init.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders-for-batch-init.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,iDAAoE;AAEpE,gDAAoD;AACpD,kFAA4E;AAE/D,QAAA,qCAAqC,GAAG;IACnD,KAAK,CAAC,6BAA6B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACzE,MAAM,eAAe,GAAG,IAAA,yBAAiB,kCACpC,MAAM,KACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,eAAe,CAAC,IACtE,CAAA;QACF,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,YAAY,iCAClE,eAAe,KAClB,SAAS,EAAE;gBACT,QAAQ;gBACR,kBAAkB;gBAClB,uBAAuB;gBACvB,qDAAqD;gBACrD,8EAA8E;gBAC9E,mDAAmD;gBACnD,SAAS;gBACT,SAAS;aACV,IACD,CAAA;QAEF,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CACvB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAQ,EAAE,EAAE;YAC3B,IAAI;gBACF,IAAI,GAAG,CAAC,gBAAgB,CAAC,QAAQ,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,eAAe,EAAE;oBAC/E,IAAI,mBAAmB,GAAG,MAAM,uCAAiB,CAAC,iBAAiB,CACjE,CAAC,EACD,EAAE,OAAO,EAAE,GAAG,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,EAC1D,OAAO,CACR,CAAA;oBAED,uCAAY,GAAG,KAAE,mBAAmB,IAAE;iBACvC;qBAAM;oBACL,OAAO,GAAG,CAAA;iBACX;aACF;YAAC,OAAO,CAAC,EAAE;gBACV;;;mBAGG;gBACH,OAAO,IAAI,CAAA;aACZ;QACH,CAAC,CAAC,CACH,CAAA;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,KAAK,EAAE,CAAA;IAClE,CAAC;CACF,CAAA"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.splitOrdersByBatch = void 0;
|
|
7
|
-
const
|
|
4
|
+
const uuid_1 = require("uuid");
|
|
8
5
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
9
6
|
const entities_1 = require("../../../entities");
|
|
10
7
|
const utils_1 = require("../../../utils");
|
|
@@ -68,13 +65,7 @@ exports.splitOrdersByBatch = {
|
|
|
68
65
|
let marketplaceOrderShippingItem = newMarketplaceOrderShippingItems[a];
|
|
69
66
|
const product = marketplaceOrderShippingItem.product;
|
|
70
67
|
const marketplaceOrderItem = marketplaceOrderShippingItem.marketplaceOrderItem;
|
|
71
|
-
const
|
|
72
|
-
.getRepository(entities_1.MarketplaceProductVariation)
|
|
73
|
-
.find({
|
|
74
|
-
where: { domain: marketplaceOrder.domain, sku: product.sku },
|
|
75
|
-
relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
|
|
76
|
-
});
|
|
77
|
-
const marketplaceProductVariation = marketplaceProductVariations.filter(mpv => mpv.marketplaceProduct.marketplaceStore.id == marketplaceOrder.marketplaceStore.id)[0];
|
|
68
|
+
const marketplaceProductVariation = marketplaceOrderItem.marketplaceProductVariation;
|
|
78
69
|
if (!(marketplaceProductVariation === null || marketplaceProductVariation === void 0 ? void 0 : marketplaceProductVariation.primaryUnitValue))
|
|
79
70
|
throw new Error(marketplaceProductVariation.variationSku + ' weight is empty');
|
|
80
71
|
const primaryUnitValue = parseFloat(marketplaceProductVariation.primaryUnitValue.toFixed(2)) || 0;
|
|
@@ -103,7 +94,7 @@ exports.splitOrdersByBatch = {
|
|
|
103
94
|
newMarketplaceOrderShipping = await tx
|
|
104
95
|
.getRepository(entities_1.MarketplaceOrderShipping)
|
|
105
96
|
.save(newMarketplaceOrderShipping);
|
|
106
|
-
marketplaceOrderShippingItem.name = (0,
|
|
97
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
107
98
|
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
108
99
|
marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
|
|
109
100
|
marketplaceOrderShippingItem.product = product;
|
|
@@ -128,7 +119,7 @@ exports.splitOrdersByBatch = {
|
|
|
128
119
|
else {
|
|
129
120
|
const matchedProduct = shipments.find(shipment => shipment.product.id == product.id);
|
|
130
121
|
if (!matchedProduct) {
|
|
131
|
-
marketplaceOrderShippingItem.name = (0,
|
|
122
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
132
123
|
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
133
124
|
marketplaceOrderShippingItem.marketplaceOrderShipping = shipment.marketplaceOrderShipping;
|
|
134
125
|
marketplaceOrderShippingItem.product = product;
|
|
@@ -148,7 +139,7 @@ exports.splitOrdersByBatch = {
|
|
|
148
139
|
newMarketplaceOrderShipping = await tx
|
|
149
140
|
.getRepository(entities_1.MarketplaceOrderShipping)
|
|
150
141
|
.save(newMarketplaceOrderShipping);
|
|
151
|
-
marketplaceOrderShippingItem.name = (0,
|
|
142
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
152
143
|
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
153
144
|
marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping;
|
|
154
145
|
marketplaceOrderShippingItem.product = product;
|
|
@@ -179,7 +170,9 @@ exports.splitOrdersByBatch = {
|
|
|
179
170
|
.getRepository(entities_1.MarketplaceOrderShipping)
|
|
180
171
|
.find({ where: { domain, orderNoRef: marketplaceOrder.orderNo } });
|
|
181
172
|
marketplaceOrderShippings = marketplaceOrderShippings.map((marketplaceOrderShipping, idx) => {
|
|
182
|
-
return Object.assign(Object.assign({}, marketplaceOrderShipping), { subOrderNoRef:
|
|
173
|
+
return Object.assign(Object.assign({}, marketplaceOrderShipping), { subOrderNoRef: marketplaceOrderShippings.length == 1
|
|
174
|
+
? marketplaceOrderShipping.orderNoRef
|
|
175
|
+
: marketplaceOrderShipping.orderNoRef + ' - ' + (idx + 1) + '/' + marketplaceOrderShippings.length });
|
|
183
176
|
});
|
|
184
177
|
await tx.getRepository(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShippings);
|
|
185
178
|
let newMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"split-orders-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"split-orders-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/split-orders-by-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
|
|
|
6
6
|
const shell_1 = require("@things-factory/shell");
|
|
7
7
|
const sync_marketplace_order_1 = require("./sync-marketplace-order");
|
|
8
8
|
exports.syncAllMarketplaceOrder = {
|
|
9
|
-
async syncAllMarketplaceOrder(_, { companyDomainId,
|
|
9
|
+
async syncAllMarketplaceOrder(_, { companyDomainId, fromCreatedDate, toCreatedDate, blackListStores }, context) {
|
|
10
10
|
const { user } = context.state;
|
|
11
11
|
const companyDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(companyDomainId);
|
|
12
12
|
// Step 1: get all available marketplace-store
|
|
@@ -21,7 +21,7 @@ exports.syncAllMarketplaceOrder = {
|
|
|
21
21
|
}
|
|
22
22
|
for (var i = 0; i < (whiteListStores === null || whiteListStores === void 0 ? void 0 : whiteListStores.length); i++) {
|
|
23
23
|
const marketplaceStore = whiteListStores[i];
|
|
24
|
-
sync_marketplace_order_1.syncMarketplaceOrder.syncMarketplaceOrder(_, { storeId: marketplaceStore.id,
|
|
24
|
+
sync_marketplace_order_1.syncMarketplaceOrder.syncMarketplaceOrder(_, { storeId: marketplaceStore.id, fromCreatedDate, toCreatedDate, scheduler: true }, context);
|
|
25
25
|
}
|
|
26
26
|
return true;
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-all-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,qFAAoF;AACpF,iDAA8C;AAE9C,qEAA+D;AAElD,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,uBAAuB,
|
|
1
|
+
{"version":3,"file":"sync-all-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,qFAAoF;AACpF,iDAA8C;AAE9C,qEAA+D;AAElD,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,uBAAuB,CAC3B,CAAM,EACN,EAAE,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,EACpE,OAAY;QAEZ,MAAM,EAAE,IAAI,EAAE,GAAmB,OAAO,CAAC,KAAK,CAAA;QAE9C,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;QAEhG,gEAAgE;QAChE,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QACnF,IAAI,eAAe,GAAuB,iBAAiB,CAAA;QAE3D,IAAI,eAAe,EAAE;YACnB,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5C,eAAe,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;SAC7F;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAA;YAC3C,6CAAoB,CAAC,oBAAoB,CACvC,CAAC,EACD,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,EACjF,OAAO,CACR,CAAA;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -1,20 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.syncMarketplaceOrder = void 0;
|
|
7
4
|
const typeorm_1 = require("typeorm");
|
|
8
|
-
const
|
|
5
|
+
const uuid_1 = require("uuid");
|
|
9
6
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
7
|
+
const env_1 = require("@things-factory/env");
|
|
10
8
|
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
11
9
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
12
10
|
const product_base_1 = require("@things-factory/product-base");
|
|
13
11
|
const shell_1 = require("@things-factory/shell");
|
|
14
|
-
const
|
|
12
|
+
const reserve_qty_order_statuses_1 = require("../../../constants/reserve-qty-order-statuses");
|
|
15
13
|
const entities_1 = require("../../../entities");
|
|
16
14
|
const utils_1 = require("../../../utils");
|
|
17
|
-
const reserve_qty_order_statuses_1 = require("../../../constants/reserve-qty-order-statuses");
|
|
18
15
|
const cancelStatuses = [
|
|
19
16
|
'cancelled',
|
|
20
17
|
'canceled',
|
|
@@ -26,7 +23,7 @@ const cancelStatuses = [
|
|
|
26
23
|
'refunded'
|
|
27
24
|
];
|
|
28
25
|
exports.syncMarketplaceOrder = {
|
|
29
|
-
async syncMarketplaceOrder(_, { storeId,
|
|
26
|
+
async syncMarketplaceOrder(_, { storeId, fromCreatedDate, toCreatedDate, scheduler = false }, context) {
|
|
30
27
|
const { domain, user } = context.state;
|
|
31
28
|
const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
|
|
32
29
|
let page = 0;
|
|
@@ -36,8 +33,8 @@ exports.syncMarketplaceOrder = {
|
|
|
36
33
|
const disallowCancelStatuses = ['CANCELLED', 'PENDING_CANCEL'];
|
|
37
34
|
while (hasMorePage) {
|
|
38
35
|
const { results: marketplaceOrders, more } = await integration_marketplace_1.StoreAPI.getStoreOrders(marketplaceStore, {
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
fromCreatedDate,
|
|
37
|
+
toCreatedDate,
|
|
41
38
|
pagination: { page, limit },
|
|
42
39
|
lastOrderId
|
|
43
40
|
});
|
|
@@ -72,6 +69,12 @@ exports.syncMarketplaceOrder = {
|
|
|
72
69
|
: shippingProviderInfo['Drop-off'];
|
|
73
70
|
deliveryProvider = shippingProviderInfo['Delivery'];
|
|
74
71
|
}
|
|
72
|
+
const marketplaceTransporter = await tx
|
|
73
|
+
.getRepository(integration_marketplace_1.MarketplaceTransporter)
|
|
74
|
+
.findOne({
|
|
75
|
+
where: { marketplaceStore },
|
|
76
|
+
relations: ['pickupTransporter']
|
|
77
|
+
});
|
|
75
78
|
let marketplaceOrder = new entities_1.MarketplaceOrder();
|
|
76
79
|
marketplaceOrder.name = order.name;
|
|
77
80
|
marketplaceOrder.orderNo = order.orderNo;
|
|
@@ -80,7 +83,10 @@ exports.syncMarketplaceOrder = {
|
|
|
80
83
|
marketplaceOrder.status = order.status;
|
|
81
84
|
marketplaceOrder.remark = order === null || order === void 0 ? void 0 : order.remark;
|
|
82
85
|
marketplaceOrder.trackingNo = tracking_code ? tracking_code : order.trackingNo;
|
|
83
|
-
marketplaceOrder.shippingProvider =
|
|
86
|
+
marketplaceOrder.shippingProvider =
|
|
87
|
+
marketplaceStore.eTrax && marketplaceTransporter
|
|
88
|
+
? marketplaceTransporter.pickupTransporter.name
|
|
89
|
+
: order.shippingProvider;
|
|
84
90
|
marketplaceOrder.orderCreatedAt = order.orderCreatedAt;
|
|
85
91
|
marketplaceOrder.orderUpdatedAt = order.orderUpdatedAt;
|
|
86
92
|
marketplaceOrder.marketplaceStore = marketplaceStore;
|
|
@@ -96,7 +102,7 @@ exports.syncMarketplaceOrder = {
|
|
|
96
102
|
marketplaceOrder.voucherCode = order.voucherCode;
|
|
97
103
|
marketplaceOrder.shippingRebate = order.shippingRebate;
|
|
98
104
|
const existingMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
|
|
99
|
-
where: { domain: marketplaceStore.domain, name: order.name },
|
|
105
|
+
where: { domain: marketplaceStore.domain, name: order.name, marketplaceStore },
|
|
100
106
|
relations: [
|
|
101
107
|
'domain',
|
|
102
108
|
'fulfillmentCenter',
|
|
@@ -292,15 +298,24 @@ exports.syncMarketplaceOrder = {
|
|
|
292
298
|
let foundVariations = [];
|
|
293
299
|
for (var j = 0; j < order.orderItems.length; j++) {
|
|
294
300
|
var item = order.orderItems[j];
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
301
|
+
const qb = await tx
|
|
302
|
+
.getRepository(entities_1.MarketplaceProductVariation)
|
|
303
|
+
.createQueryBuilder('mpv')
|
|
304
|
+
.leftJoin('mpv.marketplaceProduct', 'mp')
|
|
305
|
+
.leftJoin('mp.marketplaceStore', 'ms')
|
|
306
|
+
.where('mpv.domain_id = :domainId')
|
|
307
|
+
.andWhere('mpv.variation_id = :variationId')
|
|
308
|
+
.andWhere('ms.id = :marketplaceStoreId')
|
|
309
|
+
.setParameters({
|
|
310
|
+
domainId: marketplaceStore.domain.id,
|
|
311
|
+
variationId: item.variationId,
|
|
312
|
+
marketplaceStoreId: marketplaceStore.id
|
|
298
313
|
});
|
|
299
|
-
let foundVariation =
|
|
314
|
+
let foundVariation = await qb.getOne();
|
|
300
315
|
if (foundVariation) {
|
|
301
316
|
foundVariations.push(foundVariation);
|
|
302
317
|
}
|
|
303
|
-
|
|
318
|
+
else {
|
|
304
319
|
let newVariation = {
|
|
305
320
|
variationId: item.variationId,
|
|
306
321
|
name: item.variationName,
|
|
@@ -449,7 +464,8 @@ exports.syncMarketplaceOrder = {
|
|
|
449
464
|
let existingMarketplaceOrderShippingItems = await tx
|
|
450
465
|
.getRepository(entities_1.MarketplaceOrderShippingItem)
|
|
451
466
|
.find({
|
|
452
|
-
where: { domain: marketplaceStore.domain, marketplaceOrderItem }
|
|
467
|
+
where: { domain: marketplaceStore.domain, marketplaceOrderItem },
|
|
468
|
+
relations: ['product']
|
|
453
469
|
});
|
|
454
470
|
let product = await tx.getRepository(product_base_1.Product).findOne({
|
|
455
471
|
where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku, deletedAt: (0, typeorm_1.IsNull)() },
|
|
@@ -462,33 +478,47 @@ exports.syncMarketplaceOrder = {
|
|
|
462
478
|
relations: ['productBundleSettings', 'productBundleSettings.product']
|
|
463
479
|
});
|
|
464
480
|
}
|
|
465
|
-
if (
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
481
|
+
if (!marketplaceOrder.isSplitted && !marketplaceOrder.releaseOrderId) {
|
|
482
|
+
if ((existingMarketplaceOrderShippingItems === null || existingMarketplaceOrderShippingItems === void 0 ? void 0 : existingMarketplaceOrderShippingItems.length) &&
|
|
483
|
+
existingMarketplaceOrderShippingItems
|
|
484
|
+
.map(e => {
|
|
485
|
+
return e.product;
|
|
486
|
+
})
|
|
487
|
+
.indexOf(null) != -1) {
|
|
488
|
+
await tx.getRepository(entities_1.MarketplaceOrderShippingItem).remove(existingMarketplaceOrderShippingItems);
|
|
489
|
+
}
|
|
490
|
+
if (((existingMarketplaceOrderShippingItems === null || existingMarketplaceOrderShippingItems === void 0 ? void 0 : existingMarketplaceOrderShippingItems.length) &&
|
|
491
|
+
existingMarketplaceOrderShippingItems
|
|
492
|
+
.map(e => {
|
|
493
|
+
return e.product;
|
|
494
|
+
})
|
|
495
|
+
.indexOf(null) != -1) ||
|
|
496
|
+
!(existingMarketplaceOrderShippingItems === null || existingMarketplaceOrderShippingItems === void 0 ? void 0 : existingMarketplaceOrderShippingItems.length)) {
|
|
497
|
+
if (productBundle) {
|
|
498
|
+
const productBundleSettings = productBundle.productBundleSettings;
|
|
499
|
+
let marketplaceOrderShippingItems = [];
|
|
500
|
+
productBundleSettings.map(productBundleSetting => {
|
|
501
|
+
let marketplaceOrderShippingItem = new entities_1.MarketplaceOrderShippingItem();
|
|
502
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
503
|
+
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty;
|
|
504
|
+
marketplaceOrderShippingItem.domain = marketplaceStore.domain;
|
|
505
|
+
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
506
|
+
marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping;
|
|
507
|
+
marketplaceOrderShippingItem.product = productBundleSetting.product;
|
|
508
|
+
marketplaceOrderShippingItems.push(marketplaceOrderShippingItem);
|
|
509
|
+
});
|
|
510
|
+
await tx.getRepository(entities_1.MarketplaceOrderShippingItem).save(marketplaceOrderShippingItems);
|
|
511
|
+
}
|
|
512
|
+
else {
|
|
472
513
|
let marketplaceOrderShippingItem = new entities_1.MarketplaceOrderShippingItem();
|
|
473
|
-
marketplaceOrderShippingItem.name = (0,
|
|
474
|
-
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty
|
|
514
|
+
marketplaceOrderShippingItem.name = (0, uuid_1.v4)();
|
|
515
|
+
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty;
|
|
475
516
|
marketplaceOrderShippingItem.domain = marketplaceStore.domain;
|
|
476
517
|
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
477
518
|
marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping;
|
|
478
|
-
marketplaceOrderShippingItem.product =
|
|
479
|
-
|
|
480
|
-
}
|
|
481
|
-
await tx.getRepository(entities_1.MarketplaceOrderShippingItem).save(marketplaceOrderShippingItems);
|
|
482
|
-
}
|
|
483
|
-
else {
|
|
484
|
-
let marketplaceOrderShippingItem = new entities_1.MarketplaceOrderShippingItem();
|
|
485
|
-
marketplaceOrderShippingItem.name = (0, v4_1.default)();
|
|
486
|
-
marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty;
|
|
487
|
-
marketplaceOrderShippingItem.domain = marketplaceStore.domain;
|
|
488
|
-
marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem;
|
|
489
|
-
marketplaceOrderShippingItem.marketplaceOrderShipping = savedMarketplaceOrderShipping;
|
|
490
|
-
marketplaceOrderShippingItem.product = product ? product : null;
|
|
491
|
-
await tx.getRepository(entities_1.MarketplaceOrderShippingItem).save(marketplaceOrderShippingItem);
|
|
519
|
+
marketplaceOrderShippingItem.product = product ? product : null;
|
|
520
|
+
await tx.getRepository(entities_1.MarketplaceOrderShippingItem).save(marketplaceOrderShippingItem);
|
|
521
|
+
}
|
|
492
522
|
}
|
|
493
523
|
}
|
|
494
524
|
}
|
|
@@ -497,7 +527,12 @@ exports.syncMarketplaceOrder = {
|
|
|
497
527
|
}
|
|
498
528
|
}
|
|
499
529
|
catch (e) {
|
|
500
|
-
|
|
530
|
+
if (scheduler) {
|
|
531
|
+
env_1.logger.error(`Order no: ${marketplaceOrders[i].name}: ${e}`);
|
|
532
|
+
}
|
|
533
|
+
else {
|
|
534
|
+
throw new Error(e);
|
|
535
|
+
}
|
|
501
536
|
}
|
|
502
537
|
});
|
|
503
538
|
}
|
|
@@ -512,8 +547,8 @@ exports.syncMarketplaceOrder = {
|
|
|
512
547
|
var payoutDateList = [];
|
|
513
548
|
while (hasMore) {
|
|
514
549
|
const { result: payoutDates, more } = await integration_marketplace_1.StoreAPI.getStoreOrderPayoutDates(marketplaceStore, {
|
|
515
|
-
|
|
516
|
-
|
|
550
|
+
fromCreatedDate,
|
|
551
|
+
toCreatedDate,
|
|
517
552
|
pagination: { page: pageNo, limit: perPage }
|
|
518
553
|
});
|
|
519
554
|
payoutDateList.push(...payoutDates);
|
|
@@ -553,14 +588,15 @@ async function updateQtyAndReserveQtyBundle(tx, variation, domain, qty, marketpl
|
|
|
553
588
|
let updatedReserveQty = 0;
|
|
554
589
|
let updatedQty = 0;
|
|
555
590
|
if (existingMarketplaceOrder) {
|
|
556
|
-
if ((statusAllowed && existingStatusNotAllowed) ||
|
|
557
|
-
(cancelStatuses.includes(marketplaceOrder.status) && !existingStatusNotAllowed))
|
|
591
|
+
if (((statusAllowed && existingStatusNotAllowed) ||
|
|
592
|
+
(cancelStatuses.includes(marketplaceOrder.status) && !existingStatusNotAllowed)) &&
|
|
593
|
+
marketplaceOrder.marketplaceStore.reserveEnabled) {
|
|
558
594
|
updatedReserveQty += setting.bundleQty * qty;
|
|
559
595
|
}
|
|
560
596
|
updatedQty += setting.bundleQty * qty - matchedOrderItemQty * setting.bundleQty;
|
|
561
597
|
}
|
|
562
598
|
else {
|
|
563
|
-
if (statusAllowed && qty > 0) {
|
|
599
|
+
if (statusAllowed && qty > 0 && marketplaceOrder.marketplaceStore.reserveEnabled) {
|
|
564
600
|
updatedReserveQty += setting.bundleQty * qty;
|
|
565
601
|
}
|
|
566
602
|
if (mpv.qty - setting.bundleQty * qty >= 0) {
|
|
@@ -619,11 +655,17 @@ async function updateQtyAndReserveQty(tx, foundVariation, marketplaceOrder, qty,
|
|
|
619
655
|
let updatedReserveQty = 0;
|
|
620
656
|
let updatedQty = 0;
|
|
621
657
|
if (matchedOrderItemQty) {
|
|
622
|
-
|
|
658
|
+
if (marketplaceOrder.marketplaceStore.reserveEnabled) {
|
|
659
|
+
updatedReserveQty = roCreated
|
|
660
|
+
? 0
|
|
661
|
+
: statusAllowed && existingStatusNotAllowed
|
|
662
|
+
? qty
|
|
663
|
+
: qty - matchedOrderItemQty;
|
|
664
|
+
}
|
|
623
665
|
updatedQty = roCreated ? 0 : qty - matchedOrderItemQty;
|
|
624
666
|
}
|
|
625
667
|
else {
|
|
626
|
-
if ((statusAllowed && qty > 0) || qty < 0) {
|
|
668
|
+
if (((statusAllowed && qty > 0) || qty < 0) && marketplaceOrder.marketplaceStore.reserveEnabled) {
|
|
627
669
|
updatedReserveQty = qty;
|
|
628
670
|
}
|
|
629
671
|
if (variation.qty - qty >= 0) {
|