From bb208040bb54d86e7786f4e30d67eec4be8a9ce8 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Tue, 18 Jun 2024 11:47:35 -0300 Subject: [PATCH] Last changes --- src/components/common/VnProgressModal.vue | 97 +++ src/i18n/locale/en.yml | 1 + src/i18n/locale/es.yml | 1 + src/pages/Ticket/TicketAdvance.vue | 701 ++++++++++++++++++++++ src/pages/Ticket/locale/en.yml | 28 + src/pages/Ticket/locale/es.yml | 28 + src/router/modules/ticket.js | 11 +- 7 files changed, 866 insertions(+), 1 deletion(-) create mode 100644 src/components/common/VnProgressModal.vue create mode 100644 src/pages/Ticket/TicketAdvance.vue create mode 100644 src/pages/Ticket/locale/en.yml diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue new file mode 100644 index 000000000..e788dd20b --- /dev/null +++ b/src/components/common/VnProgressModal.vue @@ -0,0 +1,97 @@ + + + + + +es: + Progress: Progreso + Total progress: Progreso total + Cancelled: Cancelado + diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 5ef3a5472..17ffa9b2c 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -442,6 +442,7 @@ ticket: sms: Sms notes: Notes sale: Sale + ticketAdvance: Advance tickets list: nickname: Nickname state: State diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index cfadd57b3..b134b0b9c 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -440,6 +440,7 @@ ticket: sms: Sms notes: Notas sale: Lineas del pedido + ticketAdvance: Adelantar tickets list: nickname: Alias state: Estado diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue new file mode 100644 index 000000000..fc323cbae --- /dev/null +++ b/src/pages/Ticket/TicketAdvance.vue @@ -0,0 +1,701 @@ + + + + + diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml new file mode 100644 index 000000000..8d761a128 --- /dev/null +++ b/src/pages/Ticket/locale/en.yml @@ -0,0 +1,28 @@ +advanceTickets: + origin: Origin + destination: Destination + originAgency: 'Origin agency: {agency}' + destinationAgency: 'Destination agency: {agency}' + ticketId: ID + ipt: IPT + state: State + liters: Liters + lines: Lines + import: Import + futureId: ID + futureIpt: IPT + futureState: State + futureLiters: Liters + futureZone: Zone + notMovableLines: Not movable + futureLines: Lines + futureImport: Import + advanceTickets: Advance tickets with negatives + advanceTicketTitle: Advance tickets + advanceTitleSubtitle: Advance confirmation + noDeliveryZone: No delivery zone available for this landing date + moveTicketSuccess: 'Tickets moved successfully! {ticketsNumber}' + advanceTicketsWithoutNegatives: Advance tickets without negatives + advanceWithoutNegativeTitle: Advance tickets (without negatives) + advanceWithoutNegativeSubtitle: Advance confirmation + errorsList: Errors list diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml index 5348b29b9..6134258b2 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -1,2 +1,30 @@ +advanceTickets: + origin: Origen + destination: Destino + originAgency: 'Agencia origen: {agency}' + destinationAgency: 'Agencia destino: {agency}' + ticketId: ID + ipt: IPT + state: Estado + liters: Litros + lines: Líneas + import: Importe + futureId: ID + futureIpt: IPT + futureState: Estado + futureLiters: Litros + futureZone: Zona + notMovableLines: No movibles + futureLines: Líneas + futureImport: Importe + advanceTickets: Adelantar tickets con negativos + advanceTicketTitle: Advance tickets + advanceTitleSubtitle: '¿Desea adelantar {selectedTickets} tickets?' + noDeliveryZone: No hay una zona de reparto disponible para la fecha de envío seleccionada + moveTicketSuccess: 'Tickets movidos correctamente {ticketsNumber}' + advanceTicketsWithoutNegatives: Adelantar tickets sin negativos + advanceWithoutNegativeTitle: Adelantar tickets (sin negativos) + advanceWithoutNegativeSubtitle: '¿Desea adelantar {selectedTickets} tickets?' + errorsList: Lista de errores Search ticket: Buscar ticket 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 6cb7291dc..2562bdd08 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -11,7 +11,7 @@ export default { component: RouterView, redirect: { name: 'TicketMain' }, menus: { - main: ['TicketList'], + main: ['TicketList', 'TicketAdvance'], card: ['TicketBoxing', 'TicketSms', 'TicketSale'], }, children: [ @@ -40,6 +40,15 @@ export default { }, component: () => import('src/pages/Ticket/TicketCreate.vue'), }, + { + name: 'TicketAdvance', + path: 'advance', + meta: { + title: 'ticketAdvance', + icon: 'keyboard_double_arrow_left', + }, + component: () => import('src/pages/Ticket/TicketAdvance.vue'), + }, ], }, {