Resolve "Fix geofence issue" #1129

Merged
korina.cordero merged 4 commits from 271-fix-geofence-issue into master 2019-10-23 06:05:13 +00:00
2 changed files with 19 additions and 10 deletions
Showing only changes of commit 590b9b82b4 - Show all commits

View file

@ -42,3 +42,6 @@ POLICY_MOBILE=insertmobilepolicyidhere
# OTP
OTP_MODE=settotestorrandom
# geofence
GEOFENCE=settotrueorfalse

View file

@ -839,18 +839,24 @@ class APIController extends Controller
$long = $req->request->get('long');
$lat = $req->request->get('lat');
/*
// geofence
$is_covered = $geo->isCovered($long, $lat);
if (!$is_covered)
{
// TODO: put geofence error message in config file somewhere
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to Metro Manila only. We will update you as soon as we are able to cover your area');
return $res->getReturnResponse();
}
*/
// check if geofence is on
$dotenv = new Dotenv();
$dotenv->loadEnv(__DIR__.'/../../.env');
$geo_flag = $_ENV['GEOFENCE'];
if ($geo_flag == 'true')
{
$is_covered = $geo->isCovered($long, $lat);
if (!$is_covered)
{
// TODO: put geofence error message in config file somewhere
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to Metro Manila, Baguio, and Laguna only. We will update you as soon as we are able to cover your area');
return $res->getReturnResponse();
}
}
$jo = new JobOrder();
$jo->setSource(TransactionOrigin::MOBILE_APP)