From 493e51833955b79906b46ca552c7074e0af419c6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 29 Oct 2024 12:15:40 +0100
Subject: [PATCH 01/18] feat: refs #6999 added search when user tabs on a
 filter with value

---
 src/pages/Entry/EntryLatestBuys.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 119808176..50a4ccc7f 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
 
+import { useArrayData } from 'composables/useArrayData';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
@@ -12,6 +13,9 @@ import VnImg from 'src/components/ui/VnImg.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
+const tableRef = ref();
+const arrayData = useArrayData('LatestBuys', { searchUrl: 'Buys/latestBuysFilter' });
+const lastParams = {};
 const columns = [
     {
         align: 'center',
@@ -234,13 +238,26 @@ const columns = [
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
-const tableRef = ref();
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const onTabPressed = async () => {
+    let params = tableRef.value.params;
+
+    if (
+        Object.keys(params).length > 0 &&
+        JSON.stringify(params) !== JSON.stringify(lastParams)
+    ) {
+        Object.assign(lastParams, params);
+
+        await arrayData.addFilter({ filter: { where: params } });
+    }
+    params = {};
+};
 </script>
 
 <template>
@@ -260,6 +277,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :row-click="({ entryFk }) => tableRef.redirect(entryFk)"
         auto-load
         :right-search="false"
+        @keydown.tab="onTabPressed"
     />
 </template>
 

From 7f4a73fd56451c83fad6a932270eb968345c2917 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 14 Nov 2024 08:30:55 +0100
Subject: [PATCH 02/18] feat: refs #6999 added tab to search in VnTable filter

---
 src/components/VnTable/VnFilter.vue |  5 +++++
 src/pages/Entry/EntryLatestBuys.vue | 18 ------------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 9da0b26a4..c9c81f5a7 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -143,6 +143,10 @@ function alignRow() {
 const showFilter = computed(
     () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
 );
+
+const onTabPressed = async () => {
+    if (model.value) enterEvent['keyup.enter']();
+};
 </script>
 <template>
     <div
@@ -157,6 +161,7 @@ const showFilter = computed(
             v-model="model"
             :components="components"
             component-prop="columnFilter"
+            @keydown.tab="onTabPressed"
         />
     </div>
 </template>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 50a4ccc7f..bc10ac1ca 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
 
-import { useArrayData } from 'composables/useArrayData';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
@@ -14,8 +13,6 @@ import VnImg from 'src/components/ui/VnImg.vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
-const arrayData = useArrayData('LatestBuys', { searchUrl: 'Buys/latestBuysFilter' });
-const lastParams = {};
 const columns = [
     {
         align: 'center',
@@ -244,20 +241,6 @@ onMounted(async () => {
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
-
-const onTabPressed = async () => {
-    let params = tableRef.value.params;
-
-    if (
-        Object.keys(params).length > 0 &&
-        JSON.stringify(params) !== JSON.stringify(lastParams)
-    ) {
-        Object.assign(lastParams, params);
-
-        await arrayData.addFilter({ filter: { where: params } });
-    }
-    params = {};
-};
 </script>
 
 <template>
@@ -277,7 +260,6 @@ const onTabPressed = async () => {
         :row-click="({ entryFk }) => tableRef.redirect(entryFk)"
         auto-load
         :right-search="false"
-        @keydown.tab="onTabPressed"
     />
 </template>
 

From e119bf5bfc0ab05ecfa700db976812f035b16d82 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 19 Nov 2024 07:59:14 +0100
Subject: [PATCH 03/18] feat: refs #8138 add component ticket problems

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 57 +------------------
 src/pages/Ticket/TicketList.vue             | 62 +--------------------
 2 files changed, 4 insertions(+), 115 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 406bf5f29..f08402d69 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -15,6 +15,7 @@ import { toCurrency, dateRange, dashIfEmpty } from 'src/filters';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
+import TicketProblems from 'src/components/ui/TicketProblems.vue';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; // 2min in ms
 const { t } = useI18n();
@@ -366,61 +367,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <span>
-                <QIcon
-                    v-if="row.isTaxDataChecked === 0"
-                    name="vn:no036"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasTicketRequest"
-                    name="vn:buyrequest"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.itemShortage"
-                    name="vn:unavailable"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-                </QIcon>
-                <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-                    <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.risk"
-                    name="vn:risk"
-                    :color="row.hasHighRisk ? 'negative' : 'primary'"
-                    size="xs"
-                >
-                    <QTooltip
-                        >{{ $t('salesTicketsTable.risk') }}: {{ row.risk }}</QTooltip
-                    >
-                </QIcon>
-                <QIcon
-                    v-if="row.hasComponentLack"
-                    name="vn:components"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.isTooLittle"
-                    name="vn:isTooLittle"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-                </QIcon>
-            </span>
+            <TicketProblems :row="row" />
         </template>
         <template #column-id="{ row }">
             <span class="link" @click.stop.prevent>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index aae6f80a7..fdbaec7cb 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -22,6 +22,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+import TicketProblems from 'src/components/ui/TicketProblems.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -490,66 +491,7 @@ function setReference(data) {
         }"
     >
         <template #column-statusIcons="{ row }">
-            <div class="q-gutter-x-xs">
-                <QIcon
-                    v-if="row.isTaxDataChecked === 0"
-                    color="primary"
-                    name="vn:no036"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('No verified data') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasTicketRequest"
-                    color="primary"
-                    name="vn:buyrequest"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Purchase request') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.itemShortage"
-                    color="primary"
-                    name="vn:unavailable"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Not visible') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
-                    <QTooltip>
-                        {{ t('Client frozen') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
-                    <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasComponentLack"
-                    color="primary"
-                    name="vn:components"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Component lack') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasRounding"
-                    color="primary"
-                    name="sync_problem"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Rounding') }}
-                    </QTooltip>
-                </QIcon>
-            </div>
+            <TicketProblems :row="row" />
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>

From f999760205d0c2c1311bf4a82f506ae472213483 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 19 Nov 2024 07:59:45 +0100
Subject: [PATCH 04/18] fix: refs #8138 sme minor issues

---
 src/components/ui/TicketProblems.vue        | 40 +++++++++++++++++++++
 src/pages/Customer/Card/CustomerSummary.vue |  2 +-
 src/pages/Monitor/Ticket/MonitorTickets.vue | 35 +++++++++---------
 3 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 src/components/ui/TicketProblems.vue

diff --git a/src/components/ui/TicketProblems.vue b/src/components/ui/TicketProblems.vue
new file mode 100644
index 000000000..2965396b1
--- /dev/null
+++ b/src/components/ui/TicketProblems.vue
@@ -0,0 +1,40 @@
+<script setup>
+defineProps({ row: { type: Object, required: true } });
+</script>
+<template>
+    <span>
+        <QIcon
+            v-if="row.isTaxDataChecked === 0"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row.risk"
+            name="vn:risk"
+            :color="row.hasHighRisk ? 'negative' : 'primary'"
+            size="xs"
+        >
+            <QTooltip>
+                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
+        </QIcon>
+    </span>
+</template>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 95a162670..4fa7b9bdc 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -320,7 +320,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-max">
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index f08402d69..4a31418fb 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -24,13 +24,18 @@ const tableRef = ref(null);
 const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
-const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
 const to = new Date(from.getTime());
 to.setDate(to.getDate() + 1);
 to.setHours(23, 59, 59, 999);
+const stateColors = {
+    notice: 'info',
+    success: 'positive',
+    warning: 'warning',
+    alert: 'negative',
+};
 
 function exprBuilder(param, value) {
     switch (param) {
@@ -225,7 +230,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.goToLines'),
                 icon: 'vn:lines',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => openTab(row.id),
                 isPrimary: true,
                 attrs: {
@@ -236,7 +241,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.preview'),
                 icon: 'preview',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),
                 isPrimary: true,
                 attrs: {
@@ -254,10 +259,10 @@ const getBadgeAttrs = (date) => {
     let timeTicket = new Date(date);
     timeTicket.setHours(0, 0, 0, 0);
 
-    let comparation = today - timeTicket;
+    let timeDiff = today - timeTicket;
 
-    if (comparation == 0) return { color: 'warning', 'text-color': 'black' };
-    if (comparation < 0) return { color: 'success', 'text-color': 'black' };
+    if (timeDiff == 0) return { color: 'warning', 'text-color': 'black' };
+    if (timeDiff < 0) return { color: 'success', 'text-color': 'black' };
     return { color: 'transparent', 'text-color': 'white' };
 };
 
@@ -272,13 +277,6 @@ const autoRefreshHandler = (value) => {
     }
 };
 
-const stateColors = {
-    notice: 'info',
-    success: 'positive',
-    warning: 'warning',
-    alert: 'negative',
-};
-
 const totalPriceColor = (ticket) => {
     const total = parseInt(ticket.totalWithVat);
     if (total > 0 && total < 50) return 'warning';
@@ -286,10 +284,10 @@ const totalPriceColor = (ticket) => {
 
 const formatShippedDate = (date) => {
     if (!date) return '-';
-    const split1 = date.split('T');
-    const [year, month, day] = split1[0].split('-');
-    const _date = new Date(year, month - 1, day);
-    return toDateFormat(_date);
+    const dateSplit = date.split('T');
+    const [year, month, day] = dateSplit[0].split('-');
+    const newDate = new Date(year, month - 1, day);
+    return toDateFormat(newDate);
 };
 
 const openTab = (id) =>
@@ -337,7 +335,6 @@ const openTab = (id) =>
         :expr-builder="exprBuilder"
         :offset="50"
         :columns="columns"
-        :visible-columns="visibleColumns"
         :right-search="false"
         default-mode="table"
         auto-load
@@ -422,7 +419,7 @@ const openTab = (id) =>
             </QIcon>
         </template>
         <template #column-zoneFk="{ row }">
-            <div @click.stop.prevent :title="row.zoneName">
+            <div v-if="row.zoneFk" @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
             </div>

From e7b431e9ec2c9745fb9b980d039d8f721093498c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:32:35 +0100
Subject: [PATCH 05/18] fix(VnPaginate): disable pagination

---
 src/components/ui/VnPaginate.vue     | 2 ++
 src/pages/Item/ItemFixedPrice.vue    | 2 +-
 src/pages/Ticket/Card/TicketSale.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index b058dc642..04a843889 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -141,6 +141,8 @@ async function fetch(params) {
 }
 
 async function paginate() {
+    if (props.disableInfiniteScroll || !store.hasMoreData) return;
+
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
     if (!props.url) return;
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 815c7d519..628af681a 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -440,7 +440,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 selection: 'multiple',
             }"
             :crud-model="{
-                paginate: false,
+                disableInfiniteScroll: true,
             }"
             v-model:selected="rowsSelected"
             :row-click="saveOnRowChange"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 1b9791529..08cf248ba 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -621,7 +621,7 @@ watch(
         }"
         :create-as-dialog="false"
         :crud-model="{
-            paginate: false,
+            disableInfiniteScroll: true,
         }"
         :default-remove="false"
         :default-reset="false"

From 5d58bb0c139d7dd108c75736cd24325c8115a447 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:47:59 +0100
Subject: [PATCH 06/18] fix(VnPaginate): disable pagination

---
 src/components/VnTable/VnTable.vue | 2 ++
 src/components/ui/VnPaginate.vue   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 908157610..da6c89cbb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -325,6 +325,8 @@ function handleOnDataSaved(_) {
 }
 
 function handleScroll() {
+    if ($props.crudModel.disableInfiniteScroll) return;
+
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 04a843889..b058dc642 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -141,8 +141,6 @@ async function fetch(params) {
 }
 
 async function paginate() {
-    if (props.disableInfiniteScroll || !store.hasMoreData) return;
-
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
     if (!props.url) return;

From 38ccf464b761e4724c5688a6e01af39a16c07d59 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:52:00 +0100
Subject: [PATCH 07/18] fix: refs #7323 locale #7396

---
 src/i18n/locale/en.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ae7007c32..531b3bc14 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -583,15 +583,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: Fecha de caducidad del DNI
-        sex: Sexo
-        seniority: Antigüedad
+        fiDueDate: FI due date
+        sex: Sex
+        seniority: Seniority
         fi: DNI/NIE/NIF
-        birth: Fecha de nacimiento
-        isFreelance: Autónomo
+        birth: Birth
+        isFreelance: Freelance
         isSsDiscounted: Bonificación SS
-        hasMachineryAuthorized: Autorizado para llevar maquinaria
-        isDisable: Trabajador desactivado
+        hasMachineryAuthorized: Machinery authorized
+        isDisable: Disable
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications

From 1faab668b16baceb6ebec80c9075b1e38ff12acd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:53:33 +0100
Subject: [PATCH 08/18] fix: refs #7323 show advanced fields

---
 src/i18n/locale/es.yml                  | 6 +++---
 src/pages/Worker/Card/WorkerSummary.vue | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index eb0978ddd..9bfa43c49 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -579,9 +579,9 @@ worker:
         newWorker: Nuevo trabajador
     summary:
         boss: Jefe
-        phoneExtension: Extensión de teléfono
-        entPhone: Teléfono de empresa
-        personalPhone: Teléfono personal
+        phoneExtension: Ext. de teléfono
+        entPhone: Tel. de empresa
+        personalPhone: Tel. personal
         noBoss: Sin jefe
         userData: Datos de usuario
         userId: ID del usuario
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 93866b79f..496f1ca16 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -75,10 +75,10 @@ onBeforeMount(async () => {
                         <VnLinkPhone :phone-number="worker.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="worker.client?.phone">
+                <VnLv :value="advancedSummary?.client?.phone">
                     <template #label>
                         {{ t('worker.summary.personalPhone') }}
-                        <VnLinkPhone :phone-number="worker.client?.phone" />
+                        <VnLinkPhone :phone-number="advancedSummary?.client?.phone" />
                     </template>
                 </VnLv>
             </QCard>
@@ -86,12 +86,12 @@ onBeforeMount(async () => {
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
                 <VnLv
                     :label="t('worker.summary.fiDueDate')"
-                    :value="toDate(worker.fiDueDate)"
+                    :value="toDate(advancedSummary.fiDueDate)"
                 />
                 <VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
                 <VnLv
                     :label="t('worker.summary.seniority')"
-                    :value="toDate(worker.seniority)"
+                    :value="toDate(advancedSummary.seniority)"
                 />
                 <VnLv :label="t('worker.summary.fi')" :value="advancedSummary.fi" />
                 <VnLv

From 8a1db719e3c3c68eccad2218a9a47c966d050a1f Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 19 Nov 2024 11:58:16 +0100
Subject: [PATCH 09/18] fix(Supplier): change isSerious to isReal

---
 src/i18n/locale/en.yml                         | 2 +-
 src/i18n/locale/es.yml                         | 2 +-
 src/pages/Supplier/Card/SupplierBasicData.vue  | 4 ++--
 src/pages/Supplier/Card/SupplierDescriptor.vue | 4 ++--
 src/pages/Supplier/Card/SupplierSummary.vue    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa8df17e2..070125540 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -940,7 +940,7 @@ supplier:
     basicData:
         alias: Alias
         workerFk: Responsible
-        isSerious: Verified
+        isReal: Verified
         isActive: Active
         isPayMethodChecked: PayMethod checked
         note: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 575e2c6c7..54728c5b6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -938,7 +938,7 @@ supplier:
     basicData:
         alias: Alias
         workerFk: Responsable
-        isSerious: Verificado
+        isReal: Verificado
         isActive: Activo
         isPayMethodChecked: Método de pago validado
         note: Notas
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 52964557d..c1a107d3a 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -61,8 +61,8 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    v-model="data.isSerious"
-                    :label="t('supplier.basicData.isSerious')"
+                    v-model="data.isReal"
+                    :label="t('supplier.basicData.isReal')"
                 />
                 <QCheckbox
                     v-model="data.isActive"
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5754031b3..9845cd08a 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -38,7 +38,7 @@ const filter = {
         'payDemFk',
         'payDay',
         'isActive',
-        'isSerious',
+        'isReal',
         'isTrucker',
         'account',
     ],
@@ -137,7 +137,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!supplier.isSerious"
+                    v-if="!supplier.isReal"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 5791db1eb..a1d1631d4 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -67,7 +67,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                 </VnLv>
                 <QCheckbox
                     :label="t('supplier.summary.verified')"
-                    v-model="supplier.isSerious"
+                    v-model="supplier.isReal"
                     :disable="true"
                 />
                 <QCheckbox

From 3824f5d124d8083634f67b93ec4696f7763baccc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 19 Nov 2024 13:51:19 +0100
Subject: [PATCH 10/18] fix: refs #8138 move component from ui folder

---
 src/components/{ui => }/TicketProblems.vue  | 0
 src/pages/Monitor/Ticket/MonitorTickets.vue | 2 +-
 src/pages/Ticket/TicketList.vue             | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/{ui => }/TicketProblems.vue (100%)

diff --git a/src/components/ui/TicketProblems.vue b/src/components/TicketProblems.vue
similarity index 100%
rename from src/components/ui/TicketProblems.vue
rename to src/components/TicketProblems.vue
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 4a31418fb..e6bf242ac 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -15,7 +15,7 @@ import { toCurrency, dateRange, dashIfEmpty } from 'src/filters';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
-import TicketProblems from 'src/components/ui/TicketProblems.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; // 2min in ms
 const { t } = useI18n();
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index fdbaec7cb..7e95f3a1d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -22,7 +22,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import TicketProblems from 'src/components/ui/TicketProblems.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const route = useRoute();
 const router = useRouter();

From f43e974bbc595758ab316156b8e9f68d340b70f3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 19 Nov 2024 14:14:50 +0100
Subject: [PATCH 11/18] fix: worker test e2e

---
 src/pages/Worker/WorkerList.vue  | 2 +-
 test/cypress/support/commands.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 022cecdc6..71df273c1 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -306,7 +306,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnInput
-                        :label="t('worker.create.street')"
+                        :label="t('globals.street')"
                         :model-value="uppercaseStreetModel(data).get()"
                         @update:model-value="uppercaseStreetModel(data).set"
                         :disable="data.isFreelance"
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 8d48dc71a..0e0cd7d07 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -100,7 +100,6 @@ Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
                     case 'select':
                         cy.wrap(el).type(val);
                         cy.get('.q-menu .q-item').contains(val).click();
-                        cy.get('body').click();
                         break;
                     case 'date':
                         cy.wrap(el).type(val.split('-').join(''));

From 8714980595e0cfa62e24b7a38f0553ad5c2290fa Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 14:28:43 +0100
Subject: [PATCH 12/18] fix(VnSelect):  setOptions when applyFilter

---
 src/components/common/VnSelect.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 227ff9465..f24f054a5 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -202,7 +202,10 @@ async function fetchFilter(val) {
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
     arrayData.reset(['skip', 'filter.skip', 'page']);
-    return (await arrayData.applyFilter({ filter: fetchOptions }))?.data;
+
+    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
+    setOptions(data);
+    return data;
 }
 
 async function filterHandler(val, update) {

From 5f7fd91272c4a870de82ef8c42ef50166d7ad1e7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 14:41:07 +0100
Subject: [PATCH 13/18] feat: add /reports in gitignore

---
 test/cypress/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/.gitignore b/test/cypress/.gitignore
index 3f91dd465..8d940320e 100644
--- a/test/cypress/.gitignore
+++ b/test/cypress/.gitignore
@@ -1,2 +1,2 @@
-videos/*
-screenshots/*
\ No newline at end of file
+reports/*
+screenshots/*

From e54eb50265741bfd5e424e59c626df201d9dd1e3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 15:35:57 +0100
Subject: [PATCH 14/18] fix: refs #8166 show zone error

---
 src/pages/Ticket/TicketAdvance.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 8de602b37..c247a20bc 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -213,10 +213,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
             warehouseFk: ticket.futureWarehouseFk,
         });
 
-        if (!newLanded) {
-            notify(t('advanceTickets.noDeliveryZone'), 'negative');
-            return;
-        }
+        if (!newLanded) throw new Error(t('advanceTickets.noDeliveryZone'));
 
         ticket.landed = newLanded.landed;
         ticket.zoneFk = newLanded.zoneFk;
@@ -299,10 +296,10 @@ const splitTickets = async () => {
                 const { query, params } = await requestComponentUpdate(ticket, true);
                 await axios.post(query, params);
                 progressAdd(ticket.futureId);
-            } catch (error) {
+            } catch (e) {
                 splitErrors.value.push({
                     id: ticket.futureId,
-                    reason: error.response?.data?.error?.message,
+                    reason: e.message || e.response?.data?.error?.message,
                 });
                 progressAdd(ticket.futureId);
             }

From 73b7fa7704eff4dbd3b95bca8d37294eafb19efc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 15:43:55 +0100
Subject: [PATCH 15/18] feat: refs #8166 show notification

---
 src/pages/Ticket/TicketAdvance.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index c247a20bc..71e3926ac 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -213,7 +213,10 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
             warehouseFk: ticket.futureWarehouseFk,
         });
 
-        if (!newLanded) throw new Error(t('advanceTickets.noDeliveryZone'));
+        if (!newLanded) {
+            notify(t('advanceTickets.noDeliveryZone'), 'negative');
+            throw new Error(t('advanceTickets.noDeliveryZone'));
+        }
 
         ticket.landed = newLanded.landed;
         ticket.zoneFk = newLanded.zoneFk;

From fef7dd9ac1d4d9c659cfa113004d60c128ff12bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 07:41:39 +0100
Subject: [PATCH 16/18] =?UTF-8?q?fix(MonitorOrders):=20translation=20sendD?=
 =?UTF-8?q?ate=20=E2=86=92=20landed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Monitor/MonitorOrders.vue | 2 +-
 src/pages/Monitor/locale/en.yml     | 1 -
 src/pages/Monitor/locale/es.yml     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index fac601735..17f72f188 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -27,7 +27,7 @@ function exprBuilder(param, value) {
 
 const columns = computed(() => [
     {
-        label: t('salesOrdersTable.dateSend'),
+        label: t('globals.landed'),
         name: 'dateSend',
         field: 'dateSend',
         align: 'left',
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index b8082f02a..e905d2521 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -11,7 +11,6 @@ salesClientsTable:
     client: Client
 salesOrdersTable:
     delete: Delete
-    dateSend: Send date
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 4ee5b90a9..a19145300 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -11,7 +11,6 @@ salesClientsTable:
     client: Cliente
 salesOrdersTable:
     delete: Eliminar
-    dateSend: Fecha de envío
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial

From 67a5800a6668af882d976182272706176776dc98 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 07:57:45 +0100
Subject: [PATCH 17/18] fix: logout spec

---
 test/cypress/integration/outLogin/logout.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/outLogin/logout.spec.js b/test/cypress/integration/outLogin/logout.spec.js
index d6c33a65b..bcdacec78 100644
--- a/test/cypress/integration/outLogin/logout.spec.js
+++ b/test/cypress/integration/outLogin/logout.spec.js
@@ -28,7 +28,7 @@ describe('Logout', () => {
         });
 
         it('when token not exists', () => {
-            cy.get('.q-list > [href="#/item"]').click();
+            cy.get('.q-list').first().should('be.visible').click();
             cy.checkNotification('Authorization Required');
         });
     });

From 3ba8402dfde616ec0a2a7430ad78acfccf62d755 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 08:01:50 +0100
Subject: [PATCH 18/18] fix: vnSearchbar spec

---
 test/cypress/integration/vnComponent/vnSearchBar.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/integration/vnComponent/vnSearchBar.spec.js b/test/cypress/integration/vnComponent/vnSearchBar.spec.js
index 580199bc3..b8621118c 100644
--- a/test/cypress/integration/vnComponent/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnComponent/vnSearchBar.spec.js
@@ -5,6 +5,7 @@ describe('VnSearchBar', () => {
     const idGap = '.q-item > .q-item__label';
     const vnTableRow = '.q-virtual-scroll__content';
     beforeEach(() => {
+        cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('#/customer/list');
     });