@things-factory/operato-mms 4.3.207 → 4.3.208

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 (5) hide show
  1. package/client/pages/order/logistics/lazada-order-init-batch-popup.js +11 -10
  2. package/client/pages/order/logistics/order-shipping-items.js +11 -11
  3. package/client/pages/order/order-by-store.js +13 -22
  4. package/config.development.js +4 -4
  5. package/package.json +4 -4
package/client/pages/order/logistics/lazada-order-init-batch-popup.js CHANGED
@@ -443,17 +443,18 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
443
443
  case 'trackingNo':
444
444
  if (uniqueMarketplaceOrderShippings) {
445
445
  uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
446
- if (this.store?.platform === PLATFORM.LAZADA.value) {
447
- var newTrackingNo = []
448
- if (marketplaceOrderShipping?.trackingNo) {
449
- const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
450
- newTrackingNo = trackingNos.map(item => item.tracking_code)
451
- }
452
- let uniqueTrackingNos = [...new Set(newTrackingNo)]
453
- item = uniqueTrackingNos.join(', ')
454
- } else {
446
+ // if (this.store?.platform === PLATFORM.LAZADA.value) {
447
+ // var newTrackingNo = []
448
+ // if (marketplaceOrderShipping?.trackingNo) {
449
+ // const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
450
+ // newTrackingNo = trackingNos.map(item => item.tracking_code)
451
+ // }
452
+ // let uniqueTrackingNos = [...new Set(newTrackingNo)]
453
+ // item = uniqueTrackingNos.join(', ')
454
+ // }
455
+ // else {
455
456
  item = marketplaceOrderShipping.trackingNo
456
- }
457
+ // }
457
458
  })
458
459
  }
459
460
  break
package/client/pages/order/logistics/order-shipping-items.js CHANGED
@@ -315,17 +315,17 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
315
315
  massageOrderShippingInformation() {
316
316
  const marketplaceOrderShipping = this.orderShippingInformation
317
317
 
318
- if (marketplaceOrderShipping) {
319
- if (this.marketplaceStore?.platform === PLATFORM.LAZADA.value) {
320
- var newTrackingNo = []
321
- if (marketplaceOrderShipping?.trackingNo) {
322
- const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
323
- newTrackingNo = trackingNos.map(item => item.tracking_code)
324
- }
325
- let uniqueTrackingNos = [...new Set(newTrackingNo)]
326
- marketplaceOrderShipping.trackingNo = uniqueTrackingNos.join(', ')
327
- }
328
- }
318
+ // if (marketplaceOrderShipping) {
319
+ // if (this.marketplaceStore?.platform === PLATFORM.LAZADA.value) {
320
+ // var newTrackingNo = []
321
+ // if (marketplaceOrderShipping?.trackingNo) {
322
+ // const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
323
+ // newTrackingNo = trackingNos.map(item => item.tracking_code)
324
+ // }
325
+ // let uniqueTrackingNos = [...new Set(newTrackingNo)]
326
+ // marketplaceOrderShipping.trackingNo = uniqueTrackingNos.join(', ')
327
+ // }
328
+ // }
329
329
 
330
330
  return marketplaceOrderShipping
331
331
  }
