Skip to content

Fix: Proposal generate email notifications for confirmed meetings #8642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taiebot wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −4
Open

Fix: Proposal generate email notifications for confirmed meetings #8642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions lib/Service/Proposal/ProposalService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,12 @@ public function convertProposal(IUser $user, int $proposalId, int $dateId, array
}
$this->applyCalendarBlockersParticipant($user, $proposal, 'M', $vObject);

// keep only the confirmed date so the notification email shows just that one
$confirmedDate = new ProposalDateCollection();
$confirmedDate[] = $selectedDate;
$proposal->setDates($confirmedDate);
// generate notifications for internal and external participants that the meeting is confirmed
$this->generateNotifications($user, $proposal, 'F');
// destroy the proposal entry
$this->proposalVoteMapper->deleteByProposalId($user->getUID(), $proposal->getId());
$this->proposalParticipantMapper->deleteByProposalId($user->getUID(), $proposal->getId());
Expand Down Expand Up @@ -496,6 +502,9 @@ private function sendEmailNotifications(IUser $user, ProposalObject $proposal, P
),
'D' => $template->setSubject(
$this->l10n->t('%s has canceled a proposed meeting', [$senderName])
),
'F' => $template->setSubject(
$this->l10n->t('%s has confirmed a meeting date', [$senderName])
)
};
// heading
Expand All @@ -508,13 +517,18 @@ private function sendEmailNotifications(IUser $user, ProposalObject $proposal, P
),
'D' => $template->addHeading(
$this->l10n->t('Dear %s, a proposed meeting has been cancelled', [$recipientName])
),
'F' => $template->addHeading(
$this->l10n->t('Dear %s, a meeting date has been confirmed', [$recipientName])
)
};
// buttons
$template->addBodyButton(
$this->l10n->t('Respond'),
$this->urlGenerator->linkToRouteAbsolute('Calendar.ProposalPublic.index', ['token' => $recipientToken])
);
if ($reason !== 'F') {
$template->addBodyButton(
$this->l10n->t('Respond'),
$this->urlGenerator->linkToRouteAbsolute('Calendar.ProposalPublic.index', ['token' => $recipientToken])
);
}
// description
if (!empty($proposal->getDescription())) {
$template->addBodyListItem($proposal->getDescription(), $this->l10n->t('Description:'));
Expand Down
Loading