From afc52f6ceaa41fe54459926d10398a25c4f5b56a Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 7 Oct 2024 13:29:43 +0200 Subject: [PATCH] fix: changes in sale and summary --- .../Ticket/Card/TicketDescriptorMenu.vue | 9 ++- src/pages/Ticket/Card/TicketEditMana.vue | 26 +++++++ src/pages/Ticket/Card/TicketSale.vue | 19 +++++ src/pages/Ticket/Card/TicketSummary.vue | 71 ++++++++++++++----- src/pages/Ticket/TicketFilter.vue | 12 ++-- 5 files changed, 110 insertions(+), 27 deletions(-) diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue index 73104fe27..caf82ed24 100644 --- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue +++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue @@ -3,7 +3,7 @@ import axios from 'axios'; import { ref, toRefs } from 'vue'; import { useQuasar } from 'quasar'; import { useI18n } from 'vue-i18n'; -import { useRouter } from 'vue-router'; +import { useRoute, useRouter } from 'vue-router'; import { usePrintService } from 'composables/usePrintService'; import SendEmailDialog from 'components/common/SendEmailDialog.vue'; import VnConfirm from 'components/ui/VnConfirm.vue'; @@ -23,6 +23,7 @@ const props = defineProps({ required: true, }, }); +const route = useRoute(); const { push, currentRoute } = useRouter(); const { dialog, notify } = useQuasar(); @@ -334,7 +335,11 @@ async function handleInvoiceOutData() { {{ toPercentage(row.discount / 100) }} diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index 2ca0b5727..ef5024e36 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -19,6 +19,7 @@ import VnTitle from 'src/components/common/VnTitle.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; +import TicketDescriptorMenu from './TicketDescriptorMenu.vue'; const route = useRoute(); const { notify } = useNotify(); @@ -68,7 +69,7 @@ function isEditable() { async function changeState(value) { try { - stateBtnDropdownRef.value.hide(); + stateBtnDropdownRef.value?.hide(); const formData = { ticketFk: entityId.value, code: value, @@ -108,6 +109,10 @@ function getNoteValue(description) { function toTicketUrl(section) { return '#/ticket/' + entityId.value + '/' + section; } +function isOnTicketCard() { + const currentPath = route.path; + return currentPath.startsWith('/ticket'); +}