From f404243d63be8fdc5d34efa4c27f0ce827bf5fd2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Apr 2024 08:38:26 +0200
Subject: [PATCH 01/32] feat(route): refs # agency add agencyList

---
 src/i18n/en/index.js                  |  1 +
 src/i18n/es/index.js                  |  1 +
 src/pages/Route/Agency/AgencyList.vue | 39 +++++++++++++++++++++++++++
 src/router/modules/route.js           | 11 +++++++-
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Route/Agency/AgencyList.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9e0ad7c9b..a91f9586b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -937,6 +937,7 @@ export default {
         pageTitles: {
             routes: 'Routes',
             cmrsList: 'External CMRs list',
+            agencyList: 'Agency',
             RouteList: 'List',
             create: 'Create',
             basicData: 'Basic Data',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6083dfad7..3b664a8e4 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -937,6 +937,7 @@ export default {
         pageTitles: {
             routes: 'Rutas',
             cmrsList: 'Listado de CMRs externos',
+            agency: 'Agency',
             RouteList: 'Listado',
             create: 'Crear',
             basicData: 'Datos básicos',
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
new file mode 100644
index 000000000..ca5197986
--- /dev/null
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -0,0 +1,39 @@
+<script setup>
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+function navigate(id) {
+    router.push({ path: `/agencies/${id}` });
+}
+</script>
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyList"
+                url="agencies"
+                limit="20"
+                order-by="name"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate(row.id)"
+                        v-for="row of rows"
+                    >
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<style lang="scss"></style>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 614345913..4031e74bf 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'CmrList'],
+        main: ['RouteList', 'CmrList', 'agencyList'],
         card: ['RouteBasicData'],
     },
     children: [
@@ -29,6 +29,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
+                {
+                    path: 'agency',
+                    name: 'agencyList',
+                    meta: {
+                        title: 'agencyList',
+                        icon: 'package',
+                    },
+                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
+                },
                 {
                     path: 'list',
                     name: 'RouteList',

From fb6a2c809789eb74f23bdb2f62d0d90be6bc1753 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Apr 2024 14:59:51 +0200
Subject: [PATCH 02/32] feat: refs #4988 add agencyList and searchBar

---
 src/i18n/en/index.js                  |  1 +
 src/i18n/es/index.js                  |  3 +-
 src/pages/Agency/AgencyList.vue       | 92 +++++++++++++++++++++++++++
 src/pages/Agency/Card/AgencyCard.vue  | 39 ++++++++++++
 src/pages/Route/Agency/AgencyList.vue | 39 ------------
 src/router/modules/agency.js          | 54 ++++++++++++++++
 src/router/modules/route.js           | 26 +++++---
 7 files changed, 204 insertions(+), 50 deletions(-)
 create mode 100644 src/pages/Agency/AgencyList.vue
 create mode 100644 src/pages/Agency/Card/AgencyCard.vue
 delete mode 100644 src/pages/Route/Agency/AgencyList.vue
 create mode 100644 src/router/modules/agency.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 054668042..9d0488cab 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -91,6 +91,7 @@ export default {
             basicData: 'Basic data',
             log: 'Logs',
             parkingList: 'Parkings list',
+            agencyList: 'Agencies list',
         },
     },
     errors: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 099f97938..478c93467 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -91,6 +91,7 @@ export default {
             basicData: 'Datos básicos',
             log: 'Historial',
             parkingList: 'Listado de parkings',
+            agencyList: 'Listado de agencias',
         },
     },
     errors: {
@@ -992,7 +993,7 @@ export default {
             routes: 'Rutas',
             cmrsList: 'Listado de CMRs externos',
             agency: 'Agency',
-            RouteList: 'Listado',
+            RouteList: 'Listado de rutas',
             create: 'Crear',
             basicData: 'Datos básicos',
             summary: 'Resumen',
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
new file mode 100644
index 000000000..2746f8529
--- /dev/null
+++ b/src/pages/Agency/AgencyList.vue
@@ -0,0 +1,92 @@
+<script setup>
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+function navigate(id) {
+    router.push({ path: `/agency/${id}` });
+}
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'search':
+            return { name: { like: `%${value}%` } };
+    }
+}
+</script>
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                :info="t('You can search by name')"
+                :label="t('Search agency')"
+                data-key="AgencyList"
+                url="Agencies"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyList"
+                url="Agencies"
+                order="name"
+                :expr-builder="exprBuilder"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate(row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <QCheckbox
+                                :label="t('isOwn')"
+                                v-model="row.isOwn"
+                                :disable="true"
+                            />
+                            <QCheckbox
+                                :label="t('isAnyVolumeAllowed')"
+                                v-model="row.isAnyVolumeAllowed"
+                                :disable="true"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openCard')"
+                                @click.stop="navigate(row.id)"
+                                outline
+                            />
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, CustomerSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
new file mode 100644
index 000000000..1c7e3cc10
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -0,0 +1,39 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useRoute } from 'vue-router';
+import CustomerDescriptor from './CustomerDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import useCardSize from 'src/composables/useCardSize';
+
+const stateStore = useStateStore();
+const route = useRoute();
+const { t } = useI18n();
+</script>
+<template>
+    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            data-key="CustomerList"
+            url="Clients/filter"
+            :label="t('Search customer')"
+            :info="t('You can search by customer id or name')"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <CustomerDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="useCardSize()">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
deleted file mode 100644
index ca5197986..000000000
--- a/src/pages/Route/Agency/AgencyList.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<script setup>
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
-const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-const router = useRouter();
-function navigate(id) {
-    router.push({ path: `/agencies/${id}` });
-}
-</script>
-<template>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="AgencyList"
-                url="agencies"
-                limit="20"
-                order-by="name"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.name"
-                        @click="navigate(row.id)"
-                        v-for="row of rows"
-                    >
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-<style lang="scss"></style>
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
new file mode 100644
index 000000000..42b139b95
--- /dev/null
+++ b/src/router/modules/agency.js
@@ -0,0 +1,54 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/agency',
+    name: 'Agency',
+    meta: {
+        title: 'agency',
+        icon: 'garage_home',
+        moduleName: 'Agency',
+    },
+    component: RouterView,
+    redirect: { name: 'AgencyCard' },
+    menus: {
+        main: [],
+        card: ['AgencyBasicData', 'AgencyLog'],
+    },
+    children: [
+        {
+            path: '/agency/:id',
+            name: 'AgencyCard',
+            component: () => import('src/pages/Agency/Card/AgencyCard.vue'),
+            redirect: { name: 'AgencySummary' },
+            children: [
+                {
+                    name: 'AgencySummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Agency/Card/AgencySummary.vue'),
+                },
+                {
+                    name: 'AgencyBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
+                },
+                {
+                    name: 'AgencyLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Agency/Card/AgencyLog.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 1e392fa0f..cfa8c9c35 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'agencyList'],
+        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -21,15 +21,6 @@ export default {
             component: () => import('src/pages/Route/RouteMain.vue'),
             redirect: { name: 'RouteList' },
             children: [
-                {
-                    path: 'agency',
-                    name: 'agencyList',
-                    meta: {
-                        title: 'agencyList',
-                        icon: 'package',
-                    },
-                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
-                },
                 {
                     path: 'list',
                     name: 'RouteList',
@@ -83,6 +74,21 @@ export default {
                     },
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
+                {
+                    path: '/agency',
+                    redirect: { name: 'agencyList' },
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'AgencyList',
+                            meta: {
+                                title: 'agencyList',
+                                icon: 'view_list',
+                            },
+                            component: () => import('src/pages/Agency/AgencyList.vue'),
+                        },
+                    ],
+                },
             ],
         },
         {

From ad8007fe6b00c473b7f21fc4f18af3062397a19b Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 11 Apr 2024 13:42:37 +0200
Subject: [PATCH 03/32] refs #6641 add checkbox

---
 src/pages/Claim/ClaimFilter.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index ee702ffdd..ef14811d1 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -149,6 +149,15 @@ const states = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('myTeam')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
             <QSeparator />
             <QExpansionItem :label="t('More options')" expand-separator>
                 <!-- <QItem>
@@ -192,6 +201,7 @@ en:
         claimResponsibleFk: Responsible
         claimStateFk: State
         created: Created
+    myTeam: My team
 es:
     params:
         search: Contiene
@@ -211,4 +221,5 @@ es:
     Item: Artículo
     Created: Creada
     More options: Más opciones
+    myTeam: Mi equipo
 </i18n>

From c65c09c39c990bd6b72be4cc59e65db1814c80fe Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 16 Apr 2024 07:45:33 +0200
Subject: [PATCH 04/32] feat(agency): refs #4988 add agency router and sections

---
 src/components/common/VnBreadcrumbs.vue    |  1 +
 src/i18n/en/index.js                       |  8 ++-
 src/pages/Agency/AgencyList.vue            |  9 ++--
 src/pages/Agency/Card/AgencyBasicData.vue  | 59 ++++++++++++++++++++++
 src/pages/Agency/Card/AgencyCard.vue       | 46 +++++++++++------
 src/pages/Agency/Card/AgencyDescriptor.vue | 39 ++++++++++++++
 src/pages/Agency/Card/AgencyLog.vue        |  6 +++
 src/pages/Agency/Card/AgencySummary.vue    | 44 ++++++++++++++++
 src/router/modules/index.js                |  2 +
 src/router/routes.js                       |  2 +
 10 files changed, 196 insertions(+), 20 deletions(-)
 create mode 100644 src/pages/Agency/Card/AgencyBasicData.vue
 create mode 100644 src/pages/Agency/Card/AgencyDescriptor.vue
 create mode 100644 src/pages/Agency/Card/AgencyLog.vue
 create mode 100644 src/pages/Agency/Card/AgencySummary.vue

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 337507233..65f6946f4 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -30,6 +30,7 @@ watchEffect(() => {
 });
 
 function getBreadcrumb(param) {
+    console.log('param.meta.title: ', param.meta.title);
     const breadcrumb = {
         icon: param.meta.icon,
         path: param.path,
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 0f90d5f44..d26ee26a3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1003,9 +1003,10 @@ export default {
     },
     route: {
         pageTitles: {
+            agency: 'Agency',
             routes: 'Routes',
             cmrsList: 'External CMRs list',
-            agencyList: 'Agency',
+            agencyList: 'Agency list',
             RouteList: 'List',
             create: 'Create',
             basicData: 'Basic Data',
@@ -1033,6 +1034,11 @@ export default {
             },
         },
     },
+    agency: {
+        pageTitles: {
+            agency: 'Agency',
+        },
+    },
     supplier: {
         pageTitles: {
             suppliers: 'Suppliers',
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index 2746f8529..6f8185864 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -15,10 +15,11 @@ function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
 function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return { name: { like: `%${value}%` } };
-    }
+    if (param !== 'search') return;
+
+    if (!isNaN(value)) return { id: value };
+
+    return { name: { like: `%${value}%` } };
 }
 </script>
 <template>
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
new file mode 100644
index 000000000..f54f7037d
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -0,0 +1,59 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const id = route.params?.id || null;
+const warehouses = ref([]);
+const sectorFilter = { fields: ['id', 'description'] };
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: sectorFilter }],
+};
+</script>
+<template>
+    <FetchData
+        url="warehouses"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
+    <VnSubToolbar />
+    <FormModel :url="`Agencies/${id}`" model="agency" auto-load>
+        <template #form="{ data }">
+            <VnRow>
+                <VnInput v-model="data.name" :label="t('globals.name')" />
+            </VnRow>
+            <VnRow>
+                <VnSelectFilter
+                    v-model="data.sectorFk"
+                    option-value="id"
+                    option-label="name"
+                    :label="t('parking.sector')"
+                    :options="warehouses"
+                    use-input
+                    input-debounce="0"
+                    :is-clearable="false"
+                />
+            </VnRow>
+            <VnRow>
+                <QCheckbox :label="t('isOwn')" v-model="data.isOwn" />
+            </VnRow>
+            <VnRow>
+                <QCheckbox
+                    :label="t('isAnyVolumeAllowed')"
+                    v-model="data.isAnyVolumeAllowed"
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index 1c7e3cc10..628acf2f2 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -1,39 +1,55 @@
 <script setup>
+import { onMounted, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-import { useRoute } from 'vue-router';
-import CustomerDescriptor from './CustomerDescriptor.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
+import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
 
-const stateStore = useStateStore();
-const route = useRoute();
 const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+const arrayData = useArrayData('Agency', {
+    url: `Agencies/${route.params.id}`,
+});
+const { store } = arrayData;
+onMounted(async () => await arrayData.fetch({ append: false }));
+watch(
+    () => route.params.id,
+    async (newId) => {
+        if (newId) {
+            store.url = `Agencies/${newId}`;
+            await arrayData.fetch({ append: false });
+        }
+    }
+);
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
         <VnSearchbar
-            data-key="CustomerList"
-            url="Clients/filter"
-            :label="t('Search customer')"
-            :info="t('You can search by customer id or name')"
+            :info="t('Agency.searchBar.info')"
+            :label="t('Agency.searchBar.label')"
+            data-key="Agency"
         />
     </Teleport>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <CustomerDescriptor />
+            <AgencyDescriptor />
             <QSeparator />
             <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
+            <RouterView></RouterView>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
new file mode 100644
index 000000000..573205f8b
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -0,0 +1,39 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { useArrayData } from 'src/composables/useArrayData';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const { params } = useRoute();
+const entityId = computed(() => props.id || params.id);
+const { store } = useArrayData('Parking');
+const card = computed(() => store.data);
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+<template>
+    <CardDescriptor
+        module="Agency"
+        data-key="Agency"
+        :url="`Agencies/${entityId}`"
+        :title="card?.name"
+        :subtitle="card?.id"
+    >
+        <template #body="{ entity: agency }">
+            <VnLv :label="t('globals.name')" :value="agency.name" />
+        </template>
+    </CardDescriptor>
+</template>
diff --git a/src/pages/Agency/Card/AgencyLog.vue b/src/pages/Agency/Card/AgencyLog.vue
new file mode 100644
index 000000000..d4769a676
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Agency" url="/AgencyLogs" />
+</template>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
new file mode 100644
index 000000000..96652fe29
--- /dev/null
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -0,0 +1,44 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const { params } = useRoute();
+const { t } = useI18n();
+const entityId = computed(() => $props.id || params.id);
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary :url="`Agencies/${entityId}`">
+            <template #header="{ entity: agency }">{{ agency.name }}</template>
+            <template #body="{ entity: agency }">
+                <QCard class="vn-one">
+                    <QCardSection class="q-pa-none">
+                        <a
+                            class="header header-link"
+                            :href="`#/agency/${entityId}/basic-data`"
+                        >
+                            {{ t('globals.pageTitles.basicData') }}
+                            <QIcon name="open_in_new" />
+                        </a>
+                    </QCardSection>
+                    <VnLv :label="t('globals.name')" :value="agency.name" />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 302ba7fe0..6f4b0b35e 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
+import Agency from './agency';
 
 export default [
     Item,
@@ -34,4 +35,5 @@ export default [
     Entry,
     roadmap,
     Parking,
+    Agency,
 ];
diff --git a/src/router/routes.js b/src/router/routes.js
index 51e726a62..ca52441e7 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -15,6 +15,7 @@ import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
+import agency from 'src/router/modules/agency';
 
 const routes = [
     {
@@ -71,6 +72,7 @@ const routes = [
             roadmap,
             entry,
             parking,
+            agency,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From 6b4cb4ed122cf086cff1f699b2d53a08efa5d80d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 22 Apr 2024 12:19:22 +0200
Subject: [PATCH 05/32] feat: refs #4988 add agency section

---
 src/i18n/en/index.js                       |  14 ++-
 src/i18n/es/index.js                       |   9 ++
 src/pages/Agency/AgencyList.vue            |   8 --
 src/pages/Agency/Card/AgencyBasicData.vue  |  21 ++--
 src/pages/Agency/Card/AgencyCard.vue       |   5 -
 src/pages/Agency/Card/AgencyDescriptor.vue |   7 +-
 src/pages/Agency/Card/AgencyModes.vue      |  84 +++++++++++++++
 src/pages/Agency/Card/AgencySummary.vue    |  20 ++--
 src/pages/Agency/Card/AgencyWorkcenter.vue | 113 +++++++++++++++++++++
 src/router/modules/agency.js               |  36 ++++++-
 src/router/modules/route.js                |   2 +-
 11 files changed, 274 insertions(+), 45 deletions(-)
 create mode 100644 src/pages/Agency/Card/AgencyModes.vue
 create mode 100644 src/pages/Agency/Card/AgencyWorkcenter.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index d26ee26a3..be8a13267 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -94,6 +94,7 @@ export default {
         },
         created: 'Created',
         worker: 'Worker',
+        name: 'Name',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -1034,11 +1035,6 @@ export default {
             },
         },
     },
-    agency: {
-        pageTitles: {
-            agency: 'Agency',
-        },
-    },
     supplier: {
         pageTitles: {
             suppliers: 'Suppliers',
@@ -1291,4 +1287,12 @@ export default {
         },
         iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
+    agency: {
+        pageTitles: {
+            agency: 'Agency',
+            modes: 'Modes',
+        },
+        isOwn: 'Is own',
+        isAnyVolumeAllowed: 'Any volume allowed',
+    },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0d31c375f..88e000635 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -94,6 +94,7 @@ export default {
         },
         created: 'Fecha creación',
         worker: 'Trabajador',
+        name: 'Nombre',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -1284,4 +1285,12 @@ export default {
         },
         iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
+    agency: {
+        pageTitles: {
+            agency: 'Agencia',
+            modes: 'Modos',
+        },
+        isOwn: 'Propia',
+        isAnyVolumeAllowed: 'Volumen libre',
+    },
 };
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index 6f8185864..930cae563 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -5,10 +5,8 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const stateStore = useStateStore();
 function navigate(id) {
@@ -68,12 +66,6 @@ function exprBuilder(param, value) {
                                 @click.stop="navigate(row.id)"
                                 outline
                             />
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, CustomerSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
                         </template>
                     </CardList>
                 </template>
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index f54f7037d..00595ce1f 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -2,23 +2,18 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnRow from 'components/ui/VnRow.vue';
+
+import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const id = route.params?.id || null;
+const routeId = route.params?.id || null;
 const warehouses = ref([]);
-const sectorFilter = { fields: ['id', 'description'] };
-
-const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: sectorFilter }],
-};
 </script>
 <template>
     <FetchData
@@ -28,7 +23,7 @@ const filter = {
         auto-load
     />
     <VnSubToolbar />
-    <FormModel :url="`Agencies/${id}`" model="agency" auto-load>
+    <FormModel :url="`Agencies/${routeId}`" model="agency" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.name" :label="t('globals.name')" />
@@ -38,7 +33,7 @@ const filter = {
                     v-model="data.sectorFk"
                     option-value="id"
                     option-label="name"
-                    :label="t('parking.sector')"
+                    :label="t('globals.warehouse')"
                     :options="warehouses"
                     use-input
                     input-debounce="0"
@@ -46,11 +41,11 @@ const filter = {
                 />
             </VnRow>
             <VnRow>
-                <QCheckbox :label="t('isOwn')" v-model="data.isOwn" />
+                <QCheckbox :label="t('agency.isOwn')" v-model="data.isOwn" />
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('isAnyVolumeAllowed')"
+                    :label="t('agency.isAnyVolumeAllowed')"
                     v-model="data.isAnyVolumeAllowed"
                 />
             </VnRow>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index 628acf2f2..db2e6381c 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -12,11 +12,6 @@ const { t } = useI18n();
 const route = useRoute();
 const stateStore = useStateStore();
 
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
-
 const arrayData = useArrayData('Agency', {
     url: `Agencies/${route.params.id}`,
 });
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 573205f8b..311f5d3a5 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -19,10 +19,7 @@ const { params } = useRoute();
 const entityId = computed(() => props.id || params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
+console.log('card: ', card);
 </script>
 <template>
     <CardDescriptor
@@ -30,7 +27,7 @@ const filter = {
         data-key="Agency"
         :url="`Agencies/${entityId}`"
         :title="card?.name"
-        :subtitle="card?.id"
+        :subtitle="props.id"
     >
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
new file mode 100644
index 000000000..2c0c9d47b
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -0,0 +1,84 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardList from 'src/components/ui/CardList.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
+console.log('route: ', route.path);
+const routeId = route.params.id;
+const toAgencyModeCreate = (consigneeId) => {
+    router.push({
+        name: 'AgencyMode',
+        params: {
+            id: route.params.id,
+            consigneeId,
+        },
+    });
+};
+</script>
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyModes"
+                :url="`AgencyModes`"
+                :filter="{ where: { agencyFk: routeId } }"
+                order="name"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('globals.description')"
+                                :value="row?.description"
+                            />
+                            <VnLv
+                                :label="t('deliveryMethod')"
+                                :value="row?.deliveryMethodFk"
+                            />
+                            <VnLv label="m3" :value="row?.m3" />
+                            <VnLv :label="t('inflation')" :value="row?.inflation" />
+                            <VnLv :label="t('globals.code')" :value="row?.code" />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('globals.edit')"
+                                @click.stop="toAgencyModeCreate(row.id)"
+                                color="primary"
+                                icon="edit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="toAgencyModeCreate()" color="primary" fab icon="add" />
+            <QTooltip>
+                {{ t('New mode') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 96652fe29..4c9e7052f 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -2,8 +2,12 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
+import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
 const $props = defineProps({
     id: {
@@ -28,15 +32,17 @@ const filter = {
             <template #body="{ entity: agency }">
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
-                        <a
-                            class="header header-link"
-                            :href="`#/agency/${entityId}/basic-data`"
-                        >
-                            {{ t('globals.pageTitles.basicData') }}
-                            <QIcon name="open_in_new" />
-                        </a>
+                        <VnTitle
+                            :url="`#/agency/${entityId}/basic-data`"
+                            :text="t('globals.pageTitles.basicData')"
+                        />
                     </QCardSection>
                     <VnLv :label="t('globals.name')" :value="agency.name" />
+                    <QCheckbox :label="t('agency.isOwn')" v-model="agency.isOwn" />
+                    <QCheckbox
+                        :label="t('agency.isAnyVolumeAllowed')"
+                        v-model="agency.isAnyVolumeAllowed"
+                    />
                 </QCard>
             </template>
         </CardSummary>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
new file mode 100644
index 000000000..cacd4b8f2
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -0,0 +1,113 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'src/components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const paginate = ref();
+const dialog = ref();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        agencyFk: routeId.value,
+        workCenterFk: null,
+    };
+});
+</script>
+<template>
+    <div class="centerCard">
+        <FetchData
+            url="workCenters"
+            sort-by="name"
+            @on-fetch="(data) => (warehouses = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="AgencyWorkCenters"
+            url="AgencyWorkCenters"
+            :filter="{ where: { agencyFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-pa-md q-mb-sm"
+                >
+                    <QItem>
+                        <QItemSection side-left>
+                            <VnLv :value="row?.workCenter?.name" icon="delete" />
+                        </QItemSection>
+                        <QItemSection side>
+                            <QBtn icon="delete" color="primary" round flat />
+                        </QItemSection>
+                    </QItem>
+                </QCard>
+            </template>
+        </VnPaginate>
+    </div>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+            <QDialog ref="dialog">
+                <FormModelPopup
+                    :title="t('Add work center')"
+                    url-create="AgencyWorkCenters"
+                    model="AgencyWorkCenter"
+                    :form-initial-data="initialData"
+                    @on-data-saved="paginate.fetch()"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnRow class="row q-gutter-md q-mb-md">
+                            <VnSelectFilter
+                                v-model="data.workCenterFk"
+                                option-value="id"
+                                option-label="name"
+                                :label="t('workCenter')"
+                                :options="warehouses"
+                                use-input
+                                input-debounce="0"
+                                :is-clearable="false"
+                            />
+                        </VnRow>
+                    </template>
+                </FormModelPopup>
+            </QDialog>
+        </QBtn>
+        <QTooltip>
+            {{ t('globals.new') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+<style lang="scss" scoped>
+.centerCard {
+    padding: 5%;
+    width: 100%;
+    max-width: 50%;
+    margin: 0 auto;
+}
+</style>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
index 42b139b95..6f281e21d 100644
--- a/src/router/modules/agency.js
+++ b/src/router/modules/agency.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'AgencyCard' },
     menus: {
         main: [],
-        card: ['AgencyBasicData', 'AgencyLog'],
+        card: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
     },
     children: [
         {
@@ -39,6 +39,40 @@ export default {
                     },
                     component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
                 },
+                {
+                    path: 'workCenter',
+                    name: 'AgencyWorkCenterCard',
+                    redirect: { name: 'AgencyWorkCenters' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'AgencyWorkCenters',
+                            meta: {
+                                icon: 'apartment',
+                                title: 'workCenters',
+                            },
+                            component: () =>
+                                import('src/pages/Agency/Card/AgencyWorkcenter.vue'),
+                        },
+                    ],
+                },
+                {
+                    path: 'modes',
+                    name: 'AgencyModesCard',
+                    redirect: { name: 'AgencyModes' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'AgencyModes',
+                            meta: {
+                                icon: 'format_list_bulleted',
+                                title: 'modes',
+                            },
+                            component: () =>
+                                import('src/pages/Agency/Card/AgencyModes.vue'),
+                        },
+                    ],
+                },
                 {
                     name: 'AgencyLog',
                     path: 'log',
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index cfa8c9c35..e29e3a86b 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -76,7 +76,7 @@ export default {
                 },
                 {
                     path: '/agency',
-                    redirect: { name: 'agencyList' },
+                    redirect: { name: 'AgencyList' },
                     children: [
                         {
                             path: 'list',

From 663c093a0032ffd43cee788ec0a63a086da5e8e3 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 22 Apr 2024 18:17:01 +0200
Subject: [PATCH 06/32] feat: refs #4988 agency e2e

---
 src/i18n/locale/en.yml                        | 23 +++++++++----
 src/i18n/locale/es.yml                        | 13 ++++++++
 src/pages/Agency/Card/AgencyBasicData.vue     |  2 +-
 src/pages/Agency/Card/AgencyModes.vue         | 27 +--------------
 src/pages/Agency/Card/AgencyWorkcenter.vue    | 28 +++++++++++++++-
 test/cypress/integration/agency/spec.spec.js  | 25 ++++++++++++++
 .../pages/Agency/AgencyWorCenter.spec.js      | 33 +++++++++++++++++++
 test/vitest/setup-file.js                     |  1 -
 8 files changed, 116 insertions(+), 36 deletions(-)
 create mode 100644 test/cypress/integration/agency/spec.spec.js
 create mode 100644 test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
 delete mode 100644 test/vitest/setup-file.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..d978fa089 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -89,9 +89,14 @@ globals:
         basicData: Basic data
         log: Logs
         parkingList: Parkings list
+        agencyList: Agencies list
+        agency: Agency
+        workCenters: Work centers
+        modes: Modes
     created: Created
     worker: Worker
     now: Now
+    name: Name
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -1146,13 +1151,17 @@ item:
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
-    create:
-        name: Name
-        tag: Tag
-        priority: Priority
-        type: Type
-        intrastat: Intrastat
-        origin: Origin
+agency:
+    isOwn: Own
+    isAnyVolumeAllowed: Any volume allowed
+    notification:
+        removeItem: Agency removed successfully
+        removeItemError: Error removing agency
+    pageTitles:
+        agency: Agency
+    searchBar:
+        info: You can search by agency code
+        label: Search agency...
 components:
     topbar: {}
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..aa4d88f5d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -89,9 +89,14 @@ globals:
         basicData: Datos básicos
         log: Historial
         parkingList: Listado de parkings
+        agencyList: Listado de agencias
+        agency: Agencia
+        workCenters: Centros de trabajo
+        modes: Modos
     created: Fecha creación
     worker: Trabajador
     now: Ahora
+    name: Nombre
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -1152,6 +1157,14 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+agency:
+    isOwn: Propio
+    isAnyVolumeAllowed: Cualquier volumen
+    removeItem: Agencia eliminada correctamente
+    notification:
+        removeItemError: Error al eliminar la agencia
+    pageTitles:
+        agency: Agencia
 components:
     topbar: {}
     userPanel:
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index 00595ce1f..40510a205 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -30,7 +30,7 @@ const warehouses = ref([]);
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    v-model="data.sectorFk"
+                    v-model="data.warehouseFk"
                     option-value="id"
                     option-label="name"
                     :label="t('globals.warehouse')"
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
index 2c0c9d47b..4b145f227 100644
--- a/src/pages/Agency/Card/AgencyModes.vue
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardList from 'src/components/ui/CardList.vue';
@@ -7,19 +7,9 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
-const router = useRouter();
 const route = useRoute();
 console.log('route: ', route.path);
 const routeId = route.params.id;
-const toAgencyModeCreate = (consigneeId) => {
-    router.push({
-        name: 'AgencyMode',
-        params: {
-            id: route.params.id,
-            consigneeId,
-        },
-    });
-};
 </script>
 <template>
     <QPage class="column items-center q-pa-md">
@@ -51,25 +41,10 @@ const toAgencyModeCreate = (consigneeId) => {
                             <VnLv :label="t('inflation')" :value="row?.inflation" />
                             <VnLv :label="t('globals.code')" :value="row?.code" />
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.edit')"
-                                @click.stop="toAgencyModeCreate(row.id)"
-                                color="primary"
-                                icon="edit"
-                            />
-                        </template>
                     </CardList>
                 </template>
             </VnPaginate>
         </div>
-
-        <QPageSticky :offset="[18, 18]">
-            <QBtn @click.stop="toAgencyModeCreate()" color="primary" fab icon="add" />
-            <QTooltip>
-                {{ t('New mode') }}
-            </QTooltip>
-        </QPageSticky>
     </QPage>
 </template>
 <i18n>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index cacd4b8f2..83231e6c2 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -1,4 +1,6 @@
 <script setup>
+import axios from 'axios';
+import { useQuasar } from 'quasar';
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -17,6 +19,7 @@ const route = useRoute();
 const paginate = ref();
 const dialog = ref();
 const routeId = computed(() => route.params.id);
+const quasar = useQuasar();
 
 const initialData = computed(() => {
     return {
@@ -24,6 +27,23 @@ const initialData = computed(() => {
         workCenterFk: null,
     };
 });
+
+async function deleteWorCenter(id) {
+    try {
+        await axios.delete(`AgencyWorkCenters/${id}`).then(async () => {
+            quasar.notify({
+                message: t('agency.notification.removeItem'),
+                type: 'positive',
+            });
+        });
+    } catch (error) {
+        quasar.notify({
+            message: t('agency.notification.removeItemError'),
+            type: 'error',
+        });
+    }
+    paginate.value.fetch();
+}
 </script>
 <template>
     <div class="centerCard">
@@ -54,7 +74,13 @@ const initialData = computed(() => {
                             <VnLv :value="row?.workCenter?.name" icon="delete" />
                         </QItemSection>
                         <QItemSection side>
-                            <QBtn icon="delete" color="primary" round flat />
+                            <QBtn
+                                @click.stop="deleteWorCenter(row.id)"
+                                icon="delete"
+                                color="primary"
+                                round
+                                flat
+                            />
                         </QItemSection>
                     </QItem>
                 </QCard>
diff --git a/test/cypress/integration/agency/spec.spec.js b/test/cypress/integration/agency/spec.spec.js
new file mode 100644
index 000000000..dd6b0da6f
--- /dev/null
+++ b/test/cypress/integration/agency/spec.spec.js
@@ -0,0 +1,25 @@
+describe('template spec', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/agency`);
+    });
+
+    it('passes', () => {
+        cy.visit(`/#/agency`);
+        /* ==== Generated with Cypress Studio ==== */
+        cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
+        cy.get('[href="#/agency/1/workCenter"] > .q-item__section--main').click();
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5').click();
+        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5_0').click();
+        cy.get('#formModel > .q-card').click();
+        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72').click();
+        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72_1 > .q-item__section').click();
+        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-btn--flat > .q-btn__content > .block').;
+        /* ==== End Cypress Studio ==== */
+    });
+});
diff --git a/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js b/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
new file mode 100644
index 000000000..965af14c4
--- /dev/null
+++ b/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
@@ -0,0 +1,33 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import AgencyWorkCenter from 'pages/Agency/Card/AgencyWorkcenter.vue';
+
+describe('AgencyWorkCenter', () => {
+    let vm;
+    beforeAll(() => {
+        vm = createWrapper(AgencyWorkCenter, {
+            global: {
+                claim: {
+                    id: 1,
+                },
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('remove()', () => {
+        it('should delete the AgencyMode', async () => {
+            vi.spyOn(axios, 'delete').mockResolvedValue({ data: true });
+            vi.spyOn(vm.quasar, 'notify');
+
+            await vm.deleteWorCenter(1);
+
+            expect(vm.quasar.notify).toHaveBeenCalledWith(
+                expect.objectContaining({ type: 'positive' })
+            );
+        });
+    });
+});
diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
deleted file mode 100644
index 499204981..000000000
--- a/test/vitest/setup-file.js
+++ /dev/null
@@ -1 +0,0 @@
-// This file will be run before each test file

From b7ba664e4565bb900e97f559916159d2dbb65f26 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 09:05:34 -0300
Subject: [PATCH 07/32] WIP

---
 src/css/app.scss                  |   5 +
 src/pages/Item/ItemList.vue       |   6 +
 src/pages/Item/ItemListFilter.vue | 348 ++++++++++++++++++++++++++++++
 3 files changed, 359 insertions(+)
 create mode 100644 src/pages/Item/ItemListFilter.vue

diff --git a/src/css/app.scss b/src/css/app.scss
index 25b484649..9037802ad 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -119,6 +119,11 @@ select:-webkit-autofill {
     font-variation-settings: 'FILL' 1;
 }
 
+.fill-icon-on-hover:hover {
+    font-variation-settings: 'FILL' 1;
+    cursor: pointer;
+}
+
 .vn-table-separation-row {
     height: 16px !important;
     background-color: var(--vn-section-color) !important;
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 3e399e29f..9c1ab9df6 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -12,6 +12,7 @@ import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
+import ItemListFilter from './ItemListFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDateFormat } from 'src/filters/date.js';
@@ -442,6 +443,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemListFilter data-key="ItemList" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             ref="paginateRef"
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
new file mode 100644
index 000000000..a99811e2f
--- /dev/null
+++ b/src/pages/Item/ItemListFilter.vue
@@ -0,0 +1,348 @@
+<script setup>
+import { ref, watch, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const stateStore = useStateStore();
+
+const itemTypesRef = ref(null);
+const categoriesOptions = ref([]);
+const itemTypesOptions = ref([]);
+const buyersOptions = ref([]);
+const suppliersOptions = ref([]);
+const tagValues = ref([]);
+
+const arrayData = useArrayData(props.dataKey);
+const itemTypesFilter = computed(() => {
+    return {
+        fields: ['id', 'name', 'categoryFk'],
+        include: 'category',
+        order: 'name ASC',
+        where: { categoryFk: arrayData.store?.userParams?.categoryFk },
+    };
+});
+
+// TODO: checkear este watch que fetchee cuando cambie categoryFk
+watch(itemTypesFilter.value.where.categoryFk, () => itemTypesRef.value.fetch());
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        tag.value = null;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+        };
+
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+            params,
+        });
+        tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
+
+// const applyColumnFilter = async (col) => {
+//     try {
+//         params[col.field] = col.columnFilter.filterValue;
+//         await arrayData.addFilter({ params });
+//     } catch (err) {
+//         console.error('Error applying column filter', err);
+//     }
+// };
+
+const applyTags = () => {
+    // params.tags = tagValues.value
+    //     .filter((tag) => tag.selectedTag && tag.value)
+    //     .map((tag) => ({
+    //         tagFk: tag.selectedTag.id,
+    //         tagName: tag.selectedTag.name,
+    //         value: tag.value,
+    //     }));
+    console.log('apply tags');
+    const params = {
+        tags: tagValues.value
+            .filter((tag) => tag.selectedTag && tag.value)
+            .map((tag) => ({
+                tagFk: tag.selectedTag.id,
+                tagName: tag.selectedTag.name,
+                value: tag.value,
+            })),
+    };
+    console.log('params:: ', params);
+    arrayData.addFilter({ params });
+    // search();
+};
+
+const removeTag = (index, params, search) => {
+    (tagValues.value || []).splice(index, 1);
+    // applyTags(params, search);
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <FetchData
+        url="ItemCategories"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="itemTypesRef"
+        url="ItemTypes"
+        :filter="itemTypesFilter"
+        @on-fetch="(data) => (itemTypesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        @on-fetch="(data) => (buyersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['name', 'nickname'], order: 'name ASC' }"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Tags"
+        :filter="{ fields: ['id', 'name', 'isFree'] }"
+        auto-load
+        @on-fetch="(data) => (tagOptions = data)"
+    />
+    <!-- <pre>categoryFkparam:: {{ itemTypesFilter }}</pre> -->
+    <!-- <pre>{{ tagValues }}</pre> -->
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div v-if="tag.label !== 'tags'" class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+            <div v-else class="q-gutter-x-xs">
+                <strong>{{ t('params.tags') }} </strong>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.categoryFk')"
+                        v-model="params.categoryFk"
+                        @update:model-value="searchFn()"
+                        :options="categoriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.typeFk')"
+                        v-model="params.typeFk"
+                        @update:model-value="searchFn()"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.buyerFk')"
+                        v-model="params.buyerFk"
+                        @update:model-value="searchFn()"
+                        :options="buyersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplierFk')"
+                        v-model="params.supplierFk"
+                        @update:model-value="searchFn()"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        scope.opt?.name + ': ' + scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem class="row items-center">
+                <QItemLabel>
+                    {{ t('params.tags') }}
+                </QItemLabel>
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-ml-md"
+                    size="sm"
+                    color="primary"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+            <QItem
+                v-for="(tag, index) in tagValues"
+                :key="index"
+                class="row items-center"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="tag.selectedTag"
+                        :options="tagOptions"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="getSelectedTagValues(tag)"
+                    />
+                </QItemSection>
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        v-if="!tag?.selectedTag?.isFree && tag.valueOptions"
+                        :label="t('params.tag')"
+                        v-model="tag.value"
+                        :options="tag.valueOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!tag"
+                        :is-clearable="false"
+                        @update:model-value="applyTags()"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="tag.value"
+                        :label="t('params.value')"
+                        :disable="!tag"
+                        is-outlined
+                        :is-clearable="false"
+                        @keyup.enter="applyTags()"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-ml-xs"
+                    size="sm"
+                    color="primary"
+                    @click="removeTag(index, params, searchFn)"
+                />
+            </QItem>
+
+            <!-- <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isOrdered')"
+                        v-model="params.isOrdered"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem> -->
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        search: General search
+        categoryFk: Category
+        typeFk: Type
+        buyerFk: Buyer
+        supplierFk: Supplier
+        tags: Tags
+        tag: Tag
+        value: Value
+es:
+    params:
+        search: Búsqueda general
+        categoryFk: Reino
+        typeFk: Tipo
+        buyerFk: Comprador
+        supplierFk: Proveedor
+        tags: Etiquetas
+        tag: Etiqueta
+        value: Valor
+</i18n>

From f3b5bf7f4b1847286738ce6225ec4b70c5fba628 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 15:34:52 -0300
Subject: [PATCH 08/32] Item list filter

---
 src/composables/useArrayData.js   |   7 +-
 src/pages/Item/ItemList.vue       |   2 +-
 src/pages/Item/ItemListFilter.vue | 230 +++++++++++++++++++++---------
 src/router/modules/item.js        |   1 +
 4 files changed, 171 insertions(+), 69 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 998ee0576..04d7bfef7 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -156,9 +156,10 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    const key = Object.keys(
+                        exprBuilder && exprBuilder(param) ? exprBuilder(param) : param
+                    );
+                    if (key[0]) delete store.filter.where[key[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 9c1ab9df6..3b3697612 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -70,7 +70,7 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const params = reactive({});
+const params = reactive({ isFloramondo: false, isActive: true });
 
 const applyColumnFilter = async (col) => {
     try {
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index a99811e2f..ad6167014 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -4,13 +4,14 @@ import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
+import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { QCheckbox } from 'quasar';
 
 import { useArrayData } from 'composables/useArrayData';
+import { useValidator } from 'src/composables/useValidator';
 import axios from 'axios';
 
 const { t } = useI18n();
@@ -23,6 +24,7 @@ const props = defineProps({
 });
 
 const stateStore = useStateStore();
+const validationsStore = useValidator();
 
 const itemTypesRef = ref(null);
 const categoriesOptions = ref([]);
@@ -30,19 +32,27 @@ const itemTypesOptions = ref([]);
 const buyersOptions = ref([]);
 const suppliersOptions = ref([]);
 const tagValues = ref([]);
+const fieldFiltersValues = ref([]);
+const moreFields = ref([]);
 
 const arrayData = useArrayData(props.dataKey);
-const itemTypesFilter = computed(() => {
-    return {
-        fields: ['id', 'name', 'categoryFk'],
-        include: 'category',
-        order: 'name ASC',
-        where: { categoryFk: arrayData.store?.userParams?.categoryFk },
-    };
-});
+const itemTypesFilter = {
+    fields: ['id', 'name', 'categoryFk'],
+    include: 'category',
+    order: 'name ASC',
+    where: {},
+};
 
-// TODO: checkear este watch que fetchee cuando cambie categoryFk
-watch(itemTypesFilter.value.where.categoryFk, () => itemTypesRef.value.fetch());
+const onCategoryChange = async (categoryFk, search) => {
+    if (!categoryFk) {
+        itemTypesFilter.where.categoryFk = null;
+        delete itemTypesFilter.where.categoryFk;
+    } else {
+        itemTypesFilter.where.categoryFk = categoryFk;
+    }
+    search();
+    await itemTypesRef.value.fetch();
+};
 
 const getSelectedTagValues = async (tag) => {
     try {
@@ -62,45 +72,60 @@ const getSelectedTagValues = async (tag) => {
     }
 };
 
-// const applyColumnFilter = async (col) => {
-//     try {
-//         params[col.field] = col.columnFilter.filterValue;
-//         await arrayData.addFilter({ params });
-//     } catch (err) {
-//         console.error('Error applying column filter', err);
-//     }
-// };
-
-const applyTags = () => {
-    // params.tags = tagValues.value
-    //     .filter((tag) => tag.selectedTag && tag.value)
-    //     .map((tag) => ({
-    //         tagFk: tag.selectedTag.id,
-    //         tagName: tag.selectedTag.name,
-    //         value: tag.value,
-    //     }));
-    console.log('apply tags');
-    const params = {
-        tags: tagValues.value
-            .filter((tag) => tag.selectedTag && tag.value)
-            .map((tag) => ({
-                tagFk: tag.selectedTag.id,
-                tagName: tag.selectedTag.name,
-                value: tag.value,
-            })),
-    };
-    console.log('params:: ', params);
-    arrayData.addFilter({ params });
-    // search();
+const applyTags = (params, search) => {
+    params.tags = tagValues.value
+        .filter((tag) => tag.selectedTag && tag.value)
+        .map((tag) => ({
+            tagFk: tag.selectedTag.id,
+            tagName: tag.selectedTag.name,
+            value: tag.value,
+        }));
+    search();
 };
 
 const removeTag = (index, params, search) => {
     (tagValues.value || []).splice(index, 1);
-    // applyTags(params, search);
+    applyTags(params, search);
+};
+
+const applyFieldFilters = (params) => {
+    fieldFiltersValues.value.forEach((fieldFilter) => {
+        if (
+            fieldFilter.selectedField &&
+            (fieldFilter.value !== null ||
+                fieldFilter.value !== '' ||
+                fieldFilter.value !== undefined)
+        ) {
+            params[fieldFilter.name] = fieldFilter.value;
+        }
+    });
+    arrayData.applyFilter({ params });
+};
+
+const removeFieldFilter = (index, params, search) => {
+    delete params[fieldFiltersValues.value[index].name];
+    (fieldFiltersValues.value || []).splice(index, 1);
+    applyFieldFilters(params, search);
 };
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
+    if (arrayData.store?.userParams?.categoryFk)
+        itemTypesFilter.where.categoryFk = arrayData.store?.userParams?.categoryFk;
+    await itemTypesRef.value.fetch();
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+
+    const _moreFields = ['id', 'description', 'name', 'isActive'];
+
+    _moreFields.forEach((field) => {
+        let prop = properties[field];
+        moreFields.value.push({
+            name: field,
+            label: prop ? prop.description : field,
+            type: prop ? prop.type : null,
+        });
+    });
 });
 </script>
 
@@ -116,7 +141,6 @@ onMounted(async () => {
         url="ItemTypes"
         :filter="itemTypesFilter"
         @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
     />
     <FetchData
         url="TicketRequests/getItemTypeWorker"
@@ -126,7 +150,7 @@ onMounted(async () => {
     />
     <FetchData
         url="Suppliers"
-        :filter="{ fields: ['name', 'nickname'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC' }"
         @on-fetch="(data) => (suppliersOptions = data)"
         auto-load
     />
@@ -136,16 +160,16 @@ onMounted(async () => {
         auto-load
         @on-fetch="(data) => (tagOptions = data)"
     />
-    <!-- <pre>categoryFkparam:: {{ itemTypesFilter }}</pre> -->
-    <!-- <pre>{{ tagValues }}</pre> -->
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <pre>{{ itemTypesFilter }}</pre>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="tagValues.length === 0 ? ['tags'] : []"
+    >
         <template #tags="{ tag, formatFn }">
-            <div v-if="tag.label !== 'tags'" class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-            <div v-else class="q-gutter-x-xs">
-                <strong>{{ t('params.tags') }} </strong>
+            <div>
+                <strong>{{ t(`params.${tag.label}`) }}</strong>
+                <span v-if="tag.label !== 'tags'">: {{ formatFn(tag.value) }}</span>
             </div>
         </template>
         <template #body="{ params, searchFn }">
@@ -163,7 +187,9 @@ onMounted(async () => {
                     <VnSelectFilter
                         :label="t('params.categoryFk')"
                         v-model="params.categoryFk"
-                        @update:model-value="searchFn()"
+                        @update:model-value="
+                            ($event) => onCategoryChange($event, searchFn)
+                        "
                         :options="categoriesOptions"
                         option-value="id"
                         option-label="name"
@@ -243,6 +269,7 @@ onMounted(async () => {
                     </VnSelectFilter>
                 </QItemSection>
             </QItem>
+            <!-- Tags filter -->
             <QItem class="row items-center">
                 <QItemLabel>
                     {{ t('params.tags') }}
@@ -290,7 +317,7 @@ onMounted(async () => {
                         use-input
                         :disable="!tag"
                         :is-clearable="false"
-                        @update:model-value="applyTags()"
+                        @update:model-value="applyTags(params, searchFn)"
                     />
                     <VnInput
                         v-else
@@ -299,7 +326,7 @@ onMounted(async () => {
                         :disable="!tag"
                         is-outlined
                         :is-clearable="false"
-                        @keyup.enter="applyTags()"
+                        @keydown.enter.prevent="applyTags(params, searchFn)"
                     />
                 </QItemSection>
                 <QIcon
@@ -310,16 +337,78 @@ onMounted(async () => {
                     @click="removeTag(index, params, searchFn)"
                 />
             </QItem>
-
-            <!-- <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('params.isOrdered')"
-                        v-model="params.isOrdered"
-                        toggle-indeterminate
+            <!-- Filter fields -->
+            <QItem class="row items-center">
+                <QItemLabel>
+                    {{ t('More fields') }}
+                </QItemLabel>
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-ml-md"
+                    size="sm"
+                    color="primary"
+                    @click="fieldFiltersValues.push({})"
+                />
+            </QItem>
+            <QItem
+                v-for="(fieldFilter, index) in fieldFiltersValues"
+                :key="index"
+                class="row items-center"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="fieldFilter.name"
+                        :options="moreFields"
+                        option-label="label"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="
+                            ($event) => {
+                                fieldFilter.name = $event.name;
+                                fieldFilter.selectedField = $event;
+                            }
+                        "
                     />
                 </QItemSection>
-            </QItem> -->
+                <QItemSection class="col">
+                    <QCheckbox
+                        v-if="fieldFilter.selectedField?.type === 'boolean'"
+                        v-model="fieldFilter.value"
+                        :label="t('params.value')"
+                        @update:model-value="applyFieldFilters(params, searchFn)"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="fieldFilter.value"
+                        :label="t('params.value')"
+                        :disable="!fieldFilter.selectedField"
+                        is-outlined
+                        @keydown.enter="applyFieldFilters(params, searchFn)"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-ml-xs"
+                    size="sm"
+                    color="primary"
+                    @click="removeFieldFilter(index, params, searchFn)"
+                />
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isFloramondo')"
+                        v-model="params.isFloramondo"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -335,7 +424,13 @@ en:
         tags: Tags
         tag: Tag
         value: Value
+        isFloramondo: Floramondo
+        isActive: Active
+        description: Description
+        name: Name
+        id: ID
 es:
+    More fields: Más campos
     params:
         search: Búsqueda general
         categoryFk: Reino
@@ -345,4 +440,9 @@ es:
         tags: Etiquetas
         tag: Etiqueta
         value: Valor
+        isFloramondo: Floramondo
+        isActive: Activo
+        description: Descripción
+        name: Nombre
+        id: ID
 </i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..a9e7090b3 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },

From a6ebe9cf19f2ddd6c05649b8096ad93367c18aae Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 12:54:38 -0300
Subject: [PATCH 09/32] Item barcode

---
 src/css/app.scss                    |  5 ++
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Item/Card/ItemBarcode.vue | 80 +++++++++++++++++++++++++++++
 src/router/modules/item.js          | 12 ++++-
 5 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/ItemBarcode.vue

diff --git a/src/css/app.scss b/src/css/app.scss
index 25b484649..9037802ad 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -119,6 +119,11 @@ select:-webkit-autofill {
     font-variation-settings: 'FILL' 1;
 }
 
+.fill-icon-on-hover:hover {
+    font-variation-settings: 'FILL' 1;
+    cursor: pointer;
+}
+
 .vn-table-separation-row {
     height: 16px !important;
     background-color: var(--vn-section-color) !important;
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..338dff60b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,7 @@ item:
         tags: Tags
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        barcode: Barcode
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..7e9c5f669 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,7 @@ item:
         tags: Etiquetas
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        barcode: Códigos de barras
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
new file mode 100644
index 000000000..6a13a9ea7
--- /dev/null
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -0,0 +1,80 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemBarcodeRef = ref(null);
+
+onMounted(() => {
+    if (itemBarcodeRef.value) itemBarcodeRef.value.reload();
+});
+</script>
+<template>
+    <div class="full-width flex justify-center">
+        <QPage class="card-width q-pa-lg">
+            <CrudModel
+                :data-required="{ itemFk: route.params.id }"
+                :default-remove="false"
+                :filter="{
+                    fields: ['id', 'itemFk', 'code'],
+                    where: { itemFk: route.params.id },
+                }"
+                data-key="ItemBarcodes"
+                model="ItemBarcodes"
+                ref="itemBarcodeRef"
+                url="ItemBarcodes"
+            >
+                <template #body="{ rows }">
+                    <QCard class="q-px-lg q-py-md">
+                        <div
+                            v-for="(row, index) in rows"
+                            :key="index"
+                            class="q-mb-md full-width row items-center no-wrap"
+                        >
+                            <VnInput
+                                :label="t('Code')"
+                                v-model="row.code"
+                                class="full-width"
+                            />
+                            <QIcon
+                                @click="itemBarcodeRef.remove([row])"
+                                class="cursor-pointer q-ml-md"
+                                color="primary"
+                                name="delete"
+                                size="sm"
+                            >
+                                <QTooltip class="text-no-wrap">
+                                    {{ t('Remove barcode') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                        <QIcon
+                            @click="itemBarcodeRef.insert()"
+                            class="cursor-pointer fill-icon-on-hover"
+                            color="primary"
+                            name="add_circle"
+                            size="sm"
+                        >
+                            <QTooltip>
+                                {{ t('Add barcode') }}
+                            </QTooltip>
+                        </QIcon>
+                    </QCard>
+                </template>
+            </CrudModel>
+        </QPage>
+    </div>
+</template>
+
+<i18n>
+es:
+    Code: Código
+    Remove barcode: Quitar código de barras
+    Add barcode: Añadir código de barras
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..35abbb5c7 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,12 +6,13 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
         main: ['ItemList', 'WasteBreakdown'],
-        card: ['ItemBasicData'],
+        card: ['ItemBasicData', 'ItemBarcode'],
     },
     children: [
         {
@@ -94,6 +95,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
                 },
+                {
+                    path: 'barcode',
+                    name: 'ItemBarcode',
+                    meta: {
+                        title: 'barcode',
+                        icon: 'vn:barcode',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBarcode.vue'),
+                },
             ],
         },
     ],

From 84a9dc831906ab02c253026b22b8073301df3fd6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 17:30:53 -0300
Subject: [PATCH 10/32] Fix ItemDescriptor labels

---
 src/pages/Item/Card/ItemDescriptor.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 981de0632..77b078296 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -271,14 +271,27 @@ const openCloneDialog = async () => {
             <VnLv :label="t('item.descriptor.buyer')">
                 <template #value>
                     <span class="link">
-                        {{ t('item.descriptor.buyer') }}
+                        {{ entity.itemType?.worker?.user?.name }}
                         <WorkerDescriptorProxy :id="entity.itemType?.worker?.id" />
                     </span>
                 </template>
             </VnLv>
-            <VnLv :label="t('item.descriptor.color')" :value="entity.value5"> </VnLv>
-            <VnLv :label="t('item.descriptor.color')" :value="entity.value6" />
-            <VnLv :label="t('item.descriptor.stems')" :value="entity.value7" />
+            <VnLv
+                v-if="entity.value5"
+                :label="t('item.descriptor.color')"
+                :value="entity.value5"
+            >
+            </VnLv>
+            <VnLv
+                v-if="entity.value6"
+                :label="t('item.descriptor.category')"
+                :value="entity.value6"
+            />
+            <VnLv
+                v-if="entity.value7"
+                :label="t('item.descriptor.stems')"
+                :value="entity.value7"
+            />
         </template>
         <template #actions="{}">
             <QCardActions class="row justify-center">

From 969087a34777075715c870943508266ad656ac73 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 17:48:47 -0300
Subject: [PATCH 11/32] Remove unused things

---
 src/pages/Item/ItemListFilter.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index ad6167014..e0993356c 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, computed } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -160,7 +160,6 @@ onMounted(async () => {
         auto-load
         @on-fetch="(data) => (tagOptions = data)"
     />
-    <pre>{{ itemTypesFilter }}</pre>
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From 897ddc44fed3536df643bb6d4189792a26df358d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 09:57:04 +0200
Subject: [PATCH 12/32] fix: search bar

---
 src/pages/Agency/AgencyList.vue      | 2 ++
 src/pages/Agency/Card/AgencyCard.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index 930cae563..c04206625 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -13,6 +13,8 @@ function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
 function exprBuilder(param, value) {
+    if (!value) return;
+    console.log('value: ', value);
     if (param !== 'search') return;
 
     if (!isNaN(value)) return { id: value };
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index db2e6381c..ec90abf66 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -32,7 +32,7 @@ watch(
         <VnSearchbar
             :info="t('Agency.searchBar.info')"
             :label="t('Agency.searchBar.label')"
-            data-key="Agency"
+            data-key="AgencyList"
         />
     </Teleport>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">

From d490d85ecc1863a0031a38b15bc4f65b10f3dc1c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 12:34:19 +0200
Subject: [PATCH 13/32] feat: agencyWorkCenter

---
 src/i18n/locale/es.yml                       |  3 ++
 src/pages/Agency/Card/AgencyBasicData.vue    |  2 -
 src/pages/Agency/Card/AgencyCard.vue         | 37 +++++-----------
 src/pages/Agency/Card/AgencyWorkcenter.vue   |  1 +
 test/cypress/integration/agency/spec.spec.js | 46 +++++++++++++++-----
 5 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3e5099c4b..10b77ef49 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1177,6 +1177,9 @@ agency:
         removeItemError: Error al eliminar la agencia
     pageTitles:
         agency: Agencia
+    searchBar:
+        info: Puedes buscar por nombre o id
+        label: Buscar agencia...
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index 40510a205..5999f853b 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
@@ -22,7 +21,6 @@ const warehouses = ref([]);
         @on-fetch="(data) => (warehouses = data)"
         auto-load
     />
-    <VnSubToolbar />
     <FormModel :url="`Agencies/${routeId}`" model="agency" auto-load>
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index ec90abf66..e78d1cc55 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -1,17 +1,12 @@
 <script setup>
 import { onMounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'src/composables/useArrayData';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
 import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
+import VnCard from 'components/common/VnCard.vue';
 
-const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
-
 const arrayData = useArrayData('Agency', {
     url: `Agencies/${route.params.id}`,
 });
@@ -28,23 +23,13 @@ watch(
 );
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            :info="t('Agency.searchBar.info')"
-            :label="t('Agency.searchBar.label')"
-            data-key="AgencyList"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <AgencyDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Agency"
+        base-url="Agencies"
+        :descriptor="AgencyDescriptor"
+        searchbar-data-key="AgencyList"
+        searchbar-url="Agencies"
+        searchbar-label="agency.searchBar.label"
+        searchbar-info="agency.searchBar.info"
+    />
 </template>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index 83231e6c2..ed9f15689 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -133,6 +133,7 @@ async function deleteWorCenter(id) {
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
         You can search by name: Puedes buscar por nombre
+        This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
     en:
         isOwn: Has owner
         isAnyVolumeAllowed: Allows any volume
diff --git a/test/cypress/integration/agency/spec.spec.js b/test/cypress/integration/agency/spec.spec.js
index dd6b0da6f..c3f5f7c88 100644
--- a/test/cypress/integration/agency/spec.spec.js
+++ b/test/cypress/integration/agency/spec.spec.js
@@ -1,25 +1,51 @@
 describe('template spec', () => {
+    const agencyId = 11;
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/agency`);
     });
 
-    it('passes', () => {
+    it('assign workCenter', () => {
         cy.visit(`/#/agency`);
-        /* ==== Generated with Cypress Studio ==== */
         cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
-        cy.get('[href="#/agency/1/workCenter"] > .q-item__section--main').click();
+        cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5').click();
-        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5_0').click();
-        cy.get('#formModel > .q-card').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
         cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    it('delete workCenter', () => {
+        cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
+        cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
+        cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Agency removed successfully'
+        );
+    });
+
+    it('error on duplicate workCenter', () => {
+        cy.visit(`/#/agency`);
+        cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
+        cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72').click();
-        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72_1 > .q-item__section').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
         cy.get('.q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.q-btn--flat > .q-btn__content > .block').;
-        /* ==== End Cypress Studio ==== */
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
+        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+
+        cy.get(
+            ':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
+        ).should('have.text', 'This workCenter is already assigned to this agency');
     });
 });

From 914c3fb1698387080b8d19ede9f35f19954095a9 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 12:40:17 +0200
Subject: [PATCH 14/32] fix: test and console log

---
 src/components/common/VnBreadcrumbs.vue                        | 1 -
 .../agency/{spec.spec.js => agencyWorkCenter.spec.js}          | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename test/cypress/integration/agency/{spec.spec.js => agencyWorkCenter.spec.js} (97%)

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 65f6946f4..337507233 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -30,7 +30,6 @@ watchEffect(() => {
 });
 
 function getBreadcrumb(param) {
-    console.log('param.meta.title: ', param.meta.title);
     const breadcrumb = {
         icon: param.meta.icon,
         path: param.path,
diff --git a/test/cypress/integration/agency/spec.spec.js b/test/cypress/integration/agency/agencyWorkCenter.spec.js
similarity index 97%
rename from test/cypress/integration/agency/spec.spec.js
rename to test/cypress/integration/agency/agencyWorkCenter.spec.js
index c3f5f7c88..7f875179b 100644
--- a/test/cypress/integration/agency/spec.spec.js
+++ b/test/cypress/integration/agency/agencyWorkCenter.spec.js
@@ -1,5 +1,4 @@
-describe('template spec', () => {
-    const agencyId = 11;
+describe('AgencyWorkCenter', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');

From a3ba68e86501bd54d20b07caa5a49827ec8a5520 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 13:04:50 +0200
Subject: [PATCH 15/32] fix: test

---
 test/vitest/setup-file.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/vitest/setup-file.js

diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
new file mode 100644
index 000000000..e69de29bb

From f2d0d3f3ffc5419a5595335eef3c6b49942d440a Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 13:09:54 +0200
Subject: [PATCH 16/32] fix: remove test from vitest

---
 .../pages/Agency/AgencyWorCenter.spec.js      | 33 -------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js

diff --git a/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js b/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
deleted file mode 100644
index 965af14c4..000000000
--- a/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import AgencyWorkCenter from 'pages/Agency/Card/AgencyWorkcenter.vue';
-
-describe('AgencyWorkCenter', () => {
-    let vm;
-    beforeAll(() => {
-        vm = createWrapper(AgencyWorkCenter, {
-            global: {
-                claim: {
-                    id: 1,
-                },
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('remove()', () => {
-        it('should delete the AgencyMode', async () => {
-            vi.spyOn(axios, 'delete').mockResolvedValue({ data: true });
-            vi.spyOn(vm.quasar, 'notify');
-
-            await vm.deleteWorCenter(1);
-
-            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
-            );
-        });
-    });
-});

From 823351f76dc5dcd192d3db88c4070be682e3501f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 25 Apr 2024 10:55:48 -0300
Subject: [PATCH 17/32] Item botanical

---
 src/i18n/locale/en.yml                   |   1 +
 src/i18n/locale/es.yml                   |   1 +
 src/pages/Item/Card/CreateGenusForm.vue  |  50 ++++++++++
 src/pages/Item/Card/CreateSpecieForm.vue |  50 ++++++++++
 src/pages/Item/Card/ItemBotanical.vue    | 111 +++++++++++++++++++++++
 src/router/modules/item.js               |  11 ++-
 6 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/CreateGenusForm.vue
 create mode 100644 src/pages/Item/Card/CreateSpecieForm.vue
 create mode 100644 src/pages/Item/Card/ItemBotanical.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ff57bf968..6ccb1a177 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1122,6 +1122,7 @@ item:
         fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        botanical: Botanical
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f9278a9b0..4bcf01400 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1121,6 +1121,7 @@ item:
         fixedPrice: Precios fijados
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        botanical: Botánico
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/CreateGenusForm.vue b/src/pages/Item/Card/CreateGenusForm.vue
new file mode 100644
index 000000000..637a1137e
--- /dev/null
+++ b/src/pages/Item/Card/CreateGenusForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const genusInputRef = ref(null);
+const genusFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    genusInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="genera"
+        model="itemGenus"
+        :title="t('New genus')"
+        :form-initial-data="genusFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="genusInputRef"
+                    :label="t('Latin genus name')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New genus: Nuevo genus
+    Latin genus name: Nombre del genus en latín
+</i18n>
diff --git a/src/pages/Item/Card/CreateSpecieForm.vue b/src/pages/Item/Card/CreateSpecieForm.vue
new file mode 100644
index 000000000..2731820ba
--- /dev/null
+++ b/src/pages/Item/Card/CreateSpecieForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const specieInputRef = ref(null);
+const specieFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    specieInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="species"
+        model="itemSpecie"
+        :title="t('New species')"
+        :form-initial-data="specieFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="specieInputRef"
+                    :label="t('Latin species name')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New species: Nueva especie
+    Latin species name: Nombre de la especie en latín
+</i18n>
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
new file mode 100644
index 000000000..0a28b05b8
--- /dev/null
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { ref, onMounted, reactive } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import CreateGenusForm from './CreateGenusForm.vue';
+import CreateSpecieForm from './CreateSpecieForm.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemBotanicalsRef = ref(null);
+const itemGenusOptions = ref([]);
+const itemSpeciesOptions = ref([]);
+const itemBotanicals = ref([]);
+let itemBotanicalsForm = reactive({});
+
+const onGenusCreated = (response, formData) => {
+    itemGenusOptions.value = [...itemGenusOptions.value, response];
+    formData.genusFk = response.id;
+};
+
+const onSpecieCreated = (response, formData) => {
+    itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
+    formData.specieFk = response.id;
+};
+
+onMounted(async () => {
+    itemBotanicals.value = await itemBotanicalsRef.value.fetch();
+    if (itemBotanicals.value.length > 0)
+        Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
+});
+</script>
+<template>
+    <FetchData
+        ref="itemBotanicalsRef"
+        url="ItemBotanicals"
+        :filter="{
+            where: { itemFk: route.params.id },
+        }"
+        @on-fetch="(data) => (itemBotanicals = data)"
+    />
+    <FetchData
+        url="Genera"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemGenusOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Species"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemSpeciesOptions = data)"
+        auto-load
+    />
+    <FormModel
+        url-update="ItemBotanicals"
+        model="entry"
+        auto-load
+        :form-initial-data="itemBotanicalsForm"
+        :clear-store-on-unmount="false"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectDialog
+                    :label="t('Genus')"
+                    v-model="data.genusFk"
+                    :options="itemGenusOptions"
+                    option-label="name"
+                    option-value="id"
+                    hide-selected
+                >
+                    <template #form>
+                        <CreateGenusForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onGenusCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+                <VnSelectDialog
+                    :label="t('Species')"
+                    v-model="data.specieFk"
+                    :options="itemSpeciesOptions"
+                    option-label="name"
+                    option-value="id"
+                    hide-selected
+                >
+                    <template #form>
+                        <CreateSpecieForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onSpecieCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Genus: Genus
+    Species: Especies
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 2a8e87194..c787d05f2 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'ItemMain' },
     menus: {
         main: ['ItemList', 'WasteBreakdown', 'ItemFixedPrice'],
-        card: ['ItemBasicData'],
+        card: ['ItemBasicData', 'ItemBotanical'],
     },
     children: [
         {
@@ -103,6 +103,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
                 },
+                {
+                    path: 'botanical',
+                    name: 'ItemBotanical',
+                    meta: {
+                        title: 'botanical',
+                        icon: 'vn:botanical',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+                },
             ],
         },
     ],

From 5544676a1b4a3f0bab4c79e4d88e743dc5b69c07 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 16:18:06 +0200
Subject: [PATCH 18/32] fix: mistakes like console.log an disables

---
 src/i18n/locale/en.yml                                 | 3 ++-
 src/i18n/locale/es.yml                                 | 2 ++
 src/pages/Agency/AgencyList.vue                        | 8 --------
 src/pages/Agency/Card/AgencyDescriptor.vue             | 1 -
 src/pages/Agency/Card/AgencyModes.vue                  | 1 -
 src/pages/Agency/Card/AgencySummary.vue                | 7 ++++++-
 src/pages/Agency/Card/AgencyWorkcenter.vue             | 2 ++
 src/pages/Customer/components/CustomerCreditCreate.vue | 1 -
 src/pages/Ticket/TicketCreate.vue                      | 1 -
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4de062ab0..636774d54 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -98,6 +98,7 @@ globals:
     worker: Worker
     now: Now
     name: Name
+    new: New
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -1174,8 +1175,8 @@ agency:
     isOwn: Own
     isAnyVolumeAllowed: Any volume allowed
     notification:
-        removeItem: Agency removed successfully
         removeItemError: Error removing agency
+        removeItem: WorkCenter removed successfully
     pageTitles:
         agency: Agency
     searchBar:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 10b77ef49..a2c7dd4dc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -98,6 +98,7 @@ globals:
     worker: Trabajador
     now: Ahora
     name: Nombre
+    new: Nuevo
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -1175,6 +1176,7 @@ agency:
     removeItem: Agencia eliminada correctamente
     notification:
         removeItemError: Error al eliminar la agencia
+        removeItem: Centro de trabajo eliminado correctamente
     pageTitles:
         agency: Agencia
     searchBar:
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index c04206625..88abba3eb 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -14,7 +14,6 @@ function navigate(id) {
 }
 function exprBuilder(param, value) {
     if (!value) return;
-    console.log('value: ', value);
     if (param !== 'search') return;
 
     if (!isNaN(value)) return { id: value };
@@ -62,13 +61,6 @@ function exprBuilder(param, value) {
                                 :disable="true"
                             />
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                        </template>
                     </CardList>
                 </template>
             </VnPaginate>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 311f5d3a5..0fa89d07d 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -19,7 +19,6 @@ const { params } = useRoute();
 const entityId = computed(() => props.id || params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
-console.log('card: ', card);
 </script>
 <template>
     <CardDescriptor
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
index 4b145f227..c4a92bca9 100644
--- a/src/pages/Agency/Card/AgencyModes.vue
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -8,7 +8,6 @@ import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-console.log('route: ', route.path);
 const routeId = route.params.id;
 </script>
 <template>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 4c9e7052f..0e80813aa 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -38,10 +38,15 @@ const filter = {
                         />
                     </QCardSection>
                     <VnLv :label="t('globals.name')" :value="agency.name" />
-                    <QCheckbox :label="t('agency.isOwn')" v-model="agency.isOwn" />
+                    <QCheckbox
+                        :label="t('agency.isOwn')"
+                        v-model="agency.isOwn"
+                        :disable="true"
+                    />
                     <QCheckbox
                         :label="t('agency.isAnyVolumeAllowed')"
                         v-model="agency.isAnyVolumeAllowed"
+                        :disable="true"
                     />
                 </QCard>
             </template>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index ed9f15689..b5e846300 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -134,6 +134,8 @@ async function deleteWorCenter(id) {
         Search agency: Buscar agencia
         You can search by name: Puedes buscar por nombre
         This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
+        Add work center: Añadir centro de trabajo
+        workCenter: Centro de trabajo
     en:
         isOwn: Has owner
         isAnyVolumeAllowed: Allows any volume
diff --git a/src/pages/Customer/components/CustomerCreditCreate.vue b/src/pages/Customer/components/CustomerCreditCreate.vue
index ae6d4de89..729deb258 100644
--- a/src/pages/Customer/components/CustomerCreditCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditCreate.vue
@@ -13,7 +13,6 @@ const router = useRouter();
 const initialData = ref({});
 
 const setClient = (data) => {
-    console.log(data.credit);
     initialData.value.credit = data.credit;
 };
 
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3fb9c0083..c6cd25244 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -73,7 +73,6 @@ const fetchAddresses = async (formData) => {
 
         const { defaultAddress } = selectedClient.value;
         formData.addressId = defaultAddress.id;
-        console.log();
     } catch (err) {
         console.error(`Error fetching addresses`, err);
         return err.response;

From 436f24b674fb43b30d8e32db040070934bf5db7c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 17:11:30 +0200
Subject: [PATCH 19/32] fix: translates

---
 src/pages/Agency/Card/AgencyModes.vue      |  2 ++
 src/pages/Agency/Card/AgencyWorkcenter.vue |  8 +-------
 src/pages/Agency/locale/en.yml             | 11 +++++++++++
 src/pages/Agency/locale/es,yml             | 12 ++++++++++++
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Agency/locale/en.yml
 create mode 100644 src/pages/Agency/locale/es,yml

diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
index c4a92bca9..4fb81914a 100644
--- a/src/pages/Agency/Card/AgencyModes.vue
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -52,6 +52,8 @@ const routeId = route.params.id;
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
         You can search by name: Puedes buscar por nombre
+        deliveryMethod: Método de entrega
+        inflation: Inflación
     en:
         isOwn: Has owner
         isAnyVolumeAllowed: Allows any volume
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index b5e846300..31be90af4 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -129,14 +129,8 @@ async function deleteWorCenter(id) {
 </style>
 <i18n>
     es: 
-        isOwn: Tiene propietario
-        isAnyVolumeAllowed: Permite cualquier volumen
-        Search agency: Buscar agencia
-        You can search by name: Puedes buscar por nombre
+        workCenter removed successfully: Centro de trabajo eliminado correctamente
         This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
         Add work center: Añadir centro de trabajo
         workCenter: Centro de trabajo
-    en:
-        isOwn: Has owner
-        isAnyVolumeAllowed: Allows any volume
 </i18n>
diff --git a/src/pages/Agency/locale/en.yml b/src/pages/Agency/locale/en.yml
new file mode 100644
index 000000000..3cc3d69e8
--- /dev/null
+++ b/src/pages/Agency/locale/en.yml
@@ -0,0 +1,11 @@
+agency:
+    isOwn: Own
+    isAnyVolumeAllowed: Any volume allowed
+    notification:
+        removeItemError: Error removing agency
+        removeItem: WorkCenter removed successfully
+    pageTitles:
+        agency: Agency
+    searchBar:
+        info: You can search by agency code
+        label: Search agency...
diff --git a/src/pages/Agency/locale/es,yml b/src/pages/Agency/locale/es,yml
new file mode 100644
index 000000000..2607472bd
--- /dev/null
+++ b/src/pages/Agency/locale/es,yml
@@ -0,0 +1,12 @@
+agency:
+    isOwn: Propio
+    isAnyVolumeAllowed: Cualquier volumen
+    removeItem: Agencia eliminada correctamente
+    notification:
+        removeItemError: Error al eliminar la agencia
+        removeItem: Centro de trabajo eliminado correctamente
+    pageTitles:
+        agency: Agencia
+    searchBar:
+        info: Puedes buscar por nombre o id
+        label: Buscar agencia...

From fff9ec41845bff6405535e9c6f4310fb84ae0512 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 17:17:28 +0200
Subject: [PATCH 20/32] fix: e2e test

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

diff --git a/test/cypress/integration/agency/agencyWorkCenter.spec.js b/test/cypress/integration/agency/agencyWorkCenter.spec.js
index 7f875179b..ff3c53214 100644
--- a/test/cypress/integration/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/agency/agencyWorkCenter.spec.js
@@ -23,7 +23,7 @@ describe('AgencyWorkCenter', () => {
         cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
         cy.get('.q-notification__message').should(
             'have.text',
-            'Agency removed successfully'
+            'WorkCenter removed successfully'
         );
     });
 

From d7bebfecb1723501d6125adaa9dd1dec02266269 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Apr 2024 08:28:42 +0200
Subject: [PATCH 21/32] fix: fix translates

---
 src/pages/Agency/locale/{es,yml => es.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/pages/Agency/locale/{es,yml => es.yml} (100%)

diff --git a/src/pages/Agency/locale/es,yml b/src/pages/Agency/locale/es.yml
similarity index 100%
rename from src/pages/Agency/locale/es,yml
rename to src/pages/Agency/locale/es.yml

From faa6d0e4fa8416cf3dcda5857e5577365c6ff83f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Apr 2024 08:33:41 +0200
Subject: [PATCH 22/32] feat: setup commit

---
 test/vitest/setup-file.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
index e69de29bb..288f80beb 100644
--- a/test/vitest/setup-file.js
+++ b/test/vitest/setup-file.js
@@ -0,0 +1 @@
+// This file will be run before each test file, don't delete or vitest will not work.

From 7f4155cde9a535662033e379052ae42d9d7eb914 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 08:54:26 +0200
Subject: [PATCH 23/32] fix: replace VnSelectFilter by VnSelect

---
 src/components/ItemsFilterPanel.vue     | 10 +++++-----
 src/pages/Item/ItemFixedPrice.vue       | 10 +++++-----
 src/pages/Item/ItemFixedPriceFilter.vue |  6 +++---
 src/pages/Item/ItemRequestFilter.vue    | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index f7f07a5b0..94adfe0ff 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
@@ -207,7 +207,7 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.typeFk')"
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
@@ -235,7 +235,7 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QSeparator />
@@ -246,7 +246,7 @@ const removeTag = (index, params, search) => {
                 class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
@@ -261,7 +261,7 @@ const removeTag = (index, params, search) => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 0dd7ca07d..2a753a3a5 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
@@ -178,7 +178,7 @@ const columns = computed(() => [
         name: 'warehouse',
         ...defaultColumnAttrs,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getColumnInputEvents,
@@ -434,7 +434,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
             <template #body-cell-itemId="props">
                 <QTd>
-                    <VnSelectFilter
+                    <VnSelect
                         :options="itemsWithNameOptions"
                         hide-selected
                         option-label="id"
@@ -450,7 +450,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QTd>
             </template>
             <template #body-cell-description="{ row }">
@@ -531,7 +531,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-warehouse="props">
                 <QTd class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index cd86b5f71..6c847ece8 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
@@ -35,7 +35,7 @@ const itemTypeWorkersOptions = ref([]);
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.buyerFk')"
                         v-model="params.buyerFk"
                         :options="itemTypeWorkersOptions"
@@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 8b0b34e62..e142c28d3 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -126,7 +126,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="params.attenderFk"
                         :label="t('params.attenderFk')"
                         @update:model-value="searchFn()"
@@ -151,7 +151,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"
@@ -167,7 +167,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
@@ -190,7 +190,7 @@ const decrement = (paramsObj, key) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QCard bordered>
@@ -261,7 +261,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.state')"
                         v-model="params.state"
                         @update:model-value="searchFn()"

From 3c033458d3c1dd75dbc4baf14b4dc8a512b6f4b3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 09:02:51 +0200
Subject: [PATCH 24/32] fix: minor changes

---
 src/i18n/locale/en.yml                | 2 ++
 src/pages/Item/Card/ItemBotanical.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index a07e35f30..68f1b3db3 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1126,6 +1126,8 @@ item:
         wasteBreakdown: Waste breakdown
         itemCreate: New item
         log: Log
+        tax: Tax
+        barcode: Barcode
         botanical: Botanical
     descriptor:
         item: Item
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 0a28b05b8..0dd1d1a19 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -107,5 +107,5 @@ onMounted(async () => {
 <i18n>
 es:
     Genus: Genus
-    Species: Especies
+    Species: Especie
 </i18n>

From 36e99e2c6cc267c146dff230184ea9c62d5c8658 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 09:28:32 +0200
Subject: [PATCH 25/32] fix: bug when save

---
 src/pages/Item/Card/ItemBotanical.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 0dd1d1a19..15492de9f 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted, reactive, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -17,7 +17,7 @@ const itemBotanicalsRef = ref(null);
 const itemGenusOptions = ref([]);
 const itemSpeciesOptions = ref([]);
 const itemBotanicals = ref([]);
-let itemBotanicalsForm = reactive({});
+let itemBotanicalsForm = reactive({ itemFk: null });
 
 const onGenusCreated = (response, formData) => {
     itemGenusOptions.value = [...itemGenusOptions.value, response];
@@ -28,8 +28,11 @@ const onSpecieCreated = (response, formData) => {
     itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
     formData.specieFk = response.id;
 };
-
+const entityId = computed(() => {
+    return route.params.id;
+});
 onMounted(async () => {
+    itemBotanicalsForm.itemFk = entityId.value;
     itemBotanicals.value = await itemBotanicalsRef.value.fetch();
     if (itemBotanicals.value.length > 0)
         Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
@@ -40,7 +43,7 @@ onMounted(async () => {
         ref="itemBotanicalsRef"
         url="ItemBotanicals"
         :filter="{
-            where: { itemFk: route.params.id },
+            where: { itemFk: entityId },
         }"
         @on-fetch="(data) => (itemBotanicals = data)"
     />

From 8f064e333878e6569e3329eb2f5f4ed19766f0c5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Apr 2024 09:37:02 +0200
Subject: [PATCH 26/32] warmFix: replace VnSelectFilter to VnSelect

---
 src/pages/Agency/Card/AgencyBasicData.vue  | 4 ++--
 src/pages/Agency/Card/AgencySummary.vue    | 2 +-
 src/pages/Agency/Card/AgencyWorkcenter.vue | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index 5999f853b..599058b3e 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -7,7 +7,7 @@ import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -27,7 +27,7 @@ const warehouses = ref([]);
                 <VnInput v-model="data.name" :label="t('globals.name')" />
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.warehouseFk"
                     option-value="id"
                     option-label="name"
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 0e80813aa..a4a6a2a18 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -7,7 +7,7 @@ import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index 31be90af4..f5beaab53 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -12,7 +12,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnRow from 'components/ui/VnRow.vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -99,7 +99,7 @@ async function deleteWorCenter(id) {
                 >
                     <template #form-inputs="{ data }">
                         <VnRow class="row q-gutter-md q-mb-md">
-                            <VnSelectFilter
+                            <VnSelect
                                 v-model="data.workCenterFk"
                                 option-value="id"
                                 option-label="name"
@@ -128,7 +128,7 @@ async function deleteWorCenter(id) {
 }
 </style>
 <i18n>
-    es: 
+    es:
         workCenter removed successfully: Centro de trabajo eliminado correctamente
         This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
         Add work center: Añadir centro de trabajo

From 485e916f55d08cd576e00b0f397c61fe57cad02f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 09:16:26 -0300
Subject: [PATCH 27/32] Add input focus

---
 src/pages/Item/Card/ItemBarcode.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index 6a13a9ea7..d0beab350 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,7 +11,20 @@ const { t } = useI18n();
 
 const itemBarcodeRef = ref(null);
 
-onMounted(() => {
+const insertRow = () => {
+    itemBarcodeRef.value.insert();
+    focusLastInput();
+};
+
+const focusLastInput = () => {
+    nextTick(() => {
+        const inputs = document.querySelectorAll('[focusable-input]');
+        const lastInput = inputs[inputs.length - 1];
+        if (lastInput) lastInput.focus();
+    });
+};
+
+onMounted(async () => {
     if (itemBarcodeRef.value) itemBarcodeRef.value.reload();
 });
 </script>
@@ -31,7 +44,7 @@ onMounted(() => {
                 url="ItemBarcodes"
             >
                 <template #body="{ rows }">
-                    <QCard class="q-px-lg q-py-md">
+                    <QCard v-if="rows.length > 0" class="q-px-lg q-py-md">
                         <div
                             v-for="(row, index) in rows"
                             :key="index"
@@ -41,6 +54,7 @@ onMounted(() => {
                                 :label="t('Code')"
                                 v-model="row.code"
                                 class="full-width"
+                                focusable-input
                             />
                             <QIcon
                                 @click="itemBarcodeRef.remove([row])"
@@ -55,7 +69,7 @@ onMounted(() => {
                             </QIcon>
                         </div>
                         <QIcon
-                            @click="itemBarcodeRef.insert()"
+                            @click="insertRow()"
                             class="cursor-pointer fill-icon-on-hover"
                             color="primary"
                             name="add_circle"

From 4792485214be8569bac2e6089a2271840da1920e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 13:50:39 -0300
Subject: [PATCH 28/32] Translate more fields label

---
 src/pages/Item/ItemListFilter.vue | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index e0993356c..49aeac29f 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
 
@@ -119,10 +119,12 @@ onMounted(async () => {
     const _moreFields = ['id', 'description', 'name', 'isActive'];
 
     _moreFields.forEach((field) => {
+        console.log(field);
         let prop = properties[field];
+        const label = t(`params.${field}`);
         moreFields.value.push({
             name: field,
-            label: prop ? prop.description : field,
+            label,
             type: prop ? prop.type : null,
         });
     });
@@ -183,7 +185,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.categoryFk')"
                         v-model="params.categoryFk"
                         @update:model-value="
@@ -201,7 +203,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.typeFk')"
                         v-model="params.typeFk"
                         @update:model-value="searchFn()"
@@ -223,12 +225,12 @@ onMounted(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.buyerFk')"
                         v-model="params.buyerFk"
                         @update:model-value="searchFn()"
@@ -244,7 +246,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
@@ -265,7 +267,7 @@ onMounted(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <!-- Tags filter -->
@@ -287,7 +289,7 @@ onMounted(async () => {
                 class="row items-center"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="tag.selectedTag"
                         :options="tagOptions"
@@ -302,7 +304,7 @@ onMounted(async () => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!tag?.selectedTag?.isFree && tag.valueOptions"
                         :label="t('params.tag')"
                         v-model="tag.value"
@@ -355,7 +357,7 @@ onMounted(async () => {
                 class="row items-center"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="fieldFilter.name"
                         :options="moreFields"
@@ -427,7 +429,7 @@ en:
         isActive: Active
         description: Description
         name: Name
-        id: ID
+        id: Id
 es:
     More fields: Más campos
     params:
@@ -443,5 +445,5 @@ es:
         isActive: Activo
         description: Descripción
         name: Nombre
-        id: ID
+        id: Id
 </i18n>

From ad085974dac83e25e0ef7edc82ef54e91d2c9e55 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 13:51:20 -0300
Subject: [PATCH 29/32] remove console.log

---
 src/pages/Item/ItemListFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 49aeac29f..f383a1e18 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -119,7 +119,6 @@ onMounted(async () => {
     const _moreFields = ['id', 'description', 'name', 'isActive'];
 
     _moreFields.forEach((field) => {
-        console.log(field);
         let prop = properties[field];
         const label = t(`params.${field}`);
         moreFields.value.push({

From 4282463e51e8f140be44d5549297ad62ada548a7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 14:29:11 -0300
Subject: [PATCH 30/32] Fill filter fields with user params

---
 src/pages/Item/ItemListFilter.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index f383a1e18..2e89cdbcf 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -127,6 +127,17 @@ onMounted(async () => {
             type: prop ? prop.type : null,
         });
     });
+
+    // Fill fieldFiltersValues with existent userParams
+    if (arrayData.store?.userParams) {
+        fieldFiltersValues.value = Object.entries(arrayData.store?.userParams)
+            .filter(([key, value]) => value && _moreFields.includes(key))
+            .map(([key, value]) => ({
+                name: key,
+                value,
+                selectedField: moreFields.value.find((field) => field.name === key),
+            }));
+    }
 });
 </script>
 

From ce55109dd31dd19dd579b74391c35f9b1d0cca30 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 15:41:03 -0300
Subject: [PATCH 31/32] fix more fields label when selected

---
 src/pages/Item/ItemListFilter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 2e89cdbcf..98bc74b20 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -369,7 +369,7 @@ onMounted(async () => {
                 <QItemSection class="col">
                     <VnSelect
                         :label="t('params.tag')"
-                        v-model="fieldFilter.name"
+                        :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
                         dense

From 1e1c88e55c6aa9934d6729271e469085fccaf31c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 21:05:45 +0200
Subject: [PATCH 32/32] fix: reset fieldFilter.value when change model

---
 src/pages/Item/ItemListFilter.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 98bc74b20..a51f9ebb4 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -381,6 +381,7 @@ onMounted(async () => {
                         @update:model-value="
                             ($event) => {
                                 fieldFilter.name = $event.name;
+                                fieldFilter.value = null;
                                 fieldFilter.selectedField = $event;
                             }
                         "