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

Merge branch '82-job-order-dispatched-by-disappearing-bug' into 'master'

Browse source 
Resolve "Job order dispatched by disappearing bug"

Closes #82

See merge request jankstudio/resq!68
This commit is contained in:
Kendrick Chan 2018-04-08 17:16:49 +00:00
commit 551f0066be
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Controller/JobOrderController.php
View file

@ -1268,6 +1268,7 @@ class JobOrderController extends BaseController
->setTier2Notes($req->request->get('tier2_notes'))
->setDeliveryAddress($req->request->get('delivery_address'))
->setHub($hub)
->setProcessedBy($this->getUser())
->clearRider();
// validate
@ -1288,6 +1289,14 @@ class JobOrderController extends BaseController
], 422);
}
// add event
$event = new JOEvent();
$event->setDateHappen(new DateTime())
->setTypeID(JOEventType::HUB_ASSIGN)
->setUser($this->getUser())
->setJobOrder($obj);
$em->persist($event);
// validated! save the entity
$em->flush();
@ -1384,6 +1393,7 @@ class JobOrderController extends BaseController
->setDeliveryAddress($req->request->get('delivery_address'))
->setAssignedBy($this->getUser())
->setDateAssign(new DateTime())
->setAssignedBy($this->getUser())
->setRider($rider);
// validate
@ -1404,6 +1414,14 @@ class JobOrderController extends BaseController
], 422);
}
// add event
$event = new JOEvent();
$event->setDateHappen(new DateTime())
->setTypeID(JOEventType::RIDER_ASSIGN)
->setUser($this->getUser())
->setJobOrder($obj);
$em->persist($event);
// validated! save the entity
$em->flush();