From bc41eabcf3af7e012e57622d091cb8050df8828c Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 12 Dec 2024 07:19:38 +0100
Subject: [PATCH 1/7] refactor: refs #8288 changed invoice out spanish
 translation

---
 src/i18n/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 61a5984cb..120f7742b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -497,7 +497,7 @@ invoiceOut:
         ticketList: Listado de tickets
     summary:
         issued: Fecha
-        dued: Vencimiento
+        dued: Fecha límite
         booked: Contabilizada
         taxBreakdown: Desglose impositivo
         taxableBase: Base imp.

From 6895780c09c0d2204ba3898b36b450208382dc3a Mon Sep 17 00:00:00 2001
From: Jtubau <jtubau@verdnatura.es>
Date: Thu, 12 Dec 2024 16:26:01 +0100
Subject: [PATCH 2/7] feat: refs #7072 added test to computed fn total

---
 .../components/common/VnDiscount.spec.js      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 test/vitest/__tests__/components/common/VnDiscount.spec.js

diff --git a/test/vitest/__tests__/components/common/VnDiscount.spec.js b/test/vitest/__tests__/components/common/VnDiscount.spec.js
new file mode 100644
index 000000000..5d5be61ac
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnDiscount.spec.js
@@ -0,0 +1,28 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnDiscount from 'components/common/vnDiscount.vue';
+
+describe('VnDiscount', () => {
+    let vm;
+    
+    beforeAll(() => {
+        vm = createWrapper(VnDiscount, {
+            props: {
+                data: {},
+                price: 100,
+                quantity: 2,
+                discount: 10,
+            }
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('total', () => {
+        it('should calculate total correctly', () => {            
+            expect(vm.total).toBe(180);
+        });
+    });
+});
\ No newline at end of file

From 696be32fa6c8c43e45294f358f345df61022732f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 06:54:40 +0100
Subject: [PATCH 3/7] feat: remove search after category

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 1dd569fb5..39627595d 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -65,7 +65,6 @@ const selectCategory = async (params, category, search) => {
     params.typeFk = null;
     params.categoryFk = category.id;
     await loadTypes(category?.id);
-    await search();
 };
 
 const loadTypes = async (id) => {

From bd15d2e73aef226c68e04d51d88098e72703af7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 06:56:22 +0100
Subject: [PATCH 4/7] feat: remove re-fetch when add element

---
 src/pages/Order/Card/OrderCatalog.vue         | 22 +++++++++----------
 .../Order/Card/OrderCatalogItemDialog.vue     | 15 ++++++++-----
 src/pages/Order/Card/OrderDescriptor.vue      | 11 +++++++---
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 453037f15..0b01c88ac 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -75,19 +75,17 @@ watch(
     },
     { immediate: true }
 );
-const onItemSaved = (updatedItem) => {
-    requestAnimationFrame(() => {
-        scrollToItem(updatedItem.items[0].itemFk);
-    });
-};
+// const onItemSaved = (updatedItem) => {
+//     console.error(stateStore);
+// };
 
-const scrollToItem = async (id) => {
-    const element = itemRefs.value[id]?.$el;
-    if (element) {
-        element.scrollIntoView({ behavior: 'smooth', block: 'center' });
-    }
-};
-provide('onItemSaved', onItemSaved);
+// const scrollToItem = async (id) => {
+//     const element = itemRefs.value[id]?.$el;
+//     if (element) {
+//         element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+//     }
+// };
+// provide('onItemSaved', onItemSaved);
 </script>
 
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index b1cd8ed6b..d07fa7650 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -1,12 +1,12 @@
 <script setup>
 import toCurrency from 'src/filters/toCurrency';
-import { inject, ref } from 'vue';
+import { computed, inject, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useRoute } from 'vue-router';
 import useNotify from 'composables/useNotify';
-import { useArrayData } from 'composables/useArrayData';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { useState } from 'src/composables/useState';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -18,9 +18,12 @@ const props = defineProps({
         required: true,
     },
 });
-const onItemSaved = inject('onItemSaved');
+const state = useState();
+
+const total = computed(() => state.get('orderTotal'));
+
+// const onItemSaved = inject('onItemSaved');
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
-const descriptorData = useArrayData('orderData');
 const isLoading = ref(false);
 const addToOrder = async () => {
     if (isLoading.value) return;
@@ -30,9 +33,9 @@ const addToOrder = async () => {
         items,
         orderFk: Number(route.params.id),
     });
+    state.set('orderTotal', total.value + 100);
     notify(t('globals.dataSaved'), 'positive');
-    await descriptorData.fetch({});
-    onItemSaved({ ...props, items, saved: true });
+    //  onItemSaved({ ...props, items, saved: true });
     emit('added', items);
     isLoading.value = false;
 };
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 138fcc40f..12b106847 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -63,21 +63,26 @@ const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
     data.value = useCardDescription(entity?.client?.name, entity?.id);
-    state.set('orderData', entity);
+    state.set('orderTotal', _total);
 };
 
 const getConfirmationValue = (isConfirmed) => {
     return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
 
-const total = ref(null);
+const total = computed(() => state.get('orderTotal') ?? 0);
+const _total = ref(0);
 </script>
 
 <template>
     <FetchData
         ref="getTotalRef"
         :url="`Orders/${entityId}/getTotal`"
-        @on-fetch="(response) => (total = response)"
+        @on-fetch="
+            (response) => {
+                _total = response;
+            }
+        "
     />
     <CardDescriptor
         ref="descriptor"

From b3170108e0018de0be4dfa8d926c6867051139a9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 10:50:32 +0100
Subject: [PATCH 5/7] feat: update quantity

---
 src/components/ui/CatalogItem.vue             | 44 +++++++++++--------
 .../Order/Card/OrderCatalogItemDialog.vue     | 26 ++++++++++-
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 74a36ff2e..9670d9b68 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, toRef } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnLv from 'components/ui/VnLv.vue';
@@ -13,7 +13,7 @@ const DEFAULT_PRICE_KG = 0;
 
 const { t } = useI18n();
 
-defineProps({
+const props = defineProps({
     item: {
         type: Object,
         required: true,
@@ -25,57 +25,63 @@ defineProps({
 });
 
 const dialog = ref(null);
+const card = toRef(props, 'item');
 </script>
 
 <template>
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
-                <div v-if="item.hex && isCatalog" class="item-color-container">
+                <VnImg :id="card.id" class="image" zoom-resolution="1600x900" />
+                <div v-if="card.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
-                        :style="{ backgroundColor: `#${item.hex}` }"
+                        :style="{ backgroundColor: `#${card.hex}` }"
                     ></div>
                 </div>
             </div>
             <div class="content">
                 <span class="link">
-                    {{ item.name }}
-                    <ItemDescriptorProxy :id="item.id" />
+                    {{ card.name }}
+                    <ItemDescriptorProxy :id="card.id" />
                 </span>
-                <p class="subName">{{ item.subName }}</p>
+                <p class="subName">{{ card.subName }}</p>
                 <template v-for="index in 4" :key="`tag-${index}`">
                     <VnLv
-                        v-if="item?.[`tag${index + 4}`]"
-                        :label="item?.[`tag${index + 4}`] + ':'"
-                        :value="item?.[`value${index + 4}`]"
+                        v-if="card?.[`tag${index + 4}`]"
+                        :label="card?.[`tag${index + 4}`] + ':'"
+                        :value="card?.[`value${index + 4}`]"
                     />
                 </template>
-                <div v-if="item.minQuantity" class="min-quantity">
+                <div v-if="card.minQuantity" class="min-quantity">
                     <QIcon name="production_quantity_limits" size="xs" />
-                    {{ item.minQuantity }}
+                    {{ card.minQuantity }}
                 </div>
                 <div class="footer">
                     <div class="price">
                         <p v-if="isCatalog">
-                            {{ item.available }} {{ t('to') }}
-                            {{ toCurrency(item.price) }}
+                            {{ card.available }} {{ t('to') }}
+                            {{ toCurrency(card.price) }}
                         </p>
                         <slot name="price" />
                         <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
-                                    :item="item"
-                                    @added="() => dialog.hide()"
+                                    :item="card"
+                                    @added="
+                                        (quantityAdded) => {
+                                            card.available += quantityAdded;
+                                            dialog.hide();
+                                        }
+                                    "
                                 />
                             </QPopupProxy>
                         </QIcon>
                     </div>
-                    <p v-if="item.priceKg" class="price-kg">
+                    <p v-if="card.priceKg" class="price-kg">
                         {{ t('price-kg') }}
-                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
+                        {{ toCurrency(card.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index d07fa7650..7b07582f0 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -25,6 +25,25 @@ const total = computed(() => state.get('orderTotal'));
 // const onItemSaved = inject('onItemSaved');
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
+const calculateTotals = (items) => {
+    return items.reduce(
+        (acc, item) => {
+            acc.totalQuantity += item.quantity;
+            acc.totalSum += item.quantity * item.price;
+            return acc;
+        },
+        { totalQuantity: 0, totalSum: 0 }
+    );
+};
+
+// const totalSum = (items) =>
+//     items.reduce((acc, item) => {
+//         return acc + item.quantity * item.price;
+//     }, 0);
+// const totalQuantity = (items) =>
+//     items.reduce((acc, item) => {
+//         return acc + item.quantity;
+//     }, 0);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
@@ -33,10 +52,13 @@ const addToOrder = async () => {
         items,
         orderFk: Number(route.params.id),
     });
-    state.set('orderTotal', total.value + 100);
+
+    const { totalQuantity, totalSum } = calculateTotals(items);
+
+    state.set('orderTotal', total.value + totalSum);
     notify(t('globals.dataSaved'), 'positive');
     //  onItemSaved({ ...props, items, saved: true });
-    emit('added', items);
+    emit('added', -totalQuantity);
     isLoading.value = false;
 };
 const canAddToOrder = () => {

From b18de7df4e337b322b9f75a416a0bce9b40e07ac Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 12:17:54 +0100
Subject: [PATCH 6/7] perf: #6896  REMOVE COMMENTS

---
 src/pages/Order/Card/OrderCatalog.vue           | 11 -----------
 src/pages/Order/Card/OrderCatalogItemDialog.vue | 10 ----------
 src/pages/Order/Card/OrderDescriptor.vue        | 10 +++++-----
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 0b01c88ac..b7af615bb 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -75,17 +75,6 @@ watch(
     },
     { immediate: true }
 );
-// const onItemSaved = (updatedItem) => {
-//     console.error(stateStore);
-// };
-
-// const scrollToItem = async (id) => {
-//     const element = itemRefs.value[id]?.$el;
-//     if (element) {
-//         element.scrollIntoView({ behavior: 'smooth', block: 'center' });
-//     }
-// };
-// provide('onItemSaved', onItemSaved);
 </script>
 
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 7b07582f0..39b0b0120 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -22,7 +22,6 @@ const state = useState();
 
 const total = computed(() => state.get('orderTotal'));
 
-// const onItemSaved = inject('onItemSaved');
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
 const calculateTotals = (items) => {
@@ -36,14 +35,6 @@ const calculateTotals = (items) => {
     );
 };
 
-// const totalSum = (items) =>
-//     items.reduce((acc, item) => {
-//         return acc + item.quantity * item.price;
-//     }, 0);
-// const totalQuantity = (items) =>
-//     items.reduce((acc, item) => {
-//         return acc + item.quantity;
-//     }, 0);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
@@ -57,7 +48,6 @@ const addToOrder = async () => {
 
     state.set('orderTotal', total.value + totalSum);
     notify(t('globals.dataSaved'), 'positive');
-    //  onItemSaved({ ...props, items, saved: true });
     emit('added', -totalQuantity);
     isLoading.value = false;
 };
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 12b106847..e0c613aed 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -63,15 +63,15 @@ const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
     data.value = useCardDescription(entity?.client?.name, entity?.id);
-    state.set('orderTotal', _total);
+    state.set('orderTotal', total);
 };
 
 const getConfirmationValue = (isConfirmed) => {
     return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
 
-const total = computed(() => state.get('orderTotal') ?? 0);
-const _total = ref(0);
+const orderTotal = computed(() => state.get('orderTotal') ?? 0);
+const total = ref(0);
 </script>
 
 <template>
@@ -80,7 +80,7 @@ const _total = ref(0);
         :url="`Orders/${entityId}/getTotal`"
         @on-fetch="
             (response) => {
-                _total = response;
+                total = response;
             }
         "
     />
@@ -117,7 +117,7 @@ const _total = ref(0);
                 :label="t('order.summary.items')"
                 :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
             />
-            <VnLv :label="t('order.summary.total')" :value="toCurrency(total)" />
+            <VnLv :label="t('order.summary.total')" :value="toCurrency(orderTotal)" />
         </template>
         <template #actions="{ entity }">
             <QCardActions>

From 5caf82fad7adabebcd32d47729f948294ef90997 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 13:32:40 +0100
Subject: [PATCH 7/7] fix: get total from api

---
 .../Order/Card/OrderCatalogItemDialog.vue     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 39b0b0120..0d55b7de1 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,21 +20,15 @@ const props = defineProps({
 });
 const state = useState();
 
-const total = computed(() => state.get('orderTotal'));
+const orderData = computed(() => state.get('orderData'));
 
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
-const calculateTotals = (items) => {
-    return items.reduce(
-        (acc, item) => {
-            acc.totalQuantity += item.quantity;
-            acc.totalSum += item.quantity * item.price;
-            return acc;
-        },
-        { totalQuantity: 0, totalSum: 0 }
-    );
-};
 
+const totalQuantity = (items) =>
+    items.reduce((acc, item) => {
+        return acc + item.quantity;
+    }, 0);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
@@ -44,11 +38,18 @@ const addToOrder = async () => {
         orderFk: Number(route.params.id),
     });
 
-    const { totalQuantity, totalSum } = calculateTotals(items);
+    const { data: orderTotal } = await axios.get(
+        `Orders/${Number(route.params.id)}/getTotal`
+    );
 
-    state.set('orderTotal', total.value + totalSum);
+    state.set('orderTotal', orderTotal);
+    const rows = orderData.value.rows.push(...items) || [];
+    state.set('orderData', {
+        ...orderData.value,
+        rows,
+    });
     notify(t('globals.dataSaved'), 'positive');
-    emit('added', -totalQuantity);
+    emit('added', -totalQuantity(items));
     isLoading.value = false;
 };
 const canAddToOrder = () => {