Resolve "Job order dispatched by disappearing bug" #879

Merged
jankstudio merged 1 commit from 82-job-order-dispatched-by-disappearing-bug into master 2018-04-08 17:16:52 +00:00

View file

@ -1268,6 +1268,7 @@ class JobOrderController extends BaseController
->setTier2Notes($req->request->get('tier2_notes')) ->setTier2Notes($req->request->get('tier2_notes'))
->setDeliveryAddress($req->request->get('delivery_address')) ->setDeliveryAddress($req->request->get('delivery_address'))
->setHub($hub) ->setHub($hub)
->setProcessedBy($this->getUser())
->clearRider(); ->clearRider();
// validate // validate
@ -1288,6 +1289,14 @@ class JobOrderController extends BaseController
], 422); ], 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 // validated! save the entity
$em->flush(); $em->flush();
@ -1384,6 +1393,7 @@ class JobOrderController extends BaseController
->setDeliveryAddress($req->request->get('delivery_address')) ->setDeliveryAddress($req->request->get('delivery_address'))
->setAssignedBy($this->getUser()) ->setAssignedBy($this->getUser())
->setDateAssign(new DateTime()) ->setDateAssign(new DateTime())
->setAssignedBy($this->getUser())
->setRider($rider); ->setRider($rider);
// validate // validate
@ -1404,6 +1414,14 @@ class JobOrderController extends BaseController
], 422); ], 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 // validated! save the entity
$em->flush(); $em->flush();