From 82300fd292307a89a5397397db44add3f1ca6b17 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 24 Apr 2024 11:31:37 +0200
Subject: [PATCH 1/6] refactor: refs #7239 changed french translations

---
 src/components/common/VnSmsDialog.vue | 39 ++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 59021cef4..4306beb4c 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -21,7 +21,8 @@ const props = defineProps({
     },
     template: {
         type: String,
-        required: true,
+        required: false,
+        default: '',
     },
     locale: {
         type: String,
@@ -49,7 +50,7 @@ updateMessage();
 
 function updateMessage() {
     const params = props.data;
-    const key = `templates['${props.template}']`;
+    const key = props.template ? `templates['${props.template}']` : '';
 
     message.value = t(key, params, { locale: locale.value });
 }
@@ -104,15 +105,14 @@ async function send() {
                     map-options
                     :input-debounce="0"
                     rounded
-                    outlined
                     dense
                 />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput :label="t('Phone')" v-model="phone" is-outlined />
+                <VnInput :label="t('Phone')" v-model="phone" />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput v-model="subject" :label="t('Subject')" is-outlined />
+                <VnInput v-model="subject" :label="t('Subject')" />
             </QCardSection>
             <QCardSection class="q-mb-md" q-input>
                 <QInput
@@ -125,7 +125,6 @@ async function send() {
                     :bottom-slots="true"
                     :rules="[(value) => value.length < maxLength || 'Error!']"
                     stack-label
-                    outlined
                     autofocus
                 >
                     <template #append>
@@ -135,6 +134,11 @@ async function send() {
                             @click="message = ''"
                             class="cursor-pointer"
                         />
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>
+                                {{ t('messageTooltip') }}
+                            </QTooltip>
+                        </QIcon>
                     </template>
                     <template #counter>
                         <QChip :color="color" dense>
@@ -184,18 +188,20 @@ en:
     es: Spanish
     fr: French
     pt: Portuguese
+    messageTooltip: Special characters like accents counts as multiple
 es:
     Send SMS: Enviar SMS
     Language: Idioma
     Phone: Móvil
     Subject: Asunto
     Message: Mensaje
+    messageTooltip: Carácteres especiales como acentos cuentan como varios
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } del día { shipped } para recibirlo sin portes adicionales.'
-        orderChanges: 'Pedido {orderId} día { shipped }: { changes }'
+            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español
     fr: Francés
@@ -207,12 +213,14 @@ fr:
     Phone: Mobile
     Subject: Affaire
     Message: Message
+    messageTooltip: Les caractères spéciaux comme les accents comptent comme plusieurs
     templates:
-        pendingPayment: 'Votre commande est en attente de paiement.
-            Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.'
-        minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande
-            { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.'
-        orderChanges: 'Commande { orderId } du { shipped }: { changes }'
+        pendingPayment: 'Verdnatura : Commande en attente de règlement. Veuillez régler votre commande avant 9h.
+            Sinon elle sera décalée en fonction de vos jours de livraison . Merci'
+        minAmount: 'Verdnatura vous rappelle :
+            Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
+            Merci.'
+        orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
     en: Anglais
     es: Espagnol
     fr: Français
@@ -224,12 +232,13 @@ pt:
     Phone: Móvel
     Subject: Assunto
     Message: Mensagem
+    messageTooltip: Caracteres especiais como acentos contam como vários
     templates:
         pendingPayment: 'Seu pedido está pendente de pagamento.
             Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
-            { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
-        orderChanges: 'Pedido { orderId } dia { shipped }: { changes }'
+            { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
+        orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
     en: Inglês
     es: Espanhol
     fr: Francês

From 443f4a4443c5a452264313eda5293650ab0a67d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Apr 2024 07:49:28 +0200
Subject: [PATCH 2/6] refactor: refs #7239 changed spanish translations

---
 src/components/common/VnSmsDialog.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 4306beb4c..833f54942 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -199,8 +199,9 @@ es:
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
-        minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
+            Te recomendamos amplíes para no generar costes extra provocarán un incremento de tu tarifa.
+            ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español

From c56b6b2dbc5a2b6983cab7461836de2bd530d8cd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Apr 2024 08:22:08 +0200
Subject: [PATCH 3/6] refactor: better syntax

---
 src/components/common/VnSmsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 833f54942..5b192f95d 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -200,7 +200,7 @@ es:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
-            Te recomendamos amplíes para no generar costes extra provocarán un incremento de tu tarifa.
+            Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa.
             ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés

From 88e1e577c4f7970a80fee568142539b839b918a6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Apr 2024 13:10:29 +0200
Subject: [PATCH 4/6] hotFix: refs #6636 fix ref optionsList

---
 src/pages/Claim/Card/ClaimBasicData.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 56717c628..47d1ac1c6 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -41,6 +41,7 @@ const workers = ref([]);
 const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
+const optionsList = ref([]);
 
 function setWorkers(data) {
     workers.value = data;
@@ -51,9 +52,9 @@ function setClaimStates(data) {
     claimStates.value = data;
     claimStatesCopy.value = data;
 }
-let optionsList;
+
 async function getEnumValues() {
-    optionsList = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -62,8 +63,9 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
 }
+
 getEnumValues();
 
 const workerFilter = {

From d92a0ba77e15264a175966b4e745091ddfcf4a7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 07:46:57 +0200
Subject: [PATCH 5/6] fix: Roadmap Summary ID

---
 src/pages/Route/Roadmap/RoadmapSummary.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 1fed6aa78..9aa8f40d7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -72,7 +72,12 @@ const openAddStopDialog = () => {
 
 <template>
     <div class="q-pa-md full-width">
-        <CardSummary ref="summary" :url="`Roadmaps/${entityId}`" :filter="filter">
+        <CardSummary
+            data-key="RoadmapSummary"
+            ref="summary"
+            :url="`Roadmaps/${entityId}`"
+            :filter="filter"
+        >
             <template #header-left>
                 <RouterLink :to="{ name: `RoadmapSummary`, params: { id: entityId } }">
                     <QIcon name="open_in_new" color="white" size="sm" />

From 2dfb2300a2c5ace6c98450b7dc22ddb49132cfda Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 30 Apr 2024 07:51:22 +0200
Subject: [PATCH 6/6] hotFix: refs #6336 fix vnLog user?.id

---
 src/components/common/VnLog.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index c1cc78f54..f2cef8f84 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -421,12 +421,13 @@ setLogTree();
         >
             <div class="timeline">
                 <div class="user-avatar">
-                    <VnUserLink :worker-id="userLog.user.id">
+                    <VnUserLink :worker-id="userLog?.user?.id">
                         <template #link>
                             <VnAvatar
-                                :class="{ 'cursor-pointer': userLog.user.id }"
-                                :worker-id="userLog.user.id"
-                                :title="userLog.user.nickname"
+                                :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                :worker-id="userLog?.user?.id"
+                                :title="userLog?.user?.nickname"
+                                :show-letter="!userLog?.user"
                                 size="lg"
                             />
                         </template>