From 174c34b4e06e34ddad49db21fb0732dfa804c231 Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 28 Aug 2024 16:17:34 +0200 Subject: [PATCH 1/4] fix: refs #7356 create claim dialog --- src/pages/Ticket/Card/TicketSaleMoreActions.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue index f04a13c4e..0d8a4e4b7 100644 --- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue +++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue @@ -131,7 +131,11 @@ const createClaim = () => { onCreateClaimAccepted ); else - openConfirmationModal(t('Do you want to create a claim?'), onCreateClaimAccepted); + openConfirmationModal( + t('Do you want to create a claim?'), + null, + onCreateClaimAccepted + ); }; const onCreateClaimAccepted = async () => { From 23bf9657aa61617d8ab13e4b8bf633645cfad729 Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 28 Aug 2024 17:01:50 +0200 Subject: [PATCH 2/4] fix: refs #7356 colors --- src/components/ui/VnConfirm.vue | 11 +++++++---- src/pages/Ticket/Card/TicketSaleMoreActions.vue | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue index 0480650db..0a8a8f2e7 100644 --- a/src/components/ui/VnConfirm.vue +++ b/src/components/ui/VnConfirm.vue @@ -15,7 +15,7 @@ const props = defineProps({ default: null, }, message: { - type: String, + type: [String, Object], default: null, }, data: { @@ -35,7 +35,10 @@ defineEmits(['confirm', ...useDialogPluginComponent.emits]); const { dialogRef, onDialogOK } = useDialogPluginComponent(); const title = props.title || t('Confirm'); -const message = props.message || t('Are you sure you want to continue?'); +const message = + props.message || + (props.message !== false ? t('Are you sure you want to continue?') : false); + const isLoading = ref(false); async function confirm() { @@ -61,12 +64,12 @@ async function confirm() { size="xl" v-if="icon" /> - {{ title }} + {{ title }} - + diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue index 0d8a4e4b7..94db67be2 100644 --- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue +++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue @@ -133,7 +133,7 @@ const createClaim = () => { else openConfirmationModal( t('Do you want to create a claim?'), - null, + false, onCreateClaimAccepted ); }; From 041b6561f8ec9a990c7bccc85925215097dde62c Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 28 Aug 2024 17:03:37 +0200 Subject: [PATCH 3/4] fix: refs #7356 colors --- src/components/ui/VnConfirm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue index 0a8a8f2e7..485f14fc2 100644 --- a/src/components/ui/VnConfirm.vue +++ b/src/components/ui/VnConfirm.vue @@ -64,7 +64,7 @@ async function confirm() { size="xl" v-if="icon" /> - {{ title }} + {{ title }} From c4665f6cc1add3c0c971bf045c378aad027ec639 Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 28 Aug 2024 17:06:16 +0200 Subject: [PATCH 4/4] chore: refs #7356 fix type --- src/components/ui/VnConfirm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue index 485f14fc2..fd4860107 100644 --- a/src/components/ui/VnConfirm.vue +++ b/src/components/ui/VnConfirm.vue @@ -15,7 +15,7 @@ const props = defineProps({ default: null, }, message: { - type: [String, Object], + type: [String, Boolean], default: null, }, data: {