@things-factory/operato-mms 4.3.544 → 4.3.548

package/client/pages/order/logistics/order-init-popup.js

@@ -90,7 +90,12 @@ class OrderInitPopup extends localize(i18next)(LitElement) {
     marketplaceOrderItems.map(item => {
       const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
       marketplaceOrderShippingItems.map(itm => {
-        const marketplaceOrderShipping = itm.marketplaceOrderShipping
+        const marketplaceOrderShipping = {
+          ...itm.marketplaceOrderShipping,
+          address1: this.maskString(itm.marketplaceOrderShipping.address1),
+          attentionTo: this.maskString(itm.marketplaceOrderShipping.attentionTo),
+          phone1: this.maskString(itm.marketplaceOrderShipping.phone1)
+        }
 
         if (marketplaceOrderShipping) {
           marketplaceOrderShippings.push(marketplaceOrderShipping)
@@ -102,6 +107,16 @@ class OrderInitPopup extends localize(i18next)(LitElement) {
       return marketplaceOrderShippings.find(a => a.id === id)
     })
   }
+
+  maskString(str, visibleStart = 1, visibleEnd = 1) {
+    if (str.length <= visibleStart + visibleEnd) {
+      return str
+    }
+    const regex = new RegExp(`^(.{${visibleStart}})(.+)(.{${visibleEnd}})$`)
+    return str.replace(regex, (match, start, middle, end) => {
+      return start + '*'.repeat(middle.length) + end
+    })
+  }
 }
 
 window.customElements.define('order-init-popup', OrderInitPopup)

package/client/pages/order/order-by-store.js

@@ -190,6 +190,11 @@ class OrderByStore extends localize(i18next)(PageView) {
         type: 'date',
         props: {
           searchOper: 'eq',
+          min: (() => {
+            let date = new Date()
+            date.setMonth(date.getMonth() - 3)
+            return date.toISOString().split('T')[0]
+          })(),
           max: new Date().toISOString().split('T')[0]
         },
         value: (() => {
@@ -205,7 +210,16 @@ class OrderByStore extends localize(i18next)(PageView) {
         type: 'date',
         props: {
           searchOper: 'eq',
-          max: new Date().toISOString().split('T')[0]
+          min: (() => {
+            let date = new Date()
+            date.setMonth(date.getMonth() - 3)
+            return date.toISOString().split('T')[0]
+          })(),
+          max: (() => {
+            var max = new Date()
+            max.setMonth(max.getMonth())
+            return max.toISOString().split('T')[0]
+          })()
         },
         value: new Date().toISOString().split('T')[0]
       },
@@ -520,7 +534,7 @@ class OrderByStore extends localize(i18next)(PageView) {
   }
 
   get _toDateInput() {
-    return this._searchForm.shadowRoot.querySelector('input[name=toDate]')
+    return this.searchForm.shadowRoot.querySelector('input[name=toDate]')
   }
 
   async fetchStore(id) {
@@ -1136,7 +1150,7 @@ class OrderByStore extends localize(i18next)(PageView) {
   _modifyDateRange(e) {
     try {
       const fromDate = e.currentTarget.value
-
+      let a = this?._toDateInput?.value
       if (this?._toDateInput?.value < fromDate) this._toDateInput.value = fromDate
 
       let min = new Date(fromDate)
@@ -1149,6 +1163,30 @@ class OrderByStore extends localize(i18next)(PageView) {
     } catch (e) {}
   }
 
+  // _modifyDateRange(e) {
+  //   const fromDate = e.currentTarget.value
+
+  //   if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+
+  //   let min = new Date(fromDate)
+  //   let max = new Date(fromDate)
+  //   max.setMonth(max.getMonth() + 1)
+
+  //   let today = new Date()
+  //   today.setHours(0, 0, 0, 0)
+  //   if (!Number.isNaN(new Date(min).getTime())) {
+  //     min = min.toISOString().split('T')[0]
+  //     max = max.toISOString().split('T')[0]
+  //   } else {
+  //     return
+  //   }
+
+  //   if (this._toDateInput.value > max) this._toDateInput.value = max
+
+  //   this._toDateInput.min = min
+  //   this._toDateInput.max = max
+  // }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-mms",
-  "version": "4.3.544",
+  "version": "4.3.548",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -106,5 +106,5 @@
     "@things-factory/builder": "^4.3.534",
     "@types/node-fetch": "^2.5.7"
   },
-  "gitHead": "d9ba6fd47325e8b698b33e2ea133f8596ba55719"
+  "gitHead": "f4b0d3681ce2920b0ec7bb4046830a6bf43e784d"
 }