@things-factory/biz-ui 4.3.35 → 4.3.43

package/client/components/contact-points-popup.js

@@ -14,7 +14,7 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
       config: Object,
       data: Object,
       type: String,
-      partnerBizplaceId: String
+      partnerBizplaceIds: Array
     }
   }
 
@@ -71,6 +71,11 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
     ]
   }
 
+  constructor() {
+    super()
+    this.partnerBizplaceIds = []
+  }
+
   render() {
     return html`
       <search-form id="search-form" .fields=${this._searchFields} @submit=${() => this.dataGrist.fetch()}></search-form>
@@ -86,6 +91,8 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
       </div>
 
       <div class="button-container">
+        <mwc-button @click=${this._cancel.bind(this)} label="${`${i18next.t('button.cancel')}`}" raised></mwc-button>
+
         <mwc-button
           @click=${this._selectBizplace.bind(this)}
           label="${`${i18next.t('button.confirm')}`}"
@@ -105,17 +112,12 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
         selectable: {
           multiple: false
         },
-        appendable: false
+        appendable: false,
+        handlers: { dblclick: this._dblClickHandler.bind(this) }
       },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: false },
-        {
-          type: 'string',
-          name: 'companyName',
-          header: i18next.t('field.company'),
-          width: 300
-        },
         {
           type: 'string',
           name: 'accountNo',
@@ -124,21 +126,51 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
         },
         {
           type: 'string',
-          name: 'name',
-          header: i18next.t('field.name'),
+          name: 'companyName',
+          header: i18next.t('field.company'),
           width: 300
         },
         {
           type: 'string',
-          name: 'email',
-          header: i18next.t('field.email'),
-          width: 150
+          name: 'name',
+          header: i18next.t('field.name'),
+          width: 300
         },
         {
           type: 'string',
           name: 'description',
           header: i18next.t('field.description'),
           width: 350
+        },
+        {
+          type: 'string',
+          name: 'fullAddress',
+          header: i18next.t('field.delivery_address'),
+          width: 350
+        },
+        {
+          type: 'string',
+          name: 'billingAddress',
+          header: i18next.t('field.billing_address'),
+          width: 350
+        },
+        {
+          type: 'string',
+          name: 'phone',
+          header: i18next.t('field.phone'),
+          width: 350
+        },
+        {
+          type: 'string',
+          name: 'fax',
+          header: i18next.t('field.fax'),
+          width: 350
+        },
+        {
+          type: 'string',
+          name: 'email',
+          header: i18next.t('field.email'),
+          width: 150
         }
       ]
     }
@@ -161,6 +193,12 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
         name: 'name',
         type: 'text',
         props: { searchOper: 'i_like' }
+      },
+      {
+        label: i18next.t('label.contact'),
+        name: 'phone',
+        type: 'text',
+        props: { searchOper: 'i_like' }
       }
     ]
   }
@@ -177,8 +215,8 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
     let filters = await this.searchForm.getQueryFilters()
 
     if (this.type) filters = [...filters, { name: 'type', operator: 'eq', value: this.type }]
-    if (this.partnerBizplaceId)
-      filters = [...filters, { name: 'bizplace_id', operator: 'eq', value: this.partnerBizplaceId }]
+    if (this.partnerBizplaceIds && this.partnerBizplaceIds.length > 0)
+      filters = [...filters, { name: 'bizplace_id', operator: 'in', value: this.partnerBizplaceIds }]
 
     const response = await client.query({
       query: gql`
@@ -191,6 +229,14 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
               companyName
               email
               accountNo
+              phone
+              fax
+              address
+              address2
+              postCode
+              city
+              state
+              billingAddress
             }
             total
           }
@@ -201,7 +247,17 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
 
     return {
       total: response.data.contactPoints.total || 0,
-      records: response.data.contactPoints.items || []
+      records:
+        response.data.contactPoints.items.map(res => {
+          return {
+            ...res,
+            fullAddress: res.address
+              ? `${res.address ? res.address : ''} ${res.address2 ? res.address : ''} ${
+                  res.postCode ? res.postCode + ',' : ''
+                } ${res.city ? res.city + ',' : ''} ${res.state ? res.state + ',' : ''} Malaysia`
+              : ''
+          }
+        }) || []
     }
   }
 
@@ -216,6 +272,15 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
       )
     }
   }
+
+  _dblClickHandler(columns, data, column, record, rowIndex, target) {
+    this.dispatchEvent(new CustomEvent('selected', { detail: record }))
+    history.back()
+  }
+
+  _cancel() {
+    history.back()
+  }
 }
 
 window.customElements.define('contact-points-popup', ContactPointsPopup)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/biz-ui",
-  "version": "4.3.35",
+  "version": "4.3.43",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,8 +24,8 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^4.3.35",
-    "@things-factory/code-base": "^4.3.35",
+    "@things-factory/biz-base": "^4.3.40",
+    "@things-factory/code-base": "^4.3.40",
     "@things-factory/form-ui": "^4.3.35",
     "@things-factory/grist-ui": "^4.3.35",
     "@things-factory/i18n-base": "^4.3.35",
@@ -33,5 +33,5 @@
     "@things-factory/layout-base": "^4.3.35",
     "@things-factory/shell": "^4.3.35"
   },
-  "gitHead": "3500a8c074e7ec6d112454b0b0631fcc9e41b886"
+  "gitHead": "45b1a76384731ef43ba872c9867fa56bc3b491ec"
 }