This commit is contained in:
2021-04-30 22:49:18 +00:00
parent 961ca46785
commit 2942bb5b69
6 changed files with 10 additions and 51 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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 {

View File

@@ -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>