Add checking for promo tag before geofence check. #613
This commit is contained in:
parent
1a72f5c95a
commit
13ee4c8e51
1 changed files with 31 additions and 9 deletions
|
|
@ -2636,8 +2636,30 @@ class APIController extends Controller implements LoggedController
|
|||
$long = $req->request->get('long');
|
||||
$lat = $req->request->get('lat');
|
||||
|
||||
// geofence
|
||||
$is_covered = $geo->isCovered($long, $lat);
|
||||
// NOTE: had to move this up so we can check for promo before geofence
|
||||
// customer
|
||||
$cust = $this->session->getCustomer();
|
||||
if ($cust == null)
|
||||
{
|
||||
$res->setError(true)
|
||||
->setErrorMessage('No customer information found');
|
||||
return $res->getReturnResponse();
|
||||
}
|
||||
|
||||
$is_covered = false;
|
||||
// check if customer still has promo
|
||||
if (($cust->getCustomerTag('TAG_CAR_CLUB_OFFICER_PROMO')) ||
|
||||
($cust->getCustomerTag('TAG_CAR_CLUB_MEMBER_PROMO')))
|
||||
{
|
||||
// if has customer tag, customer has not availed of promo
|
||||
$is_covered = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// geofence
|
||||
$is_covered = $geo->isCovered($long, $lat);
|
||||
}
|
||||
|
||||
if (!$is_covered)
|
||||
{
|
||||
// TODO: put geofence error message in config file somewhere
|
||||
|
|
@ -2690,13 +2712,13 @@ class APIController extends Controller implements LoggedController
|
|||
->setStatusAutoAssign(AutoAssignStatus::NOT_ASSIGNED);
|
||||
|
||||
// customer
|
||||
$cust = $this->session->getCustomer();
|
||||
if ($cust == null)
|
||||
{
|
||||
$res->setError(true)
|
||||
->setErrorMessage('No customer information found');
|
||||
return $res->getReturnResponse();
|
||||
}
|
||||
// $cust = $this->session->getCustomer();
|
||||
// if ($cust == null)
|
||||
// {
|
||||
// $res->setError(true)
|
||||
// ->setErrorMessage('No customer information found');
|
||||
// return $res->getReturnResponse();
|
||||
// }
|
||||
$jo->setCustomer($cust);
|
||||
|
||||
// validate service type
|
||||
|
|
|
|||
Loading…
Reference in a new issue