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 +6 -6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8f108c18cb - Show all commits

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

@ -978,17 +978,17 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$this->debugRequest($req);
// allow rider to change service, promo, battery and trade-in options
$required_params = ['jo_id', 'stype_id', 'promo_id'];
$required_params = ['jo_id', 'service_type', 'promo_id'];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
return $data;
// check service type
$stype_id = $req->request->get('stype_id');
if (!ServiceType::validate($stype_id))
$service_type = $req->request->get('service_type');
if (!ServiceType::validate($service_type))
{
$data = [
'error' => 'Invalid service type - ' . $stype_id
'error' => 'Invalid service type - ' . $service_type
];
return $data;
}
@ -1061,7 +1061,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
// generate new invoice
$crit = new InvoiceCriteria();
$crit->setServiceType($stype_id);
$crit->setServiceType($service_type);
$crit->setCustomerVehicle($cv);
$crit->setHasCoolant($jo->hasCoolant());
@ -1082,7 +1082,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$this->em->flush();
// save job order
$jo->setServiceType($stype_id);
$jo->setServiceType($service_type);
// save invoice
$jo->setInvoice($invoice);