@things-factory/biz-ui 4.3.38 → 4.3.40

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

@@ -86,6 +86,12 @@ 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 +111,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 +125,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 +192,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' }
       }
     ]
   }
@@ -191,6 +228,14 @@ class ContactPointsPopup extends localize(i18next)(LitElement) {
               companyName
               email
               accountNo
+              phone
+              fax
+              address
+              address2
+              postCode
+              city
+              state
+              billingAddress
             }
             total
           }
@@ -201,7 +246,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 +271,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.38",
+  "version": "4.3.40",
   "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.38",
-    "@things-factory/code-base": "^4.3.38",
+    "@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": "d0abc65661e7d6ddf1e89788e2775f90ead2393f"
+  "gitHead": "5ae9cd8d8abe747c4e8ac9e243468c1f6662481b"
 }