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

Merge branch '471-resq-no-trade-in-reason-should-not-be-required' into '485-resq-september-10-release'

Browse source 
Add checking for service type for no trade in reason. #471

See merge request jankstudio/resq!571
This commit is contained in:
Korina Cordero 2020-09-09 08:09:50 +00:00
commit e1769470de
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -341,9 +341,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$more_reason = $req->request->get('not_wait_notes');
}
// check if service is battery sales
$stype = $req->request->get('service_type');
$no_trade_in_reason = '';
if ($stype == ServiceType::BATTERY_REPLACEMENT_NEW)
{
// check if trade in
$is_trade_in = $req->request->get('invoice_trade_in_type');
$no_trade_in_reason = '';
if (empty($is_trade_in))
{
$no_trade_in_reason = $req->request->get('no_trade_in_reason');
@ -351,6 +355,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
if (empty($no_trade_in_reason))
$error_array['no_trade_in_reason'] = 'No trade in reason required.';
}
}
// TODO: check status before saving since JO might already
// have a status that needs to be retained
@ -362,8 +367,6 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// coordinates
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
$stype = $req->request->get('service_type');
// set and save values
$jo->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time')))
->setCoordinates($point)
@ -491,9 +494,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$more_reason = $req->request->get('not_wait_notes');
}
// check if service type is battery sales
$stype = $req->request->get('service_type');
$no_trade_in_reason = '';
if ($stype == ServiceType::BATTERY_REPLACEMENT_NEW)
{
// check if trade in
$is_trade_in = $req->request->get('invoice_trade_in_type');
$no_trade_in_reason = '';
if (empty($is_trade_in))
{
$no_trade_in_reason = $req->request->get('no_trade_in_reason');
@ -501,6 +508,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
if (empty($no_trade_in_reason))
$error_array['no_trade_in_reason'] = 'No trade in reason required.';
}
}
if (empty($error_array))
{
@ -510,8 +518,6 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// coordinates
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
$stype = $req->request->get('service_type');
// set and save values
$obj->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time')))
->setCoordinates($point)