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

Merge branch '153-rider-app-changes' into 'master'

Browse source 
Resolve "Rider app changes"

Closes #153

See merge request jankstudio/resq!154
This commit is contained in:
Kendrick Chan 2018-07-05 07:51:58 +00:00
commit 6df440f887
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Controller/RAPIController.php
View file

@ -385,6 +385,8 @@ class RAPIController extends Controller
'plate_number' => $cv->getPlateNumber(),
'color' => $cv->getColor(),
],
'or_num' => $jo->getORNum(),
'or_name' => $jo->getORName(),
'delivery_instructions' => $jo->getDeliveryInstructions(),
'delivery_address' => $jo->getDeliveryAddress(),
'landmark' => $jo->getLandmark(),
@ -666,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();
@ -696,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
{

18
src/Entity/JobOrder.php
View file

@ -208,6 +208,12 @@ class JobOrder
*/
protected $mode_of_payment;
// OR number
/**
* @ORM\Column(type="string", length=80, nullable=true)
*/
protected $or_num;
// name to put in OR
/**
* @ORM\Column(type="string", length=80)
@ -235,6 +241,7 @@ class JobOrder
$this->source = 'mobile';
$this->mode_of_payment = ModeOfPayment::CASH;
$this->or_name = '';
$this->or_num = '';
$this->landmark = '';
$this->promo_detail = '';
@ -571,6 +578,17 @@ class JobOrder
return $this->mode_of_payment;
}
public function setORNum($num)
{
$this->or_num = $num;
return $this;
}
public function getORNum()
{
return $this->or_num;
}
public function setORName($name)
{
$this->or_name = $name;