nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5225 from pjrobertson/patch-2 

Make it clearer that confirmation is needed for appointments
This commit is contained in:
Anna 2023-05-17 13:18:18 +02:00 committed by GitHub
parent 2a25dcaa26 ed9925968f
commit f56efee4d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Service/Appointments/MailService.php
View File

@ -118,7 +118,10 @@ class MailService {
// Heading
$summary = $this->l10n->t("Dear %s, please confirm your booking", [$booking->getDisplayName()]);
$template->addHeading($summary);
$bookingUrl = $this->urlGenerator->linkToRouteAbsolute('calendar.booking.confirmBooking', ['token' => $booking->getToken()]);
$template->addBodyButton($this->l10n->t('Confirm'), $bookingUrl);
$template->addBodyListItem($user->getDisplayName(), 'Appointment with:');
if (!empty($config->getDescription())) {
$template->addBodyListItem($config->getDescription(), 'Description:');
@ -127,9 +130,6 @@ class MailService {
// Create Booking overview
$this->addBulletList($template, $this->l10n, $booking, $config);
$bookingUrl = $this->urlGenerator->linkToRouteAbsolute('calendar.booking.confirmBooking', ['token' => $booking->getToken()]);
$template->addBodyButton($this->l10n->t('Confirm'), $bookingUrl);
$bodyText = $this->l10n->t('This confirmation link expires in %s hours.', [(BookingService::EXPIRY / 3600)]);
$template->addBodyText($bodyText);

6
src/components/Appointments/AppointmentBookingConfirmation.vue
View File

@ -24,7 +24,7 @@
<div class="appointment-booking-confirmation">
<EmptyContent :title="$t('calendar', 'Please confirm your reservation')" :description="$t('calendar', 'We sent you an email with details. Please confirm your appointment using the link in the email. You can close this page now.')">
<template #icon>
<CheckIcon decorative />
<EmailIcon decorative />
</template>
</EmptyContent>
</div>
@ -32,13 +32,13 @@
<script>
import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import CheckIcon from 'vue-material-design-icons/Check.vue'
import EmailIcon from 'vue-material-design-icons/Email.vue'
export default {
name: 'AppointmentBookingConfirmation',
components: {
EmptyContent,
CheckIcon,
EmailIcon,
},
}
</script>