@things-factory/operato-mms 3.6.42 → 3.6.48

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.
Files changed (2) hide show
  1. package/client/pages/order/logistics/shopee-order-init-batch-popup.js +55 -47
  2. package/package.json +61 -61
package/client/pages/order/logistics/shopee-order-init-batch-popup.js CHANGED
@@ -458,58 +458,66 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
458
458
  records = marketplaceOrders.map(itm => {
459
459
  switch (this._type) {
460
460
  case 'pickup':
461
- return {
462
- ...itm,
463
- rowOptionPickupAddress: {
464
- options: [
465
- {
466
- display: '',
467
- value: ''
468
- },
469
- ...itm.fullLogisticsDetail.logisticsDetail.pickup.map(pickup => {
470
- const addressDetail = {
471
- display: pickup.address + ' ,' + pickup.city + ' ,' + pickup.zipcode + ' ,' + pickup.state,
472
- value: pickup.addressId.toString(),
473
- timeSlot: pickup.timeSlot
474
- }
475
-
476
- if (!this.addressList.map(list => list.value).includes(addressDetail.value)) {
477
- this.addressList = Array.from(new Set([...this.addressList, addressDetail]))
478
- }
479
-
480
- return addressDetail
481
- })
482
- ]
461
+ if (itm.fullLogisticsDetail?.pickup?.length > 0) {
462
+ return {
463
+ ...itm,
464
+ rowOptionPickupAddress: {
465
+ options: [
466
+ {
467
+ display: '',
468
+ value: ''
469
+ },
470
+ ...itm.fullLogisticsDetail.logisticsDetail.pickup.map(pickup => {
471
+ const addressDetail = {
472
+ display: pickup.address + ' ,' + pickup.city + ' ,' + pickup.zipcode + ' ,' + pickup.state,
473
+ value: pickup.addressId.toString(),
474
+ timeSlot: pickup.timeSlot
475
+ }
476
+
477
+ if (!this.addressList.map(list => list.value).includes(addressDetail.value)) {
478
+ this.addressList = Array.from(new Set([...this.addressList, addressDetail]))
479
+ }
480
+
481
+ return addressDetail
482
+ })
483
+ ]
484
+ }
483
485
  }
486
+ } else {
487
+ return
484
488
  }
485
489
 
486
490
  case 'dropoff':
487
- return {
488
- ...itm,
489
- requiredBranch: itm.fullLogisticsDetail.dropoff.includes('branch_id'),
490
- requiredSender: itm.fullLogisticsDetail.dropoff.includes('sender_real_name'),
491
- requiredTracking: itm.fullLogisticsDetail.dropoff.includes('tracking_no'),
492
- rowOptionDropoffBranch: {
493
- options: [
494
- {
495
- display: '',
496
- value: ''
497
- },
498
- ...itm.fullLogisticsDetail.logisticsDetail.dropoff.map(dropoff => {
499
- const addressDetail = {
500
- display:
501
- dropoff.address + ' ,' + dropoff.city + ' ,' + dropoff.zipcode + ' ,' + dropoff.state,
502
- value: dropoff.branchId.toString()
503
- }
504
-
505
- if (!this.addressList.map(list => list.value).includes(addressDetail.value)) {
506
- this.addressList = Array.from(new Set([...this.addressList, addressDetail]))
507
- }
508
-
509
- return addressDetail
510
- })
511
- ]
491
+ if (itm.fullLogisticsDetail?.dropoff?.length > 0) {
492
+ return {
493
+ ...itm,
494
+ requiredBranch: itm.fullLogisticsDetail.dropoff.includes('branch_id'),
495
+ requiredSender: itm.fullLogisticsDetail.dropoff.includes('sender_real_name'),
496
+ requiredTracking: itm.fullLogisticsDetail.dropoff.includes('tracking_no'),
497
+ rowOptionDropoffBranch: {
498
+ options: [
499
+ {
500
+ display: '',
501
+ value: ''
502
+ },
503
+ ...itm.fullLogisticsDetail.logisticsDetail.dropoff.map(dropoff => {
504
+ const addressDetail = {
505
+ display:
506
+ dropoff.address + ' ,' + dropoff.city + ' ,' + dropoff.zipcode + ' ,' + dropoff.state,
507
+ value: dropoff.branchId.toString()
508
+ }
509
+
510
+ if (!this.addressList.map(list => list.value).includes(addressDetail.value)) {
511
+ this.addressList = Array.from(new Set([...this.addressList, addressDetail]))
512
+ }
513
+
514
+ return addressDetail
515
+ })
516
+ ]
517
+ }
512
518
  }
519
+ } else {
520
+ return
513
521
  }
514
522
 
515
523
  default:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-mms",
3
- "version": "3.6.42",
3
+ "version": "3.6.48",
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.22.1",
43
43
  "@material/mwc-radio": "^0.22.1",
44
44
  "@operato/ghost-print": "0.1.14",
45
- "@things-factory/apptool-ui": "^3.6.38",
46
- "@things-factory/attachment-base": "^3.6.38",
47
- "@things-factory/auth-ui": "^3.6.39",
48
- "@things-factory/biz-base": "^3.6.38",
49
- "@things-factory/board-service": "^3.6.38",
50
- "@things-factory/board-ui": "^3.6.39",
51
- "@things-factory/code-ui": "^3.6.39",
52
- "@things-factory/context-ui": "^3.6.39",
53
- "@things-factory/dashboard": "^3.6.39",
54
- "@things-factory/export-ui": "^3.6.39",
55
- "@things-factory/export-ui-csv": "^3.6.39",
56
- "@things-factory/export-ui-excel": "^3.6.39",
57
- "@things-factory/geography": "^3.6.38",
58
- "@things-factory/grist-ui": "^3.6.39",
59
- "@things-factory/help": "^3.6.39",
60
- "@things-factory/i18n-ui": "^3.6.38",
61
- "@things-factory/integration-fulfillment": "^3.6.39",
62
- "@things-factory/integration-lmd": "^3.6.39",
63
- "@things-factory/lite-menu": "^3.6.39",
64
- "@things-factory/marketplace-base": "^3.6.42",
65
- "@things-factory/more-ui": "^3.6.38",
66
- "@things-factory/notification": "^3.6.38",
67
- "@things-factory/oauth2-client": "^3.6.38",
68
- "@things-factory/pdf": "^3.6.37",
69
- "@things-factory/product-base": "^3.6.38",
70
- "@things-factory/resource-ui": "^3.6.39",
71
- "@things-factory/scene-chartjs": "^3.6.37",
72
- "@things-factory/scene-clock": "^3.6.37",
73
- "@things-factory/scene-clone": "^3.6.37",
74
- "@things-factory/scene-compass": "^3.6.37",
75
- "@things-factory/scene-data-transform": "^3.6.37",
76
- "@things-factory/scene-excel": "^3.6.37",
77
- "@things-factory/scene-firebase": "^3.6.37",
78
- "@things-factory/scene-form": "^3.6.37",
79
- "@things-factory/scene-gauge": "^3.6.37",
80
- "@things-factory/scene-google-map": "^3.6.37",
81
- "@things-factory/scene-graphql": "^3.6.37",
82
- "@things-factory/scene-grist": "^3.6.39",
83
- "@things-factory/scene-half-roundrect": "^3.6.37",
84
- "@things-factory/scene-indoor-map": "^3.6.37",
85
- "@things-factory/scene-integration": "^3.6.37",
86
- "@things-factory/scene-label": "^3.6.38",
87
- "@things-factory/scene-legend": "^3.6.37",
88
- "@things-factory/scene-marker": "^3.6.37",
89
- "@things-factory/scene-mqtt": "^3.6.37",
90
- "@things-factory/scene-news-ticker": "^3.6.37",
91
- "@things-factory/scene-progressbar": "^3.6.37",
92
- "@things-factory/scene-random": "^3.6.37",
93
- "@things-factory/scene-restful": "^3.6.37",
94
- "@things-factory/scene-switch": "^3.6.37",
95
- "@things-factory/scene-tab": "^3.6.37",
96
- "@things-factory/scene-table": "^3.6.37",
97
- "@things-factory/scene-timer": "^3.6.37",
98
- "@things-factory/scene-visualizer": "^3.6.37",
99
- "@things-factory/scene-wheel-sorter": "^3.6.37",
100
- "@things-factory/setting-ui": "^3.6.39",
101
- "@things-factory/system-ui": "^3.6.39",
102
- "@things-factory/warehouse-base": "^3.6.42"
45
+ "@things-factory/apptool-ui": "^3.6.45",
46
+ "@things-factory/attachment-base": "^3.6.47",
47
+ "@things-factory/auth-ui": "^3.6.47",
48
+ "@things-factory/biz-base": "^3.6.47",
49
+ "@things-factory/board-service": "^3.6.47",
50
+ "@things-factory/board-ui": "^3.6.47",
51
+ "@things-factory/code-ui": "^3.6.47",
52
+ "@things-factory/context-ui": "^3.6.45",
53
+ "@things-factory/dashboard": "^3.6.47",
54
+ "@things-factory/export-ui": "^3.6.45",
55
+ "@things-factory/export-ui-csv": "^3.6.45",
56
+ "@things-factory/export-ui-excel": "^3.6.45",
57
+ "@things-factory/geography": "^3.6.47",
58
+ "@things-factory/grist-ui": "^3.6.45",
59
+ "@things-factory/help": "^3.6.45",
60
+ "@things-factory/i18n-ui": "^3.6.47",
61
+ "@things-factory/integration-fulfillment": "^3.6.47",
62
+ "@things-factory/integration-lmd": "^3.6.47",
63
+ "@things-factory/lite-menu": "^3.6.47",
64
+ "@things-factory/marketplace-base": "^3.6.48",
65
+ "@things-factory/more-ui": "^3.6.45",
66
+ "@things-factory/notification": "^3.6.47",
67
+ "@things-factory/oauth2-client": "^3.6.47",
68
+ "@things-factory/pdf": "^3.6.45",
69
+ "@things-factory/product-base": "^3.6.47",
70
+ "@things-factory/resource-ui": "^3.6.47",
71
+ "@things-factory/scene-chartjs": "^3.6.45",
72
+ "@things-factory/scene-clock": "^3.6.45",
73
+ "@things-factory/scene-clone": "^3.6.45",
74
+ "@things-factory/scene-compass": "^3.6.45",
75
+ "@things-factory/scene-data-transform": "^3.6.45",
76
+ "@things-factory/scene-excel": "^3.6.45",
77
+ "@things-factory/scene-firebase": "^3.6.45",
78
+ "@things-factory/scene-form": "^3.6.45",
79
+ "@things-factory/scene-gauge": "^3.6.45",
80
+ "@things-factory/scene-google-map": "^3.6.45",
81
+ "@things-factory/scene-graphql": "^3.6.45",
82
+ "@things-factory/scene-grist": "^3.6.45",
83
+ "@things-factory/scene-half-roundrect": "^3.6.45",
84
+ "@things-factory/scene-indoor-map": "^3.6.45",
85
+ "@things-factory/scene-integration": "^3.6.45",
86
+ "@things-factory/scene-label": "^3.6.45",
87
+ "@things-factory/scene-legend": "^3.6.45",
88
+ "@things-factory/scene-marker": "^3.6.45",
89
+ "@things-factory/scene-mqtt": "^3.6.45",
90
+ "@things-factory/scene-news-ticker": "^3.6.45",
91
+ "@things-factory/scene-progressbar": "^3.6.45",
92
+ "@things-factory/scene-random": "^3.6.45",
93
+ "@things-factory/scene-restful": "^3.6.45",
94
+ "@things-factory/scene-switch": "^3.6.45",
95
+ "@things-factory/scene-tab": "^3.6.45",
96
+ "@things-factory/scene-table": "^3.6.45",
97
+ "@things-factory/scene-timer": "^3.6.45",
98
+ "@things-factory/scene-visualizer": "^3.6.45",
99
+ "@things-factory/scene-wheel-sorter": "^3.6.45",
100
+ "@things-factory/setting-ui": "^3.6.47",
101
+ "@things-factory/system-ui": "^3.6.45",
102
+ "@things-factory/warehouse-base": "^3.6.48"
103
103
  },
104
104
  "devDependencies": {
105
- "@things-factory/builder": "^3.6.37",
105
+ "@things-factory/builder": "^3.6.45",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "c0b57868acdaee9ed66a5b15c55bc0eac57542d7"
108
+ "gitHead": "1d70b4e6eee41c8b81a59cffe816de546d64cfa8"
109
109
  }