From 00ebbbfc78dec3a71744a0d45275f23633024a8d Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 20 Jun 2024 08:40:05 -0300 Subject: [PATCH 1/4] Ticket log --- src/pages/Ticket/Card/TicketLog.vue | 7 +++++++ src/router/modules/ticket.js | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/pages/Ticket/Card/TicketLog.vue diff --git a/src/pages/Ticket/Card/TicketLog.vue b/src/pages/Ticket/Card/TicketLog.vue new file mode 100644 index 000000000..a15e89cb6 --- /dev/null +++ b/src/pages/Ticket/Card/TicketLog.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js index 6cb7291dc..71b926308 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', 'TicketLog'], }, children: [ { @@ -93,6 +93,15 @@ export default { }, component: () => import('src/pages/Ticket/Card/TicketSms.vue'), }, + { + path: 'log', + name: 'TicketLog', + meta: { + title: 'log', + icon: 'history', + }, + component: () => import('src/pages/Ticket/Card/TicketLog.vue'), + }, ], }, ], From 47768faea45d079659f731685e38fabdfa5dfaeb Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 20 Jun 2024 09:42:32 -0300 Subject: [PATCH 2/4] Change model --- src/pages/Ticket/Card/TicketLog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Ticket/Card/TicketLog.vue b/src/pages/Ticket/Card/TicketLog.vue index a15e89cb6..94b63a117 100644 --- a/src/pages/Ticket/Card/TicketLog.vue +++ b/src/pages/Ticket/Card/TicketLog.vue @@ -3,5 +3,5 @@ import VnLog from 'src/components/common/VnLog.vue'; From 9ce49bf1083ad5df1748907f9699df00ce76bfe1 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 21 Jun 2024 11:31:09 +0200 Subject: [PATCH 3/4] fix: TravelLog --- src/pages/Travel/Card/TravelLog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Travel/Card/TravelLog.vue b/src/pages/Travel/Card/TravelLog.vue index 1a2667ff7..a1f774769 100644 --- a/src/pages/Travel/Card/TravelLog.vue +++ b/src/pages/Travel/Card/TravelLog.vue @@ -2,5 +2,5 @@ import VnLog from 'src/components/common/VnLog.vue'; From febc7f1f469a20c70c66b5b909ab679a9e1916ac Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 21 Jun 2024 11:33:14 +0200 Subject: [PATCH 4/4] fix: notify icon style --- src/boot/axios.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/boot/axios.js b/src/boot/axios.js index e3e7289af..4fd83ddea 100644 --- a/src/boot/axios.js +++ b/src/boot/axios.js @@ -1,11 +1,10 @@ import axios from 'axios'; -import { Notify } from 'quasar'; import { useSession } from 'src/composables/useSession'; import { Router } from 'src/router'; -import { i18n } from './i18n'; +import useNotify from 'src/composables/useNotify.js'; const session = useSession(); -const { t } = i18n.global; +const { notify } = useNotify(); axios.defaults.baseURL = '/api/'; @@ -27,10 +26,7 @@ const onResponse = (response) => { const isSaveRequest = method === 'patch'; if (isSaveRequest) { - Notify.create({ - message: t('globals.dataSaved'), - type: 'positive', - }); + notify('globals.dataSaved', 'positive'); } return response; @@ -67,10 +63,7 @@ const onResponseError = (error) => { return Promise.reject(error); } - Notify.create({ - message: t(message), - type: 'negative', - }); + notify(message, 'negative'); return Promise.reject(error); };