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

Resolve "Resq - message prompt for non-serviceable area" #1353

Merged
korina.cordero merged 176 commits from 463-resq-message-prompt-for-non-serviceable-area into 465-resq-august-13-release 2020-08-12 05:41:57 +00:00
Conversation 3 Commits 176 Files changed 3 +7 -7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit af9be59d8d - Show all commits

6
config/routes/cmb_rider_api.yaml
View file

@ -70,9 +70,9 @@ cmb_rapi_jo_history_view:
controller: App\Controller\CMBRAPIController::viewJobOrderHistory
methods: [GET]
cmb_rapi_active_jo_get:
path: /cmbrapi/activejoborders
controller: App\Controller\CMBRAPIController::viewActiveJobOrders
cmb_rapi_assigned_jo_get:
path: /cmbrapi/assignedjoborders
controller: App\Controller\CMBRAPIController::getAssignedJobOrders
methods: [GET]
cmb_rapi_jo_in_transit:

4
src/Controller/CMBRAPIController.php
View file

@ -324,11 +324,11 @@ class CMBRAPIController extends Controller
}
public function viewActiveJobOrders(Request $req, RiderAPIHandlerInterface $rapi_handler)
public function getAssignedJobOrders(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$data = $rapi_handler->getActiveJobOrders($req);
$data = $rapi_handler->getAssignedJobOrders($req);
if (isset($data['error']))
{

4
src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View file

@ -396,7 +396,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
return $data;
}
public function getActiveJobOrders(Request $req)
public function getAssignedJobOrders(Request $req)
{
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
@ -523,7 +523,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
}
$data = [
'active_jos' => $jo_data,
'assigned_jos' => $jo_data,
];
return $data;