From 89cf61a750d6218a65a080d67e2e7d86bdbe1b0d Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 27 Dec 2024 14:10:42 +0100
Subject: [PATCH 1/7] refactor: refs #8316 used VnSection and VnCardBeta

---
 src/i18n/locale/en.yml                 |   4 +
 src/i18n/locale/es.yml                 |   4 +
 src/pages/Parking/Card/ParkingCard.vue |  13 +---
 src/pages/Parking/ParkingList.vue      | 102 ++++++++++++-------------
 src/router/modules/parking.js          |  91 ++++++++++++----------
 5 files changed, 111 insertions(+), 103 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4a78811e6..de9ef1bec 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -550,6 +550,8 @@ shelving:
         newShelving: New Shelving
     summary:
         recyclable: Recyclable
+    search: Search shelving
+    searchInfo: You can search by shelving reference
 parking:
     pickingOrder: Picking order
     sector: Sector
@@ -558,6 +560,8 @@ parking:
     searchBar:
         info: You can search by parking code
         label: Search parking...
+    search: Search parking
+    searchInfo: You can search by parking code 
 order:
     field:
         salesPersonFk: Sales Person
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2bfe7ec4b..5413dde5d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -575,6 +575,8 @@ shelving:
         newShelving: Nuevo Carro
     summary:
         recyclable: Reciclable
+    search: Buscar carro
+    searchInfo: Puedes buscar por referencia del carro
 parking:
     pickingOrder: Orden de recogida
     row: Fila
@@ -582,6 +584,8 @@ parking:
     searchBar:
         info: Puedes buscar por código de parking
         label: Buscar parking...
+    search: Buscar parking
+    searchInfo: Puedes buscar por código de parking
 department:
     chat: Chat
     bossDepartment: Jefe de departamento
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 337106986..1cd2df7b7 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -1,19 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
-import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Parking"
         base-url="Parkings"
         :descriptor="ParkingDescriptor"
-        :filter-panel="ParkingFilter"
-        search-data-key="ParkingList"
-        :searchbar-props="{
-            url: 'Parkings',
-            label: 'parking.searchBar.label',
-            info: 'parking.searchBar.info',
-        }"
     />
 </template>
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 109613383..88db8bbf0 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -5,17 +5,17 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const stateStore = useStateStore();
 const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ParkingList';
 
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -37,58 +37,54 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template>
-        <VnSearchbar
-            data-key="ParkingList"
-            :label="t('Search parking')"
-            :info="t('You can search by parking code')"
-        />
-    </template>
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        prefix="parking"
+        :array-data-props="{
+            url: 'Parkings',
+            order: ['code'],
+            exprBuilder,
+        }"
+    >
+        <template #rightMenu>
             <ParkingFilter data-key="ParkingList" />
         </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ParkingList"
-                url="Parkings"
-                :user-filter="filter"
-                :expr-builder="exprBuilder"
-                :limit="20"
-                order="code"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :id="row.id"
-                        :title="row.code"
-                        @click="push({ path: `/parking/${row.id}` })"
+        <template #body>
+            <QPage class="column items-center q-pa-md">
+                <div class="vn-card-list">
+                    <VnPaginate
+                        :data-key="dataKey"
+                        :user-filter="filter"
+                        :expr-builder="exprBuilder"
+                        :limit="20"
                     >
