From 9207b374197efc7c2a559c8efdde7689bdcec0e3 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 24 Jun 2024 13:46:06 +0200 Subject: [PATCH 001/227] refactor: refs #7014 refactor Main.vue --- src/components/common/VnSectionMain.vue | 17 +++++++++++++++++ src/pages/Account/AccountMain.vue | 14 ++------------ src/pages/Claim/ClaimMain.vue | 14 ++------------ src/pages/Customer/CustomerMain.vue | 14 ++------------ src/pages/Entry/EntryMain.vue | 15 ++------------- src/pages/InvoiceIn/InvoiceInMain.vue | 14 ++------------ src/pages/InvoiceOut/InvoiceOutMain.vue | 14 ++------------ src/pages/Item/ItemMain.vue | 15 ++------------- src/pages/Monitor/MonitorMain.vue | 15 ++------------- src/pages/Order/OrderMain.vue | 14 ++------------ src/pages/Route/RouteMain.vue | 11 ++--------- src/pages/Shelving/ShelvingMain.vue | 14 ++------------ src/pages/Supplier/SupplierMain.vue | 14 ++------------ src/pages/Ticket/TicketMain.vue | 14 ++------------ src/pages/Travel/TravelMain.vue | 14 ++------------ src/pages/Wagon/WagonMain.vue | 14 ++------------ src/pages/Worker/WorkerMain.vue | 14 ++------------ src/pages/Zone/ZoneMain.vue | 13 ++----------- 18 files changed, 51 insertions(+), 203 deletions(-) create mode 100644 src/components/common/VnSectionMain.vue diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue new file mode 100644 index 000000000..f0dc2e500 --- /dev/null +++ b/src/components/common/VnSectionMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/pages/Account/AccountMain.vue b/src/pages/Account/AccountMain.vue index f0dc2e500..c6a38a77a 100644 --- a/src/pages/Account/AccountMain.vue +++ b/src/pages/Account/AccountMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Claim/ClaimMain.vue b/src/pages/Claim/ClaimMain.vue index f0dc2e500..c6a38a77a 100644 --- a/src/pages/Claim/ClaimMain.vue +++ b/src/pages/Claim/ClaimMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Customer/CustomerMain.vue b/src/pages/Customer/CustomerMain.vue index f0dc2e500..c6a38a77a 100644 --- a/src/pages/Customer/CustomerMain.vue +++ b/src/pages/Customer/CustomerMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Entry/EntryMain.vue b/src/pages/Entry/EntryMain.vue index c1f2a31db..c6a38a77a 100644 --- a/src/pages/Entry/EntryMain.vue +++ b/src/pages/Entry/EntryMain.vue @@ -1,18 +1,7 @@ diff --git a/src/pages/InvoiceIn/InvoiceInMain.vue b/src/pages/InvoiceIn/InvoiceInMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/InvoiceIn/InvoiceInMain.vue +++ b/src/pages/InvoiceIn/InvoiceInMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/InvoiceOut/InvoiceOutMain.vue b/src/pages/InvoiceOut/InvoiceOutMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/InvoiceOut/InvoiceOutMain.vue +++ b/src/pages/InvoiceOut/InvoiceOutMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Item/ItemMain.vue b/src/pages/Item/ItemMain.vue index c1f2a31db..c6a38a77a 100644 --- a/src/pages/Item/ItemMain.vue +++ b/src/pages/Item/ItemMain.vue @@ -1,18 +1,7 @@ diff --git a/src/pages/Monitor/MonitorMain.vue b/src/pages/Monitor/MonitorMain.vue index c1f2a31db..c6a38a77a 100644 --- a/src/pages/Monitor/MonitorMain.vue +++ b/src/pages/Monitor/MonitorMain.vue @@ -1,18 +1,7 @@ diff --git a/src/pages/Order/OrderMain.vue b/src/pages/Order/OrderMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/Order/OrderMain.vue +++ b/src/pages/Order/OrderMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue index bbf19068e..e3d1ecf38 100644 --- a/src/pages/Route/RouteMain.vue +++ b/src/pages/Route/RouteMain.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/Shelving/ShelvingMain.vue b/src/pages/Shelving/ShelvingMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/Shelving/ShelvingMain.vue +++ b/src/pages/Shelving/ShelvingMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Supplier/SupplierMain.vue b/src/pages/Supplier/SupplierMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/Supplier/SupplierMain.vue +++ b/src/pages/Supplier/SupplierMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Ticket/TicketMain.vue b/src/pages/Ticket/TicketMain.vue index f0dc2e500..c6a38a77a 100644 --- a/src/pages/Ticket/TicketMain.vue +++ b/src/pages/Ticket/TicketMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Travel/TravelMain.vue b/src/pages/Travel/TravelMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/Travel/TravelMain.vue +++ b/src/pages/Travel/TravelMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Wagon/WagonMain.vue b/src/pages/Wagon/WagonMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/Wagon/WagonMain.vue +++ b/src/pages/Wagon/WagonMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Worker/WorkerMain.vue b/src/pages/Worker/WorkerMain.vue index 66ce78f23..c6a38a77a 100644 --- a/src/pages/Worker/WorkerMain.vue +++ b/src/pages/Worker/WorkerMain.vue @@ -1,17 +1,7 @@ diff --git a/src/pages/Zone/ZoneMain.vue b/src/pages/Zone/ZoneMain.vue index 68ff9a5d1..b6f3fb74e 100644 --- a/src/pages/Zone/ZoneMain.vue +++ b/src/pages/Zone/ZoneMain.vue @@ -1,11 +1,9 @@ + diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 6cb7291dc..05e323d50 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -12,7 +12,7 @@ export default { redirect: { name: 'TicketMain' }, menus: { main: ['TicketList'], - card: ['TicketBoxing', 'TicketSms', 'TicketSale'], + card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketDms'], }, children: [ { @@ -93,6 +93,15 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketSms.vue'), }, + { + path: 'dms', + name: 'TicketDms', + meta: { + title: 'dms', + icon: 'cloud_upload', + }, + component: () => import('src/pages/Ticket/Card/TicketDms.vue'), + }, ], }, ], From c500dd6346479852457472558403e5bdfcf6a1d1 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Mon, 24 Jun 2024 16:58:26 -0300 Subject: [PATCH 003/227] Add allow import feature in VnDmsList --- src/components/common/VnDmsImportForm.vue | 81 +++++++++++++++++++++++ src/components/common/VnDmsList.vue | 12 ++++ src/pages/Ticket/Card/TicketDms.vue | 1 + 3 files changed, 94 insertions(+) create mode 100644 src/components/common/VnDmsImportForm.vue diff --git a/src/components/common/VnDmsImportForm.vue b/src/components/common/VnDmsImportForm.vue new file mode 100644 index 000000000..b31197bbc --- /dev/null +++ b/src/components/common/VnDmsImportForm.vue @@ -0,0 +1,81 @@ + + + + + +es: + Select document id: Introduzca id de gestion documental + Document: Documento + The document indentifier can't be empty: El número de documento no puede estar vacío + diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index 769ba9959..0576ba266 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -3,6 +3,7 @@ import { ref, computed } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRoute } from 'vue-router'; import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar'; +import VnDmsImportForm from 'src/components/common/VnDmsImportForm.vue'; import axios from 'axios'; import VnPaginate from 'components/ui/VnPaginate.vue'; @@ -18,6 +19,7 @@ const { t } = useI18n(); const rows = ref(); const dmsRef = ref(); const formDialog = ref({}); +const showImportDialog = ref(false); const $props = defineProps({ model: { @@ -45,6 +47,10 @@ const $props = defineProps({ type: String, required: true, }, + allowImport: { + type: Boolean, + default: false, + }, }); const dmsFilter = { @@ -373,9 +379,15 @@ function shouldRenderButton(button, isExternal = false) { :description="$props.description" /> + + + + + + - es: Download as CSV: Descargar como CSV diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml new file mode 100644 index 000000000..5ad92ed09 --- /dev/null +++ b/src/pages/InvoiceOut/locale/en.yml @@ -0,0 +1,25 @@ +invoiceOutModule: + customer: Client + amount: Amount + company: Company +invoiceOutList: + tableVisibleColumns: + id: ID + ref: Reference + issued: Issued + created: Created + dueDate: Max date + invoiceOutSerial: Serial + ticket: Ticket + taxArea: Tax area +DownloadPdf: Download PDF +InvoiceOutSummary: Summary +negativeBases: + country: Country + clientId: Client ID + base: Base + ticketId: Ticket + active: Active + hasToInvoice: Has to invoice + verifiedData: Verified data + commercial: Commercial \ No newline at end of file diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml index b936c7b7e..a05125630 100644 --- a/src/pages/InvoiceOut/locale/es.yml +++ b/src/pages/InvoiceOut/locale/es.yml @@ -1,2 +1,31 @@ Search invoice: Buscar factura emitida You can search by invoice reference: Puedes buscar por referencia de la factura +invoiceOutModule: + customer: Cliente + amount: Importe + company: Empresa +invoiceOutList: + tableVisibleColumns: + id: ID + ref: Referencia + issued: Fecha emisión + customer: Cliente + company: Empresa + amount: Importe + created: F. creación + dueDate: F. máxima + invoiceOutSerial: Serial + ticket: Ticket + taxArea: Area +DownloadPdf: Descargar PDF +InvoiceOutSummary: Resumen +negativeBases: + country: País + clientId: ID del cliente + client: Cliente + base: Base + ticketId: Ticket + active: Activo + hasToInvoice: Debe facturar + verifiedData: Datos verificados + commercial: Comercial \ No newline at end of file diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js index 7c05b82e6..aac84573c 100644 --- a/src/router/modules/invoiceOut.js +++ b/src/router/modules/invoiceOut.js @@ -35,7 +35,7 @@ export default { name: 'InvoiceOutGlobal', meta: { title: 'globalInvoicing', - icon: 'contact_support', + icon: 'Date_Range', }, component: () => import('src/pages/InvoiceOut/InvoiceOutGlobal.vue'), }, From 5c36ad14f48fed04134221bb94f37431bfa6cf8a Mon Sep 17 00:00:00 2001 From: wbuezas Date: Tue, 2 Jul 2024 21:33:19 -0300 Subject: [PATCH 023/227] Ticket components --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Ticket/Card/TicketComponents.vue | 356 +++++++++++++++++++++ src/pages/Ticket/Card/TicketDescriptor.vue | 17 + src/pages/Ticket/locale/en.yml | 18 ++ src/pages/Ticket/locale/es.yml | 18 ++ src/router/modules/ticket.js | 10 + 7 files changed, 421 insertions(+) create mode 100644 src/pages/Ticket/Card/TicketComponents.vue diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 59cd1170a..c26100699 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -452,6 +452,7 @@ ticket: weeklyTickets: Weekly tickets services: Service tracking: Tracking + components: Components list: nickname: Nickname state: State diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index e35e3d41c..58b0d900b 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -451,6 +451,7 @@ ticket: weeklyTickets: Tickets programados services: Servicios tracking: Estados + components: Componentes list: nickname: Alias state: Estado diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue new file mode 100644 index 000000000..85d2179a2 --- /dev/null +++ b/src/pages/Ticket/Card/TicketComponents.vue @@ -0,0 +1,356 @@ + + + diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index 5fb312b28..100e24058 100644 --- a/src/pages/Ticket/Card/TicketDescriptor.vue +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -66,6 +66,23 @@ const filter = { fields: ['id', 'name'], }, }, + { + relation: 'zone', + scope: { + fields: [ + 'agencyModeFk', + 'bonus', + 'hour', + 'id', + 'isVolumetric', + 'itemMaxSize', + 'm3Max', + 'name', + 'price', + 'travelingDays', + ], + }, + }, ], }; diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index 39aed4af7..90a3e67b7 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -159,6 +159,24 @@ service: addService: Add service quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button. createRefundSuccess: 'The following refund ticket have been created: { ticketId }' +components: + item: Item + description: Description + quantity: Quantity + serie: Serie + components: Components + import: Import + total: Total + baseToCommission: Base to commission + totalWithoutVat: Total without VAT + zoneBreakdown: Zone breakdown + price: Price + bonus: Bonus + zone: Zone + volume: Volume + theoricalCost: Theorical cost + totalPrice: Total price + packages: Packages tracking: state: State worker: Worker diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml index d5b50efc5..370d3433d 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -164,5 +164,23 @@ ticketSale: shipped: F. Envío agency: Agencia address: Consignatario +components: + item: Artículo + description: Descripción + quantity: Cantidad + serie: Serie + components: Componentes + import: Importe + total: Total + baseToCommission: Base comisionable + totalWithoutVat: Total sin IVA + zoneBreakdown: Desglose zona + price: Precio + bonus: Bonificación + zone: Zona + volume: Volúmen + theoricalCost: Porte teórico + totalPrice: Precio total + packages: Bultos Search ticket: Buscar tickets You can search by ticket id or alias: Puedes buscar por id o alias del ticket diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 1e635470b..1a9a7d557 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -23,6 +23,7 @@ export default { 'TicketTracking', 'TicketVolume', 'TicketNotes', + 'TicketComponents', ], }, children: [ @@ -179,6 +180,15 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketVolume.vue'), }, + { + path: 'components', + name: 'TicketComponents', + meta: { + title: 'components', + icon: 'vn:components', + }, + component: () => import('src/pages/Ticket/Card/TicketComponents.vue'), + }, { path: 'observation', name: 'TicketNotes', From 34ee92ac2464c6af177a70fbb2d83e341c88df19 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Tue, 2 Jul 2024 21:46:45 -0300 Subject: [PATCH 024/227] Small change --- src/pages/Ticket/Card/TicketSaleTracking.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue index a03f75387..86f391a1d 100644 --- a/src/pages/Ticket/Card/TicketSaleTracking.vue +++ b/src/pages/Ticket/Card/TicketSaleTracking.vue @@ -29,6 +29,7 @@ const itemShelvignsSales = ref([]); const shelvingsOptions = ref([]); const parkingsOptions = ref([]); const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`); +const oldQuantity = ref(null); watch( () => route.params.id, @@ -191,10 +192,12 @@ const showShelving = async (sale) => { const updateQuantity = async (sale) => { try { + if (oldQuantity.value === sale.quantity) return; const params = { quantity: sale.quantity, }; await axios.patch(`ItemShelvingSales/${sale.id}`, params); + oldQuantity.value = null; } catch (error) { console.error(error); } @@ -431,7 +434,7 @@ const clickControled = (sale) => { {{ row.subName }} - + @@ -498,7 +501,7 @@ const clickControled = (sale) => { v-model.number="row.quantity" @keyup.enter="updateQuantity(row)" @blur="updateQuantity(row)" - @focus="edit.oldQuantity = row.quantity" + @focus="oldQuantity = row.quantity" /> From 10f5323b9a82fdc41afaec03b181532021fe9b73 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 3 Jul 2024 09:45:59 +0200 Subject: [PATCH 025/227] refactor: refs #6899 fix negativeBases call --- .../InvoiceOut/InvoiceOutNegativeBases.vue | 79 +++++++------------ src/stores/invoiceOutGlobal.js | 2 +- 2 files changed, 28 insertions(+), 53 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue index d94661849..61e63a7a7 100644 --- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue @@ -1,41 +1,20 @@ + diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index 4656980d9..de0dc50c3 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -30,7 +30,7 @@ function setClaimStates(data) { } async function getEnumValues() { - optionsList.value = [{ id: null, description: t('claim.basicData.null') }]; + optionsList.value = [{ id: null, description: t('claim.null') }]; const { data } = await axios.get(`Applications/get-enum-values`, { params: { schema: 'vn', @@ -39,7 +39,7 @@ async function getEnumValues() { }, }); for (let value of data) - optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) }); + optionsList.value.push({ id: value, description: t(`claim.${value}`) }); } getEnumValues(); @@ -77,17 +77,14 @@ const statesFilter = { - + { From 91eb966586d318d4bfabe5c7a51dda2f2b3fef07 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 3 Jul 2024 14:44:36 -0300 Subject: [PATCH 031/227] Ticket photos --- src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Order/Card/OrderCatalogItem.vue | 13 +++-- src/pages/Order/OrderCatalog.vue | 7 ++- src/pages/Ticket/Card/TicketPicture.vue | 60 +++++++++++++++++++++++ src/router/modules/ticket.js | 10 ++++ 6 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 src/pages/Ticket/Card/TicketPicture.vue diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 75b07801a..3a1d619c0 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -554,6 +554,7 @@ ticket: weeklyTickets: Weekly tickets services: Service tracking: Tracking + pictures: Pictures list: nickname: Nickname state: State diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 452e387c9..42b887c21 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -552,6 +552,7 @@ ticket: weeklyTickets: Tickets programados services: Servicios tracking: Estados + pictures: Fotos list: nickname: Alias state: Estado diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue index 8fa0bb5b9..2b4724e35 100644 --- a/src/pages/Order/Card/OrderCatalogItem.vue +++ b/src/pages/Order/Card/OrderCatalogItem.vue @@ -7,7 +7,7 @@ import VnImg from 'src/components/ui/VnImg.vue'; import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; -import toCurrency from '../../../filters/toCurrency'; +import { toCurrency } from 'filters/index'; const DEFAULT_PRICE_KG = 0; @@ -18,6 +18,10 @@ defineProps({ type: Object, required: true, }, + isCatalog: { + type: Boolean, + default: false, + }, }); const dialog = ref(null); @@ -28,7 +32,7 @@ const dialog = ref(null);
-
+
-

