maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Email notifications must honor the date format value (#342).

Browse source
This commit is contained in:
alext 2017-07-04 08:46:54 +02:00
parent dcda4b9982
commit d91bebae18
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/engine/Notifications/Email.php
View file

@ -91,6 +91,19 @@ class Email {
public function sendAppointmentDetails(array $appointment, array $provider, array $service, public function sendAppointmentDetails(array $appointment, array $provider, array $service,
array $customer, array $company, Text $title, Text $message, Url $appointmentLink, array $customer, array $company, Text $title, Text $message, Url $appointmentLink,
EmailAddress $recipientEmail) { EmailAddress $recipientEmail) {
switch($company['date_format']) {
case 'DMY':
$date_format = 'd/m/Y';
break;
case 'MDY':
$date_format = 'm/d/Y';
break;
case 'YMD':
$date_format = 'Y/m/d';
break;
default:
throw new \Exception('Invalid date_format value: ' . $company['date_format']);
}
// Prepare template replace array. // Prepare template replace array.
$replaceArray = array( $replaceArray = array(
@ -98,8 +111,8 @@ class Email {
'$email_message' => $message->get(), '$email_message' => $message->get(),
'$appointment_service' => $service['name'], '$appointment_service' => $service['name'],
'$appointment_provider' => $provider['first_name'] . ' ' . $provider['last_name'], '$appointment_provider' => $provider['first_name'] . ' ' . $provider['last_name'],
'$appointment_start_date' => date('d/m/Y H:i', strtotime($appointment['start_datetime'])), '$appointment_start_date' => date($date_format . ' H:i', strtotime($appointment['start_datetime'])),
'$appointment_end_date' => date('d/m/Y H:i', strtotime($appointment['end_datetime'])), '$appointment_end_date' => date($date_format . ' H:i', strtotime($appointment['end_datetime'])),
'$appointment_link' => $appointmentLink->get(), '$appointment_link' => $appointmentLink->get(),
'$company_link' => $company['company_link'], '$company_link' => $company['company_link'],
'$company_name' => $company['company_name'], '$company_name' => $company['company_name'],
@ -160,13 +173,27 @@ class Email {
public function sendDeleteAppointment(array $appointment, array $provider, public function sendDeleteAppointment(array $appointment, array $provider,
array $service, array $customer, array $company, EmailAddress $recipientEmail, array $service, array $customer, array $company, EmailAddress $recipientEmail,
Text $reason) { Text $reason) {
switch($company['date_format']) {
case 'DMY':
$date_format = 'd/m/Y';
break;
case 'MDY':
$date_format = 'm/d/Y';
break;
case 'YMD':
$date_format = 'Y/m/d';
break;
default:
throw new \Exception('Invalid date_format value: ' . $company['date_format']);
}
// Prepare email template data. // Prepare email template data.
$replaceArray = array( $replaceArray = array(
'$email_title' => $this->framework->lang->line('appointment_cancelled_title'), '$email_title' => $this->framework->lang->line('appointment_cancelled_title'),
'$email_message' => $this->framework->lang->line('appointment_removed_from_schedule'), '$email_message' => $this->framework->lang->line('appointment_removed_from_schedule'),
'$appointment_service' => $service['name'], '$appointment_service' => $service['name'],
'$appointment_provider' => $provider['first_name'] . ' ' . $provider['last_name'], '$appointment_provider' => $provider['first_name'] . ' ' . $provider['last_name'],
'$appointment_date' => date('d/m/Y H:i', strtotime($appointment['start_datetime'])), '$appointment_date' => date($date_format . ' H:i', strtotime($appointment['start_datetime'])),
'$appointment_duration' => $service['duration'] . ' minutes', '$appointment_duration' => $service['duration'] . ' minutes',
'$company_link' => $company['company_link'], '$company_link' => $company['company_link'],
'$company_name' => $company['company_name'], '$company_name' => $company['company_name'],