-                        <template #list-items>
-                            <VnLv label="Sector" :value="row.sector?.description" />
-                            <VnLv
-                                :label="t('parking.pickingOrder')"
-                                :value="row.pickingOrder"
-                            />
+                        <template #body="{ rows }">
+                            <CardList
+                                v-for="row of rows"
+                                :key="row.id"
+                                :id="row.id"
+                                :title="row.code"
+                                @click="push({ path: `/parking/${row.id}` })"
+                            >
+                                <template #list-items>
+                                    <VnLv label="Sector" :value="row.sector?.description" />
+                                    <VnLv
+                                        :label="t('parking.pickingOrder')"
+                                        :value="row.pickingOrder"
+                                    />
+                                </template>
+                                <template #actions>
+                                    <QBtn
+                                        :label="t('components.smartCard.openSummary')"
+                                        @click.stop="viewSummary(row.id, ParkingSummary)"
+                                        color="primary"
+                                    />
+                                </template>
+                            </CardList>
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ParkingSummary)"
-                                color="primary"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-<i18n>
-es:
-    Search parking: Buscar parking
-    You can search by parking code: Puede buscar por el código del parking
-</i18n>
+                    </VnPaginate>
+                </div>
+            </QPage>
+        </template>
+    </VnSection>
+</template>
\ No newline at end of file
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index 51ea200c6..0dbbf4fb9 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -1,54 +1,65 @@
 import { RouterView } from 'vue-router';
 
+const parkingCard = {
+    name: 'ParkingCard',
+    path: ':id',
+    component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
+    redirect: { name: 'ParkingSummary' },
+    meta: {
+        menu: [
+            'ParkingBasicData', 
+            'ParkingLog'
+        ],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'ParkingSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ParkingBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ParkingLog',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
+        },
+    ],
+};
+
 export default {
+    name: 'Parking',    
     path: '/parking',
-    name: 'Parking',
     meta: {
         title: 'parking',
         icon: 'garage_home',
         moduleName: 'Parking',
+        menu: [],
     },
     component: RouterView,
-    redirect: { name: 'ParkingCard' },
-    menus: {
-        main: [],
-        card: ['ParkingBasicData', 'ParkingLog'],
-    },
+    redirect: { name: 'ParkingMain' },
     children: [
         {
-            path: '/parking/:id',
-            name: 'ParkingCard',
-            component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
-            redirect: { name: 'ParkingSummary' },
-            children: [
-                {
-                    name: 'ParkingSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
-                },
-                {
-                    name: 'ParkingBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Parking/Card/ParkingBasicData.vue'),
-                },
-                {
-                    name: 'ParkingLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
-                },
-            ],
-        },
+            name: 'ParkingMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'ParkingIndexMain' },
+            children: [ parkingCard ],
+        },       
     ],
 };

From 7786c1ed64d312722ae9111f9ec78bb540eff492 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 27 Dec 2024 14:31:15 +0100
Subject: [PATCH 2/7] chore: refs #8316 remove search and searchInfo entries
 from shelving in English and Spanish locales

---
 src/i18n/locale/en.yml | 2 --
 src/i18n/locale/es.yml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index de9ef1bec..795124f7f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -550,8 +550,6 @@ shelving:
         newShelving: New Shelving
     summary:
         recyclable: Recyclable
-    search: Search shelving
-    searchInfo: You can search by shelving reference
 parking:
     pickingOrder: Picking order
     sector: Sector
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 5413dde5d..25a3d0bd8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -575,8 +575,6 @@ shelving:
         newShelving: Nuevo Carro
     summary:
         recyclable: Reciclable
-    search: Buscar carro
-    searchInfo: Puedes buscar por referencia del carro
 parking:
     pickingOrder: Orden de recogida
     row: Fila

From 663ca7c25d6fa9ea9e69e90c0a90c95f7ca99bd9 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 8 Jan 2025 13:08:24 +0100
Subject: [PATCH 3/7] refactor: refs #8316 moved userFilter to array-data-props

---
 src/pages/Parking/ParkingList.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 88db8bbf0..767e6db65 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -43,6 +43,7 @@ function exprBuilder(param, value) {
         :array-data-props="{
             url: 'Parkings',
             order: ['code'],
+            userFilter: filter,
             exprBuilder,
         }"
     >
