diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index b3a85eefa7..3475430923 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -443,6 +443,11 @@ ticket: sms: Sms notes: Notes sale: Sale +<<<<<<< Updated upstream +======= + dms: File management + services: Service +>>>>>>> Stashed changes list: nickname: Nickname state: State diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index d03ee9d5ca..3151d72bf5 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -441,6 +441,11 @@ ticket: sms: Sms notes: Notas sale: Lineas del pedido +<<<<<<< Updated upstream +======= + dms: Gestión documental + service: Servicios +>>>>>>> Stashed changes list: nickname: Alias state: Estado diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue new file mode 100644 index 0000000000..25e345de06 --- /dev/null +++ b/src/pages/Ticket/Card/TicketService.vue @@ -0,0 +1 @@ + diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml new file mode 100644 index 0000000000..b8c21600d1 --- /dev/null +++ b/src/pages/Ticket/locale/en.yml @@ -0,0 +1,8 @@ +service: + pay: Pay + description: Description + quantity: Quantity + price: Price + removeService: Remove service + newService: New service type + addService: Add service diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml index 5348b29b9a..a8ef0347bb 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -1,2 +1,10 @@ +service: + pay: Abonar + description: Descripción + quantity: Cantidad + price: Precio + removeService: Quitar servicio + newService: Nuevo tipo de servicio + addService: Añadir servicio 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 6cb7291dc1..cbcc4b7620 100644 --- a/src/router/modules/ticket.js +++ b/src/router/modules/ticket.js @@ -12,7 +12,11 @@ export default { redirect: { name: 'TicketMain' }, menus: { main: ['TicketList'], +<<<<<<< Updated upstream card: ['TicketBoxing', 'TicketSms', 'TicketSale'], +======= + card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketDms', 'TicketService'], +>>>>>>> Stashed changes }, children: [ { @@ -93,6 +97,27 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketSms.vue'), }, +<<<<<<< Updated upstream +======= + { + path: 'dms', + name: 'TicketDms', + meta: { + title: 'dms', + icon: 'cloud_upload', + }, + component: () => import('src/pages/Ticket/Card/TicketDms.vue'), + }, + { + path: 'service', + name: 'TicketService', + meta: { + title: 'service', + icon: 'cloud_upload', + }, + component: () => import('src/pages/Ticket/Card/TicketService.vue'), + }, +>>>>>>> Stashed changes ], }, ],