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

Resolve "Rider app changes" #965

Merged
jankstudio merged 2 commits from 153-rider-app-changes into master 2018-07-05 07:51:59 +00:00
Conversation 2 Commits 2 Files changed 2 +7 -2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 584652d31d - Show all commits

9
src/Controller/RAPIController.php
View file

@ -668,7 +668,7 @@ class RAPIController extends Controller
{
// allow rider to change service, promo, battery and trade-in options
$em = $this->getDoctrine()->getManager();
$required_params = ['jo_id', 'stype_id', 'promo_id', 'batt_id', 'trade_in'];
$required_params = ['jo_id', 'stype_id', 'promo_id'];
$res = $this->checkJO($req, $required_params, $jo);
if ($res->isError())
return $res->getReturnResponse();
@ -698,10 +698,15 @@ class RAPIController extends Controller
}
}
// check or number
$or_num = $req->request->get('or_num');
if ($or_num != null)
$jo->setORNum($or_num);
// check battery id
$batt_id = $req->request->get('batt_id');
// no battery
if ($batt_id == 0)
if ($batt_id == 0 || $batt_id == null)
$battery = null;
else
{