diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 6a66754f4..def8f3b51 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -555,6 +555,7 @@ ticket: weeklyTickets: Weekly tickets services: Service tracking: Tracking + components: Components pictures: Pictures list: nickname: Nickname diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index a0af73641..58f688a7c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -553,6 +553,7 @@ ticket: weeklyTickets: Tickets programados services: Servicios tracking: Estados + components: Componentes pictures: Fotos list: nickname: Alias diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue new file mode 100644 index 000000000..19d25d259 --- /dev/null +++ b/src/pages/Ticket/Card/TicketComponents.vue @@ -0,0 +1,354 @@ + + + diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index b753d0b4c..f68c897db 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/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue index 4cc8207ef..63dd454ba 100644 --- a/src/pages/Ticket/Card/TicketService.vue +++ b/src/pages/Ticket/Card/TicketService.vue @@ -77,7 +77,6 @@ const getDefaultTaxClass = async () => { params: { filter: JSON.stringify(filter) }, }); defaultTaxClass.value = data; - console.log('defaultTaxClass', defaultTaxClass.value); } catch (error) { console.error(error); } diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index 6788b4b44..b78b20fa2 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -178,6 +178,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 a7006beea..610a490c9 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -164,6 +164,24 @@ 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 expedition: id: Expedición item: Artículo diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 7d6467cc8..332bf917a 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -25,6 +25,7 @@ export default { 'TicketBoxing', 'TicketSms', 'TicketPicture', + 'TicketComponents', ], }, children: [ @@ -180,6 +181,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: 'expedition', name: 'TicketExpedition',