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

Resolve "Changes for ios api" #902

Merged
jankstudio merged 1 commit from 107-changes-for-ios-api into master 2018-04-29 06:26:18 +00:00
Conversation 2 Commits 1 Files changed 2 +6 -2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Controller/APIController.php
View file

@ -1291,7 +1291,10 @@ class APIController extends Controller
switch ($status)
{
case JOStatus::FULFILLED:
$jo_data['date_fulfilled'] = $jo->getDateFulfill()->format('M d, Y');
if ($jo->getDateFulfill() == null)
$jo_data['date_fulfilled'] = '';
else
$jo_data['date_fulfilled'] = $jo->getDateFulfill()->format('M d, Y');
break;
case JOStatus::CANCELLED:
$jo_data['date_cancelled'] = $jo->getDateCancel()->format('M d, Y');

3
src/Controller/JobOrderController.php
View file

@ -1299,7 +1299,8 @@ class JobOrderController extends BaseController
->setDeliveryInstructions($req->request->get('delivery_instructions'))
->setTier1Notes($req->request->get('tier1_notes'))
->setTier2Notes($req->request->get('tier2_notes'))
->setDeliveryAddress($req->request->get('delivery_address'));
->setDeliveryAddress($req->request->get('delivery_address'))
->setDateFulfill(new DateTime());
// validate
$errors = $validator->validate($obj);