From cf193b07c58649168bf8f4aeae619768b90ace5b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 08:02:17 -0300
Subject: [PATCH 1/4] Item tax

---
 src/components/CrudModel.vue    |   8 ++-
 src/i18n/locale/en.yml          |   3 +
 src/pages/Item/Card/ItemTax.vue | 103 +++++++++++++++++++++++++++++++-
 3 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index fb3ac10c3..24d848f3b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -124,11 +124,15 @@ async function onSubmit() {
         });
     }
     isLoading.value = true;
-    await saveChanges();
+    await saveChanges($props.saveFn ? formData.value : null);
 }
 
 async function saveChanges(data) {
-    if ($props.saveFn) return $props.saveFn(data, getChanges);
+    if ($props.saveFn) {
+        $props.saveFn(data, getChanges);
+        isLoading.value = false;
+        return;
+    }
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 04c278abe..d3b18dfe2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1123,6 +1123,9 @@ item:
         fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        botanical: Botanical
+        barcode: Barcodes
+        tax: Tax
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/pages/Item/Card/ItemTax.vue b/src/pages/Item/Card/ItemTax.vue
index 76663932c..b966eede9 100644
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@@ -1 +1,102 @@
-<template>Item tax</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const taxesFilter = {
+    fields: ['id', 'countryFk', 'taxClassFk'],
+    include: [
+        {
+            relation: 'country',
+            scope: {
+                fields: ['country'],
+            },
+        },
+    ],
+};
+
+const ItemTaxRef = ref(null);
+const taxesOptions = ref([]);
+
+const submitTaxes = async (data) => {
+    try {
+        let payload = data.map((tax) => ({
+            id: tax.id,
+            taxClassFk: tax.taxClassFk,
+        }));
+
+        await axios.post(`Items/updateTaxes`, payload);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error saving taxes', err);
+    }
+};
+
+onMounted(async () => {
+    if (ItemTaxRef.value) ItemTaxRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="TaxClasses"
+        :filter="{
+            fields: ['id', 'description', 'code'],
+        }"
+        @on-fetch="(data) => (taxesOptions = data)"
+        auto-load
+    />
+    <CrudModel
+        :url="`items/${route.params.id}/taxes`"
+        :save-fn="submitTaxes"
+        :filter="taxesFilter"
+        :default-remove="false"
+        data-key="ItemTax"
+        model="ItemTax"
+        ref="ItemTaxRef"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pl-lg q-py-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnInput
+                            :label="t('Country')"
+                            v-model="row.country.country"
+                            disable
+                        />
+                        <VnSelectFilter
+                            :label="t('Class')"
+                            v-model="row.taxClassFk"
+                            :options="taxesOptions"
+                            option-label="description"
+                            option-value="id"
+                            hide-selected
+                        />
+                    </VnRow>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<i18n>
+es:
+    Country: País
+    Class: Clase
+</i18n>

From 4be559bbe8ce672f2348b86407a2ba32624404f7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 15:16:37 +0200
Subject: [PATCH 2/4] fix: hansChanges to false

---
 src/components/CrudModel.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 24d848f3b..de4724e55 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -131,6 +131,7 @@ async function saveChanges(data) {
     if ($props.saveFn) {
         $props.saveFn(data, getChanges);
         isLoading.value = false;
+        hasChanges.value = false;
         return;
     }
     const changes = data || getChanges();

From f46b78131c07489886b8a89bf95bbbe35770755c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 10:24:07 +0200
Subject: [PATCH 3/4] perf: remove onMounted and reload

---
 src/pages/Customer/Card/CustomerContacts.vue   |  7 ++-----
 src/pages/Entry/Card/EntryNotes.vue            |  7 ++-----
 src/pages/Item/Card/ItemBarcode.vue            |  7 ++-----
 src/pages/Item/Card/ItemTax.vue                |  7 ++-----
 src/pages/Route/Roadmap/RoadmapStops.vue       | 14 +++++++-------
 src/pages/Supplier/Card/SupplierAccounts.vue   |  7 ++-----
 src/pages/Supplier/Card/SupplierAgencyTerm.vue |  7 ++-----
 src/pages/Supplier/Card/SupplierContacts.vue   |  7 ++-----
 8 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerContacts.vue b/src/pages/Customer/Card/CustomerContacts.vue
index 6fb891dff..cd4d553df 100644
--- a/src/pages/Customer/Card/CustomerContacts.vue
+++ b/src/pages/Customer/Card/CustomerContacts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,10 +11,6 @@ const route = useRoute();
 const { t } = useI18n();
 
 const customerContactsRef = ref(null);
-
-onMounted(() => {
-    if (customerContactsRef.value) customerContactsRef.value.reload();
-});
 </script>
 <template>
     <div class="full-width flex justify-center">
@@ -30,6 +26,7 @@ onMounted(() => {
                 model="CustomerContacts"
                 ref="customerContactsRef"
                 url="ClientContacts"
+                auto-load
             >
                 <template #body="{ rows }">
                     <QCard class="q-pl-lg q-py-md">
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index b9683578c..f07d0b233 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -21,10 +21,6 @@ const sortEntryObservationOptions = (data) => {
     );
 };
 
-onMounted(() => {
-    if (entryObservationsRef.value) entryObservationsRef.value.reload();
-});
-
 const columns = computed(() => [
     {
         name: 'observationType',
@@ -65,6 +61,7 @@ const columns = computed(() => [
         ref="entryObservationsRef"
         :data-required="{ entryFk: params.id }"
         v-model:selected="selected"
+        auto-load
     >
         <template #body="{ rows, validate }">
             <QTable
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index 26254ba84..b353d67c7 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, nextTick } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -23,10 +23,6 @@ const focusLastInput = () => {
         if (lastInput) lastInput.focus();
     });
 };
-
-onMounted(async () => {
-    if (itemBarcodeRef.value) itemBarcodeRef.value.reload();
-});
 </script>
 <template>
     <div class="full-width flex justify-center">
@@ -42,6 +38,7 @@ onMounted(async () => {
                 model="ItemBarcodes"
                 ref="itemBarcodeRef"
                 url="ItemBarcodes"
+                auto-load
             >
                 <template #body="{ rows }">
                     <QCard class="q-px-lg q-py-md">
diff --git a/src/pages/Item/Card/ItemTax.vue b/src/pages/Item/Card/ItemTax.vue
index 0942493f3..489a2c7b2 100644
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -44,10 +44,6 @@ const submitTaxes = async (data) => {
         console.error('Error saving taxes', err);
     }
 };
-
-onMounted(async () => {
-    if (ItemTaxRef.value) ItemTaxRef.value.reload();
-});
 </script>
 <template>
     <FetchData
@@ -66,6 +62,7 @@ onMounted(async () => {
         data-key="ItemTax"
         model="ItemTax"
         ref="ItemTaxRef"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-px-lg q-py-md">
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 10d6e6066..5c3bd51e7 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -3,9 +3,9 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 import CrudModel from 'components/CrudModel.vue';
-import RoadmapAddStopForm from "pages/Route/Roadmap/RoadmapAddStopForm.vue";
+import RoadmapAddStopForm from 'pages/Route/Roadmap/RoadmapAddStopForm.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -21,10 +21,6 @@ const updateDefaultStop = (data) => {
     eta.setDate(eta.getDate() + 1);
     defaultStop.value.eta = eta.toISOString();
 };
-
-onMounted(() => {
-    if (roadmapStopsCrudRef.value) roadmapStopsCrudRef.value.reload();
-});
 </script>
 <template>
     <VnSubToolbar />
@@ -43,6 +39,7 @@ onMounted(() => {
             :filter="{ where: { roadmapFk: route.params?.id } }"
             :default-remove="false"
             :data-required="defaultStop"
+            auto-load
         >
             <template #body="{ rows }">
                 <QCard class="q-pa-md">
@@ -51,7 +48,10 @@ onMounted(() => {
                         :key="index"
                         class="row no-wrap"
                     >
-                        <RoadmapAddStopForm :roadmap-fk="route.params?.id" :form-data="row" />
+                        <RoadmapAddStopForm
+                            :roadmap-fk="route.params?.id"
+                            :form-data="row"
+                        />
                         <div class="col-1 row justify-center items-center">
                             <QIcon
                                 name="delete"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 41df6adb9..d95b6c30c 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -59,10 +59,6 @@ const setWireTransfer = async () => {
         console.error('Error setting wire transfer', err);
     }
 };
-
-onMounted(() => {
-    if (supplierAccountRef.value) supplierAccountRef.value.reload();
-});
 </script>
 <template>
     <FetchData
@@ -94,6 +90,7 @@ onMounted(() => {
         :default-remove="false"
         :data-required="{ supplierFk: route.params.id }"
         @save-changes="onChangesSaved()"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-pa-md">
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 769ff4dad..50a4f7adc 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -26,10 +26,6 @@ const supplierAgencyFilter = {
 const redirectToCreateView = () => {
     router.push({ name: 'SupplierAgencyTermCreate' });
 };
-
-onMounted(() => {
-    if (supplierAgencyTermRef.value) supplierAgencyTermRef.value.reload();
-});
 </script>
 <template>
     <FetchData
@@ -49,6 +45,7 @@ onMounted(() => {
         :data-required="{
             supplierFk: route.params.id,
         }"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-pa-md">
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index a78c376a9..92ba1c1fc 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, nextTick } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -19,10 +19,6 @@ const insertRow = () => {
         if (lastInput) lastInput.focus();
     });
 };
-
-onMounted(() => {
-    if (supplierContactRef.value) supplierContactRef.value.reload();
-});
 </script>
 
 <template>
@@ -36,6 +32,7 @@ onMounted(() => {
         ref="supplierContactRef"
         :default-remove="false"
         :data-required="{ supplierFk: route.params.id }"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-pa-md">

From cd5389fb919519f8b950ada4d5a8bf46257a9ff3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 10:25:46 +0200
Subject: [PATCH 4/4] fix: i18n

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

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ecb85bd1a..d14b3aae7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -989,7 +989,7 @@ supplier:
         billingData: Billing data
         payMethod: Pay method
         payDeadline: Pay deadline
-        payDay: Día de pago
+        payDay: Pay day
         account: Account
         fiscalData: Fiscal data
         sageTaxType: Sage tax type