From 1a25c853f4bda85e6c4f50159df88d2c969c55c1 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 14 Dec 2022 00:14:57 +0000
Subject: [PATCH] case 4341

---
 ayanova/src/api/gzutil.js                     |  5 +++
 ayanova/src/components/work-order-address.vue | 31 +++++++++++++++++++
 ayanova/src/views/adm-global-settings.vue     | 14 +++++++++
 ayanova/src/views/adm-import.vue              |  4 +++
 ayanova/src/views/cust-customer.vue           | 30 +++++++++++++++++-
 ayanova/src/views/cust-head-office.vue        | 29 ++++++++++++++++-
 ayanova/src/views/svc-csr.vue                 |  1 +
 ayanova/src/views/svc-pm.vue                  |  4 ++-
 ayanova/src/views/svc-quote.vue               |  5 ++-
 ayanova/src/views/svc-unit.vue                | 31 ++++++++++++++++++-
 ayanova/src/views/svc-workorder.vue           |  5 ++-
 ayanova/src/views/vendor.vue                  | 30 +++++++++++++++++-
 12 files changed, 182 insertions(+), 7 deletions(-)

diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index 97eed924..23882da8 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -829,6 +829,11 @@ export default {
       if (obj.postCode) {
         q += obj.postCode + delimiter;
       }
+
+      if (obj.addressPostal) {
+        q += obj.addressPostal + delimiter;
+      }
+
       if (q.length > 1) {
         q = q.substring(0, q.length - 1);
       }
diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index e01f54e2..a12b1396 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -146,6 +146,25 @@
                 ></v-text-field>
               </v-col>
 
+              <v-col
+                v-if="form().showMe(this, 'AddressPostal')"
+                cols="12"
+                sm="6"
+                lg="4"
+                xl="3"
+              >
+                <v-text-field
+                  ref="addressPostal"
+                  v-model="value.addressPostal"
+                  dense
+                  :readonly="readonly"
+                  :label="$ay.t('AddressPostal')"
+                  data-cy="addressPostal"
+                  :error-messages="form().serverErrors(this, 'addressPostal')"
+                  @input="fieldValueChanged('addressPostal')"
+                ></v-text-field>
+              </v-col>
+
               <v-col
                 v-if="form().showMe(this, 'Latitude')"
                 cols="12"
@@ -451,6 +470,7 @@ export default {
         this.value.city = item.src.city;
         this.value.region = item.src.region;
         this.value.country = item.src.country;
+        this.value.addressPostal = item.src.addressPostal;
         if (item.src.latitude) {
           this.value.latitude = item.src.latitude;
         }
@@ -476,6 +496,7 @@ export default {
       this.value.postCity = this.value.city;
       this.value.postRegion = this.value.region;
       this.value.postCountry = this.value.country;
+      this.value.postCode = this.value.addressPostal;
       this.pvm.formState.dirty = true;
       this.value.isDirty = true;
     },
@@ -484,6 +505,7 @@ export default {
       this.value.city = this.value.postCity;
       this.value.region = this.value.postRegion;
       this.value.country = this.value.postCountry;
+      this.value.addressPostal = this.value.postCode;
       this.pvm.formState.dirty = true;
       this.value.isDirty = true;
     },
@@ -507,6 +529,12 @@ export default {
       if (this.value.country) {
         ret += this.value.country + "\n";
       }
+
+      if (this.value.addressPostal) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + this.value.addressPostal + "\n";
+      }
+
       window.$gz.util.copyToClipboard(ret);
       /* todo maybe down the road if asked for?
 
@@ -647,6 +675,9 @@ function formatAddress(o) {
   if (!window.$gz.util.stringIsNullOrEmpty(o.country)) {
     ret.physical += o.country + " ";
   }
+  if (!window.$gz.util.stringIsNullOrEmpty(o.addressPostal)) {
+    ret.postal += o.addressPostal;
+  }
   if (!window.$gz.util.stringIsNullOrEmpty(o.latitude)) {
     ret.physical += ", lat " + o.latitude;
   }
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 03e65bb4..8cd118a2 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -258,6 +258,19 @@
             ></v-text-field>
           </v-col>
 
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-text-field
+              ref="addressPostal"
+              v-model="obj.addressPostal"
+              dense
+              :readonly="formState.readOnly"
+              :label="$ay.t('AddressPostal')"
+              data-cy="addressPostal"
+              :error-messages="form().serverErrors(this, 'addressPostal')"
+              @input="fieldValueChanged('addressPostal')"
+            ></v-text-field>
+          </v-col>
+
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-decimal
               ref="latitude"
@@ -1600,6 +1613,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude"
   ]);
diff --git a/ayanova/src/views/adm-import.vue b/ayanova/src/views/adm-import.vue
index 43a42c6a..873a6af0 100644
--- a/ayanova/src/views/adm-import.vue
+++ b/ayanova/src/views/adm-import.vue
@@ -385,6 +385,7 @@ function cleanData(dat, atype) {
           "City",
           "Region",
           "Country",
+          "AddressPostal",
           "Latitude",
           "Longitude"
         ]
@@ -418,6 +419,7 @@ function cleanData(dat, atype) {
           "City",
           "Region",
           "Country",
+          "AddressPostal",
           "Latitude",
           "Longitude"
         ]
@@ -552,6 +554,7 @@ function cleanData(dat, atype) {
           "City",
           "Region",
           "Country",
+          "AddressPostal",
           "Latitude",
           "Longitude"
         ]
@@ -604,6 +607,7 @@ function cleanData(dat, atype) {
           "City",
           "Region",
           "Country",
+          "AddressPostal",
           "Latitude",
           "Longitude"
         ]
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index ce7a4cb1..eda33b3a 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -507,6 +507,25 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col
+                  v-if="form().showMe(this, 'AddressPostal')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    ref="addressPostal"
+                    v-model="obj.addressPostal"
+                    dense
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostal')"
+                    data-cy="addressPostal"
+                    :error-messages="form().serverErrors(this, 'addressPostal')"
+                    @input="fieldValueChanged('addressPostal')"
+                  ></v-text-field>
+                </v-col>
+
                 <v-col
                   v-if="form().showMe(this, 'Latitude')"
                   cols="12"
@@ -777,6 +796,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null
       },
@@ -1197,6 +1217,12 @@ export default {
       if (vm.obj.country) {
         ret += vm.obj.country + "\n";
       }
+
+      if (vm.obj.addressPostal) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + vm.obj.addressPostal + "\n";
+      }
+
       window.$gz.util.copyToClipboard(ret);
       /* todo maybe down the road if asked for?
 
@@ -1304,7 +1330,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       case "CustomerNoteList":
@@ -1570,6 +1597,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude",
     "CustomerCustom1",
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 513726ef..26c038a9 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -434,6 +434,25 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col
+                  v-if="form().showMe(this, 'AddressPostal')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    ref="addressPostal"
+                    v-model="obj.addressPostal"
+                    dense
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostal')"
+                    data-cy="addressPostal"
+                    :error-messages="form().serverErrors(this, 'addressPostal')"
+                    @input="fieldValueChanged('addressPostal')"
+                  ></v-text-field>
+                </v-col>
+
                 <v-col
                   v-if="form().showMe(this, 'Latitude')"
                   cols="12"
@@ -699,6 +718,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null
       },
@@ -1106,6 +1126,11 @@ export default {
       if (vm.obj.country) {
         ret += vm.obj.country + "\n";
       }
+
+      if (vm.obj.addressPostal) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + vm.obj.addressPostal + "\n";
+      }
       window.$gz.util.copyToClipboard(ret);
       /* todo maybe down the road if asked for?
 
@@ -1213,7 +1238,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       case "CustomerList":
@@ -1372,6 +1398,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude",
     "HeadOfficeCustom1",
diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue
index 13a2d74f..0b400643 100644
--- a/ayanova/src/views/svc-csr.vue
+++ b/ayanova/src/views/svc-csr.vue
@@ -596,6 +596,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null,
         items: [],
diff --git a/ayanova/src/views/svc-pm.vue b/ayanova/src/views/svc-pm.vue
index 6d21197f..31139923 100644
--- a/ayanova/src/views/svc-pm.vue
+++ b/ayanova/src/views/svc-pm.vue
@@ -115,6 +115,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null,
         items: [],
@@ -1740,7 +1741,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       default:
diff --git a/ayanova/src/views/svc-quote.vue b/ayanova/src/views/svc-quote.vue
index c138151c..ff74cf91 100644
--- a/ayanova/src/views/svc-quote.vue
+++ b/ayanova/src/views/svc-quote.vue
@@ -113,6 +113,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null,
         items: [],
@@ -1813,7 +1814,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       default:
@@ -2075,6 +2077,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude",
     "SelectAlternateAddress",
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index 7551f0d4..69ca484e 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -574,6 +574,25 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col
+                  v-if="form().showMe(this, 'AddressPostal')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    ref="addressPostal"
+                    v-model="obj.addressPostal"
+                    dense
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostal')"
+                    data-cy="addressPostal"
+                    :error-messages="form().serverErrors(this, 'addressPostal')"
+                    @input="fieldValueChanged('addressPostal')"
+                  ></v-text-field>
+                </v-col>
+
                 <v-col
                   v-if="form().showMe(this, 'Latitude')"
                   cols="12"
@@ -761,6 +780,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null
       },
@@ -860,6 +880,7 @@ export default {
                 gen.city ||
                 gen.region ||
                 gen.country ||
+                gen.addressPostal ||
                 gen.latitude ||
                 gen.longitude
               ) {
@@ -868,6 +889,7 @@ export default {
                 this.obj.city = gen.city ?? null;
                 this.obj.region = gen.region ?? null;
                 this.obj.country = gen.country ?? null;
+                this.obj.addressPostal = gen.addressPostal ?? null;
                 this.obj.latitude = gen.latitude ?? null;
                 this.obj.longitude = gen.longitude ?? null;
               }
@@ -1108,6 +1130,11 @@ export default {
       if (vm.obj.country) {
         ret += vm.obj.country + "\n";
       }
+      if (vm.obj.addressPostal) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + vm.obj.addressPostal + "\n";
+      }
+
       window.$gz.util.copyToClipboard(ret);
     },
     async GeoCapture() {
@@ -1174,7 +1201,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       case "WorkOrderItemUnitList":
@@ -1406,6 +1434,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude",
     "UnitCustom1",
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index 9b756206..0a50a385 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -123,6 +123,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null,
         items: [],
@@ -2032,7 +2033,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       default:
@@ -2320,6 +2322,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude",
     "SelectAlternateAddress",
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index 68e18678..e49d102a 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -411,6 +411,25 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col
+                  v-if="form().showMe(this, 'AddressPostal')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <v-text-field
+                    ref="addressPostal"
+                    v-model="obj.addressPostal"
+                    dense
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('AddressPostal')"
+                    data-cy="addressPostal"
+                    :error-messages="form().serverErrors(this, 'addressPostal')"
+                    @input="fieldValueChanged('addressPostal')"
+                  ></v-text-field>
+                </v-col>
+
                 <v-col
                   v-if="form().showMe(this, 'Latitude')"
                   cols="12"
@@ -626,6 +645,7 @@ export default {
         city: null,
         region: null,
         country: null,
+        addressPostal: null,
         latitude: null,
         longitude: null
       },
@@ -920,6 +940,12 @@ export default {
       if (vm.obj.country) {
         ret += vm.obj.country + "\n";
       }
+
+      if (vm.obj.addressPostal) {
+        //Postal codes should have two spaces before them according to regs.
+        ret += "  " + vm.obj.addressPostal + "\n";
+      }
+
       window.$gz.util.copyToClipboard(ret);
     },
     AddressCopyPostalToClipBoard() {
@@ -1014,7 +1040,8 @@ async function clickHandler(menuItem) {
           city: m.vm.obj.city || m.vm.obj.postCity,
           region: m.vm.obj.region || m.vm.obj.postRegion,
           country: m.vm.obj.country || m.vm.obj.postCountry,
-          postCode: m.vm.obj.postCode
+          postCode: m.vm.obj.postCode,
+          addressPostal: m.vm.obj.addressPostal
         });
         break;
       default:
@@ -1159,6 +1186,7 @@ async function fetchTranslatedText() {
     "AddressCity",
     "AddressStateProv",
     "AddressCountry",
+    "AddressPostal",
     "AddressLatitude",
     "AddressLongitude",
     "VendorCustom1",