From 164eb960e13c6a0533a595e49ca0de5c874d4131 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 7 Mar 2021 15:39:36 +0000
Subject: [PATCH]

---
 ayanova/src/components/percent-control.vue |  2 +-
 ayanova/src/views/acc-tax-code.vue         | 32 +++++-----
 ayanova/src/views/svc-contract.vue         | 73 +++++++++++-----------
 3 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/ayanova/src/components/percent-control.vue b/ayanova/src/components/percent-control.vue
index 24829efc..da2a8628 100644
--- a/ayanova/src/components/percent-control.vue
+++ b/ayanova/src/components/percent-control.vue
@@ -39,7 +39,7 @@ export default {
     readonly: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
     errorMessages: { type: Array, default: null },
-    precision: { type: Number, default: undefined }
+    precision: { type: Number, default: 3 }
   },
   computed: {
     currencyValue() {
diff --git a/ayanova/src/views/acc-tax-code.vue b/ayanova/src/views/acc-tax-code.vue
index a77927a1..64098b87 100644
--- a/ayanova/src/views/acc-tax-code.vue
+++ b/ayanova/src/views/acc-tax-code.vue
@@ -26,17 +26,17 @@
             xl="3"
           >
             <gz-decimal
-              v-model="obj.taxA"
+              v-model="obj.taxAPct"
               :readonly="formState.readOnly"
               :label="$ay.t('TaxCodeTaxA')"
-              ref="taxA"
-              data-cy="taxA"
+              ref="taxAPct"
+              data-cy="taxAPct"
               :rules="[
-                form().decimalValid(this, 'taxA'),
-                form().required(this, 'taxA')
+                form().decimalValid(this, 'taxAPct'),
+                form().required(this, 'taxAPct')
               ]"
-              :error-messages="form().serverErrors(this, 'taxA')"
-              @input="fieldValueChanged('taxA')"
+              :error-messages="form().serverErrors(this, 'taxAPct')"
+              @input="fieldValueChanged('taxAPct')"
             ></gz-decimal>
           </v-col>
 
@@ -48,17 +48,17 @@
             xl="3"
           >
             <gz-decimal
-              v-model="obj.taxB"
+              v-model="obj.taxBPct"
               :readonly="formState.readOnly"
               :label="$ay.t('TaxCodeTaxB')"
-              ref="taxB"
-              data-cy="taxB"
+              ref="taxBPct"
+              data-cy="taxBPct"
               :rules="[
-                form().decimalValid(this, 'taxB'),
-                form().required(this, 'taxB')
+                form().decimalValid(this, 'taxBPct'),
+                form().required(this, 'taxBPct')
               ]"
-              :error-messages="form().serverErrors(this, 'taxB')"
-              @input="fieldValueChanged('taxB')"
+              :error-messages="form().serverErrors(this, 'taxBPct')"
+              @input="fieldValueChanged('taxBPct')"
             ></gz-decimal>
           </v-col>
 
@@ -242,8 +242,8 @@ export default {
           wiki: null,
           customFields: "{}",
           tags: [],
-          taxA: 0.05,
-          taxB: 0.0,
+          taxAPct: 0.05,
+          taxBPct: 0.0,
           taxOnTax: false
         },
       formState: {
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index 44e73cd1..f1e338d0 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -40,18 +40,17 @@
             <v-row>
               <v-col>
                 <gz-percent
-                  v-model="obj.partsOverride"
+                  v-model="obj.partsOverridePct"
                   :readonly="formState.readOnly"
                   :label="$ay.t('PartList')"
-                  ref="partsOverride"
-                  data-cy="partsOverride"
+                  ref="partsOverridePct"
+                  data-cy="partsOverridePct"
                   :rules="[
-                    form().decimalValid(this, 'partsOverride'),
-                    form().required(this, 'partsOverride')
+                    form().decimalValid(this, 'partsOverridePct'),
+                    form().required(this, 'partsOverridePct')
                   ]"
-                  :error-messages="form().serverErrors(this, 'partsOverride')"
-                  @input="fieldValueChanged('partsOverride')"
-                  :precision="5"
+                  :error-messages="form().serverErrors(this, 'partsOverridePct')"
+                  @input="fieldValueChanged('partsOverridePct')"
                 ></gz-percent>
               </v-col>
 
@@ -76,19 +75,19 @@
             <v-row>
               <v-col>
                 <gz-percent
-                  v-model="obj.serviceRatesOverride"
+                  v-model="obj.serviceRatesOverridePct"
                   :readonly="formState.readOnly"
                   :label="$ay.t('ServiceRateList')"
-                  ref="serviceRatesOverride"
-                  data-cy="serviceRatesOverride"
+                  ref="serviceRatesOverridePct"
+                  data-cy="serviceRatesOverridePct"
                   :rules="[
