From 871b8534deb17d9f4e3b9b862e109a1c482961db Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 31 Jul 2020 22:01:13 +0000
Subject: [PATCH]

---
 ayanova/src/views/adm-user.vue  | 22 ++++++++++++++++++++++
 ayanova/src/views/cust-user.vue | 24 +++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 9c4ed043..3bf04ff3 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -31,6 +31,28 @@
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
+
+            <v-col
+              v-if="form().showMe(this, 'subVendorId') && obj.userType == 5"
+              cols="12"
+              sm="6"
+              lg="4"
+              xl="3"
+            >
+              <gz-pick-list
+                :ayaType="ayaTypes().Vendor"
+                :showEditIcon="true"
+                v-model="obj.subVendorId"
+                :readonly="formState.readOnly"
+                :disabled="formState.readOnly"
+                :label="$ay.t('Vendor')"
+                ref="subVendorId"
+                :data-cy="!!$ay.dev ? 'subVendorId' : false"
+                :error-messages="form().serverErrors(this, 'subVendorId')"
+                @input="fieldValueChanged('subVendorId')"
+              ></gz-pick-list>
+            </v-col>
+
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-text-field
                 v-model="obj.employeeNumber"
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index a7edb54a..b5c6c709 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -13,7 +13,7 @@
             <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
 
             <v-col
-              v-if="form().showMe(this, 'UserId')"
+              v-if="form().showMe(this, 'customerId') && obj.userType == 3"
               cols="12"
               sm="6"
               lg="4"
@@ -33,6 +33,27 @@
               ></gz-pick-list>
             </v-col>
 
+            <v-col
+              v-if="form().showMe(this, 'headOfficeId') && obj.userType == 4"
+              cols="12"
+              sm="6"
+              lg="4"
+              xl="3"
+            >
+              <gz-pick-list
+                :ayaType="ayaTypes().HeadOffice"
+                :showEditIcon="true"
+                v-model="obj.headOfficeId"
+                :readonly="formState.readOnly"
+                :disabled="formState.readOnly"
+                :label="$ay.t('HeadOffice')"
+                ref="headOfficeId"
+                :data-cy="!!$ay.dev ? 'headOfficeId' : false"
+                :error-messages="form().serverErrors(this, 'headOfficeId')"
+                @input="fieldValueChanged('headOfficeId')"
+              ></gz-pick-list>
+            </v-col>
+
             <v-col cols="12" sm="6" lg="4" xl="3">
               <v-text-field
                 v-model="obj.name"
@@ -742,6 +763,7 @@ async function fetchTranslatedText(vm) {
     "User",
     "Name",
     "Customer",
+    "HeadOffice",
     "NewLogin",
     "NewPassword",
     "AuthorizationRoles",