From 31d829ac052352f90dd5f60b9591ecb14ca840ac Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 30 Jan 2025 00:08:58 +0100
Subject: [PATCH] Merge branch 'dev' into 6321_negative_tickets

---
 cypress.config.js                             |   4 +-
 quasar.config.js                              |   1 -
 src/components/common/VnSelect.vue            |   4 +-
 src/css/app.scss                              |   1 +
 src/pages/Item/components/ItemProposal.vue    |  18 +--
 src/pages/Item/locale/en.yml                  |   1 +
 src/pages/Item/locale/es.yml                  |   1 +
 src/pages/Ticket/Card/TicketTransfer.vue      | 128 +++++++++---------
 src/pages/Ticket/Card/components/split.js     |  23 +---
 .../Ticket/Negative/TicketLackDetail.vue      |   8 +-
 .../Negative/components/ChangeItemDialog.vue  |  12 +-
 .../components/ChangeQuantityDialog.vue       |  14 +-
 .../Negative/components/ChangeStateDialog.vue |  14 +-
 .../components => utils}/notifyResults.js     |   4 -
 14 files changed, 96 insertions(+), 137 deletions(-)
 rename src/{pages/Ticket/Negative/components => utils}/notifyResults.js (73%)

diff --git a/cypress.config.js b/cypress.config.js
index 1924144f6..a9e27fcfd 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -14,8 +14,8 @@ export default defineConfig({
         downloadsFolder: 'test/cypress/downloads',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
-        experimentalRunAllSpecs: true,
-        watchForFileChanges: true,
+        experimentalRunAllSpecs: false,
+        watchForFileChanges: false,
         reporter: 'cypress-mochawesome-reporter',
         reporterOptions: {
             charts: true,
diff --git a/quasar.config.js b/quasar.config.js
index 7c669c99f..9467c92af 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -30,7 +30,6 @@ export default configure(function (/* ctx */) {
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
         boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
-        importStrategy: 'auto',
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
 
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index c8187eba0..339f90e0e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -334,8 +334,8 @@ function handleKeyDown(event) {
 }
 
 function getCaption(opt) {
-    if (optionCaption.value === false && typeof optionCaption.value !== 'string') return;
-    return '' + (opt[optionCaption.value] || opt[optionValue.value]);
+    if (optionCaption.value === false) return;
+    return opt[optionCaption.value] || opt[optionValue.value];
 }
 </script>
 
diff --git a/src/css/app.scss b/src/css/app.scss
index c1deaa027..a1ca8985f 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -273,6 +273,7 @@ input::-webkit-inner-spin-button {
         }
         td {
             font-size: 11pt;
+            border-top: 1px solid var(--vn-page-color);
             border-collapse: collapse;
         }
     }
diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue
index 07ecd048a..506c73430 100644
--- a/src/pages/Item/components/ItemProposal.vue
+++ b/src/pages/Item/components/ItemProposal.vue
@@ -105,37 +105,25 @@ const columns = computed(() => [
     {
         align: 'left',
         sortable: true,
-        label: t('proposal.tag5'),
+        label: t('item.list.color'),
         name: 'tag5',
         field: 'value5',
-        // format: (val) => val,
-        style: "color: 'red'",
         columnClass: 'expand',
     },
     {
         align: 'left',
         sortable: true,
-        label: t('proposal.tag6'),
+        label: t('item.list.stems'),
         name: 'tag6',
         field: 'value6',
-        // format: (val) => val,
-        attrs: ({ model }) => {
-            return {
-                style: `color:        var(--vn-label-color)`,
-            };
-        },
-        style: (row) => `color:        var(--vn-label-color)`,
-
         columnClass: 'expand',
     },
     {
         align: 'left',
         sortable: true,
-        label: t('proposal.tag7'),
+        label: t('item.list.producer'),
         name: 'tag7',
         field: 'value7',
-        // format: (val) => val,
-        style: "color: 'red'",
         columnClass: 'expand',
     },
 
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index 78ea5c9bb..d74ef9cbc 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -130,6 +130,7 @@ item:
         origin: Orig.
         userName: Buyer
         weight: Weight
+        color: Color
         weightByPiece: Weight/stem
         stemMultiplier: Multiplier
         producer: Producer
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 649461f00..5ab0b1bb6 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -135,6 +135,7 @@ item:
         size: Medida
         origin: Orig.
         weight: Peso
+        color: Color
         weightByPiece: Peso/tallo
         userName: Comprador
         stemMultiplier: Multiplicador
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 6ef32e568..fc7be2f57 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -34,7 +34,6 @@ const $props = defineProps({
 
 onMounted(() => (_transfer.value = $props.transfer));
 const { t } = useI18n();
-const QPopupProxyRef = ref(null);
 const transferFormRef = ref(null);
 const _transfer = ref();
 const splitDate = ref(Date.vnNew());
@@ -110,71 +109,68 @@ const splitSelectedRows = async () => {
             ></QBtn>
             <VnInputDate :label="$t('New date')" v-model="splitDate"></VnInputDate>
         </div>
-        <QSeparator class="q-my-lg" color="primary" />
-        <QCard
-            v-if="!$props.split"
-            class="full-width q-px-md"
-            style="display: flex; width: 80vw"
-        >
-            {{ ticket }}- {{ transfer }}
-            <QTable
-                :rows="transfer.sales"
-                :columns="transferLinesColumns"
-                :title="t('Sales to transfer')"
-                row-key="id"
-                :pagination="{ rowsPerPage: 0 }"
-                class="full-width q-mt-md"
-                :no-data-label="t('globals.noResults')"
-            >
-                <template #body-cell-quantity="{ row }">
-                    <QTd @click.stop>
-                        <VnInput
-                            v-model.number="row.quantity"
-                            :clearable="false"
-                            style="max-width: 60px"
-                        />
-                    </QTd>
-                </template>
-            </QTable>
-            <QSeparator vertical spaced />
-            <QTable
-                v-if="transfer.lastActiveTickets"
-                :rows="transfer.lastActiveTickets"
-                :columns="destinationTicketColumns"
-                :title="t('Destination ticket')"
-                row-key="id"
-                class="full-width q-mt-md"
-                @row-click="(_, row) => handleRowClick(row)"
-                :no-data-label="t('globals.noResults')"
-                :pagination="{ rowsPerPage: 0 }"
-            >
-                <template #body-cell-address="{ row }">
-                    <QTd @click.stop>
-                        <span>
-                            {{ row.nickname }}
-                            {{ row.name }}
-                            {{ row.street }}
-                            {{ row.postalCode }}
-                            {{ row.city }}
-                        </span>
-                        <QTooltip>
-                            {{ row.nickname }}
-                            {{ row.name }}
-                            {{ row.street }}
-                            {{ row.postalCode }}
-                            {{ row.city }}
-                        </QTooltip>
-                    </QTd>
-                </template>
+        <div v-else>
+            <QSeparator class="q-my-lg" color="primary" />
+            <QCard class="full-width q-px-md" style="display: flex; width: 80vw">
+                <QTable
+                    :rows="transfer.sales"
+                    :columns="transferLinesColumns"
+                    :title="t('Sales to transfer')"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
+                >
+                    <template #body-cell-quantity="{ row }">
+                        <QTd @click.stop>
+                            <VnInput
+                                v-model.number="row.quantity"
+                                :clearable="false"
+                                style="max-width: 60px"
+                            />
+                        </QTd>
+                    </template>
+                </QTable>
+                <QSeparator vertical spaced />
+                <QTable
+                    v-if="transfer.lastActiveTickets"
+                    :rows="transfer.lastActiveTickets"
+                    :columns="destinationTicketColumns"
+                    :title="t('Destination ticket')"
+                    row-key="id"
+                    class="full-width q-mt-md"
+                    @row-click="(_, row) => handleRowClick(row)"
+                    :no-data-label="t('globals.noResults')"
+                    :pagination="{ rowsPerPage: 0 }"
+                >
+                    <template #body-cell-address="{ row }">
+                        <QTd @click.stop>
+                            <span>
+                                {{ row.nickname }}
+                                {{ row.name }}
+                                {{ row.street }}
+                                {{ row.postalCode }}
+                                {{ row.city }}
+                            </span>
+                            <QTooltip>
+                                {{ row.nickname }}
+                                {{ row.name }}
+                                {{ row.street }}
+                                {{ row.postalCode }}
+                                {{ row.city }}
+                            </QTooltip>
+                        </QTd>
+                    </template>
 
-                <template #no-data>
-                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
-                </template>
-                <template #bottom>
-                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
-                </template>
-            </QTable>
-        </QCard>
+                    <template #no-data>
+                        <TicketTransferForm ref="transferFormRef" v-bind="$props" />
+                    </template>
+                    <template #bottom>
+                        <TicketTransferForm ref="transferFormRef" v-bind="$props" />
+                    </template>
+                </QTable>
+            </QCard>
+        </div>
     </QPopupProxy>
 </template>
 <style lang="scss">
@@ -186,6 +182,4 @@ const splitSelectedRows = async () => {
 es:
     Sales to transfer: Líneas a transferir
     Destination ticket: Ticket destinatario
-    Transfer to ticket: Transferir a ticket
-    New ticket: Nuevo ticket
 </i18n>
diff --git a/src/pages/Ticket/Card/components/split.js b/src/pages/Ticket/Card/components/split.js
index 37ffafdeb..23812136a 100644
--- a/src/pages/Ticket/Card/components/split.js
+++ b/src/pages/Ticket/Card/components/split.js
@@ -1,8 +1,9 @@
 import axios from 'axios';
+import notifyResults from 'src/utils/notifyResults';
 
 export default async function (data) {
     const reducedData = data.reduce((acc, item) => {
-        const existing = acc.find((obj) => obj.ticketFk === item.id);
+        const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
         if (existing) {
             existing.sales.push(item.saleFk);
         } else {
@@ -11,29 +12,11 @@ export default async function (data) {
         return acc;
     }, []);
 
-    console.log(reducedData);
-
     const promises = reducedData.map((params) => axios.post(`Tickets/split`, params));
 
     const results = await Promise.allSettled(promises);
 
-    // results.forEach((result, index) => {
-    //     if (result.status === 'fulfilled') {
-    //         console.log(`Promise ${index + 1} fulfilled:`, result.value.data);
-    //         // Mostrar notificación de éxito
-    //         Notify.create({
-    //             type: 'positive',
-    //             message: `Operación ${index + 1} completada con éxito.`,
-    //         });
-    //     } else {
-    //         console.error(`Promise ${index + 1} rejected:`, result.reason);
-    //         // Mostrar notificación de error
-    //         Notify.create({
-    //             type: 'negative',
-    //             message: `Operación ${index + 1} fallida: ${result.reason.message}`,
-    //         });
-    //     }
-    // });
+    notifyResults(results, 'ticketFk');
 
     return results;
 }
diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue
index 64bdcfc01..99b4f57fc 100644
--- a/src/pages/Ticket/Negative/TicketLackDetail.vue
+++ b/src/pages/Ticket/Negative/TicketLackDetail.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import ChangeQuantityDialog from './components/ChangeQuantityDialog.vue';
 import ChangeStateDialog from './components/ChangeStateDialog.vue';
 import ChangeItemDialog from './components/ChangeItemDialog.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import TicketTransfer from '../Card/TicketTransfer.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -167,7 +166,6 @@ const filterTable = { stateFk: 0, warehouseFk: useState().getUser().value.wareho
                     <TicketTransfer
                         ref="transferFormRef"
                         split="true"
-                        class="full-width"
                         :ticket="selectedRows"
                         :transfer="{
                             sales: selectedRows,
@@ -175,7 +173,11 @@ const filterTable = { stateFk: 0, warehouseFk: useState().getUser().value.wareho
                         }"
                     ></TicketTransfer>
                 </QBtn>
-                <QBtn color="primary" @click="showProposalDialog = true">
+                <QBtn
+                    color="primary"
+                    @click="showProposalDialog = true"
+                    :disable="selectedRows.length < 1"
+                >
                     <QIcon
                         name="import_export"
                         class="rotate-90"
diff --git a/src/pages/Ticket/Negative/components/ChangeItemDialog.vue b/src/pages/Ticket/Negative/components/ChangeItemDialog.vue
index fd28d33fc..e419b85c0 100644
--- a/src/pages/Ticket/Negative/components/ChangeItemDialog.vue
+++ b/src/pages/Ticket/Negative/components/ChangeItemDialog.vue
@@ -1,12 +1,10 @@
 <script setup>
 import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import handlePromiseResults from './notifyResults';
+import notifyResults from 'src/utils/notifyResults';
 const emit = defineEmits(['update-item']);
 
-const { t } = useI18n();
 const showChangeItemDialog = ref(false);
 const newItem = ref(null);
 const $props = defineProps({
@@ -27,7 +25,7 @@ const updateItem = async () => {
             }),
         );
         const result = await Promise.allSettled(rowsToUpdate);
-        handlePromiseResults(result, 'saleFk');
+        notifyResults(result, 'saleFk');
         emit('update-item', newItem.value);
     } catch (err) {
         console.error('Error updating item:', err);
@@ -40,7 +38,7 @@ const updateItem = async () => {
     <QCard class="q-pa-sm">
         <QCardSection class="row items-center justify-center column items-stretch">
             {{ showChangeItemDialog }}
-            <span>{{ t('negative.detail.modal.changeItem.title') }}</span>
+            <span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
             <VnSelect
                 url="Items/WithName"
                 :fields="['id', 'name']"
@@ -53,9 +51,9 @@ const updateItem = async () => {
             </VnSelect>
         </QCardSection>
         <QCardActions align="right">
-            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+            <QBtn :label="$t('globals.cancel')" color="primary" flat v-close-popup />
             <QBtn
-                :label="t('globals.confirm')"
+                :label="$t('globals.confirm')"
                 color="primary"
                 :disable="!newItem"
                 @click="updateItem"
diff --git a/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue b/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
index fdd557191..96cbd213d 100644
--- a/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
+++ b/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
@@ -1,11 +1,9 @@
 <script setup>
 import { ref, defineEmits } from 'vue';
-import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import VnInput from 'src/components/common/VnInput.vue';
-import handlePromiseResults from './notifyResults';
+import notifyResults from 'src/utils/notifyResults';
 
-const { t } = useI18n();
 const showChangeQuantityDialog = ref(false);
 const newQuantity = ref(null);
 const $props = defineProps({
@@ -26,7 +24,7 @@ const updateQuantity = async () => {
         );
 
         const result = await Promise.allSettled(rowsToUpdate);
-        handlePromiseResults(result, 'saleFk');
+        notifyResults(result, 'saleFk');
 
         emit('update-quantity', newQuantity.value);
     } catch (err) {
@@ -38,18 +36,18 @@ const updateQuantity = async () => {
 <template>
     <QCard class="q-pa-sm">
         <QCardSection class="row items-center justify-center column items-stretch">
-            <span>{{ t('negative.detail.modal.changeQuantity.title') }}</span>
+            <span>{{ $t('negative.detail.modal.changeQuantity.title') }}</span>
             <VnInput
                 type="number"
                 :min="0"
-                :label="t('negative.detail.modal.changeQuantity.placeholder')"
+                :label="$t('negative.detail.modal.changeQuantity.placeholder')"
                 v-model="newQuantity"
             />
         </QCardSection>
         <QCardActions align="right">
-            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+            <QBtn :label="$t('globals.cancel')" color="primary" flat v-close-popup />
             <QBtn
-                :label="t('globals.confirm')"
+                :label="$t('globals.confirm')"
                 color="primary"
                 :disable="!newQuantity || newQuantity < 0"
                 @click="updateQuantity"
diff --git a/src/pages/Ticket/Negative/components/ChangeStateDialog.vue b/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
index f005fbb12..1acc7e0ef 100644
--- a/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
+++ b/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
@@ -1,14 +1,12 @@
 <script setup>
 import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import handlePromiseResults from './notifyResults';
+import notifyResults from 'src/utils/notifyResults';
 
 const emit = defineEmits(['update-state']);
 const editableStates = ref([]);
-const { t } = useI18n();
 const showChangeStateDialog = ref(false);
 const newState = ref(null);
 const $props = defineProps({
@@ -27,7 +25,7 @@ const updateState = async () => {
             }),
         );
         const result = await Promise.allSettled(rowsToUpdate);
-        handlePromiseResults(result, 'ticketFk');
+        notifyResults(result, 'ticketFk');
 
         emit('update-state', newState.value);
     } catch (err) {
@@ -44,9 +42,9 @@ const updateState = async () => {
     />
     <QCard class="q-pa-sm">
         <QCardSection class="row items-center justify-center column items-stretch">
-            <span>{{ t('negative.detail.modal.changeState.title') }}</span>
+            <span>{{ $t('negative.detail.modal.changeState.title') }}</span>
             <VnSelect
-                :label="t('negative.detail.modal.changeState.placeholder')"
+                :label="$t('negative.detail.modal.changeState.placeholder')"
                 v-model="newState"
                 :options="editableStates"
                 option-label="name"
@@ -54,9 +52,9 @@ const updateState = async () => {
             />
         </QCardSection>
         <QCardActions align="right">
-            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+            <QBtn :label="$t('globals.cancel')" color="primary" flat v-close-popup />
             <QBtn
-                :label="t('globals.confirm')"
+                :label="$t('globals.confirm')"
                 color="primary"
                 :disable="!newState"
                 @click="updateState"
diff --git a/src/pages/Ticket/Negative/components/notifyResults.js b/src/utils/notifyResults.js
similarity index 73%
rename from src/pages/Ticket/Negative/components/notifyResults.js
rename to src/utils/notifyResults.js
index abedcd2c2..e87ad6c6f 100644
--- a/src/pages/Ticket/Negative/components/notifyResults.js
+++ b/src/utils/notifyResults.js
@@ -4,16 +4,12 @@ export default function (results, key) {
     results.forEach((result, index) => {
         if (result.status === 'fulfilled') {
             const data = JSON.parse(result.value.config.data);
-            console.log(`Promise ${index + 1} fulfilled:`, result.value);
-            // Mostrar notificación de éxito
             Notify.create({
                 type: 'positive',
                 message: `Operación (${index + 1}) ${data[key]} completada con éxito.`,
             });
         } else {
             const data = JSON.parse(result.reason.config.data);
-            console.error(`Promise ${index + 1} rejected:`, result.reason);
-            // Mostrar notificación de error
             Notify.create({
                 type: 'negative',
                 message: `Operación (${index + 1}) ${data[key]} fallida: ${result.reason.message}`,