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

Merge branch '175-sprint-20180129' into 'master'

Browse source 
Resolve "Sprint 20180129"

Closes #175

See merge request jankstudio/resq!208
This commit is contained in:
Kendrick Chan 2019-01-27 19:17:34 +00:00
commit 992e77e57b
3 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Controller/JobOrderController.php
View file

@ -956,24 +956,38 @@ class JobOrderController extends BaseController
if (empty($obj))
throw $this->createNotFoundException('The item does not exist');
// check if cancelled already
if (!$obj->canDispatch())
{
throw $this->createNotFoundException('Could not dispatch. Job Order is not pending.');
// TODO: have this handled better, so UI shows the error
// $error_array['dispatch'] = 'Could not dispatch. Job Order is not pending.';
}
// check if lat and lng are provided
if (empty($req->request->get('coord_lng')) || empty($req->request->get('coord_lat'))) {
if (empty($req->request->get('coord_lng')) || empty($req->request->get('coord_lat')))
{
$error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.';
}
// check if hub is set
if (empty($req->request->get('hub'))) {
if (empty($req->request->get('hub')))
{
$error_array['hub'] = 'No hub selected.';
} else {
}
else
{
// get hub
$hub = $em->getRepository(Hub::class)->find($req->request->get('hub'));
if (empty($hub)) {
if (empty($hub))
{
$error_array['hub'] = 'Invalid hub specified.';
}
}
if (empty($error_array)) {
if (empty($error_array))
{
// coordinates
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
@ -1001,7 +1015,8 @@ class JobOrderController extends BaseController
}
// check if any errors were found
if (!empty($error_array)) {
if (!empty($error_array))
{
// return validation failure response
return $this->json([
'success' => false,
@ -1127,6 +1142,11 @@ class JobOrderController extends BaseController
if (empty($obj))
throw $this->createNotFoundException('The item does not exist');
// check if we can assign
if (!$obj->canAssign())
throw $this->createNotFoundException('Cannot assign rider to this job order.');
// check if lat and lng are provided
if (empty($req->request->get('coord_lng')) || empty($req->request->get('coord_lat'))) {
$error_array['coordinates'] = 'No map coordinates provided. Please click on a location on the map.';

16
src/Entity/JobOrder.php
View file

@ -726,4 +726,20 @@ class JobOrder
return $this->flag_coolant;
}
public function canDispatch()
{
if ($this->status == JOStatus::PENDING)
return true;
return false;
}
public function canAssign()
{
if ($this->status == JOStatus::ASSIGNED)
return true;
return false;
}
}

5
src/Ramcar/TicketType.php
View file

@ -12,6 +12,9 @@ class TicketType extends NameValue
const FOR_FOLLOW_UP = 'for_follow_up';
const RESQ_INQUIRY = 'resq_inquiry';
const BATTERY_QUEUE = 'battery_queue';
const RESQ_QUEUE = 'resq_queue';
const COLLECTION = [
'complaint' => 'Complaint',
'inquiry' => 'Inquiry',
@ -20,5 +23,7 @@ class TicketType extends NameValue
'other' => 'Other',
'for_follow_up' => 'For follow-up',
'resq_inquiry' => 'RESQ Inquiry',
'battery_queue' => 'Battery Queue (XFER)',
'resq_queue' => 'Resq Queue (XFER)',
];
}