@@ -54,9 +55,6 @@ function exprBuilder(param, value) {
                 <div class="vn-card-list">
                     <VnPaginate
                         :data-key="dataKey"
-                        :user-filter="filter"
-                        :expr-builder="exprBuilder"
-                        :limit="20"
                     >
                         <template #body="{ rows }">
                             <CardList

From b41d5f19dcfe0e083a4810cfa11d162ddfd4ea51 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 16 Jan 2025 07:37:19 +0100
Subject: [PATCH 4/7] fix: refs #8316 translations

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

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e1ec62175..56c1392fc 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -579,6 +579,8 @@ parking:
     searchBar:
         info: You can search by parking code
         label: Search parking...
+    search: Search parking
+    searchInfo: You can search by parking code
 department:
     chat: Chat
     bossDepartment: Boss Department

From b8c8610781af7d55be32d6e2c5699c6042b66f0e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 16 Jan 2025 08:06:16 +0100
Subject: [PATCH 5/7] feat: refs #8316 parking inside shelving

---
 src/pages/Parking/ParkingList.vue | 15 ++++---
 src/router/modules/index.js       |  2 -
 src/router/modules/parking.js     | 65 -------------------------------
 src/router/modules/shelving.js    | 55 ++++++++++++++++++++++----
 src/router/routes.js              |  2 -
 5 files changed, 57 insertions(+), 82 deletions(-)
 delete mode 100644 src/router/modules/parking.js

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 767e6db65..91ccc4f51 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -53,19 +53,22 @@ function exprBuilder(param, value) {
         <template #body>
             <QPage class="column items-center q-pa-md">
                 <div class="vn-card-list">
-                    <VnPaginate
-                        :data-key="dataKey"
-                    >
+                    <VnPaginate :data-key="dataKey">
                         <template #body="{ rows }">
                             <CardList
                                 v-for="row of rows"
                                 :key="row.id"
                                 :id="row.id"
                                 :title="row.code"
-                                @click="push({ path: `/parking/${row.id}` })"
+                                @click="
+                                    push({ path: `/shelving/parking/${row.id}/summary` })
+                                "
                             >
                                 <template #list-items>
-                                    <VnLv label="Sector" :value="row.sector?.description" />
+                                    <VnLv
+                                        label="Sector"
+                                        :value="row.sector?.description"
+                                    />
                                     <VnLv
                                         :label="t('parking.pickingOrder')"
                                         :value="row.pickingOrder"
@@ -85,4 +88,4 @@ function exprBuilder(param, value) {
             </QPage>
         </template>
     </VnSection>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index a22d5399c..b73d1dce7 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,7 +13,6 @@ import Travel from './travel';
 import Order from './order';
 import Entry from './entry';
 import roadmap from './roadmap';
-import Parking from './parking';
 import Agency from './agency';
 import ItemType from './itemType';
 import Zone from './zone';
@@ -36,7 +35,6 @@ export default [
     invoiceIn,
     Entry,
     roadmap,
-    Parking,
     Agency,
     ItemType,
     Zone,
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
deleted file mode 100644
index 0dbbf4fb9..000000000
--- a/src/router/modules/parking.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { RouterView } from 'vue-router';
-
-const parkingCard = {
-    name: 'ParkingCard',
-    path: ':id',
-    component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
-    redirect: { name: 'ParkingSummary' },
-    meta: {
-        menu: [
-            'ParkingBasicData', 
-            'ParkingLog'
-        ],
-    },
-    children: [
-        {
-            path: 'summary',
-            name: 'ParkingSummary',
-            meta: {
-                title: 'summary',
-                icon: 'launch',
-            },
-            component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
-        },
-        {
-            path: 'basic-data',
-            name: 'ParkingBasicData',
-            meta: {
-                title: 'basicData',
-                icon: 'vn:settings',
-            },
-            component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
-        },
-        {
-            path: 'log',
-            name: 'ParkingLog',
-            meta: {
-                title: 'log',
-                icon: 'history',
-            },
-            component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
-        },
-    ],
-};
-
-export default {
-    name: 'Parking',    
-    path: '/parking',
-    meta: {
-        title: 'parking',
-        icon: 'garage_home',
-        moduleName: 'Parking',
-        menu: [],
-    },
-    component: RouterView,
-    redirect: { name: 'ParkingMain' },
-    children: [
-        {
-            name: 'ParkingMain',
-            path: '',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ParkingIndexMain' },
-            children: [ parkingCard ],
-        },       
-    ],
-};
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 9cc6bcef1..e52dfce4d 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -1,5 +1,44 @@
 import { RouterView } from 'vue-router';
 
+const parkingCard = {
+    name: 'ParkingCard',
+    path: ':id',
+    component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
+    redirect: { name: 'ParkingSummary' },
+    meta: {
+        menu: ['ParkingBasicData', 'ParkingLog'],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'ParkingSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ParkingBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ParkingLog',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
+        },
+    ],
+};
+
 export default {
     path: '/shelving',
     name: 'Shelving',
@@ -11,7 +50,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
-        main: ['ShelvingList', 'ParkingList'],
+        main: ['ShelvingList', 'ParkingMain'],
         card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
@@ -40,18 +79,20 @@ export default {
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
                 {
-                    path: '/parking',
+                    path: 'parking',
+                    name: 'ParkingMain',
                     redirect: { name: 'ParkingList' },
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Parking/ParkingList.vue'),
                     children: [
                         {
                             path: 'list',
                             name: 'ParkingList',
-                            meta: {
-                                title: 'parkingList',
-                                icon: 'view_list',
-                            },
-                            component: () => import('src/pages/Parking/ParkingList.vue'),
                         },
+                        parkingCard,
                     ],
                 },
             ],
diff --git a/src/router/routes.js b/src/router/routes.js
index d84ba7e46..499328d3d 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -14,7 +14,6 @@ import shelving from 'src/router/modules/shelving';
 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';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
@@ -86,7 +85,6 @@ const routes = [
             travel,
             roadmap,
             entry,
-            parking,
             agency,
             ItemType,
             zone,

From fcb34c930962d0dee1e935a96e3664e6c063130c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 17 Jan 2025 14:58:23 +0100
Subject: [PATCH 6/7] refactor: refs #8316 added shelvingCardBeta and
 localizations

---
 src/i18n/locale/en.yml                   |  17 ----
 src/i18n/locale/es.yml                   |  16 ----
 src/pages/Parking/locale/en.yml          |   7 ++
 src/pages/Parking/locale/es.yml          |   7 ++
 src/pages/Shelving/Card/ShelvingCard.vue |  15 +--
 src/pages/Shelving/ShelvingList.vue      | 113 ++++++++++++-----------
 src/pages/Shelving/locale/en.yml         |   9 ++
 src/pages/Shelving/locale/es.yml         |   9 ++
 8 files changed, 96 insertions(+), 97 deletions(-)
 create mode 100644 src/pages/Parking/locale/en.yml
 create mode 100644 src/pages/Parking/locale/es.yml
 create mode 100644 src/pages/Shelving/locale/en.yml
 create mode 100644 src/pages/Shelving/locale/es.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 56c1392fc..ff7b5464e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -564,23 +564,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: CSV download failed
-shelving:
-    list:
-        parking: Parking
-        priority: Priority
-        newShelving: New Shelving
-    summary:
-        recyclable: Recyclable
-parking:
-    pickingOrder: Picking order
-    sector: Sector
-    row: Row
-    column: Column
-    searchBar:
-        info: You can search by parking code
-        label: Search parking...
-    search: Search parking
-    searchInfo: You can search by parking code
 department:
     chat: Chat
     bossDepartment: Boss Department
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6fa2d16a0..679392fbd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -563,22 +563,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: Error al descargar CSV
-shelving:
-    list:
-        parking: Parking
-        priority: Prioridad
-        newShelving: Nuevo Carro
-    summary:
-        recyclable: Reciclable
-parking:
-    pickingOrder: Orden de recogida
-    row: Fila
-    column: Columna
-    searchBar:
-        info: Puedes buscar por código de parking
-        label: Buscar parking...
-    search: Buscar parking
-    searchInfo: Puedes buscar por código de parking
 department:
     chat: Chat
     bossDepartment: Jefe de departamento
diff --git a/src/pages/Parking/locale/en.yml b/src/pages/Parking/locale/en.yml
new file mode 100644
index 000000000..72caba408
--- /dev/null
+++ b/src/pages/Parking/locale/en.yml
@@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Picking order
+    sector: Sector
+    row: Row
+    column: Column
+    search: Search parking
+    searchInfo: You can search by parking code
\ No newline at end of file
diff --git a/src/pages/Parking/locale/es.yml b/src/pages/Parking/locale/es.yml
new file mode 100644
index 000000000..ab23182a1
--- /dev/null
+++ b/src/pages/Parking/locale/es.yml
@@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Orden de recogida
+    row: Fila
+    sector: Sector
+    column: Columna
+    search: Buscar parking
+    searchInfo: Puedes buscar por código de parking
\ No newline at end of file
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index a501a7a99..41a0db33c 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,19 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-import ShelvingFilter from './ShelvingFilter.vue';
-import ShelvingSearchbar from './ShelvingSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Shelving"
         base-url="Shelvings"
         :descriptor="ShelvingDescriptor"
-        :filter-panel="ShelvingFilter"
-        search-data-key="ShelvingList"
-    >
-        <template #searchbar>
-            <ShelvingSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index cd7c4bcf9..053a7c463 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -6,13 +6,14 @@ import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
 import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
-import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ShelvingList';
+
 const filter = {
     include: [{ relation: 'parking' }],
 };
@@ -34,58 +35,64 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <ShelvingSearchbar />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        prefix="shelving"
+        :array-data-props="{
+            url: 'Shelvings',
+            order: ['code'],
+            userFilter: filter,
+            exprBuilder,
+        }"
+    >
+        <template #rightMenu>
             <ShelvingFilter data-key="ShelvingList" />
         </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ShelvingList"
-                url="Shelvings"
-                :filter="filter"
-                :expr-builder="exprBuilder"
-                :limit="20"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :id="row.id"
-                        :title="row.code"
-                        @click="navigate(row.id)"
+        <template #body>
+            <QPage class="column items-center q-pa-md">
+                <div class="vn-card-list">
+                    <VnPaginate
+                        :data-key="dataKey"
                     >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('shelving.list.parking')"
-                                :title-label="t('shelving.list.parking')"
-                                :value="row.parking?.code"
-                            />
-                            <VnLv
-                                :label="t('shelving.list.priority')"
-                                :value="row?.priority"
-                            />
+                        <template #body="{ rows }">
+                            <CardList
+                                v-for="row of rows"
+                                :key="row.id"
+                                :id="row.id"
+                                :title="row.code"
+                                @click="navigate(row.id)"
+                            >
+                                <template #list-items>
+                                    <VnLv
+                                        :label="t('shelving.list.parking')"
+                                        :title-label="t('shelving.list.parking')"
+                                        :value="row.parking?.code"
+                                    />
+                                    <VnLv
+                                        :label="t('shelving.list.priority')"
+                                        :value="row?.priority"
+                                    />
+                                </template>
+                                <template #actions>
+                                    <QBtn
+                                        :label="t('components.smartCard.openSummary')"
+                                        @click.stop="viewSummary(row.id, ShelvingSummary)"
+                                        color="primary"
+                                    />
+                                </template>
+                            </CardList>
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ShelvingSummary)"
-                                color="primary"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'ShelvingCreate' }">
-                <QBtn fab icon="add" color="primary" shortcut="+" />
-                <QTooltip>
-                    {{ t('shelving.list.newShelving') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
-</template>
+                    </VnPaginate>
+                </div>
+                <QPageSticky :offset="[20, 20]">
+                    <RouterLink :to="{ name: 'ShelvingCreate' }">
+                        <QBtn fab icon="add" color="primary" shortcut="+" />
+                        <QTooltip>
+                            {{ t('shelving.list.newShelving') }}
+                        </QTooltip>
+                    </RouterLink>
+                </QPageSticky>
+            </QPage>
+        </template>
+    </VnSection>
+</template>
\ No newline at end of file
diff --git a/src/pages/Shelving/locale/en.yml b/src/pages/Shelving/locale/en.yml
new file mode 100644
index 000000000..bd031f50c
--- /dev/null
+++ b/src/pages/Shelving/locale/en.yml
@@ -0,0 +1,9 @@
+shelving:
+    list:
+        parking: Parking
+        priority: Priority
+        newShelving: New Shelving
+    summary:
+        recyclable: Recyclable
+    search: Search shelving
+    searchInfo: You can search by shelving reference
\ No newline at end of file
diff --git a/src/pages/Shelving/locale/es.yml b/src/pages/Shelving/locale/es.yml
new file mode 100644
index 000000000..729485e70
--- /dev/null
+++ b/src/pages/Shelving/locale/es.yml
@@ -0,0 +1,9 @@
+shelving:
+    list:
+        parking: Parking
+        priority: Prioridad
+        newShelving: Nuevo Carro
+    summary:
+        recyclable: Reciclable
+    search: Buscar carro
+    searchInfo: Puedes buscar por referencia del carro
\ No newline at end of file

From c6f613c5e516dc4a3660ab4c19b0817effeb7160 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 Jan 2025 10:02:23 +0100
Subject: [PATCH 7/7] fix: refs #8316 redirections

---
 src/pages/Parking/ParkingList.vue   |  2 +-
 src/pages/Shelving/ShelvingList.vue |  8 +--
 src/router/modules/shelving.js      | 91 ++++++++++++++++-------------
 3 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 91ccc4f51..bce87126e 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -47,7 +47,7 @@ function exprBuilder(param, value) {
             exprBuilder,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ParkingFilter data-key="ParkingList" />
         </template>
         <template #body>
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 053a7c463..cf158e76b 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -45,15 +45,13 @@ function exprBuilder(param, value) {
             exprBuilder,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ShelvingFilter data-key="ShelvingList" />
         </template>
         <template #body>
             <QPage class="column items-center q-pa-md">
                 <div class="vn-card-list">
-                    <VnPaginate
-                        :data-key="dataKey"
-                    >
+                    <VnPaginate :data-key="dataKey">
                         <template #body="{ rows }">
                             <CardList
                                 v-for="row of rows"
@@ -95,4 +93,4 @@ function exprBuilder(param, value) {
             </QPage>
         </template>
     </VnSection>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index e52dfce4d..cd8a2bf15 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -39,6 +39,41 @@ const parkingCard = {
     ],
 };
 
+const shelvingCard = {
+    name: 'ShelvingLayout',
+    path: ':id',
+    component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
+    redirect: { name: 'ShelvingSummary' },
+    children: [
+        {
+            name: 'ShelvingSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+            },
+            component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
+        },
+        {
+            name: 'ShelvingBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
+        },
+        {
+            name: 'ShelvingLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Shelving/Card/ShelvingLog.vue'),
+        },
+    ],
+};
+
 export default {
     path: '/shelving',
     name: 'Shelving',
@@ -58,16 +93,24 @@ export default {
             path: '',
             name: 'ShelvingMain',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ShelvingList' },
+            redirect: { name: 'ShelvingSection' },
             children: [
                 {
-                    path: 'list',
-                    name: 'ShelvingList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'ShelvingSection',
+                    redirect: { name: 'ShelvingList' },
                     component: () => import('src/pages/Shelving/ShelvingList.vue'),
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ShelvingList',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        shelvingCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -97,39 +140,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'ShelvingLayout',
-            path: ':id',
-            component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
-            redirect: { name: 'ShelvingSummary' },
-            children: [
-                {
-                    name: 'ShelvingSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                    },
-                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
-                },
-                {
-                    name: 'ShelvingBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
-                },
-                {
-                    name: 'ShelvingLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Shelving/Card/ShelvingLog.vue'),
-                },
-            ],
-        },
     ],
 };