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

Merge branch '693-fuel-price-change-and-geofence-message-change' into 'master'

Browse source 
Resolve "Fuel price change and geofence message change"

Closes #693

See merge request jankstudio/resq!809
This commit is contained in:
Kendrick Chan 2022-08-05 14:22:29 +00:00
commit a08f988a54
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Controller/APIController.php
View file

@ -902,7 +902,7 @@ class APIController extends Controller implements LoggedController
{
// TODO: put geofence error message in config file somewhere
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to some areas in Metro Manila, Laguna, and Baguio only. We will update you as soon as we are able to cover your area');
->setErrorMessage($this->getGeoErrorMessage());
return $res->getReturnResponse();
}
@ -2308,7 +2308,7 @@ class APIController extends Controller implements LoggedController
if (!$is_covered)
{
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to some areas in Metro Manila, Laguna, and Baguio only. We will update you as soon as we are able to cover your area');
->setErrorMessage($this->getGeoErrorMessage());
}
return $res->getReturnResponse();
@ -2769,7 +2769,7 @@ class APIController extends Controller implements LoggedController
{
// TODO: put geofence error message in config file somewhere
$res->setError(true)
->setErrorMessage('Oops! Our service is limited to some areas in Metro Manila, Laguna, and Baguio only. We will update you as soon as we are able to cover your area');
->setErrorMessage($this->getGeoErrorMessage());
return $res->getReturnResponse();
}
@ -4708,4 +4708,8 @@ class APIController extends Controller implements LoggedController
{
return trim(strtolower($string));
}
protected function getGeoErrorMessage() {
return 'Oops! Our service is limited to some areas in Metro Manila, Laguna, Cavite, Pampanga and Baguio only. We will update you as soon as we are able to cover your area';
}
}

4
src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
View file

@ -35,8 +35,8 @@ class ResqInvoiceGenerator implements InvoiceGeneratorInterface
const WARRANTY_FEE = 0;
const OTHER_SERVICES_FEE = 200;
const COOLANT_FEE = 1600;
const REFUEL_FEE_GAS = 380;
const REFUEL_FEE_DIESEL = 400;
const REFUEL_FEE_GAS = 340; // for 4 liters
const REFUEL_FEE_DIESEL = 360; // for 4 liters
private $security;
protected $em;