Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracking: 调整多日行程导游或司机多安排的日期显示

Browse Source
feature/trippest
lyt 7 years ago
parent 3abfd13240
commit 9a3ac72ca1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File

12
webht/third_party/trippestOrderSync/controllers/api.php vendored
Unescape Escape View File

@ -191,7 +191,11 @@ class Api extends CI_Controller {
$ret['operation'][$value->GCOD_startDate]['cardriver'][] = $tmp_car; $ret['operation'][$value->GCOD_startDate]['cardriver'][] = $tmp_car;
// 出团时间 // 出团时间
$ret['operation'][$value->GCOD_startDate]['start_date'] = $value->GCOD_startDate; $ret['operation'][$value->GCOD_startDate]['start_date'] = $value->GCOD_startDate;
$ret['operation'][$value->GCOD_startDate]['end_date'] = $value->GCOD_endDate; if ( ! $ret['operation'][$value->GCOD_startDate]['end_date']
|| strtotime($ret['operation'][$value->GCOD_startDate]['end_date']) > strtotime($value->GCOD_endDate)
) {
$ret['operation'][$value->GCOD_startDate]['end_date'] = $value->GCOD_endDate;
}
} }
else if ($value->GCOD_operationType === 'guiderOperations') { else if ($value->GCOD_operationType === 'guiderOperations') {
$tmp_g = array(); $tmp_g = array();
@ -204,7 +208,11 @@ class Api extends CI_Controller {
$ret['operation'][$value->GCOD_startDate]['tourguide'][] = $tmp_g; $ret['operation'][$value->GCOD_startDate]['tourguide'][] = $tmp_g;
// 出团时间 // 出团时间
$ret['operation'][$value->GCOD_startDate]['start_date'] = $value->GCOD_startDate; $ret['operation'][$value->GCOD_startDate]['start_date'] = $value->GCOD_startDate;
$ret['operation'][$value->GCOD_startDate]['end_date'] = $value->GCOD_endDate; if ( ! $ret['operation'][$value->GCOD_startDate]['end_date']
|| strtotime($ret['operation'][$value->GCOD_startDate]['end_date']) > strtotime($value->GCOD_endDate)
) {
$ret['operation'][$value->GCOD_startDate]['end_date']= $value->GCOD_endDate;
}
} }
} }
// 加上行程 // 加上行程

Write Preview
Loading…
Cancel
Save