From 2942bb5b692b4b2fa848f4b03db12cf4075a45eb Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 30 Apr 2021 22:49:18 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                      |  2 +
 ayanova/src/components/work-order-address.vue |  6 +--
 ayanova/src/views/cust-customer.vue           |  4 +-
 ayanova/src/views/cust-head-office.vue        |  2 +-
 ayanova/src/views/svc-unit.vue                | 45 +------------------
 ayanova/src/views/vendor.vue                  |  2 +-
 6 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 47e63d42..ea261f4c 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -55,6 +55,8 @@ todo: workorders - need to set billing and service address from customers on mig
 
 ## CLIENT MISC ITEMS
 
+todo: Translation: "Physical" address seems wierd, rename to Street address or Delivery address or Service Address or whatever
+
 todo: be sure to address items in case https://rockfish.ayanova.com/default.htm#!/rfcaseEdit/3864 
 	before next update to server / windows build for Joyce
 
diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index b4f286a3..221b85d1 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -174,7 +174,7 @@
               </v-col>
 
               <v-col cols="12">
-                <v-menu offset-y v-if="formState.readOnly">
+                <v-menu offset-y v-if="!formState.readOnly">
                   <template v-slot:activator="{ on, attrs }">
                     <span class="text-h6">
                       {{ $ay.t("AddressTypePostal") }}</span
@@ -196,13 +196,13 @@
                         <v-icon>$ayiClone</v-icon>
                       </v-list-item-icon>
                       <v-list-item-title>{{
-                        $ay.t("AddressCopyToPostal")
+                        $ay.t("AddressCopyToPhysical")
                       }}</v-list-item-title>
                     </v-list-item>
                   </v-list>
                 </v-menu>
                 <span class="text-h6" v-else>
-                  {{ $ay.t("AddressTypePhysical") }}</span
+                  {{ $ay.t("AddressTypePostal") }}</span
                 >
               </v-col>
 
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index 374d8a01..83f5c8fe 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -583,13 +583,13 @@
                           <v-icon>$ayiClone</v-icon>
                         </v-list-item-icon>
                         <v-list-item-title>{{
-                          $ay.t("AddressCopyToPostal")
+                          $ay.t("AddressCopyToPhysical")
                         }}</v-list-item-title>
                       </v-list-item>
                     </v-list>
                   </v-menu>
                   <span class="text-h6" v-else>
-                    {{ $ay.t("AddressTypePhysical") }}</span
+                    {{ $ay.t("AddressTypePostal") }}</span
                   >
                 </v-col>
 
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 91e6ff63..2d20422c 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -492,7 +492,7 @@
                           <v-icon>$ayiClone</v-icon>
                         </v-list-item-icon>
                         <v-list-item-title>{{
-                          $ay.t("AddressCopyToPostal")
+                          $ay.t("AddressCopyToPhysical")
                         }}</v-list-item-title>
                       </v-list-item>
                     </v-list>
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index d7c92723..1c8a9d8c 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -1149,22 +1149,7 @@ export default {
           loading: false
         });
       }
-    },
-
-    AddressCopyToPostal() {
-      let vm = this;
-      vm.obj.postAddress = vm.obj.address;
-      vm.obj.postCity = vm.obj.city;
-      vm.obj.postRegion = vm.obj.region;
-      vm.obj.postCountry = vm.obj.country;
-    },
-    AddressCopyToPhysical() {
-      let vm = this;
-      vm.obj.address = vm.obj.postAddress;
-      vm.obj.city = vm.obj.postCity;
-      vm.obj.region = vm.obj.postRegion;
-      vm.obj.country = vm.obj.postCountry;
-    },
+    },   
     AddressCopyPhysicalToClipBoard() {
       let vm = this;
       let ret = "";
@@ -1188,34 +1173,6 @@ export default {
       }
       window.$gz.util.copyToClipboard(ret);
     },
-    AddressCopyPostalToClipBoard() {
-      let vm = this;
-      let ret = "";
-      if (vm.obj.name) {
-        ret += vm.obj.name + "\n";
-      }
-      if (vm.obj.postAddress) {
-        ret += vm.obj.postAddress + "\n";
-      }
-
-      if (vm.obj.postCity) {
-        ret += vm.obj.postCity + " ";
-      }
-
-      if (vm.obj.postRegion) {
-        ret += vm.obj.postRegion + " ";
-      }
-
-      if (vm.obj.postCode) {
-        //Postal codes should have two spaces before them according to regs.
-        ret += "  " + vm.obj.postCode + "\n";
-      }
-
-      if (vm.obj.postCountry) {
-        ret += vm.obj.postCountry + "\n";
-      }
-      window.$gz.util.copyToClipboard(ret);
-    },
     async GeoCapture() {
       let vm = this;
       try {
diff --git a/ayanova/src/views/vendor.vue b/ayanova/src/views/vendor.vue
index 484dcf1d..e57b1d68 100644
--- a/ayanova/src/views/vendor.vue
+++ b/ayanova/src/views/vendor.vue
@@ -463,7 +463,7 @@
                           <v-icon>$ayiClone</v-icon>
                         </v-list-item-icon>
                         <v-list-item-title>{{
-                          $ay.t("AddressCopyToPostal")
+                          $ay.t("AddressCopyToPhysical")
                         }}</v-list-item-title>
                       </v-list-item>
                     </v-list>