From 774599a01b6ea73141a044ab1a299b14e0f05ddb Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Fri, 5 Aug 2022 22:10:12 +0800 Subject: [PATCH 1/2] Change prices for refuel #693 --- src/Service/InvoiceGenerator/ResqInvoiceGenerator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php index 5ee7669c..298d9988 100644 --- a/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php +++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php @@ -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; From 80d4063238b555cb35fd12cedb2e7826ee47e7ea Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Fri, 5 Aug 2022 22:21:49 +0800 Subject: [PATCH 2/2] Change error message for geofence #693 --- src/Controller/APIController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 66500409..0df9bffe 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -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'; + } }