@things-factory/operato-mms 4.1.2 → 4.1.8
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/client/pages/order/logistics/lazada-order-init-batch-popup.js +32 -27
- package/client/pages/order/logistics/order-init-popup.js +13 -10
- package/client/pages/order/logistics/order-shipping-items.js +23 -26
- package/client/pages/order/logistics/request-ro-popup.js +18 -16
- package/client/pages/order/logistics/shopee-order-init-batch-popup.js +32 -27
- package/client/pages/order/order-by-store.js +34 -29
- package/client/pages/order/select-datetime-popup.js +2 -2
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +25 -24
- 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 +26 -24
- 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 +44 -44
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +41 -33
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +42 -33
- 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
|
|
|
@@ -314,29 +314,31 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
314
314
|
description
|
|
315
315
|
}
|
|
316
316
|
marketplaceOrderItems {
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
317
|
+
marketplaceOrderShippingItems {
|
|
318
|
+
marketplaceOrderShipping {
|
|
319
|
+
id
|
|
320
|
+
name
|
|
321
|
+
address1
|
|
322
|
+
address2
|
|
323
|
+
address3
|
|
324
|
+
address4
|
|
325
|
+
address5
|
|
326
|
+
city
|
|
327
|
+
postCode
|
|
328
|
+
country
|
|
329
|
+
state
|
|
330
|
+
phone1
|
|
331
|
+
phone2
|
|
332
|
+
attentionTo
|
|
333
|
+
trackingNo
|
|
334
|
+
ownTrackingNo
|
|
335
|
+
transporter
|
|
336
|
+
ownTransporter
|
|
337
|
+
totalWeight
|
|
338
|
+
weightUnit
|
|
339
|
+
totalVolume
|
|
340
|
+
volumeUnit
|
|
341
|
+
}
|
|
340
342
|
}
|
|
341
343
|
marketplaceProductVariation {
|
|
342
344
|
name
|
|
@@ -423,11 +425,14 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
423
425
|
let marketplaceOrderShippings = []
|
|
424
426
|
|
|
425
427
|
marketplaceOrderItems.map(item => {
|
|
426
|
-
const
|
|
428
|
+
const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
|
|
429
|
+
marketplaceOrderShippingItems.map(itm => {
|
|
430
|
+
const marketplaceOrderShipping = itm.marketplaceOrderShipping
|
|
427
431
|
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
432
|
+
if (marketplaceOrderShipping) {
|
|
433
|
+
marketplaceOrderShippings.push(marketplaceOrderShipping)
|
|
434
|
+
}
|
|
435
|
+
})
|
|
431
436
|
})
|
|
432
437
|
|
|
433
438
|
const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import '@things-factory/component-ui'
|
|
2
|
-
import { MultiColumnFormStyles } from '@things-factory/form-ui'
|
|
3
2
|
import '@things-factory/grist-ui'
|
|
4
|
-
import { i18next, localize } from '@things-factory/i18n-base'
|
|
5
|
-
import { isMobileDevice } from '@things-factory/utils'
|
|
6
|
-
import { css, html, LitElement } from 'lit-element'
|
|
7
|
-
import { PLATFORM } from '../../constants'
|
|
8
|
-
|
|
9
3
|
import './order-items'
|
|
10
4
|
import './order-shipping'
|
|
5
|
+
|
|
6
|
+
import { css, html, LitElement } from 'lit-element'
|
|
7
|
+
|
|
8
|
+
import { MultiColumnFormStyles } from '@things-factory/form-ui'
|
|
9
|
+
import { i18next, localize } from '@things-factory/i18n-base'
|
|
10
|
+
|
|
11
11
|
class OrderInitPopup extends localize(i18next)(LitElement) {
|
|
12
12
|
static get properties() {
|
|
13
13
|
return {
|
|
@@ -88,11 +88,14 @@ class OrderInitPopup extends localize(i18next)(LitElement) {
|
|
|
88
88
|
const marketplaceOrderItems = this.orderInformation.marketplaceOrderItems
|
|
89
89
|
|
|
90
90
|
marketplaceOrderItems.map(item => {
|
|
91
|
-
const
|
|
91
|
+
const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
|
|
92
|
+
marketplaceOrderShippingItems.map(itm => {
|
|
93
|
+
const marketplaceOrderShipping = itm.marketplaceOrderShipping
|
|
92
94
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
95
|
+
if (marketplaceOrderShipping) {
|
|
96
|
+
marketplaceOrderShippings.push(marketplaceOrderShipping)
|
|
97
|
+
}
|
|
98
|
+
})
|
|
96
99
|
})
|
|
97
100
|
|
|
98
101
|
return Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
|
|
@@ -240,18 +240,6 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
|
|
|
240
240
|
header: i18next.t('field.product_name'),
|
|
241
241
|
width: 400
|
|
242
242
|
},
|
|
243
|
-
{
|
|
244
|
-
type: 'string',
|
|
245
|
-
name: 'variationSku',
|
|
246
|
-
header: i18next.t('field.variation_sku'),
|
|
247
|
-
width: 200
|
|
248
|
-
},
|
|
249
|
-
{
|
|
250
|
-
type: 'string',
|
|
251
|
-
name: 'sku',
|
|
252
|
-
header: i18next.t('field.variation_name'),
|
|
253
|
-
width: 200
|
|
254
|
-
},
|
|
255
243
|
{
|
|
256
244
|
type: 'float',
|
|
257
245
|
name: 'qty',
|
|
@@ -279,17 +267,23 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
|
|
|
279
267
|
ownTrackingNo
|
|
280
268
|
transporter
|
|
281
269
|
ownTransporter
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
isku
|
|
286
|
-
name
|
|
287
|
-
}
|
|
270
|
+
marketplaceOrderShippingItems {
|
|
271
|
+
product {
|
|
272
|
+
sku
|
|
288
273
|
name
|
|
289
|
-
variationSku
|
|
290
274
|
}
|
|
291
275
|
qty
|
|
292
|
-
|
|
276
|
+
marketplaceOrderItem {
|
|
277
|
+
marketplaceProductVariation {
|
|
278
|
+
marketplaceProduct {
|
|
279
|
+
isku
|
|
280
|
+
name
|
|
281
|
+
}
|
|
282
|
+
name
|
|
283
|
+
variationSku
|
|
284
|
+
}
|
|
285
|
+
paidPrice
|
|
286
|
+
}
|
|
293
287
|
}
|
|
294
288
|
}
|
|
295
289
|
}
|
|
@@ -300,15 +294,18 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
|
|
|
300
294
|
if (!response.errors) {
|
|
301
295
|
this.fillUpForm(this.shippingForm, this.massageOrderShippingInformation())
|
|
302
296
|
|
|
297
|
+
const marketplaceOrderShippingItems = response.data.marketplaceOrderShipping.marketplaceOrderShippingItems
|
|
303
298
|
return {
|
|
304
299
|
records:
|
|
305
|
-
|
|
300
|
+
marketplaceOrderShippingItems.map(mosi => {
|
|
301
|
+
const product = mosi.product
|
|
302
|
+
const marketplaceOrderItem = mosi.marketplaceOrderItem
|
|
306
303
|
return {
|
|
307
|
-
...
|
|
308
|
-
...
|
|
309
|
-
|
|
310
|
-
productSku:
|
|
311
|
-
productName:
|
|
304
|
+
...marketplaceOrderItem,
|
|
305
|
+
...marketplaceOrderItem.marketplaceProductVariation,
|
|
306
|
+
qty: mosi.qty,
|
|
307
|
+
productSku: product.sku,
|
|
308
|
+
productName: product.name
|
|
312
309
|
}
|
|
313
310
|
}) || []
|
|
314
311
|
}
|
|
@@ -381,22 +381,24 @@ class RequestROPopup extends LitElement {
|
|
|
381
381
|
description
|
|
382
382
|
}
|
|
383
383
|
marketplaceOrderItems {
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
384
|
+
marketplaceOrderShippingItems {
|
|
385
|
+
marketplaceOrderShipping {
|
|
386
|
+
id
|
|
387
|
+
name
|
|
388
|
+
address1
|
|
389
|
+
address2
|
|
390
|
+
address3
|
|
391
|
+
address4
|
|
392
|
+
address5
|
|
393
|
+
city
|
|
394
|
+
postCode
|
|
395
|
+
country
|
|
396
|
+
state
|
|
397
|
+
phone1
|
|
398
|
+
phone2
|
|
399
|
+
attentionTo
|
|
400
|
+
trackingNo
|
|
401
|
+
}
|
|
400
402
|
}
|
|
401
403
|
marketplaceProductVariation {
|
|
402
404
|
marketplaceProduct {
|
|
@@ -378,29 +378,31 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
378
378
|
description
|
|
379
379
|
}
|
|
380
380
|
marketplaceOrderItems {
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
381
|
+
marketplaceOrderShippingItems {
|
|
382
|
+
marketplaceOrderShipping {
|
|
383
|
+
id
|
|
384
|
+
name
|
|
385
|
+
address1
|
|
386
|
+
address2
|
|
387
|
+
address3
|
|
388
|
+
address4
|
|
389
|
+
address5
|
|
390
|
+
city
|
|
391
|
+
postCode
|
|
392
|
+
country
|
|
393
|
+
state
|
|
394
|
+
phone1
|
|
395
|
+
phone2
|
|
396
|
+
attentionTo
|
|
397
|
+
trackingNo
|
|
398
|
+
ownTrackingNo
|
|
399
|
+
transporter
|
|
400
|
+
ownTransporter
|
|
401
|
+
totalWeight
|
|
402
|
+
weightUnit
|
|
403
|
+
totalVolume
|
|
404
|
+
volumeUnit
|
|
405
|
+
}
|
|
404
406
|
}
|
|
405
407
|
marketplaceProductVariation {
|
|
406
408
|
name
|
|
@@ -573,11 +575,14 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
573
575
|
let marketplaceOrderShippings = []
|
|
574
576
|
|
|
575
577
|
marketplaceOrderItems.map(item => {
|
|
576
|
-
const
|
|
578
|
+
const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
|
|
579
|
+
marketplaceOrderShippingItems.map(itm => {
|
|
580
|
+
const marketplaceOrderShipping = itm.marketplaceOrderShipping
|
|
577
581
|
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
582
|
+
if (marketplaceOrderShipping) {
|
|
583
|
+
marketplaceOrderShippings.push(marketplaceOrderShipping)
|
|
584
|
+
}
|
|
585
|
+
})
|
|
581
586
|
})
|
|
582
587
|
|
|
583
588
|
const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
|
|
@@ -441,31 +441,33 @@ class OrderByStore extends localize(i18next)(PageView) {
|
|
|
441
441
|
description
|
|
442
442
|
}
|
|
443
443
|
marketplaceOrderItems {
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
444
|
+
marketplaceOrderShippingItems {
|
|
445
|
+
marketplaceOrderShipping {
|
|
446
|
+
id
|
|
447
|
+
name
|
|
448
|
+
address1
|
|
449
|
+
address2
|
|
450
|
+
address3
|
|
451
|
+
address4
|
|
452
|
+
address5
|
|
453
|
+
city
|
|
454
|
+
postCode
|
|
455
|
+
country
|
|
456
|
+
state
|
|
457
|
+
phone1
|
|
458
|
+
phone2
|
|
459
|
+
attentionTo
|
|
460
|
+
trackingNo
|
|
461
|
+
ownTrackingNo
|
|
462
|
+
totalWeight
|
|
463
|
+
weightUnit
|
|
464
|
+
totalVolume
|
|
465
|
+
volumeUnit
|
|
466
|
+
transporter
|
|
467
|
+
ownTransporter
|
|
468
|
+
orderNoRef
|
|
469
|
+
subOrderNoRef
|
|
470
|
+
}
|
|
469
471
|
}
|
|
470
472
|
marketplaceProductVariation {
|
|
471
473
|
marketplaceProduct {
|
|
@@ -523,11 +525,14 @@ class OrderByStore extends localize(i18next)(PageView) {
|
|
|
523
525
|
let marketplaceOrderShippings = []
|
|
524
526
|
|
|
525
527
|
marketplaceOrderItems.map(item => {
|
|
526
|
-
const
|
|
528
|
+
const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
|
|
529
|
+
marketplaceOrderShippingItems.map(itm => {
|
|
530
|
+
const marketplaceOrderShipping = itm.marketplaceOrderShipping
|
|
527
531
|
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
532
|
+
if (marketplaceOrderShipping) {
|
|
533
|
+
marketplaceOrderShippings.push(marketplaceOrderShipping)
|
|
534
|
+
}
|
|
535
|
+
})
|
|
531
536
|
})
|
|
532
537
|
|
|
533
538
|
const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
|
|
@@ -72,8 +72,8 @@ export class SelectDateTimePopup extends localize(i18next)(LitElement) {
|
|
|
72
72
|
`,
|
|
73
73
|
variables: {
|
|
74
74
|
storeId: this.storeId,
|
|
75
|
-
fromDate: this._getInputByName('fromDate').value,
|
|
76
|
-
toDate: this._getInputByName('toDate').value
|
|
75
|
+
fromDate: new Date(this._getInputByName('fromDate').value).toISOString(),
|
|
76
|
+
toDate: new Date(this._getInputByName('toDate').value).toISOString()
|
|
77
77
|
}
|
|
78
78
|
})
|
|
79
79
|
|
|
@@ -21,22 +21,29 @@ exports.addReleaseOrderResolver = {
|
|
|
21
21
|
relations: [
|
|
22
22
|
'marketplaceOrderItems',
|
|
23
23
|
'marketplaceOrderItems.marketplaceProductVariation',
|
|
24
|
-
'marketplaceOrderItems.
|
|
24
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
25
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
25
26
|
'marketplaceStore'
|
|
26
27
|
]
|
|
27
28
|
});
|
|
28
29
|
let marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
|
|
29
30
|
where: { orderNoRef: marketplaceOrder.orderNo, domain },
|
|
30
31
|
order: { subOrderNoRef: 'ASC' },
|
|
31
|
-
relations: [
|
|
32
|
+
relations: [
|
|
33
|
+
'marketplaceOrderShippingItems',
|
|
34
|
+
'marketplaceOrderShippingItems.marketplaceOrderItem',
|
|
35
|
+
'marketplaceOrderShippingItems.product'
|
|
36
|
+
]
|
|
32
37
|
});
|
|
33
|
-
for (
|
|
38
|
+
for (let j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
34
39
|
let marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
40
|
+
let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
|
|
35
41
|
if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
|
|
36
42
|
const date = new Date();
|
|
37
|
-
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
43
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
|
|
44
|
+
.getDate()
|
|
38
45
|
.toString()
|
|
39
|
-
.padStart(2, '0')}
|
|
46
|
+
.padStart(2, '0')}`;
|
|
40
47
|
const newReleaseOrder = {
|
|
41
48
|
releaseDate,
|
|
42
49
|
type: 'b2c',
|
|
@@ -68,19 +75,12 @@ exports.addReleaseOrderResolver = {
|
|
|
68
75
|
marketplaceOrderStatus: marketplaceOrder.status,
|
|
69
76
|
airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
|
|
70
77
|
invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
|
|
71
|
-
orderInventories:
|
|
72
|
-
.filter(item => {
|
|
73
|
-
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
74
|
-
return item;
|
|
75
|
-
}
|
|
76
|
-
})
|
|
77
|
-
.map((orderItem) => {
|
|
78
|
-
const { marketplaceProductVariation: productVariation } = orderItem;
|
|
78
|
+
orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
|
|
79
79
|
return {
|
|
80
80
|
product: {
|
|
81
|
-
sku:
|
|
81
|
+
sku: marketplaceOrderShippingItem.product.sku
|
|
82
82
|
},
|
|
83
|
-
releaseQty:
|
|
83
|
+
releaseQty: marketplaceOrderShippingItem.qty
|
|
84
84
|
};
|
|
85
85
|
})
|
|
86
86
|
};
|
|
@@ -89,6 +89,14 @@ exports.addReleaseOrderResolver = {
|
|
|
89
89
|
customerBizplaceId,
|
|
90
90
|
releaseOrder: newReleaseOrder
|
|
91
91
|
});
|
|
92
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
93
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
94
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
95
|
+
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
96
|
+
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
97
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
98
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
99
|
+
}
|
|
92
100
|
}
|
|
93
101
|
catch (e) { }
|
|
94
102
|
var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
|
|
@@ -100,7 +108,8 @@ exports.addReleaseOrderResolver = {
|
|
|
100
108
|
where: { domain, sku: oi.product.sku }
|
|
101
109
|
});
|
|
102
110
|
}
|
|
103
|
-
let
|
|
111
|
+
let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
|
|
112
|
+
let moi = mosis[0].marketplaceOrderItem;
|
|
104
113
|
return {
|
|
105
114
|
sku: product.sku,
|
|
106
115
|
name: product.name,
|
|
@@ -111,9 +120,6 @@ exports.addReleaseOrderResolver = {
|
|
|
111
120
|
paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
|
|
112
121
|
};
|
|
113
122
|
}));
|
|
114
|
-
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
115
|
-
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
116
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
117
123
|
let newInvoice = {
|
|
118
124
|
invoiceProducts,
|
|
119
125
|
releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
|
|
@@ -163,11 +169,6 @@ exports.addReleaseOrderResolver = {
|
|
|
163
169
|
catch (e) { }
|
|
164
170
|
}
|
|
165
171
|
}
|
|
166
|
-
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
167
|
-
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
168
|
-
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
169
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
170
|
-
}
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,uDAAyE;AACzE,qFAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
|