From 67d6d4ef4571b3c130bd64fb5d8213a55057fe62 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 29 Nov 2024 10:05:09 +0100
Subject: [PATCH 1/5] fix: hotfix webAccess

---
 src/pages/Customer/Card/CustomerWebAccess.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index eec127fde..85615e668 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -27,7 +27,7 @@ async function hasCustomerRole() {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        model="customer"
+        url="VnUsers/preview"
         :mapper="
             ({ active, name, email }) => {
                 return {
@@ -41,7 +41,7 @@ async function hasCustomerRole() {
         auto-load
     >
         <template #form="{ data, validate }">
-            <QCheckbox :label="t('Enable web access')" v-model="data.account.active" />
+            <QCheckbox :label="t('Enable web access')" v-model="data.active" />
             <VnInput :label="t('User')" clearable v-model="data.name" />
             <VnInput
                 :label="t('Recovery email')"

From 514d54b222883e14a293c3da4ca2ab171c154b05 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 29 Nov 2024 12:20:53 +0100
Subject: [PATCH 2/5] fix: hotfix-accountWeb

---
 src/pages/Customer/Card/CustomerWebAccess.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 85615e668..9d2e43262 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -27,7 +27,7 @@ async function hasCustomerRole() {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        url="VnUsers/preview"
+        model="customer"
         :mapper="
             ({ active, name, email }) => {
                 return {
@@ -41,14 +41,14 @@ async function hasCustomerRole() {
         auto-load
     >
         <template #form="{ data, validate }">
-            <QCheckbox :label="t('Enable web access')" v-model="data.active" />
-            <VnInput :label="t('User')" clearable v-model="data.name" />
+            <QCheckbox :label="t('Enable web access')" v-model="data.account.active" />
+            <VnInput :label="t('User')" clearable v-model="data.account.name" />
             <VnInput
                 :label="t('Recovery email')"
                 :rules="validate('client.email')"
                 clearable
                 type="email"
-                v-model="data.email"
+                data.account.name
                 class="q-mt-sm"
                 :info="t('This email is used for user to regain access their account')"
             />

From 940fe5c2b94c1fe5871eb829abe7adf9841e03f3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 13:21:19 +0100
Subject: [PATCH 3/5] fix: #6943 CustomerAddressCreate

---
 .../components/CustomerAddressCreate.vue        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index f4a188243..6cf42b20e 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -18,8 +18,6 @@ const router = useRouter();
 
 const formInitialData = reactive({ isDefaultAddress: false });
 
-const urlCreate = ref('');
-
 const agencyModes = ref([]);
 const incoterms = ref([]);
 const customsAgents = ref([]);
@@ -40,13 +38,18 @@ function handleLocation(data, location) {
     data.countryFk = countryFk;
 }
 
-function onAgentCreated(requestResponse, data) {
-    customsAgents.value.push(requestResponse);
-    data.customsAgentFk = requestResponse.id;
+function onAgentCreated({ id, fiscalName }, data) {
+    customsAgents.value.push({ id, fiscalName });
+    data.customsAgentFk = id;
 }
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (customsAgents = data)"
+        auto-load
+        url="CustomsAgents"
+    />
     <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
@@ -57,7 +60,7 @@ function onAgentCreated(requestResponse, data) {
     <FormModel
         :form-initial-data="formInitialData"
         :observe-form-changes="false"
-        :url-create="urlCreate"
+        :url-create="`Clients/${route.params.id}/createAddress`"
         @on-data-saved="toCustomerAddress()"
         model="client"
     >
@@ -141,7 +144,7 @@ function onAgentCreated(requestResponse, data) {
                     <template #form>
                         <CustomerNewCustomsAgent
                             @on-data-saved="
-                                (_, requestResponse) =>
+                                (requestResponse, _) =>
                                     onAgentCreated(requestResponse, data)
                             "
                         />

From 51460c1138957fbc3067262b5f5964695998378a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 13:27:36 +0100
Subject: [PATCH 4/5] fix: #6943 use v-model

---
 src/pages/Customer/Card/CustomerWebAccess.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 9d2e43262..ea901c65a 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -48,7 +48,7 @@ async function hasCustomerRole() {
                 :rules="validate('client.email')"
                 clearable
                 type="email"
-                data.account.name
+                v-model="data.account.email"
                 class="q-mt-sm"
                 :info="t('This email is used for user to regain access their account')"
             />

From 2e1a5ecdd986b8922efb3f999d09c343a6f36c4f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 13:29:15 +0100
Subject: [PATCH 5/5] fix: #6943 CustomerAddressCreate

---
 src/pages/Customer/components/CustomerAddressCreate.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 6cf42b20e..bc4d6a128 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -144,8 +144,7 @@ function onAgentCreated({ id, fiscalName }, data) {
                     <template #form>
                         <CustomerNewCustomsAgent
                             @on-data-saved="
-                                (requestResponse, _) =>
-                                    onAgentCreated(requestResponse, data)
+                                (requestResponse) => onAgentCreated(requestResponse, data)
                             "
                         />
                     </template>