@things-factory/operato-mms 3.8.24 → 3.8.28
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/client/pages/reports/sales-by-platform/lazada-sales-report.js +108 -17
- package/client/pages/reports/sales-by-platform/shopee-sales-report.js +64 -6
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +66 -61
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +66 -61
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/dist-server/routers/etrax-router.js +31 -9
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/package.json +8 -8
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +68 -62
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +68 -62
- package/server/routers/etrax-router.ts +41 -12
- package/translations/en.json +6 -6
- package/translations/ko.json +6 -6
- package/translations/ms.json +6 -6
- package/translations/zh.json +6 -6
|
@@ -33,68 +33,73 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
33
33
|
where: { orderNoRef: marketplaceOrder.orderNo, domain }
|
|
34
34
|
});
|
|
35
35
|
for (var j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
? marketplaceOrderShipping.ownTrackingNo
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
:
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
36
|
+
let marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
37
|
+
if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
|
|
38
|
+
const date = new Date();
|
|
39
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
40
|
+
.toString()
|
|
41
|
+
.padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
|
|
42
|
+
const newMarketplaceOrder = {
|
|
43
|
+
releaseDate,
|
|
44
|
+
type: 'b2c',
|
|
45
|
+
transporter: marketplaceOrder.shippingProvider,
|
|
46
|
+
trackingNo: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.ownTrackingNo)
|
|
47
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
48
|
+
: marketplaceOrderShipping.trackingNo,
|
|
49
|
+
packingOption: true,
|
|
50
|
+
exportOption: false,
|
|
51
|
+
ownTransport: true,
|
|
52
|
+
courierOption: true,
|
|
53
|
+
collectionOrderNo: marketplaceOrder.orderNo,
|
|
54
|
+
refNo: marketplaceOrder.orderNo,
|
|
55
|
+
refNo2: marketplaceOrderShippings.length > 1 ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.subOrderNoRef : marketplaceOrder.orderNo,
|
|
56
|
+
deliverTo: {
|
|
57
|
+
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
58
|
+
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
59
|
+
deliveryAddress3: marketplaceOrderShipping.address3,
|
|
60
|
+
deliveryAddress4: marketplaceOrderShipping.address4,
|
|
61
|
+
deliveryAddress5: marketplaceOrderShipping.address5,
|
|
62
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
63
|
+
city: marketplaceOrderShipping.city,
|
|
64
|
+
postalCode: marketplaceOrderShipping.postCode,
|
|
65
|
+
country: marketplaceOrderShipping.country,
|
|
66
|
+
state: marketplaceOrderShipping.state,
|
|
67
|
+
phone1: marketplaceOrderShipping.phone1,
|
|
68
|
+
phone2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.phone2) ? marketplaceOrderShipping.phone2 : null
|
|
69
|
+
},
|
|
70
|
+
marketplaceOrderStatus: marketplaceOrder.status,
|
|
71
|
+
airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
|
|
72
|
+
invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
|
|
73
|
+
orderInventories: marketplaceOrder.marketplaceOrderItems
|
|
74
|
+
.filter(item => {
|
|
75
|
+
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
76
|
+
return item;
|
|
77
|
+
}
|
|
78
|
+
})
|
|
79
|
+
.map((orderItem) => {
|
|
80
|
+
const { marketplaceProductVariation: productVariation } = orderItem;
|
|
81
|
+
return {
|
|
82
|
+
product: {
|
|
83
|
+
sku: productVariation.sku
|
|
84
|
+
},
|
|
85
|
+
releaseQty: orderItem.qty
|
|
86
|
+
};
|
|
87
|
+
})
|
|
88
|
+
};
|
|
89
|
+
var releaseOrder = await integration_fulfillment_1.FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
|
|
90
|
+
customerBizplaceId,
|
|
91
|
+
releaseOrder: newMarketplaceOrder
|
|
92
|
+
});
|
|
93
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
94
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
95
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
99
|
+
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
100
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
101
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
94
102
|
}
|
|
95
|
-
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
96
|
-
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
97
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
98
103
|
}
|
|
99
104
|
}
|
|
100
105
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,uDAAyE;AACzE,qFAAwE;AACxE,uEAA6F;AAC7F,iDAA8C;AAEjC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAO,EAAE,EAAE,WAAW,EAA2B,EAAE,OAAY;QACvF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,EAAE,GAAyC,IAAA,4BAAkB,EAAC,mCAAgB,EAAE,IAAI,CAAC,CAAA;QAC3F,MAAM,iBAAiB,GAAuB,MAAM,EAAE;aACnD,iBAAiB,CAAC,0BAA0B,EAAE,KAAK,CAAC;aACpD,iBAAiB,CAAC,8BAA8B,EAAE,KAAK,CAAC;aACxD,iBAAiB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC3D,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;aAC/C,KAAK,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACvD,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,2BAA2B,EAAE;YACrC,MAAM,EAAE,CAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,CAAC;SACjE,CAAC;aACD,QAAQ,CAAC,iCAAiC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC;aAC5E,OAAO,EAAE,CAAA;QAEZ,IAAI,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC7E,IAAI,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAEhD,IAAI,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrG,IAAI,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;QAC/E,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,IAAI,CACvD,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CACrE,CAAC,EAAE,CAAA;QAEJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAE7C,MAAM,yBAAyB,GAA+B,MAAM,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAC,IAAI,CAAC;gBAC/G,KAAK,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;aACxD,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,yBAAyB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzD,
|
|
1
|
+
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.etraxRouter = void 0;
|
|
7
7
|
const koa_router_1 = __importDefault(require("koa-router"));
|
|
8
8
|
const typeorm_1 = require("typeorm");
|
|
9
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
10
|
+
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
9
11
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
10
12
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
11
13
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
12
|
-
|
|
14
|
+
const shell_1 = require("@things-factory/shell");
|
|
13
15
|
const debug = require('debug')('things-factory:jest.config');
|
|
14
16
|
exports.etraxRouter = new koa_router_1.default();
|
|
15
17
|
exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
16
|
-
const { domain, user } = context.state;
|
|
17
18
|
const repo = (0, typeorm_1.getRepository)(integration_lmd_1.LastMileDelivery);
|
|
18
19
|
const requestBody = context.request.body;
|
|
19
20
|
debug('etrax_status_update/context: ', context);
|
|
@@ -23,7 +24,6 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
23
24
|
const extOrderNo = requestBody.ExtOrderNo;
|
|
24
25
|
const trackingNo = requestBody.TrackingNo;
|
|
25
26
|
const status = requestBody.Status;
|
|
26
|
-
const trackingDate = requestBody.TrackingDate; //yyyyMMddHHmmss
|
|
27
27
|
const awbUrl = requestBody.AWBurl;
|
|
28
28
|
const customerCode = bodySourceID;
|
|
29
29
|
const lmd = await repo.findOne({
|
|
@@ -58,17 +58,42 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
58
58
|
if (status === 'TAS') {
|
|
59
59
|
//Update DB if Validate Success
|
|
60
60
|
const orderRepo = (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder);
|
|
61
|
-
const orderItemRepo = (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderItem);
|
|
62
61
|
const orderShippingRepo = (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping);
|
|
63
62
|
let order = await orderRepo.findOne({
|
|
64
63
|
where: { orderNo: extOrderNo },
|
|
65
|
-
relations: [
|
|
64
|
+
relations: [
|
|
65
|
+
'domain',
|
|
66
|
+
'marketplaceStore',
|
|
67
|
+
'marketplaceOrderItems',
|
|
68
|
+
'marketplaceOrderItems.marketplaceOrderShipping',
|
|
69
|
+
'marketplaceOrderItems.marketplaceOrderShipping.fulfillmentCenter'
|
|
70
|
+
]
|
|
66
71
|
});
|
|
67
72
|
let orderItems = order.marketplaceOrderItems;
|
|
68
73
|
for (const orderItem of orderItems) {
|
|
69
74
|
if (orderItem.marketplaceOrderShipping !== null) {
|
|
70
75
|
const orderShipping = orderItem.marketplaceOrderShipping;
|
|
76
|
+
const fulfillmentCenter = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.fulfillmentCenter;
|
|
77
|
+
const marketplaceStore = order.marketplaceStore;
|
|
71
78
|
const currentDate = new Date();
|
|
79
|
+
const centerId = fulfillmentCenter.centerId;
|
|
80
|
+
const warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
|
|
81
|
+
const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
|
|
82
|
+
const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id == (order === null || order === void 0 ? void 0 : order.domain.id)).id;
|
|
83
|
+
const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
|
|
84
|
+
where: { marketplaceStore },
|
|
85
|
+
relations: ['pickupTransporter']
|
|
86
|
+
});
|
|
87
|
+
let patch = {
|
|
88
|
+
id: orderShipping.releaseOrderId,
|
|
89
|
+
trackingNo: trackingNo,
|
|
90
|
+
transporter: marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name
|
|
91
|
+
};
|
|
92
|
+
integration_fulfillment_1.FulfillmentAPI.updateReleaseGoodDetails(fulfillmentCenter, {
|
|
93
|
+
customerBizplaceId,
|
|
94
|
+
releaseOrder: Object.assign({}, patch),
|
|
95
|
+
shippingOrder: null
|
|
96
|
+
});
|
|
72
97
|
await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate });
|
|
73
98
|
}
|
|
74
99
|
}
|
|
@@ -77,7 +102,7 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
77
102
|
// to-do update tracking no to every marketplaces
|
|
78
103
|
if (marketplaceStore.platform === 'woocommerce') {
|
|
79
104
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
|
|
80
|
-
|
|
105
|
+
await integration_marketplace_1.StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note });
|
|
81
106
|
}
|
|
82
107
|
const resp = {
|
|
83
108
|
Status: 'SUCCESS',
|
|
@@ -89,9 +114,6 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
89
114
|
};
|
|
90
115
|
context.type = 'application/json';
|
|
91
116
|
context.body = JSON.stringify(resp);
|
|
92
|
-
//let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
|
|
93
|
-
//await orderItemRepo.save(orderItem)
|
|
94
|
-
//await orderShippingRepo.save(orderShipping)
|
|
95
117
|
}
|
|
96
118
|
});
|
|
97
119
|
//# sourceMappingURL=etrax-router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,qCAAuC;AAEvC,qEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.28",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@things-factory/apptool-ui": "^3.8.0",
|
|
46
46
|
"@things-factory/attachment-base": "^3.8.0",
|
|
47
47
|
"@things-factory/auth-ui": "^3.8.0",
|
|
48
|
-
"@things-factory/biz-base": "^3.8.
|
|
48
|
+
"@things-factory/biz-base": "^3.8.26",
|
|
49
49
|
"@things-factory/board-service": "^3.8.0",
|
|
50
50
|
"@things-factory/board-ui": "^3.8.0",
|
|
51
51
|
"@things-factory/code-ui": "^3.8.0",
|
|
@@ -58,15 +58,15 @@
|
|
|
58
58
|
"@things-factory/grist-ui": "^3.7.5",
|
|
59
59
|
"@things-factory/help": "^3.8.0",
|
|
60
60
|
"@things-factory/i18n-ui": "^3.8.0",
|
|
61
|
-
"@things-factory/integration-fulfillment": "^3.8.
|
|
62
|
-
"@things-factory/integration-lmd": "^3.8.
|
|
61
|
+
"@things-factory/integration-fulfillment": "^3.8.26",
|
|
62
|
+
"@things-factory/integration-lmd": "^3.8.26",
|
|
63
63
|
"@things-factory/lite-menu": "^3.8.0",
|
|
64
|
-
"@things-factory/marketplace-base": "^3.8.
|
|
64
|
+
"@things-factory/marketplace-base": "^3.8.28",
|
|
65
65
|
"@things-factory/more-ui": "^3.8.0",
|
|
66
66
|
"@things-factory/notification": "^3.8.0",
|
|
67
67
|
"@things-factory/oauth2-client": "^3.8.0",
|
|
68
68
|
"@things-factory/pdf": "^3.7.5",
|
|
69
|
-
"@things-factory/product-base": "^3.8.
|
|
69
|
+
"@things-factory/product-base": "^3.8.26",
|
|
70
70
|
"@things-factory/resource-ui": "^3.8.0",
|
|
71
71
|
"@things-factory/scene-chartjs": "^3.7.5",
|
|
72
72
|
"@things-factory/scene-clock": "^3.7.5",
|
|
@@ -99,11 +99,11 @@
|
|
|
99
99
|
"@things-factory/scene-wheel-sorter": "^3.7.5",
|
|
100
100
|
"@things-factory/setting-ui": "^3.8.19",
|
|
101
101
|
"@things-factory/system-ui": "^3.8.0",
|
|
102
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
102
|
+
"@things-factory/warehouse-base": "^3.8.28"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
105
|
"@things-factory/builder": "^3.7.5",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "8bc0e8adad38cec375d701d66f2f198bceafd644"
|
|
109
109
|
}
|
|
@@ -39,73 +39,79 @@ export const addReleaseOrderResolver = {
|
|
|
39
39
|
})
|
|
40
40
|
|
|
41
41
|
for (var j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
42
|
-
|
|
42
|
+
let marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
.
|
|
47
|
-
|
|
44
|
+
if (!marketplaceOrderShipping?.releaseOrderId) {
|
|
45
|
+
const date: Date = new Date()
|
|
46
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
47
|
+
.toString()
|
|
48
|
+
.padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
|
|
48
49
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
:
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
50
|
+
const newReleaseOrder: any = {
|
|
51
|
+
releaseDate,
|
|
52
|
+
type: 'b2c',
|
|
53
|
+
transporter: marketplaceOrder.shippingProvider,
|
|
54
|
+
trackingNo: marketplaceOrderShipping?.ownTrackingNo
|
|
55
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
56
|
+
: marketplaceOrderShipping.trackingNo,
|
|
57
|
+
packingOption: true,
|
|
58
|
+
exportOption: false,
|
|
59
|
+
ownTransport: true,
|
|
60
|
+
courierOption: true,
|
|
61
|
+
collectionOrderNo: marketplaceOrder.orderNo,
|
|
62
|
+
refNo: marketplaceOrder.orderNo,
|
|
63
|
+
refNo2:
|
|
64
|
+
marketplaceOrderShippings.length > 1 ? marketplaceOrderShipping?.subOrderNoRef : marketplaceOrder.orderNo,
|
|
65
|
+
deliverTo: {
|
|
66
|
+
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
67
|
+
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
68
|
+
deliveryAddress3: marketplaceOrderShipping.address3,
|
|
69
|
+
deliveryAddress4: marketplaceOrderShipping.address4,
|
|
70
|
+
deliveryAddress5: marketplaceOrderShipping.address5,
|
|
71
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
72
|
+
city: marketplaceOrderShipping.city,
|
|
73
|
+
postalCode: marketplaceOrderShipping.postCode,
|
|
74
|
+
country: marketplaceOrderShipping.country,
|
|
75
|
+
state: marketplaceOrderShipping.state,
|
|
76
|
+
phone1: marketplaceOrderShipping.phone1,
|
|
77
|
+
phone2: marketplaceOrderShipping?.phone2 ? marketplaceOrderShipping.phone2 : null
|
|
78
|
+
},
|
|
79
|
+
marketplaceOrderStatus: marketplaceOrder.status,
|
|
80
|
+
airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
|
|
81
|
+
invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
|
|
82
|
+
orderInventories: marketplaceOrder.marketplaceOrderItems
|
|
83
|
+
.filter(item => {
|
|
84
|
+
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
85
|
+
return item
|
|
86
|
+
}
|
|
87
|
+
})
|
|
88
|
+
.map((orderItem: any) => {
|
|
89
|
+
const { marketplaceProductVariation: productVariation }: any = orderItem
|
|
90
|
+
return {
|
|
91
|
+
product: {
|
|
92
|
+
sku: productVariation.sku
|
|
93
|
+
},
|
|
94
|
+
releaseQty: orderItem.qty
|
|
95
|
+
}
|
|
96
|
+
})
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
var releaseOrder: any = await FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
|
|
100
|
+
customerBizplaceId,
|
|
101
|
+
releaseOrder: newReleaseOrder
|
|
102
|
+
})
|
|
99
103
|
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
}
|
|
104
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id
|
|
105
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
|
|
106
|
+
await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
|
|
107
|
+
}
|
|
104
108
|
}
|
|
105
109
|
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
110
|
+
if (releaseOrder && releaseOrder?.id) {
|
|
111
|
+
marketplaceOrder.releaseOrderId = releaseOrder.id
|
|
112
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter
|
|
113
|
+
await getRepository(MarketplaceOrder).save(marketplaceOrder)
|
|
114
|
+
}
|
|
109
115
|
}
|
|
110
116
|
}
|
|
111
117
|
}
|
|
@@ -40,73 +40,79 @@ export const autoAddReleaseOrderResolver = {
|
|
|
40
40
|
})
|
|
41
41
|
|
|
42
42
|
for (var j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
43
|
-
|
|
43
|
+
let marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
|
|
44
44
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
.
|
|
48
|
-
|
|
45
|
+
if (!marketplaceOrderShipping?.releaseOrderId) {
|
|
46
|
+
const date: Date = new Date()
|
|
47
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
48
|
+
.toString()
|
|
49
|
+
.padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
|
|
49
50
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
:
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
51
|
+
const newMarketplaceOrder: any = {
|
|
52
|
+
releaseDate,
|
|
53
|
+
type: 'b2c',
|
|
54
|
+
transporter: marketplaceOrder.shippingProvider,
|
|
55
|
+
trackingNo: marketplaceOrderShipping?.ownTrackingNo
|
|
56
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
57
|
+
: marketplaceOrderShipping.trackingNo,
|
|
58
|
+
packingOption: true,
|
|
59
|
+
exportOption: false,
|
|
60
|
+
ownTransport: true,
|
|
61
|
+
courierOption: true,
|
|
62
|
+
collectionOrderNo: marketplaceOrder.orderNo,
|
|
63
|
+
refNo: marketplaceOrder.orderNo,
|
|
64
|
+
refNo2:
|
|
65
|
+
marketplaceOrderShippings.length > 1 ? marketplaceOrderShipping?.subOrderNoRef : marketplaceOrder.orderNo,
|
|
66
|
+
deliverTo: {
|
|
67
|
+
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
68
|
+
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
69
|
+
deliveryAddress3: marketplaceOrderShipping.address3,
|
|
70
|
+
deliveryAddress4: marketplaceOrderShipping.address4,
|
|
71
|
+
deliveryAddress5: marketplaceOrderShipping.address5,
|
|
72
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
73
|
+
city: marketplaceOrderShipping.city,
|
|
74
|
+
postalCode: marketplaceOrderShipping.postCode,
|
|
75
|
+
country: marketplaceOrderShipping.country,
|
|
76
|
+
state: marketplaceOrderShipping.state,
|
|
77
|
+
phone1: marketplaceOrderShipping.phone1,
|
|
78
|
+
phone2: marketplaceOrderShipping?.phone2 ? marketplaceOrderShipping.phone2 : null
|
|
79
|
+
},
|
|
80
|
+
marketplaceOrderStatus: marketplaceOrder.status,
|
|
81
|
+
airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
|
|
82
|
+
invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
|
|
83
|
+
orderInventories: marketplaceOrder.marketplaceOrderItems
|
|
84
|
+
.filter(item => {
|
|
85
|
+
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
86
|
+
return item
|
|
87
|
+
}
|
|
88
|
+
})
|
|
89
|
+
.map((orderItem: any) => {
|
|
90
|
+
const { marketplaceProductVariation: productVariation }: any = orderItem
|
|
91
|
+
return {
|
|
92
|
+
product: {
|
|
93
|
+
sku: productVariation.sku
|
|
94
|
+
},
|
|
95
|
+
releaseQty: orderItem.qty
|
|
96
|
+
}
|
|
97
|
+
})
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
var releaseOrder: any = await FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
|
|
101
|
+
customerBizplaceId,
|
|
102
|
+
releaseOrder: newMarketplaceOrder
|
|
103
|
+
})
|
|
100
104
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
}
|
|
105
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id
|
|
106
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
|
|
107
|
+
await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
|
|
108
|
+
}
|
|
105
109
|
}
|
|
106
110
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
111
|
+
if (releaseOrder && releaseOrder?.id) {
|
|
112
|
+
marketplaceOrder.releaseOrderId = releaseOrder.id
|
|
113
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter
|
|
114
|
+
await getRepository(MarketplaceOrder).save(marketplaceOrder)
|
|
115
|
+
}
|
|
110
116
|
}
|
|
111
117
|
}
|
|
112
118
|
}
|