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

Merge branch '107-changes-for-ios-api' into 'master'

Browse source 
Resolve "Changes for ios api"

Closes #107

See merge request jankstudio/resq!91
This commit is contained in:
Kendrick Chan 2018-04-29 06:26:17 +00:00
commit b2e75d2b5a
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) switch ($status)
{ {
case JOStatus::FULFILLED: 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; break;
case JOStatus::CANCELLED: case JOStatus::CANCELLED:
$jo_data['date_cancelled'] = $jo->getDateCancel()->format('M d, Y'); $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')) ->setDeliveryInstructions($req->request->get('delivery_instructions'))
->setTier1Notes($req->request->get('tier1_notes')) ->setTier1Notes($req->request->get('tier1_notes'))
->setTier2Notes($req->request->get('tier2_notes')) ->setTier2Notes($req->request->get('tier2_notes'))
->setDeliveryAddress($req->request->get('delivery_address')); ->setDeliveryAddress($req->request->get('delivery_address'))
->setDateFulfill(new DateTime());
// validate // validate
$errors = $validator->validate($obj); $errors = $validator->validate($obj);