From d8edd443c79166567ab8f20ff20d033c80e7d31a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 20 Jan 2025 14:11:42 +0100 Subject: [PATCH 01/11] fix: refs #6896 hotfix search --- src/pages/Order/Card/OrderCatalogFilter.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue index 39627595d..262f503fd 100644 --- a/src/pages/Order/Card/OrderCatalogFilter.vue +++ b/src/pages/Order/Card/OrderCatalogFilter.vue @@ -115,6 +115,7 @@ const removeTagGroupParam = (params, search, valIndex) => { } else { params.tagGroups.splice(valIndex, 1); } + search(); }; const setCategoryList = (data) => { From ae507167b7fb8244307217550088e503c0987a7e Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 21 Jan 2025 10:43:44 +0100 Subject: [PATCH 02/11] feat: refs #8087 add additional filter fields to TravelCard component --- src/pages/Travel/Card/TravelCard.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue index 4e48e6b53..9c67428f5 100644 --- a/src/pages/Travel/Card/TravelCard.vue +++ b/src/pages/Travel/Card/TravelCard.vue @@ -14,6 +14,9 @@ const filter = { 'warehouseOutFk', 'cargoSupplierFk', 'agencyModeFk', + 'isRaid', + 'isDelivered', + 'isReceived', ], include: [ { From 61e410aa1d785599b6e67194958e6c1d738135e4 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 21 Jan 2025 11:16:38 +0000 Subject: [PATCH 03/11] fix: use clientFk to filter data --- src/pages/Customer/Card/CustomerConsumption.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue index 640e37ed3..f0d8dea47 100644 --- a/src/pages/Customer/Card/CustomerConsumption.vue +++ b/src/pages/Customer/Card/CustomerConsumption.vue @@ -152,7 +152,8 @@ const updateDateParams = (value, params) => { v-if="campaignList" data-key="CustomerConsumption" url="Clients/consumption" - :order="['itemTypeFk', 'itemName', 'itemSize', 'description']" + :order="['itemTypeFk', 'itemName', 'itemSize', 'description']" + :filter="{ where: { clientFk: route.params.id } }" :columns="columns" search-url="consumption" :user-params="userParams" From 0658785a9a7d6b31f7a67bca1751b49a76df544b Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Wed, 22 Jan 2025 13:03:23 +0000 Subject: [PATCH 04/11] style: perf max-width rule --- src/css/app.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index 5891aa29a..57bd207c2 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -308,11 +308,11 @@ input::-webkit-inner-spin-button { } .q-item > .q-item__section:has(.q-checkbox) { - max-width: min-content; + max-width: fit-content; } .row > .column:has(.q-checkbox) { - max-width: min-content; + max-width: fit-content; } .q-field__inner { .q-field__control { From a58f31f7d8b75912a6dac642081d382c8d53081c Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 23 Jan 2025 07:18:28 +0100 Subject: [PATCH 05/11] fix: change name --- src/pages/Wagon/WagonCounter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Wagon/WagonCounter.vue b/src/pages/Wagon/WagonCounter.vue index 505cbba28..fd411b86b 100644 --- a/src/pages/Wagon/WagonCounter.vue +++ b/src/pages/Wagon/WagonCounter.vue @@ -11,7 +11,7 @@ const { t } = useI18n(); const counters = ref({ alquilerBandeja: { count: 0, id: 96001, title: 'CC Bandeja', isTray: true }, bandejaRota: { count: 0, id: 88381, title: 'CC Bandeja Rota', isTray: true }, - carryOficial: { count: 0, id: 96000, title: 'CC Carry OFICIAL TAG5' }, + carryOficial: { count: 0, id: 96000, title: 'CC Carry OFICIAL TAG6' }, candadoRojo: { count: 0, id: 96002, title: 'CC Carry NO OFICIAL' }, sacadores: { count: 0, id: 142260, title: 'CC Sacadores' }, sinChapa: { count: 0, id: 2214, title: 'DC Carry Sin Placa CC' }, From f4adedb4f1f9b42670e528c85d9d926dcc158e22 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 24 Jan 2025 00:23:31 +0100 Subject: [PATCH 06/11] fix: replace GoToUser by NewOrder --- .../Customer/Card/CustomerDescriptor.vue | 23 +++++++++---------- .../Customer/Card/CustomerDescriptorMenu.vue | 8 +------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue index 23b12e11f..b1d50851d 100644 --- a/src/pages/Customer/Card/CustomerDescriptor.vue +++ b/src/pages/Customer/Card/CustomerDescriptor.vue @@ -188,14 +188,18 @@ const debtWarning = computed(() => { - {{ t('Go to user') }} + {{ t('globals.pageTitles.createOrder') }} diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue index aeaeaef57..5df5721e1 100644 --- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue +++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue @@ -6,7 +6,7 @@ import axios from 'axios'; import { useQuasar } from 'quasar'; import useNotify from 'src/composables/useNotify'; -import VnSmsDialog from 'src/components/common/VnSmsDialog.vue'; +import VnSmsDialog from 'src/componts/common/VnSmsDialog.vue'; import useOpenURL from 'src/composables/useOpenURL'; const $props = defineProps({ @@ -51,7 +51,6 @@ const openCreateForm = (type) => { }; const clientFk = { ticket: 'clientId', - order: 'clientFk', }; const key = clientFk[type]; if (!key) return; @@ -70,11 +69,6 @@ const openCreateForm = (type) => { {{ t('globals.pageTitles.createTicket') }} - - - {{ t('globals.pageTitles.createOrder') }} - - {{ t('Send SMS') }} From 00c90b29e936b7e0cb43e1f79a27b454d9a915c9 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 24 Jan 2025 00:24:19 +0100 Subject: [PATCH 07/11] fix: remove "Go to module index" i18n value --- src/pages/Entry/Card/EntryDescriptor.vue | 1 - src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue | 4 ---- src/pages/Supplier/Card/SupplierDescriptor.vue | 1 - src/pages/Ticket/Card/TicketDescriptor.vue | 1 - src/pages/Travel/Card/TravelDescriptor.vue | 1 - src/pages/Zone/Card/ZoneDescriptor.vue | 4 ---- 6 files changed, 12 deletions(-) diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index 9814615a6..eee76868b 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -155,7 +155,6 @@ es: All travels with current agency: Todos los envíos con la agencia actual All entries with current supplier: Todas las entradas con el proveedor actual Show entry report: Ver informe del pedido - Go to module index: Ir al índice del modulo Inventory entry: Es inventario Virtual entry: Es una redada diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue index 936e95d2f..6d093d91d 100644 --- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue +++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue @@ -63,7 +63,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity - -es: - Go to module index: Ir al índice del módulo - diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue index a1a2a0991..37c9c1cff 100644 --- a/src/pages/Supplier/Card/SupplierDescriptor.vue +++ b/src/pages/Supplier/Card/SupplierDescriptor.vue @@ -188,7 +188,6 @@ const getEntryQueryParams = (supplier) => { es: All entries with current supplier: Todas las entradas con proveedor actual Go to client: Ir a cliente - Go to module index: Ir al índice del módulo Inactive supplier: Proveedor inactivo Unverified supplier: Proveedor no verificado diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index 4e77b633f..9f7684b93 100644 --- a/src/pages/Ticket/Card/TicketDescriptor.vue +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -239,7 +239,6 @@ function ticketFilter(ticket) { es: This ticket is deleted: Este ticket está eliminado - Go to module index: Ir al índice del modulo Client inactive: Cliente inactivo Client not checked: Cliente no verificado Client has debt: Cliente con deuda diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue index 00852e5ee..72acf91b8 100644 --- a/src/pages/Travel/Card/TravelDescriptor.vue +++ b/src/pages/Travel/Card/TravelDescriptor.vue @@ -85,7 +85,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity. es: - Go to module index: Ir al índice del módulo The travel will be deleted: El envío será eliminado Do you want to delete this travel?: ¿Quieres eliminar este envío? All travels with current agency: Todos los envíos con la agencia actual diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue index f991818fb..8355c219e 100644 --- a/src/pages/Zone/Card/ZoneDescriptor.vue +++ b/src/pages/Zone/Card/ZoneDescriptor.vue @@ -66,7 +66,3 @@ const setData = (entity) => { - -es: - Go to module index: Ir al índice del módulo - From d5ea4fb46df5b2869b5305e9d4f86f97503b475b Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 24 Jan 2025 00:26:31 +0100 Subject: [PATCH 08/11] perf: eslint --- src/pages/Customer/Card/CustomerDescriptor.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue index b1d50851d..fd4ed0e42 100644 --- a/src/pages/Customer/Card/CustomerDescriptor.vue +++ b/src/pages/Customer/Card/CustomerDescriptor.vue @@ -223,10 +223,10 @@ en: unpaidDated: 'Date {dated}' unpaidAmount: 'Amount {amount}' es: - Customer ticket list: Listado de tickets del cliente + Customer ticket list: Listado de tickets del cliente Customer invoice out list: Listado de facturas del cliente - Go to supplier: Ir al proveedor - Unpaid: Impagado + Go to supplier: Ir al proveedor + Unpaid: Impagado unpaidDated: 'Fecha {dated}' unpaidAmount: 'Importe {amount}' From f0dc7b4a4121f1d4c09ce2399d58a275009aff6a Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 24 Jan 2025 08:19:53 +0100 Subject: [PATCH 09/11] fix: import component --- src/pages/Customer/Card/CustomerDescriptorMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue index 5df5721e1..fb78eab69 100644 --- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue +++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue @@ -6,7 +6,7 @@ import axios from 'axios'; import { useQuasar } from 'quasar'; import useNotify from 'src/composables/useNotify'; -import VnSmsDialog from 'src/componts/common/VnSmsDialog.vue'; +import VnSmsDialog from 'src/components/common/VnSmsDialog.vue'; import useOpenURL from 'src/composables/useOpenURL'; const $props = defineProps({ From 5b448e5bb37593aa0ac6f581b336b694404314ef Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 24 Jan 2025 08:24:12 +0100 Subject: [PATCH 10/11] fix: order when is string --- src/composables/useArrayData.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 412e17598..3c3a283f1 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -93,8 +93,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { Object.assign(params, userParams); if (params.filter) params.filter.skip = store.skip; - if (store?.order && typeof store?.order == 'string') store.order = [store.order]; - if (store.order?.length) params.filter.order = [...store.order]; + if (store.order?.length) params.filter.order = [...toArray(store.order)]; else delete params.filter.order; store.currentFilter = JSON.parse(JSON.stringify(params)); @@ -191,10 +190,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { async function addOrder(field, direction = 'ASC') { const newOrder = field + ' ' + direction; - let order = store.order || []; - if (typeof order == 'string') order = [order]; + const order = toArray(store.order); - let index = order.findIndex((o) => o.split(' ')[0] === field); + let index = getOrderIndex(order, field); if (index > -1) { order[index] = newOrder; } else { @@ -211,16 +209,23 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { } async function deleteOrder(field) { - let order = store.order ?? []; - if (typeof order == 'string') order = [order]; - - const index = order.findIndex((o) => o.split(' ')[0] === field); + const order = toArray(store.order); + const index = getOrderIndex(order, field); if (index > -1) order.splice(index, 1); store.order = order; fetch({}); } + function getOrderIndex(order, field) { + return order.findIndex((o) => o.split(' ')[0] === field); + } + + function toArray(str = []) { + if (Array.isArray(str)) return str; + if (typeof str === 'string') return str.split(',').map((item) => item.trim()); + } + function sanitizerParams(params, exprBuilder) { for (const param in params) { if (params[param] === '' || params[param] === null) { From 658747d4799598d82ab89d4a8c70001e20555202 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 24 Jan 2025 11:45:03 +0100 Subject: [PATCH 11/11] fix: empty store.order --- src/composables/useArrayData.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 3c3a283f1..1e65c9093 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -93,7 +93,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { Object.assign(params, userParams); if (params.filter) params.filter.skip = store.skip; - if (store.order?.length) params.filter.order = [...toArray(store.order)]; + if (store.order?.length) params.filter.order = toArray(store.order); else delete params.filter.order; store.currentFilter = JSON.parse(JSON.stringify(params)); @@ -222,6 +222,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { } function toArray(str = []) { + if (!str) return []; if (Array.isArray(str)) return str; if (typeof str === 'string') return str.split(',').map((item) => item.trim()); }