Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -1591,7 +1591,7 @@ print_r(date('H:i',$ms));exit();*/
 				            $nowin_server_addoffset = date('Y-m-d H:i:s',strtotime('-'.$new_time[0].' hour -'.$new_time[1].' minutes',strtotime($nowin_server)));
 				        }
 
-						foreach ($schedule as $key => $value) {
+						/*foreach ($schedule as $key => $value) {
 							
 							if($value['day'] == strtolower($day)){							
 								$start = date('Y-m-d',$data['date']).' '.$value['time']['start'];
@@ -1631,6 +1631,48 @@ print_r(date('H:i',$ms));exit();*/
 								}
 							}
 						}						
+						$res['data']['time_interval'] = array_values(array_unique($res['data']['time_interval'],SORT_REGULAR));*/
+
+
+						
+						foreach ($schedule as $key => $value) {
+							
+							if($value['day'] == strtolower($day)){							
+								$start = date('Y-m-d',$data['date']).' '.$value['time']['start'];
+					            $end = date('Y-m-d',$data['date']).' '.$value['time']['end'];
+								$interval_time = $result_availability['data']['duration']*60;
+								$start_time = strtotime($start);
+								$end_time =  strtotime($end);
+								$break_from = strtotime(date('Y-m-d',$data['date']).' '.$value['time']['break_from']);
+								$break_to = strtotime(date('Y-m-d',$data['date']).' '.$value['time']['break_to']);
+						
+								for ($i=$start_time; $i <= $end_time; $i=$i+$interval_time) { 
+									
+									$initial = $i;
+									$end = $i+$interval_time;
+									if(isset($value['time']['break_from']) && isset($value['time']['break_to']) && ($value['time']['break_from'] != 'null' ) && ($value['time']['break_to'] != 'null') && strlen($value['time']['break_from']) && strlen($value['time']['break_to'])){
+									 
+										if(!((($initial <= $break_from) &&($end > $break_from)) || (($initial < $break_to) &&($end >= $break_to)) || (($initial > $break_from) && ($end < $break_to)))){
+											if($end <= $end_time && ($initial > strtotime($nowin_server_addoffset))){
+												$time = date('h:i a',$initial).' - '.date('h:i a',$end);
+												$result = $this->Webservice_model->is_waiting_list_used($data,$time);
+												if($result != false || count($result) <= 1){
+													array_push($res['data']['time_interval'], array('time'=>date('h:i a',$initial).' - '.date('h:i a',$end)));
+												}
+											}
+										}
+									}else{
+									    if($end <= $end_time && ($initial > strtotime($nowin_server_addoffset))){
+									    	$time = date('h:i a',$initial).' - '.date('h:i a',$end);
+											$result = $this->Webservice_model->is_waiting_list_used($data,$time);
+											if($result != false || count($result) <= 1){
+													array_push($res['data']['time_interval'], array('time'=>date('h:i a',$initial).' - '.date('h:i a',$end)));
+											}
+										}
+									}
+								}
+							}
+						}						
 						$res['data']['time_interval'] = array_values(array_unique($res['data']['time_interval'],SORT_REGULAR));
 					}else{
 						$res =  array(