@things-factory/operato-mms 4.1.4 → 4.1.12
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/order/logistics/batch-init-popup.js +15 -3
- package/config.development.js +160 -0
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +2 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/dist-server/routers/etrax-router.js +26 -6
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/package.json +61 -61
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +2 -1
- package/server/routers/etrax-router.ts +33 -7
- package/translations/en.json +1 -0
- package/translations/ko.json +1 -0
- package/translations/ms.json +1 -0
- package/translations/zh.json +1 -0
|
@@ -62,7 +62,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
render() {
|
|
65
|
-
const shippingProviders = [{ name: 'SeeBuu Logistics' }, { name: 'GDex' }]
|
|
65
|
+
const shippingProviders = [{ name: 'SeeBuu Logistics' }, { name: 'GDex' }, { name: 'Others' }]
|
|
66
66
|
|
|
67
67
|
return html`
|
|
68
68
|
<search-form id="search-form" .fields=${this._searchFields} @submit=${e => this.dataGrist.fetch()}></search-form>
|
|
@@ -223,6 +223,15 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
223
223
|
sortable: false,
|
|
224
224
|
width: 130
|
|
225
225
|
},
|
|
226
|
+
{
|
|
227
|
+
type: 'string',
|
|
228
|
+
name: 'trackingUrl',
|
|
229
|
+
header: i18next.t('field.tracking_url'),
|
|
230
|
+
record: { editable: true },
|
|
231
|
+
label: true,
|
|
232
|
+
sortable: false,
|
|
233
|
+
width: 130
|
|
234
|
+
},
|
|
226
235
|
{
|
|
227
236
|
type: 'string',
|
|
228
237
|
name: 'shippingProvider',
|
|
@@ -360,6 +369,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
360
369
|
weightUnit
|
|
361
370
|
totalVolume
|
|
362
371
|
volumeUnit
|
|
372
|
+
trackingUrl
|
|
363
373
|
marketplaceStore {
|
|
364
374
|
id
|
|
365
375
|
name
|
|
@@ -406,7 +416,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
406
416
|
return {
|
|
407
417
|
...itm,
|
|
408
418
|
status: itm.marketplaceOrder.status,
|
|
409
|
-
|
|
419
|
+
isSplitted: itm.marketplaceOrder.isSplitted,
|
|
410
420
|
shippingProvider: itm.transporter,
|
|
411
421
|
ownShippingProvider: itm.ownTransporter,
|
|
412
422
|
orderCreatedAt: itm.marketplaceOrder.orderCreatedAt,
|
|
@@ -504,7 +514,9 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
504
514
|
id: patch.id,
|
|
505
515
|
orderNo: patch.marketplaceOrder.orderNo,
|
|
506
516
|
trackingNo: patch?.trackingNo,
|
|
507
|
-
shippingProvider: patch?.shippingProvider
|
|
517
|
+
shippingProvider: patch?.shippingProvider,
|
|
518
|
+
ownTrackingNo: patch?.ownTrackingNo,
|
|
519
|
+
trackingUrl: patch?.trackingUrl
|
|
508
520
|
}
|
|
509
521
|
})
|
|
510
522
|
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
domainType: 'company',
|
|
3
|
+
domainExtType: 'company',
|
|
4
|
+
subdomainOffset: 2,
|
|
5
|
+
ormconfig: {
|
|
6
|
+
name: 'default',
|
|
7
|
+
type: 'postgres',
|
|
8
|
+
database: 'postgres',
|
|
9
|
+
username: 'postgres',
|
|
10
|
+
password: 'hatio',
|
|
11
|
+
host: 'localhost',
|
|
12
|
+
port: 15432,
|
|
13
|
+
synchronize: true,
|
|
14
|
+
logging: true
|
|
15
|
+
},
|
|
16
|
+
// ormconfig: {
|
|
17
|
+
// name: 'default',
|
|
18
|
+
// type: 'postgres',
|
|
19
|
+
// database: 'postgres3',
|
|
20
|
+
// username: 'postgres',
|
|
21
|
+
// password: 'mysecretpassword',
|
|
22
|
+
// host: 'samhouse.asuscomm.com',
|
|
23
|
+
// port: 15432,
|
|
24
|
+
// synchronize: true,
|
|
25
|
+
// logging: true
|
|
26
|
+
// },
|
|
27
|
+
inspect: '9280',
|
|
28
|
+
password: {
|
|
29
|
+
lowerCase: true,
|
|
30
|
+
upperCase: false,
|
|
31
|
+
digit: false,
|
|
32
|
+
specialCharacter: false,
|
|
33
|
+
allowRepeat: true,
|
|
34
|
+
useTightPattern: false,
|
|
35
|
+
useLoosePattern: true,
|
|
36
|
+
tightCharacterLength: 4,
|
|
37
|
+
looseCharacterLength: 4,
|
|
38
|
+
history: 2
|
|
39
|
+
},
|
|
40
|
+
oauth2: {
|
|
41
|
+
platforms: [
|
|
42
|
+
{
|
|
43
|
+
name: 'Operato Hub',
|
|
44
|
+
apiURL: 'http://operato-s.com:3000/api'
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
},
|
|
48
|
+
useVirtualHostBasedDomain: false,
|
|
49
|
+
port: 5000,
|
|
50
|
+
uploads: 'uploads',
|
|
51
|
+
attachmentsPath: 'attachments',
|
|
52
|
+
SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
|
|
53
|
+
logger: {
|
|
54
|
+
file: {
|
|
55
|
+
filename: 'logs/application-%DATE%.log',
|
|
56
|
+
datePattern: 'YYYY-MM-DD-HH',
|
|
57
|
+
zippedArchive: true,
|
|
58
|
+
maxSize: '200m',
|
|
59
|
+
maxFiles: '1m',
|
|
60
|
+
level: 'info'
|
|
61
|
+
}
|
|
62
|
+
},
|
|
63
|
+
email: {
|
|
64
|
+
host: 'smtp.office365.com',
|
|
65
|
+
port: 587,
|
|
66
|
+
secure: false, // true for 465, false for other ports
|
|
67
|
+
auth: {
|
|
68
|
+
user: 'no-reply@hatiolab.com', // generated ethereal user
|
|
69
|
+
pass: 'h@ti0LAB1008' // generated ethereal password
|
|
70
|
+
},
|
|
71
|
+
secureConnection: false,
|
|
72
|
+
tls: {
|
|
73
|
+
ciphers: 'SSLv3'
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
sender: 'no-reply@hatiolab.com',
|
|
77
|
+
notification: {
|
|
78
|
+
fcm: {
|
|
79
|
+
serviceAccount: {
|
|
80
|
+
project_id: 'operato',
|
|
81
|
+
private_key:
|
|
82
|
+
'-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
|
|
83
|
+
client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
|
|
84
|
+
},
|
|
85
|
+
appConfig: {
|
|
86
|
+
apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
|
|
87
|
+
projectId: 'operato',
|
|
88
|
+
messagingSenderId: 79537064975,
|
|
89
|
+
appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
|
|
90
|
+
},
|
|
91
|
+
serverKey:
|
|
92
|
+
'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
|
|
93
|
+
},
|
|
94
|
+
vapidKey: {
|
|
95
|
+
subject: 'mailto:heartyoh@hatiolab.com',
|
|
96
|
+
publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
|
|
97
|
+
privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
|
|
98
|
+
}
|
|
99
|
+
},
|
|
100
|
+
marketplaceIntegrationShopee: {
|
|
101
|
+
platform: 'shopee',
|
|
102
|
+
isUAT: false,
|
|
103
|
+
application: 'Operato MMS',
|
|
104
|
+
partnerId: 846025,
|
|
105
|
+
partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
|
|
106
|
+
},
|
|
107
|
+
// marketplaceIntegrationShopee: {
|
|
108
|
+
// platform: 'shopee',
|
|
109
|
+
// isUAT: true,
|
|
110
|
+
// application: 'Staging MMS',
|
|
111
|
+
// partnerId: 845525,
|
|
112
|
+
// partnerKey: '4a3f4214fd0f0bda970b342a99b6f8705fc7bacad2743cffa7ed67b79840665e'
|
|
113
|
+
// },
|
|
114
|
+
marketplaceIntegrationLazada: {
|
|
115
|
+
platform: 'lazada',
|
|
116
|
+
application: 'operato-mms',
|
|
117
|
+
appKey: '120961',
|
|
118
|
+
appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
|
|
119
|
+
callback: 'https://maybank.operato-m.com/lazada-callback'
|
|
120
|
+
},
|
|
121
|
+
fulfillmentIntegrationOperato: {
|
|
122
|
+
host: 'operato-s.com:3000',
|
|
123
|
+
protocol: 'http',
|
|
124
|
+
platform: 'operato',
|
|
125
|
+
application: 'Operato MMS',
|
|
126
|
+
appKey: 'a9bf751e622bf146662b240d58971051',
|
|
127
|
+
appSecret: '1c385935dc131c4b902b9bbf6a4798af',
|
|
128
|
+
callback: 'http://operato-s.com:5000/callback-operato'
|
|
129
|
+
},
|
|
130
|
+
marketplaceIntegrationShopify: {
|
|
131
|
+
platform: 'shopify',
|
|
132
|
+
application: 'Operato',
|
|
133
|
+
apiKey: '37da47200ab87c8aaf0634869c80bd5f',
|
|
134
|
+
apiSecret: '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'
|
|
135
|
+
},
|
|
136
|
+
marketplaceIntegrationShopifyPrivate: {
|
|
137
|
+
platform: 'shopify',
|
|
138
|
+
application: 'Beacon Chicken 1',
|
|
139
|
+
apiKey: '37da47200ab87c8aaf0634869c80bd5f',
|
|
140
|
+
apiSecret: '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'
|
|
141
|
+
},
|
|
142
|
+
marketplaceIntegrationWoocommerce: {
|
|
143
|
+
key_id: '',
|
|
144
|
+
user_id: '',
|
|
145
|
+
consumer_key: '',
|
|
146
|
+
consumer_secret: '',
|
|
147
|
+
key_permission: 'read' | 'write' | 'read_write'
|
|
148
|
+
},
|
|
149
|
+
marketplaceIntegrationMagento: {
|
|
150
|
+
oauth_signature_method: 'HMAC-SHA1',
|
|
151
|
+
oauth_verifier: '',
|
|
152
|
+
oauth_consumer_key: '',
|
|
153
|
+
oauth_consumer_secret: ''
|
|
154
|
+
},
|
|
155
|
+
sellercraftChannelIntegrationConfig: {
|
|
156
|
+
apiKey: 'eqDVmIp0kxakM4sNnzqTkySBM73UGMS1nOPDN5Z1',
|
|
157
|
+
tokenCraftUrl: 'https://staging-tokencraft.sellercraft.co/v1/get-shop',
|
|
158
|
+
getShopsTokenCraftUrl: 'https://staging-tokencraft.sellercraft.co/v1/get-shops'
|
|
159
|
+
}
|
|
160
|
+
}
|
|
@@ -13,7 +13,8 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
13
13
|
const qb = (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrder, 'MO');
|
|
14
14
|
const marketplaceOrders = await qb
|
|
15
15
|
.leftJoinAndSelect('MO.marketplaceOrderItems', 'MOI')
|
|
16
|
-
.leftJoinAndSelect('MOI.
|
|
16
|
+
.leftJoinAndSelect('MOI.marketplaceOrderShippingItems', 'MOSI')
|
|
17
|
+
.leftJoinAndSelect('MOSI.marketplaceOrderShipping', 'MOS')
|
|
17
18
|
.leftJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
|
|
18
19
|
.leftJoinAndSelect('MO.marketplaceStore', 'MPS')
|
|
19
20
|
.where('MO.domain = :domainId', { domainId: domain.id })
|
|
@@ -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,uEAKyC;AACzC,+DAAqE;AACrE,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,
|
|
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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"}
|
|
@@ -65,14 +65,16 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
65
65
|
'domain',
|
|
66
66
|
'marketplaceStore',
|
|
67
67
|
'marketplaceOrderItems',
|
|
68
|
-
'marketplaceOrderItems.
|
|
69
|
-
'marketplaceOrderItems.marketplaceOrderShipping
|
|
68
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
69
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
70
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
|
|
70
71
|
]
|
|
71
72
|
});
|
|
72
73
|
let orderItems = order.marketplaceOrderItems;
|
|
73
74
|
for (const orderItem of orderItems) {
|
|
74
|
-
if (orderItem.marketplaceOrderShipping !== null) {
|
|
75
|
-
const
|
|
75
|
+
if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
|
|
76
|
+
const orderShippingItems = orderItem.marketplaceOrderShippingItems;
|
|
77
|
+
const orderShipping = orderShippingItems[0].marketplaceOrderShipping;
|
|
76
78
|
const fulfillmentCenter = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.fulfillmentCenter;
|
|
77
79
|
const marketplaceStore = order.marketplaceStore;
|
|
78
80
|
const currentDate = new Date();
|
|
@@ -100,9 +102,27 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
100
102
|
const storeId = order.marketplaceStore.id;
|
|
101
103
|
const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
|
|
102
104
|
// to-do update tracking no to every marketplaces
|
|
103
|
-
if (marketplaceStore.platform === 'woocommerce') {
|
|
105
|
+
if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
|
|
104
106
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
|
|
105
|
-
await
|
|
107
|
+
let orderInfo = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
|
|
108
|
+
where: {
|
|
109
|
+
name: order.name
|
|
110
|
+
},
|
|
111
|
+
relations: ['marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
|
|
112
|
+
});
|
|
113
|
+
const result = await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
114
|
+
orderId: order.name,
|
|
115
|
+
trackingUrl: note,
|
|
116
|
+
trackingNo,
|
|
117
|
+
order: orderInfo,
|
|
118
|
+
note
|
|
119
|
+
});
|
|
120
|
+
if (marketplaceStore.platform === 'woocommerce') {
|
|
121
|
+
await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
|
|
122
|
+
orderId: order.name,
|
|
123
|
+
status: 'READY_TO_SHIP'
|
|
124
|
+
});
|
|
125
|
+
}
|
|
106
126
|
}
|
|
107
127
|
const resp = {
|
|
108
128
|
Status: 'SUCCESS',
|
|
@@ -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,uDAAyE;AACzE,qFAA2F;AAC3F,qEAAyE;AACzE,qFAA4G;AAC5G,
|
|
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.12",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -42,68 +42,68 @@
|
|
|
42
42
|
"@material/mwc-linear-progress": "^0.25.3",
|
|
43
43
|
"@material/mwc-radio": "^0.25.3",
|
|
44
44
|
"@operato/ghost-print": "^0.3.28",
|
|
45
|
-
"@operato/scene-chartjs": "^0.1.
|
|
46
|
-
"@operato/scene-clock": "^0.1.
|
|
47
|
-
"@operato/scene-clone": "^0.1.
|
|
48
|
-
"@operato/scene-compass": "^0.1.
|
|
49
|
-
"@operato/scene-gauge": "^0.1.
|
|
50
|
-
"@operato/scene-grist": "^0.1.
|
|
51
|
-
"@operato/scene-half-roundrect": "^0.1.
|
|
52
|
-
"@operato/scene-indoor-map": "^0.1.
|
|
53
|
-
"@operato/scene-integration": "^0.1.
|
|
54
|
-
"@operato/scene-legend": "^0.1.
|
|
55
|
-
"@operato/scene-
|
|
56
|
-
"@operato/scene-
|
|
57
|
-
"@operato/scene-
|
|
58
|
-
"@operato/scene-
|
|
59
|
-
"@operato/scene-
|
|
60
|
-
"@operato/scene-
|
|
61
|
-
"@operato/scene-
|
|
62
|
-
"@
|
|
63
|
-
"@things-factory/
|
|
64
|
-
"@things-factory/
|
|
65
|
-
"@things-factory/
|
|
66
|
-
"@things-factory/
|
|
67
|
-
"@things-factory/board-
|
|
68
|
-
"@things-factory/
|
|
69
|
-
"@things-factory/
|
|
70
|
-
"@things-factory/
|
|
71
|
-
"@things-factory/
|
|
72
|
-
"@things-factory/export-ui
|
|
73
|
-
"@things-factory/export-ui-
|
|
74
|
-
"@things-factory/
|
|
75
|
-
"@things-factory/
|
|
76
|
-
"@things-factory/
|
|
77
|
-
"@things-factory/
|
|
78
|
-
"@things-factory/
|
|
79
|
-
"@things-factory/integration-
|
|
80
|
-
"@things-factory/
|
|
81
|
-
"@things-factory/
|
|
82
|
-
"@things-factory/
|
|
83
|
-
"@things-factory/
|
|
84
|
-
"@things-factory/
|
|
85
|
-
"@things-factory/
|
|
86
|
-
"@things-factory/
|
|
87
|
-
"@things-factory/
|
|
88
|
-
"@things-factory/
|
|
89
|
-
"@things-factory/scene-
|
|
90
|
-
"@things-factory/scene-
|
|
91
|
-
"@things-factory/scene-
|
|
92
|
-
"@things-factory/scene-
|
|
93
|
-
"@things-factory/scene-
|
|
94
|
-
"@things-factory/scene-
|
|
95
|
-
"@things-factory/scene-
|
|
96
|
-
"@things-factory/scene-
|
|
97
|
-
"@things-factory/scene-
|
|
98
|
-
"@things-factory/scene-restful": "^4.1.
|
|
99
|
-
"@things-factory/scene-visualizer": "^4.1.
|
|
100
|
-
"@things-factory/setting-ui": "^4.1.
|
|
101
|
-
"@things-factory/system-ui": "^4.1.
|
|
102
|
-
"@things-factory/warehouse-base": "^4.1.
|
|
45
|
+
"@operato/scene-chartjs": "^0.1.5",
|
|
46
|
+
"@operato/scene-clock": "^0.1.5",
|
|
47
|
+
"@operato/scene-clone": "^0.1.5",
|
|
48
|
+
"@operato/scene-compass": "^0.1.5",
|
|
49
|
+
"@operato/scene-gauge": "^0.1.5",
|
|
50
|
+
"@operato/scene-grist": "^0.1.5",
|
|
51
|
+
"@operato/scene-half-roundrect": "^0.1.5",
|
|
52
|
+
"@operato/scene-indoor-map": "^0.1.5",
|
|
53
|
+
"@operato/scene-integration": "^0.1.5",
|
|
54
|
+
"@operato/scene-legend": "^0.1.5",
|
|
55
|
+
"@operato/scene-news-ticker": "^0.1.5",
|
|
56
|
+
"@operato/scene-progressbar": "^0.1.5",
|
|
57
|
+
"@operato/scene-random": "^0.1.5",
|
|
58
|
+
"@operato/scene-switch": "^0.1.5",
|
|
59
|
+
"@operato/scene-tab": "^0.1.5",
|
|
60
|
+
"@operato/scene-table": "^0.1.5",
|
|
61
|
+
"@operato/scene-timer": "^0.1.5",
|
|
62
|
+
"@operato/scene-wheel-sorter": "^0.1.5",
|
|
63
|
+
"@things-factory/apptool-ui": "^4.1.12",
|
|
64
|
+
"@things-factory/attachment-base": "^4.1.12",
|
|
65
|
+
"@things-factory/auth-ui": "^4.1.12",
|
|
66
|
+
"@things-factory/biz-base": "^4.1.12",
|
|
67
|
+
"@things-factory/board-service": "^4.1.12",
|
|
68
|
+
"@things-factory/board-ui": "^4.1.12",
|
|
69
|
+
"@things-factory/code-ui": "^4.1.12",
|
|
70
|
+
"@things-factory/context-ui": "^4.1.12",
|
|
71
|
+
"@things-factory/dashboard": "^4.1.12",
|
|
72
|
+
"@things-factory/export-ui": "^4.1.12",
|
|
73
|
+
"@things-factory/export-ui-csv": "^4.1.12",
|
|
74
|
+
"@things-factory/export-ui-excel": "^4.1.12",
|
|
75
|
+
"@things-factory/geography": "^4.1.12",
|
|
76
|
+
"@things-factory/grist-ui": "^4.1.12",
|
|
77
|
+
"@things-factory/help": "^4.1.12",
|
|
78
|
+
"@things-factory/i18n-base": "^4.1.12",
|
|
79
|
+
"@things-factory/integration-fulfillment": "^4.1.12",
|
|
80
|
+
"@things-factory/integration-lmd": "^4.1.12",
|
|
81
|
+
"@things-factory/lite-menu": "^4.1.12",
|
|
82
|
+
"@things-factory/marketplace-base": "^4.1.12",
|
|
83
|
+
"@things-factory/more-ui": "^4.1.12",
|
|
84
|
+
"@things-factory/notification": "^4.1.12",
|
|
85
|
+
"@things-factory/oauth2-client": "^4.1.12",
|
|
86
|
+
"@things-factory/pdf": "^4.1.12",
|
|
87
|
+
"@things-factory/product-base": "^4.1.12",
|
|
88
|
+
"@things-factory/resource-ui": "^4.1.12",
|
|
89
|
+
"@things-factory/scene-data-transform": "^4.1.12",
|
|
90
|
+
"@things-factory/scene-excel": "^4.1.12",
|
|
91
|
+
"@things-factory/scene-firebase": "^4.1.12",
|
|
92
|
+
"@things-factory/scene-form": "^4.1.12",
|
|
93
|
+
"@things-factory/scene-google-map": "^4.1.12",
|
|
94
|
+
"@things-factory/scene-graphql": "^4.1.12",
|
|
95
|
+
"@things-factory/scene-label": "^4.1.12",
|
|
96
|
+
"@things-factory/scene-marker": "^4.1.12",
|
|
97
|
+
"@things-factory/scene-mqtt": "^4.1.12",
|
|
98
|
+
"@things-factory/scene-restful": "^4.1.12",
|
|
99
|
+
"@things-factory/scene-visualizer": "^4.1.12",
|
|
100
|
+
"@things-factory/setting-ui": "^4.1.12",
|
|
101
|
+
"@things-factory/system-ui": "^4.1.12",
|
|
102
|
+
"@things-factory/warehouse-base": "^4.1.12"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
|
-
"@things-factory/builder": "^4.1.
|
|
105
|
+
"@things-factory/builder": "^4.1.12",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "9055b83aa979f9c2d706b02cf8d73d848522d7dd"
|
|
109
109
|
}
|
|
@@ -18,7 +18,8 @@ export const autoAddReleaseOrderResolver = {
|
|
|
18
18
|
const qb: SelectQueryBuilder<MarketplaceOrder> = createQueryBuilder(MarketplaceOrder, 'MO')
|
|
19
19
|
const marketplaceOrders: MarketplaceOrder[] = await qb
|
|
20
20
|
.leftJoinAndSelect('MO.marketplaceOrderItems', 'MOI')
|
|
21
|
-
.leftJoinAndSelect('MOI.
|
|
21
|
+
.leftJoinAndSelect('MOI.marketplaceOrderShippingItems', 'MOSI')
|
|
22
|
+
.leftJoinAndSelect('MOSI.marketplaceOrderShipping', 'MOS')
|
|
22
23
|
.leftJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
|
|
23
24
|
.leftJoinAndSelect('MO.marketplaceStore', 'MPS')
|
|
24
25
|
.where('MO.domain = :domainId', { domainId: domain.id })
|
|
@@ -5,7 +5,12 @@ import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
|
|
|
5
5
|
import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
|
|
6
6
|
import { Etrax, LastMileDelivery } from '@things-factory/integration-lmd'
|
|
7
7
|
import { MarketplaceStore, MarketplaceTransporter, StoreAPI } from '@things-factory/integration-marketplace'
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
MarketplaceOrder,
|
|
10
|
+
MarketplaceOrderItem,
|
|
11
|
+
MarketplaceOrderShipping,
|
|
12
|
+
MarketplaceOrderShippingItem
|
|
13
|
+
} from '@things-factory/marketplace-base'
|
|
9
14
|
import { Domain } from '@things-factory/shell'
|
|
10
15
|
|
|
11
16
|
const debug = require('debug')('things-factory:jest.config')
|
|
@@ -70,15 +75,17 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
70
75
|
'domain',
|
|
71
76
|
'marketplaceStore',
|
|
72
77
|
'marketplaceOrderItems',
|
|
73
|
-
'marketplaceOrderItems.
|
|
74
|
-
'marketplaceOrderItems.marketplaceOrderShipping
|
|
78
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
79
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
80
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
|
|
75
81
|
]
|
|
76
82
|
})
|
|
77
83
|
let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
|
|
78
84
|
|
|
79
85
|
for (const orderItem of orderItems) {
|
|
80
|
-
if (orderItem.marketplaceOrderShipping !== null) {
|
|
81
|
-
const
|
|
86
|
+
if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
|
|
87
|
+
const orderShippingItems: MarketplaceOrderShippingItem[] = orderItem.marketplaceOrderShippingItems
|
|
88
|
+
const orderShipping: MarketplaceOrderShipping = orderShippingItems[0].marketplaceOrderShipping
|
|
82
89
|
const fulfillmentCenter: FulfillmentCenter = orderShipping?.fulfillmentCenter
|
|
83
90
|
const marketplaceStore: MarketplaceStore = order.marketplaceStore
|
|
84
91
|
|
|
@@ -119,9 +126,28 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
119
126
|
const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
|
|
120
127
|
|
|
121
128
|
// to-do update tracking no to every marketplaces
|
|
122
|
-
if (marketplaceStore.platform === 'woocommerce') {
|
|
129
|
+
if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
|
|
123
130
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
|
|
124
|
-
|
|
131
|
+
let orderInfo: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne({
|
|
132
|
+
where: {
|
|
133
|
+
name: order.name
|
|
134
|
+
},
|
|
135
|
+
relations: ['marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
|
|
136
|
+
})
|
|
137
|
+
const result = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
138
|
+
orderId: order.name,
|
|
139
|
+
trackingUrl: note,
|
|
140
|
+
trackingNo,
|
|
141
|
+
order: orderInfo,
|
|
142
|
+
note
|
|
143
|
+
})
|
|
144
|
+
|
|
145
|
+
if (marketplaceStore.platform === 'woocommerce') {
|
|
146
|
+
await StoreAPI.updateOrderStatus(marketplaceStore, {
|
|
147
|
+
orderId: order.name,
|
|
148
|
+
status: 'READY_TO_SHIP'
|
|
149
|
+
})
|
|
150
|
+
}
|
|
125
151
|
}
|
|
126
152
|
|
|
127
153
|
const resp = {
|
package/translations/en.json
CHANGED
package/translations/ko.json
CHANGED
|
@@ -143,6 +143,7 @@
|
|
|
143
143
|
"field.total_weight": "[ko] total weight",
|
|
144
144
|
"field.town": "[ko] town",
|
|
145
145
|
"field.tracking_no": "[ko] tracking no",
|
|
146
|
+
"field.tracking_url": "[ko] tracking URL",
|
|
146
147
|
"field.type": "[ko] type",
|
|
147
148
|
"field.unit": "[ko] unit",
|
|
148
149
|
"field.uom_value": "[ko] UOM value",
|
package/translations/ms.json
CHANGED
|
@@ -143,6 +143,7 @@
|
|
|
143
143
|
"field.total_weight": "[ms] total weight",
|
|
144
144
|
"field.town": "[ms] town",
|
|
145
145
|
"field.tracking_no": "[ms] tracking no",
|
|
146
|
+
"field.tracking_url": "[ms] tracking URL",
|
|
146
147
|
"field.type": "[ms] type",
|
|
147
148
|
"field.unit": "[ms] unit",
|
|
148
149
|
"field.uom_value": "[ms] UOM value",
|
package/translations/zh.json
CHANGED
|
@@ -143,6 +143,7 @@
|
|
|
143
143
|
"field.total_weight": "[zh] total weight",
|
|
144
144
|
"field.town": "[zh] town",
|
|
145
145
|
"field.tracking_no": "[zh] tracking no",
|
|
146
|
+
"field.tracking_url": "[zh] tracking URL",
|
|
146
147
|
"field.type": "[zh] type",
|
|
147
148
|
"field.unit": "[zh] unit",
|
|
148
149
|
"field.uom_value": "[zh] UOM value",
|