@things-factory/operato-mms 4.1.28 → 4.1.29
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.
|
@@ -71,21 +71,21 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
71
71
|
]
|
|
72
72
|
});
|
|
73
73
|
let orderItems = order.marketplaceOrderItems;
|
|
74
|
+
const marketplaceStore = order.marketplaceStore;
|
|
75
|
+
const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
|
|
76
|
+
where: { marketplaceStore },
|
|
77
|
+
relations: ['pickupTransporter']
|
|
78
|
+
});
|
|
74
79
|
for (const orderItem of orderItems) {
|
|
75
80
|
if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
|
|
76
81
|
const orderShippingItems = orderItem.marketplaceOrderShippingItems;
|
|
77
82
|
const orderShipping = orderShippingItems[0].marketplaceOrderShipping;
|
|
78
83
|
const fulfillmentCenter = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.fulfillmentCenter;
|
|
79
|
-
const marketplaceStore = order.marketplaceStore;
|
|
80
84
|
const currentDate = new Date();
|
|
81
85
|
const centerId = fulfillmentCenter.centerId;
|
|
82
86
|
const warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
|
|
83
87
|
const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
|
|
84
88
|
const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id == (order === null || order === void 0 ? void 0 : order.domain.id)).id;
|
|
85
|
-
const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
|
|
86
|
-
where: { marketplaceStore },
|
|
87
|
-
relations: ['pickupTransporter']
|
|
88
|
-
});
|
|
89
89
|
let patch = {
|
|
90
90
|
id: orderShipping.releaseOrderId,
|
|
91
91
|
trackingNo: trackingNo,
|
|
@@ -96,11 +96,9 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
96
96
|
releaseOrder: Object.assign({}, patch),
|
|
97
97
|
shippingOrder: null
|
|
98
98
|
});
|
|
99
|
-
await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate });
|
|
99
|
+
await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: (marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name) || orderShipping.transporter });
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
|
-
const storeId = order.marketplaceStore.id;
|
|
103
|
-
const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
|
|
104
102
|
// to-do update tracking no to every marketplaces
|
|
105
103
|
if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
|
|
106
104
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
|
|
@@ -115,7 +113,8 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
115
113
|
trackingUrl: note,
|
|
116
114
|
trackingNo,
|
|
117
115
|
order: orderInfo,
|
|
118
|
-
note
|
|
116
|
+
note,
|
|
117
|
+
transporter: marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name
|
|
119
118
|
});
|
|
120
119
|
if (marketplaceStore.platform === 'woocommerce') {
|
|
121
120
|
await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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
|
|
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": "4.1.
|
|
3
|
+
"version": "4.1.29",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"@things-factory/integration-fulfillment": "^4.1.28",
|
|
80
80
|
"@things-factory/integration-lmd": "^4.1.28",
|
|
81
81
|
"@things-factory/lite-menu": "^4.1.28",
|
|
82
|
-
"@things-factory/marketplace-base": "^4.1.
|
|
82
|
+
"@things-factory/marketplace-base": "^4.1.29",
|
|
83
83
|
"@things-factory/more-ui": "^4.1.28",
|
|
84
84
|
"@things-factory/notification": "^4.1.28",
|
|
85
85
|
"@things-factory/oauth2-client": "^4.1.28",
|
|
@@ -99,11 +99,11 @@
|
|
|
99
99
|
"@things-factory/scene-visualizer": "^4.1.28",
|
|
100
100
|
"@things-factory/setting-ui": "^4.1.28",
|
|
101
101
|
"@things-factory/system-ui": "^4.1.28",
|
|
102
|
-
"@things-factory/warehouse-base": "^4.1.
|
|
102
|
+
"@things-factory/warehouse-base": "^4.1.29"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
105
|
"@things-factory/builder": "^4.1.28",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "8ad57f2550985b4746e3bbb82e4c8516e6be5ca1"
|
|
109
109
|
}
|
|
@@ -82,12 +82,18 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
82
82
|
})
|
|
83
83
|
let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
|
|
84
84
|
|
|
85
|
+
const marketplaceStore: MarketplaceStore = order.marketplaceStore
|
|
86
|
+
|
|
87
|
+
const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
|
|
88
|
+
where: { marketplaceStore },
|
|
89
|
+
relations: ['pickupTransporter']
|
|
90
|
+
})
|
|
91
|
+
|
|
85
92
|
for (const orderItem of orderItems) {
|
|
86
93
|
if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
|
|
87
94
|
const orderShippingItems: MarketplaceOrderShippingItem[] = orderItem.marketplaceOrderShippingItems
|
|
88
95
|
const orderShipping: MarketplaceOrderShipping = orderShippingItems[0].marketplaceOrderShipping
|
|
89
96
|
const fulfillmentCenter: FulfillmentCenter = orderShipping?.fulfillmentCenter
|
|
90
|
-
const marketplaceStore: MarketplaceStore = order.marketplaceStore
|
|
91
97
|
|
|
92
98
|
const currentDate: Date = new Date()
|
|
93
99
|
|
|
@@ -98,11 +104,6 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
98
104
|
customerBizplace => customerBizplace.company.domain.id == order?.domain.id
|
|
99
105
|
).id
|
|
100
106
|
|
|
101
|
-
const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
|
|
102
|
-
where: { marketplaceStore },
|
|
103
|
-
relations: ['pickupTransporter']
|
|
104
|
-
})
|
|
105
|
-
|
|
106
107
|
let patch = {
|
|
107
108
|
id: orderShipping.releaseOrderId,
|
|
108
109
|
trackingNo: trackingNo,
|
|
@@ -117,14 +118,11 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
117
118
|
|
|
118
119
|
await orderShippingRepo.update(
|
|
119
120
|
{ id: orderShipping.id },
|
|
120
|
-
{ trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate }
|
|
121
|
+
{ trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: marketplaceTransporter?.pickupTransporter.name || orderShipping.transporter }
|
|
121
122
|
)
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
|
|
125
|
-
const storeId = order.marketplaceStore.id
|
|
126
|
-
const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
|
|
127
|
-
|
|
128
126
|
// to-do update tracking no to every marketplaces
|
|
129
127
|
if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
|
|
130
128
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
|
|
@@ -139,7 +137,8 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
139
137
|
trackingUrl: note,
|
|
140
138
|
trackingNo,
|
|
141
139
|
order: orderInfo,
|
|
142
|
-
note
|
|
140
|
+
note,
|
|
141
|
+
transporter: marketplaceTransporter?.pickupTransporter.name
|
|
143
142
|
})
|
|
144
143
|
|
|
145
144
|
if (marketplaceStore.platform === 'woocommerce') {
|