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

The emails display the provider timezone.

Browse source
This commit is contained in:
Alex Tselegidis 2020-03-29 16:23:53 +02:00
parent 88bbe06548
commit 6858d120f6
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/views/emails/appointment_details.php
View file

@ -33,6 +33,10 @@
<td class="label" style="padding: 3px;font-weight: bold;"><?= lang('end') ?></td> <td class="label" style="padding: 3px;font-weight: bold;"><?= lang('end') ?></td>
<td style="padding: 3px;"><?= $appointment_end_date ?></td> <td style="padding: 3px;"><?= $appointment_end_date ?></td>
</tr> </tr>
<tr>
<td class="label" style="padding: 3px;font-weight: bold;"><?= lang('timezone') ?></td>
<td style="padding: 3px;"><?= $appointment_timezone ?></td>
</tr>
</table> </table>
<h2><?= lang('customer_details_title') ?></h2> <h2><?= lang('customer_details_title') ?></h2>

4
application/views/emails/delete_appointment.php
View file

@ -33,6 +33,10 @@
<td class="label" style="padding: 3px;font-weight: bold;"><?= lang('duration') ?></td> <td class="label" style="padding: 3px;font-weight: bold;"><?= lang('duration') ?></td>
<td style="padding: 3px;"><?= $appointment_duration ?></td> <td style="padding: 3px;"><?= $appointment_duration ?></td>
</tr> </tr>
<tr>
<td class="label" style="padding: 3px;font-weight: bold;"><?= lang('timezone') ?></td>
<td style="padding: 3px;"><?= $appointment_timezone ?></td>
</tr>
</table> </table>
<h2><?= lang('customer_details_title') ?></h2> <h2><?= lang('customer_details_title') ?></h2>

14
engine/Notifications/Email.php
View file

@ -83,6 +83,12 @@ class Email {
EmailAddress $recipientEmail, EmailAddress $recipientEmail,
Text $icsStream Text $icsStream
) { ) {
$framework = get_instance();
$framework->load->model('timezones_model');
$timezones = $framework->timezones_model->to_array();
switch ($company['date_format']) switch ($company['date_format'])
{ {
case 'DMY': case 'DMY':
@ -117,6 +123,7 @@ class Email {
$appointment_provider = $provider['first_name'] . ' ' . $provider['last_name']; $appointment_provider = $provider['first_name'] . ' ' . $provider['last_name'];
$appointment_start_date = date($date_format . ' ' . $timeFormat, strtotime($appointment['start_datetime'])); $appointment_start_date = date($date_format . ' ' . $timeFormat, strtotime($appointment['start_datetime']));
$appointment_end_date = date($date_format . ' ' . $timeFormat, strtotime($appointment['end_datetime'])); $appointment_end_date = date($date_format . ' ' . $timeFormat, strtotime($appointment['end_datetime']));
$appointment_timezone = $timezones[$provider['timezone']];
$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'];
@ -171,6 +178,12 @@ class Email {
EmailAddress $recipientEmail, EmailAddress $recipientEmail,
Text $reason Text $reason
) { ) {
$framework = get_instance();
$framework->load->model('timezones_model');
$timezones = $framework->timezones_model->to_array();
switch ($company['date_format']) switch ($company['date_format'])
{ {
case 'DMY': case 'DMY':
@ -203,6 +216,7 @@ class Email {
$appointment_provider = $provider['first_name'] . ' ' . $provider['last_name']; $appointment_provider = $provider['first_name'] . ' ' . $provider['last_name'];
$appointment_date = date($date_format . ' ' . $timeFormat, strtotime($appointment['start_datetime'])); $appointment_date = date($date_format . ' ' . $timeFormat, strtotime($appointment['start_datetime']));
$appointment_duration = $service['duration'] . ' ' . $this->framework->lang->line('minutes'); $appointment_duration = $service['duration'] . ' ' . $this->framework->lang->line('minutes');
$appointment_timezone = $timezones[$provider['timezone']];
$company_link = $company['company_link']; $company_link = $company['company_link'];
$company_name = $company['company_name']; $company_name = $company['company_name'];
$customer_name = $customer['first_name'] . ' ' . $customer['last_name']; $customer_name = $customer['first_name'] . ' ' . $customer['last_name'];