From c3b063b595a4ee512b0c5e576ec9bc299a924cdd Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 5 Mar 2021 23:17:19 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt           |  7 +++++-
 ayanova/src/views/svc-contract.vue | 36 ++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 08c8af23..37f5cbfa 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -33,7 +33,12 @@ MISC ITEMS THAT CAME UP
 
 ## CLIENT MISC ITEMS
 
-todo: delete all tags from customer, go back in and zone2 appears for some reason
+todo: BUGBUG delete all tags from customer, go back in and zone2 appears for some reason
+
+todo: percentage control
+	Not actually that complex, just shows percentage but when in edit mode is decimal
+	copy decimal control and convert into pctg.
+	then replace decimal controls in acc-tax-code and svc-contract with it
 
 todo: NOT import PO's unless they are current, active and unreceived
 todo: erase database should reset all id values if they aren't reset already so that future data doesn't result in a new PO starting at 29000 due to huge db trial seed prior
diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue
index 7fb0aac2..2727b2cd 100644
--- a/ayanova/src/views/svc-contract.vue
+++ b/ayanova/src/views/svc-contract.vue
@@ -31,7 +31,9 @@
             ></gz-duration-picker>
           </v-col>
           <v-col cols="12">
-            {{ $ay.t("ContractDefaultAdjustments") }}
+            <span class="text-h6">
+              {{ $ay.t("ContractDefaultAdjustments") }}</span
+            >
           </v-col>
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-decimal
@@ -48,6 +50,21 @@
               @input="fieldValueChanged('partsOverride')"
             ></gz-decimal>
           </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-select
+              v-model="obj.partsOverrideType"
+              :items="selectLists.overrideTypes"
+              item-text="name"
+              item-value="id"
+              :readonly="formState.readOnly"
+              :label="$ay.t('ContractOverrideType')"
+              ref="partsOverrideType"
+              data-cy="partsOverrideType"
+              :rules="[form().integerValid(this, 'partsOverrideType')]"
+              :error-messages="form().serverErrors(this, 'partsOverrideType')"
+              @input="fieldValueChanged('partsOverrideType')"
+            ></v-select>
+          </v-col>
 
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-checkbox
@@ -251,7 +268,10 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      ayaType: window.$gz.type.Contract
+      ayaType: window.$gz.type.Contract,
+      selectLists: {
+        overrideTypes: []
+      }
     };
   },
   //WATCHERS
@@ -648,6 +668,7 @@ let JUST_DELETED = false;
 async function initForm(vm) {
   await fetchTranslatedText(vm);
   await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY);
+  await populateSelectionLists(vm);
 }
 
 //////////////////////////////////////////////////////////
@@ -678,4 +699,15 @@ async function fetchTranslatedText(vm) {
     "ContractCustom16"
   ]);
 }
+
+//////////////////////
+//
+//
+async function populateSelectionLists(vm) {
+  //ensure the pick lists required are pre-fetched
+  await window.$gz.enums.fetchEnumList("contractoverridetype");
+  vm.selectLists.overrideTypes = window.$gz.enums.getSelectionList(
+    "contractoverridetype"
+  );
+}
 </script>