Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -1599,8 +1599,10 @@ print_r(date('H:i',$ms));exit();*/
 								$interval_time = $result_availability['data']['duration']*60;
 								$start_time = strtotime($start);
 								$end_time =  strtotime($end);
-								$break_from = strtotime($value['time']['break_from']);
-								$break_to = strtotime($value['time']['break_to']);
+								$breaked_from = date('Y-m-d',$data['date']).' '.$value['time']['break_from'];
+								$break_from = strtotime($breaked_from);
+								$breaked_to = date('Y-m-d',$data['date']).' '.$value['time']['break_to'];
+								$break_to = strtotime($breaked_to);
 						
 								for ($i=$start_time; $i <= $end_time; $i=$i+$interval_time) {