+

{{ item.available }} {{ t('to') }} {{ toCurrency(item.price) }}

- + + {{ t('globals.add') }} {{ t('globals.noResults') }}
- +
diff --git a/src/pages/Ticket/Card/TicketPicture.vue b/src/pages/Ticket/Card/TicketPicture.vue new file mode 100644 index 000000000..e319ef963 --- /dev/null +++ b/src/pages/Ticket/Card/TicketPicture.vue @@ -0,0 +1,60 @@ + + + + + + + +es: + by: por + diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 1e635470b..db61cd405 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -23,6 +23,7 @@ export default { 'TicketTracking', 'TicketVolume', 'TicketNotes', + 'TicketPicture', ], }, children: [ @@ -142,6 +143,15 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketLog.vue'), }, + { + path: 'picture', + name: 'TicketPicture', + meta: { + title: 'pictures', + icon: 'vn:photo', + }, + component: () => import('src/pages/Ticket/Card/TicketPicture.vue'), + }, { path: 'boxing', name: 'TicketBoxing', From 02ce4f2658d586e98a265c43cc9e0cfdbbc6f8da Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 3 Jul 2024 15:12:20 -0300 Subject: [PATCH 032/227] Small change --- src/pages/Ticket/Card/TicketComponents.vue | 13 ++++++++----- src/pages/Ticket/Card/TicketService.vue | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue index 85d2179a2..5aeb6b0a5 100644 --- a/src/pages/Ticket/Card/TicketComponents.vue +++ b/src/pages/Ticket/Card/TicketComponents.vue @@ -37,7 +37,8 @@ watch( getTheoricalCost(); if (ticketData.value?.zone && ticketData.value?.zone?.isVolumetric) getTicketVolume(); - } + }, + { immediate: true } ); const salesFilter = computed(() => ({ @@ -134,7 +135,6 @@ const getComponentsSum = async () => { try { const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`); componentsList.value = data; - console.log('componentsList', componentsList.value); } catch (error) { console.error(error); } @@ -153,7 +153,6 @@ const getTicketVolume = async () => { try { if (!ticketData.value) return; const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`); - console.log('data volume: ', data); ticketVolume.value = data[0].volume; } catch (error) { console.error(error); @@ -218,8 +217,12 @@ onUnmounted(() => (stateStore.rightDrawer = false)); class="justify-center" horizontal > - {{ component.name }}: - {{ toCurrency(component.value, 'EUR', 3) }} + + {{ component.name }}: + + {{ + toCurrency(component.value, 'EUR', 3) + }} { params: { filter: JSON.stringify(filter) }, }); defaultTaxClass.value = data; - console.log('defaultTaxClass', defaultTaxClass.value); } catch (error) { console.error(error); } From 8baf5b14890741a5a1ec5e8b89292f499e35f237 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Wed, 3 Jul 2024 16:14:47 -0300 Subject: [PATCH 033/227] Apply right alignment to total and import columns --- src/pages/Ticket/Card/TicketComponents.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue index 5aeb6b0a5..b99da3f9b 100644 --- a/src/pages/Ticket/Card/TicketComponents.vue +++ b/src/pages/Ticket/Card/TicketComponents.vue @@ -339,7 +339,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));