Commit b7ab889d authored by Ralph van den Houdt's avatar Ralph van den Houdt Committed by Harold Aling
Browse files

Issue #2507505 by Heine, ralphvdhoudt: Available timeslots are always in the evening

parent e04f0bb6
Loading
Loading
Loading
Loading
+9 −8
Changes for dvg_appointments.module: 9 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -966,6 +966,11 @@ function dvg_appointments_date_time_element_process($element, &$form_state, $for
  ksort($dates);

  $full_date = $element['slots'] = array();
  $timezone = new DateTimeZone($client_api->get_timezone() ? $client_api->get_timezone() : drupal_get_user_timezone());

  $afternoon_start_hour = variable_get('dvg_appointments_afternoon_start_hour', '12');
  $evening_start_hour = variable_get('dvg_appointments_evening_start_hour', '18');  

  foreach ($dates as $date => $time_array) {
    $unix_date = strtotime($date);
    $morning_time = array();
@@ -978,21 +983,17 @@ function dvg_appointments_date_time_element_process($element, &$form_state, $for
    foreach ($time_array as $time) {
      $unix_time = strtotime($time);

      $timezone = new DateTimeZone($client_api->get_timezone() ? $client_api->get_timezone() : drupal_get_user_timezone());
      $date = new DateTime('1970-01-01 12:00', $timezone);
      $midday = $date->getTimestamp();

      $date = new DateTime('1970-01-01 17:00', $timezone);
      $evening = $date->getTimestamp();
      $datetime = new DateTime($time, $timezone);
      $hour = (int) $datetime->format('H');

      $index = $unix_time;
      if ($unix_time < $unix_date) {
        $index += $unix_date;
      }
      if ($unix_time < $midday) {
      if ($hour < $afternoon_start_hour) {
        $morning_time[$index] = dvg_appointments_format_date($unix_time, 'time');
      }
      elseif ($unix_time < $evening) {
      elseif ($hour < $evening_start_hour) {
        $midday_time[$index] = dvg_appointments_format_date($unix_time, 'time');
      }
      else {