Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -1610,7 +1610,7 @@ print_r(date('H:i',$ms));exit();*/
 									$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 < strtotime($value['time']['break_from'])) &&($end > strtotime($value['time']['break_from']))) || (($initial < strtotime($value['time']['break_to'])) &&($end > strtotime($value['time']['break_to']))))){
+										if(!((($initial < $break_from) &&($end > $break_from)) || (($initial < $break_to) &&($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);