rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '138-fix-api-service-history-bug' into 'master'

Browse source 
Resolve "Fix api service history bug"

Closes #138

See merge request jankstudio/resq!136
This commit is contained in:
Kendrick Chan 2018-06-11 07:47:20 +00:00
commit c46d43b001
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Controller/APIController.php
View file

@ -1379,7 +1379,10 @@ class APIController extends Controller
$jo_data['date_fulfilled'] = $jo->getDateFulfill()->format('M d, Y');
break;
case JOStatus::CANCELLED:
$jo_data['date_cancelled'] = $jo->getDateCancel()->format('M d, Y');
$date_cancel = $jo->getDateCancel();
if ($date_cancel == null)
$date_cancel = new DateTime();
$jo_data['date_cancelled'] = $date_cancel->format('M d, Y');
break;
}