-                    form().decimalValid(this, 'serviceRatesOverride'),
-                    form().required(this, 'serviceRatesOverride')
+                    form().decimalValid(this, 'serviceRatesOverridePct'),
+                    form().required(this, 'serviceRatesOverridePct')
                   ]"
                   :error-messages="
-                    form().serverErrors(this, 'serviceRatesOverride')
+                    form().serverErrors(this, 'serviceRatesOverridePct')
                   "
-                  @input="fieldValueChanged('serviceRatesOverride')"
+                  @input="fieldValueChanged('serviceRatesOverridePct')"
                 ></gz-percent>
               </v-col>
 
@@ -116,19 +115,19 @@
             <v-row>
               <v-col>
                 <gz-percent
-                  v-model="obj.travelRatesOverride"
+                  v-model="obj.travelRatesOverridePct"
                   :readonly="formState.readOnly"
                   :label="$ay.t('TravelRateList')"
-                  ref="travelRatesOverride"
-                  data-cy="travelRatesOverride"
+                  ref="travelRatesOverridePct"
+                  data-cy="travelRatesOverridePct"
                   :rules="[
-                    form().decimalValid(this, 'travelRatesOverride'),
-                    form().required(this, 'travelRatesOverride')
+                    form().decimalValid(this, 'travelRatesOverridePct'),
+                    form().required(this, 'travelRatesOverridePct')
                   ]"
                   :error-messages="
-                    form().serverErrors(this, 'travelRatesOverride')
+                    form().serverErrors(this, 'travelRatesOverridePct')
                   "
-                  @input="fieldValueChanged('travelRatesOverride')"
+                  @input="fieldValueChanged('travelRatesOverridePct')"
                 ></gz-percent>
               </v-col>
 
@@ -190,7 +189,7 @@
                   v-for="item in obj.contractPartOverrideItems"
                   :key="item.Id"
                 >
-                  <td class="text-right">{{ item.override * 100 }}%</td>
+                  <td class="text-right">{{ item.overridePct }}%</td>
                   <td class="text-left">
                     {{
                       selectLists.overrideTypes.find(
@@ -329,31 +328,31 @@
                     v-model="
                       obj.contractPartOverrideItems[
                         editContractPartOverrideItemIndex
-                      ].override
+                      ].overridePct
                     "
                     :readonly="formState.readOnly"
                     :label="$ay.t('ContractAdjustment')"
-                    ref="ContractPartOverrideItems.Override"
-                    data-cy="ContractPartOverrideItems.Override"
+                    ref="ContractPartOverrideItems.OverridePct"
+                    data-cy="ContractPartOverrideItems.OverridePct"
                     :rules="[
                       form().decimalValid(
                         this,
-                        'ContractPartOverrideItems.Override'
+                        'ContractPartOverrideItems.OverridePct'
                       ),
                       form().required(
                         this,
-                        'ContractPartOverrideItems.Override'
+                        'ContractPartOverrideItems.OverridePct'
                       )
                     ]"
                     :error-messages="
                       form().serverErrors(
                         this,
-                        `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].Override`
+                        `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].OverridePct`
                       )
                     "
                     @input="
                       fieldValueChanged(
-                        `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].Override`
+                        `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].OverridePct`
                       )
                     "
                   ></gz-percent>
@@ -370,12 +369,12 @@
                     item-value="id"
                     :readonly="formState.readOnly"
                     :label="$ay.t('ContractOverrideType')"
-                    ref="ContractPartOverrideItems.Override"
-                    data-cy="ContractPartOverrideItems.Override"
+                    ref="ContractPartOverrideItems.OverrideType"
+                    data-cy="ContractPartOverrideItems.OverrideType"
                     :rules="[
                       form().integerValid(
                         this,
-                        'ContractPartOverrideItems.Override'
+                        'ContractPartOverrideItems.OverrideType'
                       )
                     ]"
                     :error-messages="
@@ -588,11 +587,11 @@ export default {
           responseTime: "00:00:00",
           contractServiceRatesOnly: false,
           contractTravelRatesOnly: false,
-          partsOverride: 0,
+          partsOverridePct: 0,
           partsOverrideType: 1,
-          serviceRatesOverride: 0,
+          serviceRatesOverridePct: 0,
           serviceRatesOverrideType: 1,
-          travelRatesOverride: 0,
+          travelRatesOverridePct: 0,
           travelRatesOverrideType: 1,
           alertNotes: null,
           serviceRateItems: [],
@@ -667,7 +666,7 @@ export default {
       this.obj.contractPartOverrideItems.push({
         id: 0,
         contractId: 0,
-        override: 0,
+        overridePct: 0,
         overrideType: 1,
         tags: []
       });