Skip to content

T
TimeOutAdmin
Commit e2dd0841 by Tobin
Options

Merge branch 'master' into 'live_production'

dc See merge request !77
parents 951e3ff8 23fddc9f
Showing with 6 additions and 2 deletions
application/models/Webservice_model.php
...@@ -570,7 +570,7 @@ class Webservice_model extends CI_Model { ...@@ -570,7 +570,7 @@ class Webservice_model extends CI_Model {
$dates = explode(',', $rs->date_time); $dates = explode(',', $rs->date_time);
$time_spec = array(); $time_spec = array();
$date_list = array(); $data_array = array();
foreach ($dates as $rss) { foreach ($dates as $rss) {
list($id,$date,$time) = explode('#', $rss); list($id,$date,$time) = explode('#', $rss);
...@@ -578,9 +578,13 @@ class Webservice_model extends CI_Model { ...@@ -578,9 +578,13 @@ class Webservice_model extends CI_Model {
$cTime = date("Y-m-d H:i", strtotime('+15 minutes')); $cTime = date("Y-m-d H:i", strtotime('+15 minutes'));
if($cTime < $sTime){ if($cTime < $sTime){
$time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time); $time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time);
$date_list[] = array('date'=>$date, 'time'=>array('id'=>$id, 'time'=>$time)); $data_array[$date][] = array('id'=>$id, 'time'=>$time);
} }
} }
$date_list = array();
foreach ($data_array as $key => $value) {
$date_list[] = array('date'=>$key, 'time'=>$value);
}
$lang = $this->getUserLang($user_id); $lang = $this->getUserLang($user_id);
if($rs->is_layout == 1 && !empty($pData = json_decode($rs->seat_pricing, TRUE))){ if($rs->is_layout == 1 && !empty($pData = json_decode($rs->seat_pricing, TRUE))){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment