@things-factory/worksheet-base 4.3.195 → 4.3.196
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.
|
@@ -28,6 +28,9 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
28
28
|
const senderGeoArea = await tx
|
|
29
29
|
.getRepository(geography_1.GeoArea)
|
|
30
30
|
.findOne({ where: { postalCode: bizplace.postalCode } });
|
|
31
|
+
const recipientGeoArea = await tx
|
|
32
|
+
.getRepository(geography_1.GeoArea)
|
|
33
|
+
.findOne({ where: { postalCode: releaseGood.postalCode } });
|
|
31
34
|
let data = {
|
|
32
35
|
courier: lmd.platform,
|
|
33
36
|
clientId: lmd === null || lmd === void 0 ? void 0 : lmd.clientId,
|
|
@@ -38,13 +41,13 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
38
41
|
staging: lmd === null || lmd === void 0 ? void 0 : lmd.staging,
|
|
39
42
|
recipient: releaseGood.attentionTo,
|
|
40
43
|
phone: releaseGood.phone1,
|
|
41
|
-
email: releaseGood.email,
|
|
44
|
+
email: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.email) || (lmd.platform == 'AIRSPEED' ? 'N/A' : ' '),
|
|
42
45
|
address: releaseGood.deliveryAddress1,
|
|
43
46
|
address2: releaseGood.deliveryAddress2,
|
|
44
47
|
city: releaseGood.city,
|
|
45
48
|
postcode: releaseGood.postalCode,
|
|
46
49
|
district: releaseGood.city,
|
|
47
|
-
state: releaseGood.state,
|
|
50
|
+
state: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) || (recipientGeoArea === null || recipientGeoArea === void 0 ? void 0 : recipientGeoArea.stateName),
|
|
48
51
|
country: releaseGood.country,
|
|
49
52
|
pAddress: bizplace.address,
|
|
50
53
|
pAddress2: bizplace.address2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":";;;AAAA,qCAA0E;AAC1E,+BAAmC;AAEnC,qEAA+E;AAC/E,6CAA4C;AAC5C,yDAAmD;AACnD,uDAAmD;AACnD,2DAAsE;AACtE,iEAAqD;AACrD,iEAAkE;AAClE,qEAAuE;AAKvE,yDAAyD;AAEzD,MAAM,UAAU,GAAG;IACjB,8BAA8B;IAC9B,QAAQ,EAAE,0BAA0B;CACrC,CAAA;AAEM,KAAK,UAAU,eAAe,CAAC,YAAY,EAAE,EAAE;IACpD,IAAI;QACF,IAAI,cAAc,GAAG,EAAE,CAAA;QACvB,KAAK,IAAI,WAAW,IAAI,YAAY,EAAE;YACpC,MAAM,GAAG,GAAqB,WAAW,CAAC,gBAAgB,CAAA;YAE1D,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE;gBACrC,SAAS,EAAE,CAAC,QAAQ,CAAC;aACtB,CAAC,CAAA;YAEF,MAAM,aAAa,GAAY,MAAM,EAAE;iBACpC,aAAa,CAAC,mBAAO,CAAC;iBACtB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YAE1D,IAAI,IAAI,GAAG;gBACT,OAAO,EAAE,GAAG,CAAC,QAAQ;gBACrB,QAAQ,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ;gBACvB,UAAU,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS;gBAC1B,eAAe,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,eAAe;gBACrC,eAAe,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,eAAe;gBACrC,KAAK,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW;gBACvB,OAAO,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO;gBAErB,SAAS,EAAE,WAAW,CAAC,WAAW;gBAClC,KAAK,EAAE,WAAW,CAAC,MAAM;gBACzB,KAAK,EAAE,WAAW,CAAC,KAAK;
|
|
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.196",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -34,12 +34,12 @@
|
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.190",
|
|
35
35
|
"@things-factory/marketplace-base": "^4.3.193",
|
|
36
36
|
"@things-factory/notification": "^4.3.186",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.196",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.186",
|
|
39
39
|
"@things-factory/shell": "^4.3.179",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.179",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.196",
|
|
42
42
|
"uuid": "^9.0.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "ef671f15d25f20c681f337abee65fb77f9d12869"
|
|
45
45
|
}
|
package/server/utils/lmd-util.ts
CHANGED
|
@@ -34,6 +34,10 @@ export async function createLmdParcel(releaseGoods, tx) {
|
|
|
34
34
|
const senderGeoArea: GeoArea = await tx
|
|
35
35
|
.getRepository(GeoArea)
|
|
36
36
|
.findOne({ where: { postalCode: bizplace.postalCode } })
|
|
37
|
+
|
|
38
|
+
const recipientGeoArea: GeoArea = await tx
|
|
39
|
+
.getRepository(GeoArea)
|
|
40
|
+
.findOne({ where: { postalCode: releaseGood.postalCode } })
|
|
37
41
|
|
|
38
42
|
let data = {
|
|
39
43
|
courier: lmd.platform,
|
|
@@ -46,13 +50,13 @@ export async function createLmdParcel(releaseGoods, tx) {
|
|
|
46
50
|
|
|
47
51
|
recipient: releaseGood.attentionTo,
|
|
48
52
|
phone: releaseGood.phone1,
|
|
49
|
-
email: releaseGood.
|
|
53
|
+
email: releaseGood?.email || (lmd.platform == 'AIRSPEED' ? 'N/A' : ' '),
|
|
50
54
|
address: releaseGood.deliveryAddress1,
|
|
51
55
|
address2: releaseGood.deliveryAddress2,
|
|
52
56
|
city: releaseGood.city,
|
|
53
57
|
postcode: releaseGood.postalCode,
|
|
54
58
|
district: releaseGood.city,
|
|
55
|
-
state: releaseGood
|
|
59
|
+
state: releaseGood?.state || recipientGeoArea?.stateName,
|
|
56
60
|
country: releaseGood.country,
|
|
57
61
|
|
|
58
62
|
pAddress: bizplace.address,
|