From b29a56d7ddcb855239308df488fa9dfedb41753b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:37:39 +0200
Subject: [PATCH 1/4] refs #6943 remake, refactor, clean code Samples

---
 .../components/CustomerSamplesCreate.vue      | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 0470dc176..50a2c17d5 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
+import { usePrintService } from 'composables/usePrintService';
 import { useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
@@ -27,7 +28,7 @@ const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const stateStore = useStateStore();
-
+const { sendEmail } = usePrintService();
 const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
@@ -156,22 +157,25 @@ const onSubmit = async () => {
     }
 };
 
-const onDataSaved = async ({
-    addressId,
-    companyFk,
-    companyId,
-    from,
-    recipient,
-    replyTo,
-}) => {
-    await axios.post(`Clients/${route.params.id}/incoterms-authorization-email`, {
-        addressId,
-        companyFk,
-        companyId,
-        from,
-        recipient,
-        replyTo,
+const getSamples = async () => {
+    const filter = { where: { id: initialData.typeFk } };
+    let { data } = await axios.get('Samples', {
+        params: { filter: JSON.stringify(filter) },
     });
+    return data[0];
+};
+
+getSamples();
+const onDataSaved = async () => {
+    const params = {
+        recipientId: initialData.recipientId,
+        recipient: initialData.recipient,
+        replyTo: initialData.replyTo,
+    };
+    setParams(params);
+    const samplesData = await getSamples();
+    const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+    await sendEmail(path, params);
     toCustomerSamples();
 };
 
@@ -327,7 +331,6 @@ const toCustomerSamples = () => {
                             option-value="id"
                             required="true"
                             v-model="initialData.addressId"
-                            v-if="sampleType.id === 20"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">

From d08748b1a4aa6ba3ea1c92625e1ee67ef8f53f06 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:41:35 +0200
Subject: [PATCH 2/4] refs #6943 fix sampleType

---
 src/pages/Customer/components/CustomerSamplesCreate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 50a2c17d5..e3dac3214 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -331,6 +331,7 @@ const toCustomerSamples = () => {
                             option-value="id"
                             required="true"
                             v-model="initialData.addressId"
+                            v-if="sampleType.id === 20"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">

From bcdd6965e647b00fff8278fb57fd8185f1ea7f15 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:43:48 +0200
Subject: [PATCH 3/4] refs #6943 add try catch

---
 .../components/CustomerSamplesCreate.vue      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index e3dac3214..3e5891ef4 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -167,15 +167,19 @@ const getSamples = async () => {
 
 getSamples();
 const onDataSaved = async () => {
-    const params = {
-        recipientId: initialData.recipientId,
-        recipient: initialData.recipient,
-        replyTo: initialData.replyTo,
-    };
-    setParams(params);
-    const samplesData = await getSamples();
-    const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
-    await sendEmail(path, params);
+    try {
+        const params = {
+            recipientId: initialData.recipientId,
+            recipient: initialData.recipient,
+            replyTo: initialData.replyTo,
+        };
+        setParams(params);
+        const samplesData = await getSamples();
+        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        await sendEmail(path, params);
+    } catch (error) {
+        notify('errors.create', 'negative');
+    }
     toCustomerSamples();
 };
 

From 61c0f63eafcbbcf790424ba9aaacce08f7a131b3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:46:21 +0200
Subject: [PATCH 4/4] refs #6943 add try catch get

---
 .../Customer/components/CustomerSamplesCreate.vue  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 3e5891ef4..79f4fe449 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -158,11 +158,15 @@ const onSubmit = async () => {
 };
 
 const getSamples = async () => {
-    const filter = { where: { id: initialData.typeFk } };
-    let { data } = await axios.get('Samples', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    return data[0];
+    try {
+        const filter = { where: { id: initialData.typeFk } };
+        let { data } = await axios.get('Samples', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        return data[0];
+    } catch (error) {
+        notify('errors.create', 'negative');
+    }
 };
 
 getSamples();