package/client/pages/order/order-by-store.js CHANGED
@@ -714,17 +714,7 @@ class OrderByStore extends localize(i18next)(PageView) {
714
714
  case 'trackingNo':
715
715
  if (uniqueMarketplaceOrderShippings) {
716
716
  uniqueMarketplaceOrderShippings.map(marketplaceOrderShipping => {
717
- if (this.store?.platform === PLATFORM.LAZADA.value) {
718
- var newTrackingNo = []
719
- if (marketplaceOrderShipping?.trackingNo) {
720
- const trackingNos = JSON.parse(marketplaceOrderShipping.trackingNo)
721
- newTrackingNo = trackingNos.map(item => item.tracking_code)
722
- let uniqueTrackingNos = [...new Set(newTrackingNo)]
723
- item = uniqueTrackingNos.join(', ')
724
- }
725
- } else {
726
- item = marketplaceOrderShipping.trackingNo
727
- }
717
+ item = marketplaceOrderShipping.trackingNo
728
718
  })
729
719
  }
730
720
  break
@@ -967,8 +957,9 @@ class OrderByStore extends localize(i18next)(PageView) {
967
957
  break
968
958
 
969
959
  case 'lazada':
970
- var decodedHTML = atob(orderDocInfo[0].file)
971
- this._callPrintDialog(decodedHTML)
960
+ let url = new URL(window.location)
961
+ let content = `${url.origin}/proxy?url=${encodeURIComponent(orderDocInfo[0].file)}`
962
+ this._callPrintDialog(content)
972
963
  break
973
964
 
974
965
  default:
@@ -998,15 +989,15 @@ class OrderByStore extends localize(i18next)(PageView) {
998
989
  })
999
990
  break
1000
991
 
1001
- case 'lazada':
1002
- GhostPrint.print({
1003
- srcdoc: contentSource,
1004
- pending: 1000,
1005
- onfinish: () => {
1006
- this._showToast({ message: i18next.t('text.document_has_been_generated') })
1007
- }
1008
- })
1009
- break
992
+ // case 'lazada':
993
+ // GhostPrint.print({
994
+ // srcdoc: contentSource,
995
+ // pending: 1000,
996
+ // onfinish: () => {
997
+ // this._showToast({ message: i18next.t('text.document_has_been_generated') })
998
+ // }
999
+ // })
1000
+ // break
1010
1001
  }
1011
1002
  }
1012
1003
 
package/config.development.js CHANGED
@@ -6,12 +6,12 @@ module.exports = {
6
6
  ormconfig: {
7
7
  name: 'default',
8
8
  type: 'postgres',
9
- database: 'dev3',
9
+ database: 'v3-hub1',
10
10
  username: 'postgres',
11
11
  password: 'hatio',
12
12
  host: 'localhost',
13
13
  port: 15432,
14
- synchronize: false,
14
+ synchronize: true,
15
15
  logging: true
16
16
  },
17
17
  sftpFileStorage: {
@@ -104,13 +104,13 @@ module.exports = {
104
104
  }
105
105
  },
106
106
  fulfillmentIntegrationOperato: {
107
- host: '192.168.0.161:3000',
107
+ host: 'operato-h.com:3000',
108
108
  protocol: 'http',
109
109
  platform: 'operato',
110
110
  application: 'Operato MMS',
111
111
  appKey: 'a9bf751e622bf146662b240d58971051',
112
112
  appSecret: '1c385935dc131c4b902b9bbf6a4798af',
113
- callback: 'http://192.168.0.161:5000/callback-operato'
113
+ callback: 'http://operato-h.com:5000/callback-operato'
114
114
  },
115
115
  sellercraftChannelIntegrationConfig: {
116
116
  apiKey: 'eqDVmIp0kxakM4sNnzqTkySBM73UGMS1nOPDN5Z1',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-mms",
3
- "version": "4.3.207",
3
+ "version": "4.3.208",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -80,7 +80,7 @@
80
80
  "@things-factory/integration-fulfillment": "^4.3.190",
81
81
  "@things-factory/integration-lmd": "^4.3.197",
82
82
  "@things-factory/lite-menu": "^4.3.186",
83
- "@things-factory/marketplace-base": "^4.3.207",
83
+ "@things-factory/marketplace-base": "^4.3.208",
84
84
  "@things-factory/more-ui": "^4.3.179",
85
85
  "@things-factory/notification": "^4.3.186",
86
86
  "@things-factory/oauth2-client": "^4.3.179",
@@ -100,11 +100,11 @@
100
100
  "@things-factory/scene-visualizer": "^4.3.159",
101
101
  "@things-factory/setting-ui": "^4.3.186",
102
102
  "@things-factory/system-ui": "^4.3.179",
103
- "@things-factory/warehouse-base": "^4.3.207"
103
+ "@things-factory/warehouse-base": "^4.3.208"
104
104
  },
105
105
  "devDependencies": {
106
106
  "@things-factory/builder": "^4.3.179",
107
107
  "@types/node-fetch": "^2.5.7"
108
108
  },
109
- "gitHead": "ed466df1affa16c0c06e6507bc3bc1b840e9d6b7"
109
+ "gitHead": "a681ae874929a5594a4e44d0eb1697b2982eace7"
110
110
  }