diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index a7c4e6378..52cd3ed47 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -643,18 +643,10 @@ function handleOnDataSaved(_) { :key="col?.id" class="text-center" > -
- {{ - rows.reduce( - (sum, currentRow) => sum + currentRow[col.name], - 0 - ) - }} -
+ @@ -739,10 +731,6 @@ es: border-color: var(--vn-section-color); } -.q-table__container > div:first-child { - background-color: var(--vn-page-color); -} - .grid-three { display: grid; grid-template-columns: repeat(auto-fit, minmax(400px, max-content)); diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 79a79c383..37101dafe 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -131,9 +131,8 @@ async function fetch(params) { useArrayData(props.dataKey, params); arrayData.reset(['filter.skip', 'skip']); await arrayData.fetch({ append: false }); - if (!store.hasMoreData) { - isLoading.value = false; - } + if (!store.hasMoreData) isLoading.value = false; + emit('onFetch', store.data); return store.data; } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index aeac483be..9f7c62848 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -36,7 +36,6 @@ $color-font-secondary: #777; .bg-success { background-color: $positive; } - .bg-notice { background-color: $info; } diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 1fe101e29..558f142ca 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -162,6 +162,7 @@ globals: dms: Gestión documental entryCreate: Nueva entrada latestBuys: Últimas compras + reserves: Reservas tickets: Tickets ticketCreate: Nuevo ticket boxing: Encajado diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index 379be1d2f..58a5c2e1b 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v import { toDate, toCurrency } from 'src/filters'; import { getUrl } from 'src/composables/getUrl'; import axios from 'axios'; +import FetchedTags from 'src/components/ui/FetchedTags.vue'; const route = useRoute(); const { t } = useI18n(); @@ -163,7 +164,7 @@ const fetchEntryBuys = async () => { >