@things-factory/worksheet-base 4.3.352 → 4.3.356
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.
|
@@ -13,12 +13,11 @@ const biz_base_1 = require("@things-factory/biz-base");
|
|
|
13
13
|
const board_service_1 = require("@things-factory/board-service");
|
|
14
14
|
const env_1 = require("@things-factory/env");
|
|
15
15
|
const geography_1 = require("@things-factory/geography");
|
|
16
|
-
require("jspdf");
|
|
17
16
|
const integration_base_1 = require("@things-factory/integration-base");
|
|
18
17
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
18
|
+
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
19
19
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
20
20
|
const index_1 = require("../index");
|
|
21
|
-
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
22
21
|
const debug = require('debug')('things-factory:worksheet-base:lmd-util');
|
|
23
22
|
// import { SellercraftController } from '../controllers'
|
|
24
23
|
const LMD_BOARDS = {
|
|
@@ -56,12 +55,12 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
|
|
|
56
55
|
}
|
|
57
56
|
}
|
|
58
57
|
if ((lmd === null || lmd === void 0 ? void 0 : lmd.platform) == 'DHL_EXPRESS') {
|
|
59
|
-
if ((releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) != undefined && (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) != undefined ||
|
|
60
|
-
(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) == '-' && (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) == '-' ||
|
|
61
|
-
(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) == null && (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) == null) {
|
|
58
|
+
if (((releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) != undefined && (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) != undefined) ||
|
|
59
|
+
((releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) == '-' && (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) == '-') ||
|
|
60
|
+
((releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) == null && (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) == null)) {
|
|
62
61
|
let addArray = (_a = releaseGood.deliveryAddress1) === null || _a === void 0 ? void 0 : _a.split(',');
|
|
63
|
-
releaseGood.deliveryAddress1 = ((_b = addArray[0]) === null || _b === void 0 ? void 0 : _b.trim()) +
|
|
64
|
-
releaseGood.deliveryAddress2 = ((_c = addArray[1]) === null || _c === void 0 ? void 0 : _c.trim()) +
|
|
62
|
+
releaseGood.deliveryAddress1 = ((_b = addArray[0]) === null || _b === void 0 ? void 0 : _b.trim()) + ',';
|
|
63
|
+
releaseGood.deliveryAddress2 = ((_c = addArray[1]) === null || _c === void 0 ? void 0 : _c.trim()) + ',';
|
|
65
64
|
releaseGood.deliveryAddress3 = addArray === null || addArray === void 0 ? void 0 : addArray.slice(2).join(', ').trim();
|
|
66
65
|
}
|
|
67
66
|
}
|
|
@@ -75,7 +74,7 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
|
|
|
75
74
|
staging: lmd === null || lmd === void 0 ? void 0 : lmd.staging,
|
|
76
75
|
accountNumber: lmd === null || lmd === void 0 ? void 0 : lmd.accountNumber,
|
|
77
76
|
accountName: lmd === null || lmd === void 0 ? void 0 : lmd.name,
|
|
78
|
-
orderDate:
|
|
77
|
+
orderDate: lmd.platform == 'DHL_EXPRESS' ? dateTime() : new Date().toISOString,
|
|
79
78
|
remark: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.remark,
|
|
80
79
|
prefix: lmd === null || lmd === void 0 ? void 0 : lmd.prefix,
|
|
81
80
|
orderNo: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.refNo,
|
|
@@ -117,7 +116,7 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
|
|
|
117
116
|
item: opi.orderProduct.product.name.slice(0, 49).trim() || ' ',
|
|
118
117
|
sku: opi.orderProduct.product.sku || ' ',
|
|
119
118
|
price: ((_f = (_e = opi === null || opi === void 0 ? void 0 : opi.orderProduct) === null || _e === void 0 ? void 0 : _e.paidAmount) === null || _f === void 0 ? void 0 : _f.toString()) ||
|
|
120
|
-
((_h = (_g = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _g === void 0 ? void 0 : _g.costPrice) === null || _h === void 0 ? void 0 : _h.toString()) ||
|
|
119
|
+
((_h = ((opi === null || opi === void 0 ? void 0 : opi.releaseQty) * ((_g = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _g === void 0 ? void 0 : _g.costPrice) || 0)) === null || _h === void 0 ? void 0 : _h.toString()) ||
|
|
121
120
|
' ',
|
|
122
121
|
weight: ((_k = (_j = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _j === void 0 ? void 0 : _j.grossWeight) === null || _k === void 0 ? void 0 : _k.toString()) || ' ',
|
|
123
122
|
width: ((_l = opi === null || opi === void 0 ? void 0 : opi.orderProduct.productDetail) === null || _l === void 0 ? void 0 : _l.width) || ' ',
|
|
@@ -148,7 +147,8 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
|
|
|
148
147
|
for (let parcel of res) {
|
|
149
148
|
let courier = parcel.transporter;
|
|
150
149
|
let transporter = courier.replace(/_/g, ' ');
|
|
151
|
-
await tx
|
|
150
|
+
await tx
|
|
151
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
152
152
|
.update({ name: parcel.refNo }, { parcelId: parcel.parcelId, transporter: transporter });
|
|
153
153
|
}
|
|
154
154
|
const qb = tx
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.356",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -36,14 +36,14 @@
|
|
|
36
36
|
"@things-factory/integration-sftp": "^4.3.344",
|
|
37
37
|
"@things-factory/marketplace-base": "^4.3.345",
|
|
38
38
|
"@things-factory/notification": "^4.3.281",
|
|
39
|
-
"@things-factory/sales-base": "^4.3.
|
|
39
|
+
"@things-factory/sales-base": "^4.3.355",
|
|
40
40
|
"@things-factory/setting-base": "^4.3.281",
|
|
41
41
|
"@things-factory/shell": "^4.3.281",
|
|
42
42
|
"@things-factory/transport-base": "^4.3.344",
|
|
43
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
43
|
+
"@things-factory/warehouse-base": "^4.3.355",
|
|
44
44
|
"jspdf": "2.5.1",
|
|
45
45
|
"puppeteer": "21.0.3",
|
|
46
46
|
"uuid": "^9.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "afd33b49bce6a09e28663b22eade0f7db58918b4"
|
|
49
49
|
}
|
package/server/utils/lmd-util.ts
CHANGED
|
@@ -1,42 +1,27 @@
|
|
|
1
1
|
import 'jspdf'
|
|
2
2
|
|
|
3
3
|
import fetch from 'node-fetch'
|
|
4
|
-
import {
|
|
5
|
-
getRepository,
|
|
6
|
-
SelectQueryBuilder
|
|
7
|
-
} from 'typeorm'
|
|
4
|
+
import { getRepository, SelectQueryBuilder } from 'typeorm'
|
|
8
5
|
import { v4 as uuidv4 } from 'uuid'
|
|
9
6
|
|
|
10
7
|
import { Attachment, uploadAwb, uploadInvoice } from '@things-factory/attachment-base'
|
|
11
8
|
import { Bizplace } from '@things-factory/biz-base'
|
|
12
|
-
import {
|
|
13
|
-
Board,
|
|
14
|
-
headlessModel,
|
|
15
|
-
pdf
|
|
16
|
-
} from '@things-factory/board-service'
|
|
9
|
+
import { Board, headlessModel, pdf } from '@things-factory/board-service'
|
|
17
10
|
import { logger } from '@things-factory/env'
|
|
18
11
|
import { GeoArea } from '@things-factory/geography'
|
|
19
|
-
import '
|
|
20
|
-
import jsPDF from 'jspdf'
|
|
21
|
-
import {
|
|
22
|
-
Integration,
|
|
23
|
-
Platform
|
|
24
|
-
} from '@things-factory/integration-base'
|
|
12
|
+
import { Integration, Platform } from '@things-factory/integration-base'
|
|
25
13
|
import {
|
|
14
|
+
getAccessTokenEfmx,
|
|
26
15
|
LastMileAPI,
|
|
27
16
|
LastMileDelivery,
|
|
28
|
-
refreshAccessTokenNinjavan
|
|
29
|
-
getAccessTokenEfmx
|
|
17
|
+
refreshAccessTokenNinjavan
|
|
30
18
|
} from '@things-factory/integration-lmd'
|
|
31
|
-
import {
|
|
32
|
-
OrderPackage,
|
|
33
|
-
ReleaseGood
|
|
34
|
-
} from '@things-factory/sales-base'
|
|
35
|
-
import { EcommerceController } from '../index'
|
|
36
|
-
import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
37
19
|
import { MarketplaceStore } from '@things-factory/integration-marketplace'
|
|
20
|
+
import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
21
|
+
import { OrderPackage, ReleaseGood } from '@things-factory/sales-base'
|
|
38
22
|
import { Domain } from '@things-factory/shell'
|
|
39
23
|
|
|
24
|
+
import { EcommerceController } from '../index'
|
|
40
25
|
|
|
41
26
|
const debug = require('debug')('things-factory:worksheet-base:lmd-util')
|
|
42
27
|
|
|
@@ -75,24 +60,24 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
|
|
|
75
60
|
}
|
|
76
61
|
}
|
|
77
62
|
|
|
78
|
-
if(lmd?.platform=='EMS'){
|
|
63
|
+
if (lmd?.platform == 'EMS') {
|
|
79
64
|
if (currentTimestamp >= lmd?.expiresIn || lmd?.expiresIn == null) {
|
|
80
|
-
let lastMileDelivery= await getAccessTokenEfmx(lmd?.id, lmd?.clientId,lmd?.secretKey,{state:{
|
|
65
|
+
let lastMileDelivery = await getAccessTokenEfmx(lmd?.id, lmd?.clientId, lmd?.secretKey, { state: { tx } })
|
|
81
66
|
lmd.accessToken = lastMileDelivery.accessToken
|
|
67
|
+
}
|
|
82
68
|
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
69
|
+
if (lmd?.platform == 'DHL_EXPRESS') {
|
|
70
|
+
if (
|
|
71
|
+
(releaseGood?.deliveryAddress2 != undefined && releaseGood?.deliveryAddress3 != undefined) ||
|
|
72
|
+
(releaseGood?.deliveryAddress2 == '-' && releaseGood?.deliveryAddress3 == '-') ||
|
|
73
|
+
(releaseGood?.deliveryAddress2 == null && releaseGood?.deliveryAddress3 == null)
|
|
74
|
+
) {
|
|
89
75
|
let addArray = releaseGood.deliveryAddress1?.split(',')
|
|
90
|
-
releaseGood.deliveryAddress1 = addArray[0]?.trim() +
|
|
91
|
-
releaseGood.deliveryAddress2 = addArray[1]?.trim() +
|
|
76
|
+
releaseGood.deliveryAddress1 = addArray[0]?.trim() + ','
|
|
77
|
+
releaseGood.deliveryAddress2 = addArray[1]?.trim() + ','
|
|
92
78
|
releaseGood.deliveryAddress3 = addArray?.slice(2).join(', ').trim()
|
|
93
|
-
|
|
79
|
+
}
|
|
94
80
|
}
|
|
95
|
-
}
|
|
96
81
|
|
|
97
82
|
let data = {
|
|
98
83
|
courier: lmd.platform,
|
|
@@ -104,7 +89,7 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
|
|
|
104
89
|
staging: lmd?.staging,
|
|
105
90
|
accountNumber: lmd?.accountNumber,
|
|
106
91
|
accountName: lmd?.name,
|
|
107
|
-
orderDate:
|
|
92
|
+
orderDate: lmd.platform == 'DHL_EXPRESS' ? dateTime() : new Date().toISOString,
|
|
108
93
|
remark: releaseGood?.remark,
|
|
109
94
|
prefix: lmd?.prefix,
|
|
110
95
|
|
|
@@ -156,7 +141,7 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
|
|
|
156
141
|
sku: opi.orderProduct.product.sku || ' ',
|
|
157
142
|
price:
|
|
158
143
|
opi?.orderProduct?.paidAmount?.toString() ||
|
|
159
|
-
opi?.orderProduct.productDetail?.costPrice?.toString() ||
|
|
144
|
+
(opi?.releaseQty * opi?.orderProduct.productDetail?.costPrice || 0)?.toString() ||
|
|
160
145
|
' ',
|
|
161
146
|
weight: opi?.orderProduct.productDetail?.grossWeight?.toString() || ' ',
|
|
162
147
|
width: opi?.orderProduct.productDetail?.width || ' ',
|
|
@@ -191,10 +176,10 @@ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplac
|
|
|
191
176
|
for (let parcel of res) {
|
|
192
177
|
let courier = parcel.transporter
|
|
193
178
|
let transporter = courier.replace(/_/g, ' ')
|
|
194
|
-
await tx
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
}
|
|
179
|
+
await tx
|
|
180
|
+
.getRepository(OrderPackage)
|
|
181
|
+
.update({ name: parcel.refNo }, { parcelId: parcel.parcelId, transporter: transporter })
|
|
182
|
+
}
|
|
198
183
|
|
|
199
184
|
const qb: SelectQueryBuilder<OrderPackage> = tx
|
|
200
185
|
.getRepository(OrderPackage)
|
|
@@ -276,12 +261,12 @@ export async function processAwbAndTrackingNo(orderPackages, tx, domain, user, m
|
|
|
276
261
|
awbContent = await constructAwb(orderPackage, awbRes)
|
|
277
262
|
}
|
|
278
263
|
|
|
279
|
-
if(awbRes.invoice){
|
|
264
|
+
if (awbRes.invoice) {
|
|
280
265
|
invoiceContent = Buffer.from(awbRes.invoice, 'base64')
|
|
281
266
|
}
|
|
282
|
-
|
|
267
|
+
|
|
283
268
|
awb = await uploadAwbToS3(awbContent, orderPackage)
|
|
284
|
-
invoice = invoiceContent? await uploadInvoiceToS3(invoiceContent, orderPackage) : null
|
|
269
|
+
invoice = invoiceContent ? await uploadInvoiceToS3(invoiceContent, orderPackage) : null
|
|
285
270
|
|
|
286
271
|
await tx
|
|
287
272
|
.getRepository(OrderPackage)
|
|
@@ -406,7 +391,7 @@ function dateTime() {
|
|
|
406
391
|
const timezoneGMT = 8 * 60 // 8 hours ahead in minutes
|
|
407
392
|
currentDate.setMinutes(currentDate.getMinutes() + timezoneGMT)
|
|
408
393
|
|
|
409
|
-
const yy = currentDate.getFullYear()
|
|
394
|
+
const yy = currentDate.getFullYear()
|
|
410
395
|
const mm = String(currentDate.getMonth() + 1).padStart(2, '0')
|
|
411
396
|
const dd = String(currentDate.getDate()).padStart(2, '0')
|
|
412
397
|
const hrs = String(currentDate.getHours()).padStart(2, '0')
|