From 70ca31aa46361550557d23dff11d53b9b8e72231 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 10:24:09 +0100
Subject: [PATCH] feat: refs #7936 add company filter

---
 src/pages/InvoiceIn/InvoiceInFilter.vue | 36 +++++--------------------
 src/pages/InvoiceIn/InvoiceInList.vue   |  4 +++
 src/pages/InvoiceIn/locale/en.yml       |  1 +
 src/pages/InvoiceIn/locale/es.yml       |  1 +
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 2991a4190..8f69bf262 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -1,25 +1,14 @@
 <script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
 import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
-const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
-const activities = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="SupplierActivities"
-        auto-load
-        @on-fetch="(data) => (activities = data)"
-    />
     <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
@@ -31,7 +20,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('globals.from')"
+                        :label="$t('globals.from')"
                         v-model="params.from"
                         is-outlined
                     />
@@ -40,7 +29,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('globals.to')"
+                        :label="$t('globals.to')"
                         v-model="params.to"
                         is-outlined
                     />
@@ -113,7 +102,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputNumber
-                        :label="t('globals.amount')"
+                        :label="$t('globals.amount')"
                         v-model="params.amount"
                         is-outlined
                     />
@@ -123,7 +112,7 @@ const activities = ref([]);
                 <QItemSection>
                     <VnSelect
                         v-model="params.companyFk"
-                        :label="t('globals.company')"
+                        :label="$t('globals.company')"
                         url="Companies"
                         option-label="code"
                         :fields="['id', 'code']"
@@ -136,13 +125,13 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('InvoiceIn.isBooked')"
+                        :label="$t('InvoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
                     />
                     <QCheckbox
-                        :label="t('params.correctingFk')"
+                        :label="getLocale('params.correctingFk')"
                         v-model="params.correctingFk"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
@@ -152,16 +141,3 @@ const activities = ref([]);
         </template>
     </VnFilterPanel>
 </template>
-
-<i18n>
-en:
-    params:
-        search: Id or supplier name
-        account: Ledger account
-        correctingFk: Rectificative
-es:
-    params:
-        search: Id o nombre proveedor
-        account: Cuenta contable
-        correctingFk: Rectificativa
-</i18n>
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 4c9059dbe..82e550aca 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -14,6 +14,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
@@ -23,6 +24,7 @@ onMounted(async () => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 const tableRef = ref();
+const companies = ref([]);
 const cols = computed(() => [
     {
         align: 'left',
@@ -90,6 +92,7 @@ const cols = computed(() => [
                 optionLabel: 'code',
             },
         },
+        format: (row) => row.code,
     },
     {
         align: 'right',
@@ -113,6 +116,7 @@ const cols = computed(() => [
 ]);
 </script>
 <template>
+    <FetchData url="Companies" @on-fetch="(data) => (companies = data)" auto-load />
     <InvoiceInSearchbar />
     <RightMenu>
         <template #right-panel>
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index c917f524e..91d08c3ca 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -43,4 +43,5 @@ InvoiceIn:
         search: Id or supplier name
         account: Ledger account
         correctingFk: Rectificative
+        correctedFk: Corrected
         isBooked: Is booked
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index f7e9b7034..80ab9866b 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -42,3 +42,4 @@ InvoiceIn:
         search: Id o nombre proveedor
         account: Cuenta contable
         correctingFk: Rectificativa
+        correctedFk: Rectificada