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

Merge branch '383-resq-bug-fixes-for-advance-order' into 'master'

Browse source 
Resolve "Resq - bug fixes for advance order"

Closes #383

See merge request jankstudio/resq!427
This commit is contained in:
Kendrick Chan 2020-04-21 08:38:13 +00:00
commit 031e2aa380
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/APIController.php
View file

@ -1021,7 +1021,7 @@ class APIController extends Controller implements LoggedController
if (!empty($nearest_hub))
{
$jo->setHub($nearest_hub);
$jo->setStatus(JOStatus::ASSIGNED);
$jo->setStatus(JOStatus::RIDER_ASSIGN);
}
$em->persist($jo);
@ -1035,7 +1035,7 @@ class APIController extends Controller implements LoggedController
$em->persist($event);
// check JO status
if ($jo->getStatus() == JOStatus::ASSIGNED)
if ($jo->getStatus() == JOStatus::RIDER_ASSIGN)
{
// add event logs for hub and rider assignments
$hub_assign_event = new JOEvent();

14
src/Ramcar/JOStatus.php
View file

@ -4,13 +4,13 @@ namespace App\Ramcar;
class JOStatus extends NameValue
{
const PENDING = 'pending';
const RIDER_ASSIGN = 'rider_assign';
const ASSIGNED = 'assigned';
const IN_TRANSIT = 'in_transit';
const IN_PROGRESS = 'in_progress';
const CANCELLED = 'cancelled';
const FULFILLED = 'fulfilled';
const PENDING = 'pending'; // NOTE: JO has no hub assigned
const RIDER_ASSIGN = 'rider_assign'; // NOTE: JO has hub assigned but no rider assigned
const ASSIGNED = 'assigned'; // NOTE: JO has hub and rider assigned
const IN_TRANSIT = 'in_transit'; // NOTE: JO's rider is on his way
const IN_PROGRESS = 'in_progress'; // NOTE: JO fulfillment in progress
const CANCELLED = 'cancelled'; // NOTE: JO is cancelled
const FULFILLED = 'fulfilled'; // NOTE: JO is fulfilled
const COLLECTION = [
'pending' => 'For Dispatch',