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

Add title field to error object. #421

Browse source
This commit is contained in:
Korina Cordero 2020-06-12 10:35:20 +00:00
parent 027c1ead39
commit 18081d0903
3 changed files with 360 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
src/Controller/CMBRAPIController.php
View file

@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\JsonResponse;
use App\Ramcar\APIResult;
use App\Ramcar\NewAPIResult;
use App\Service\RiderAPIHandlerInterface;
@ -16,15 +16,17 @@ class CMBRAPIController extends Controller
{
public function register(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->register($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -38,15 +40,17 @@ class CMBRAPIController extends Controller
public function login(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->login($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -60,15 +64,17 @@ class CMBRAPIController extends Controller
public function logout(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->logout($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -82,15 +88,17 @@ class CMBRAPIController extends Controller
public function getJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->getJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -104,15 +112,17 @@ class CMBRAPIController extends Controller
public function acceptJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->acceptJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -126,15 +136,17 @@ class CMBRAPIController extends Controller
public function cancelJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->cancelJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -149,15 +161,17 @@ class CMBRAPIController extends Controller
public function arrive(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->arrive($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -171,15 +185,17 @@ class CMBRAPIController extends Controller
public function hubArrive(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->hubArrive($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -193,15 +209,17 @@ class CMBRAPIController extends Controller
public function payment(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->payment($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -215,15 +233,17 @@ class CMBRAPIController extends Controller
public function available(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->available($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -237,15 +257,17 @@ class CMBRAPIController extends Controller
public function getPromos(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->getPromos($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -259,15 +281,17 @@ class CMBRAPIController extends Controller
public function getBatteries(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->getBatteries($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -281,15 +305,17 @@ class CMBRAPIController extends Controller
public function changeService(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->changeService($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -303,15 +329,17 @@ class CMBRAPIController extends Controller
public function getJobOrderHistory(Request $req, $period, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->getJobOrderHistory($req, $period);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -326,15 +354,17 @@ class CMBRAPIController extends Controller
public function getAssignedJobOrders(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->getAssignedJobOrders($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -349,15 +379,17 @@ class CMBRAPIController extends Controller
public function setJobOrderInTransit(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->setJobOrderInTransit($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -372,15 +404,17 @@ class CMBRAPIController extends Controller
public function generateInvoice(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->generateInvoice($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -395,15 +429,17 @@ class CMBRAPIController extends Controller
public function goOnline(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->goOnline($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -417,15 +453,17 @@ class CMBRAPIController extends Controller
public function goOffline(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->goOffline($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -439,15 +477,17 @@ class CMBRAPIController extends Controller
public function startJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->startJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -461,15 +501,17 @@ class CMBRAPIController extends Controller
public function completeJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->completeJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -483,15 +525,17 @@ class CMBRAPIController extends Controller
public function setActiveJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->setActiveJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -505,15 +549,17 @@ class CMBRAPIController extends Controller
public function rejectJobOrder(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->rejectJobOrder($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -527,15 +573,17 @@ class CMBRAPIController extends Controller
public function setOdometer(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->setOdometer($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -549,15 +597,17 @@ class CMBRAPIController extends Controller
public function uploadArrivePhotos(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->uploadArrivePhotos($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -571,15 +621,17 @@ class CMBRAPIController extends Controller
public function uploadFinishPhotos(Request $req, RiderAPIHandlerInterface $rapi_handler)
{
$res = new APIResult();
$res = new NewAPIResult();
$data = $rapi_handler->uploadFinishPhotos($req);
if (isset($data['error']))
{
$message = $data['error'];
$title = $data['title'];
$res->setError(true)
->setErrorTitle($title)
->setErrorMessage($message);
}
else
@ -590,7 +642,4 @@ class CMBRAPIController extends Controller
// response
return $res->getReturnResponse();
}
}

92
src/Ramcar/NewAPIResult.php Normal file
View file

@ -0,0 +1,92 @@
<?php
namespace App\Ramcar;
use Symfony\Component\HttpFoundation\Response;
class NewAPIResult
{
protected $err_title;
protected $err_flag;
protected $err_message;
protected $data;
public function __construct()
{
$this->err_title = '';
$this->err_flag = false;
$this->err_message = '';
$this->data = [];
}
public function setError($flag = true)
{
$this->err_flag = $flag;
return $this;
}
public function isError()
{
return $this->err_flag;
}
public function setErrorMessage($message)
{
$this->err_message = $message;
return $this;
}
public function getErrorMessage()
{
return $this->err_message;
}
public function setData($data)
{
$this->data = $data;
return $this;
}
public function getData()
{
return $this->data;
}
public function setErrorTitle($title)
{
$this->err_title = $title;
return $this;
}
public function getErrorTitle()
{
return $this->err_title;
}
public function getReturnResponse()
{
if ($this->isError())
$status = 'error';
else
$status = 'success';
if (count($this->data) == 0)
$this->data = new \stdClass();
$return_data = [
'error' => [
'title' => $this->err_title,
'status' => $status,
'message' => $this->err_message
],
'data' => $this->data
];
// $json_data = json_encode($return_data, JSON_NUMERIC_CHECK);
$json_data = json_encode($return_data);
$json = new Response($json_data);
return $json;
}
}

229
src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View file

@ -88,6 +88,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
{
$params = implode(', ', $missing);
$data = [
'title' => 'Failed Registration',
'error' => 'Missing parameter(s): ' . $params
];
return $data;
@ -149,12 +150,16 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Login';
return $data;
}
// check if session has a rider already
if ($this->session->hasRider())
{
$data = [
'title' => 'Failed Login',
'error' => 'Another rider is already logged in. Please logout first.'
];
return $data;
@ -165,6 +170,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
if ($rider == null)
{
$data = [
'title' => 'Failed Login',
'error' => 'Invalid username or password.'
];
return $data;
@ -175,6 +181,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
if (!$encoder->isPasswordValid($rider->getPassword(), $req->request->get('pass'), ''))
{
$data = [
'title' => 'Failed Login',
'error' => 'Invalid username or password.'
];
return $data;
@ -232,7 +239,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Logout';
return $data;
}
// make rider unavailable
$rider = $this->session->getRider();
@ -258,7 +268,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Go Online';
return $data;
}
// set rider to available to take on JOs
$rider = $this->session->getRider();
@ -275,7 +288,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Go Offline';
return $data;
}
// set rider to unavailable to take on JOs
$rider = $this->session->getRider();
@ -293,12 +309,16 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Get Job Order History';
return $data;
}
// are we logged in?
if (!$this->session->hasRider())
{
$data = [
'title' => 'Failed Get Job Order History',
'error' => 'No logged in rider.'
];
return $data;
@ -450,12 +470,16 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Get Assigned Job Orders';
return $data;
}
// are we logged in?
if (!$this->session->hasRider())
{
$data = [
'title' => 'Failed Get Assigned Job Orders',
'error' => 'No logged in rider.'
];
return $data;
@ -585,7 +609,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Get Job Order';
return $data;
}
$coord = $jo->getCoordinates();
$cust = $jo->getCustomer();
@ -686,7 +713,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Accept Job Order';
return $data;
}
// TODO: refactor this into a jo handler class, so we don't have to repeat for control center
// TODO: send mqtt event (?)
@ -709,7 +739,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id'];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Set Job Order in Transit';
return $data;
}
// set jo status to in transit
$jo->setStatus(JOStatus::IN_TRANSIT);
@ -739,7 +772,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Job Order Cancellation';
return $data;
}
$cancel_reason = $req->request->get('cancel_reason');
@ -766,7 +802,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Job Order Rejection';
return $data;
}
$jo->requeue();
@ -799,7 +838,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id'];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Arrive';
return $data;
}
// TODO: refactor this into a jo handler class, so we don't have to repeat for control center
@ -865,7 +907,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id'];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Payment';
return $data;
}
// set invoice to paid
$jo->getInvoice()->setStatus(InvoiceStatus::PAID);
@ -889,7 +934,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Available Rider';
return $data;
}
// make rider available
$this->session->getRider()->setAvailable(true);
@ -905,7 +953,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Get Promos';
return $data;
}
$promos = $this->em->getRepository(Promo::class)->findAll();
@ -932,7 +983,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = [];
$data = $this->checkParamsAndKey($req, $required_params);
if (isset($data['error']))
{
$data['title'] = 'Failed Get Batteries';
return $data;
}
$batts = $this->em->getRepository(Battery::class)->findAll();
$models = $this->em->getRepository(BatteryModel::class)->findAll();
@ -984,13 +1038,17 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id', 'service_type', 'promo_id'];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Service Change';
return $data;
}
// check service type
$service_type = $req->request->get('service_type');
if (!ServiceType::validate($service_type))
{
$data = [
'title' => 'Failed Service Change',
'error' => 'Invalid service type - ' . $service_type
];
return $data;
@ -1007,6 +1065,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
if ($promo == null)
{
$data = [
'title' => 'Failed Service Change',
'error' => 'Invalid promo id - ' . $promo_id
];
return $data;
@ -1045,6 +1104,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
if ($battery == null)
{
$data = [
'title' => 'Failed Service Change',
'error' => 'Invalid battery id - ' . $batt_id
];
return $data;
@ -1111,7 +1171,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id'];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Invoice Generation';
return $data;
}
$inv = $jo->getInvoice();
$promo = $inv->getPromo();
@ -1176,7 +1239,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id'];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Job Order Start';
return $data;
}
// add event log
$rider = $this->session->getRider();
@ -1197,7 +1263,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$required_params = ['jo_id'];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Job Order Completion';
return $data;
}
/*
// set jo status to fulfilled
@ -1286,7 +1355,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Set Active Job Order';
return $data;
}
$rider = $this->session->getRider();
$rider->setActiveJobOrder($jo);
@ -1305,7 +1377,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Set Odometer';
return $data;
}
$odometer_reading = $req->request->get('odometer');
@ -1323,7 +1398,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Upload Arrive Photos';
return $data;
}
$dest = $this->upload_dir;
@ -1336,36 +1414,70 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
(empty($plate_num_img_file)))
{
$data = [
'title' => 'Failed Upload Arrive Photos',
'error' => 'No image files received.'
];
return $data;
}
else
{
// save speedometer file
$orig_speed_filename = pathinfo($speed_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_speed_filename = uniqid() . '-'. $orig_speed_filename . '.' . $speed_img_file->guessClientExtension();
// save battery file
$orig_batt_filename = pathinfo($batt_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_batt_filename = uniqid() . '-' . $orig_batt_filename . '.' . $batt_img_file->guessClientExtension();
$new_speed_filename = '';
$new_batt_filename = '';
$new_plate_num_filename = '';
// save plate number file
$orig_plate_num_filename = pathinfo($plate_num_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_plate_num_filename = uniqid() . '-' . $orig_plate_num_filename . '.' . $plate_num_img_file->guessClientExtension();
try
if (!empty($speed_img_file))
{
$speed_img_file->move($dest, $new_speed_filename);
$batt_img_file->move($dest, $new_batt_filename);
$plate_num_img_file->move($dest, $new_plate_num_filename);
// save speedometer file
$orig_speed_filename = pathinfo($speed_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_speed_filename = uniqid() . '-'. $orig_speed_filename . '.' . $speed_img_file->guessClientExtension();
try
{
$speed_img_file->move($dest, $new_speed_filename);
}
catch (FileException $e)
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
}
}
catch (FileException $e)
if (!empty($batt_img_file))
{
// save battery file
$orig_batt_filename = pathinfo($batt_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_batt_filename = uniqid() . '-' . $orig_batt_filename . '.' . $batt_img_file->guessClientExtension();
try
{
$batt_img_file->move($dest, $new_batt_filename);
}
catch (FileException $e)
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
}
}
if (!empty($plate_num_img_file))
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
// save plate number file
$orig_plate_num_filename = pathinfo($plate_num_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_plate_num_filename = uniqid() . '-' . $orig_plate_num_filename . '.' . $plate_num_img_file->guessClientExtension();
try
{
$plate_num_img_file->move($dest, $new_plate_num_filename);
}
catch (FileException $e)
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
}
}
$jo_extra = $jo->getJOExtra();
@ -1402,7 +1514,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
];
$data = $this->checkActiveJO($req, $required_params, $jo);
if (isset($data['error']))
{
$data['title'] = 'Failed Upload Finish Photos';
return $data;
}
$dest = $this->upload_dir;
@ -1415,36 +1530,70 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
(empty($plate_num_img_file)))
{
$data = [
'title' => 'Failed Upload Arrive Photos',
'error' => 'No image files received.'
];
return $data;
}
else
{
// save speedometer file
$orig_speed_filename = pathinfo($speed_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_speed_filename = uniqid() . '-'. $orig_speed_filename . '.' . $speed_img_file->guessClientExtension();
$new_speed_filename = '';
$new_batt_filename = '';
$new_plate_num_filename = '';
// save battery file
$orig_batt_filename = pathinfo($batt_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_batt_filename = uniqid() . '-' . $orig_batt_filename . '.' . $batt_img_file->guessClientExtension();
// save plate number file
$orig_plate_num_filename = pathinfo($plate_num_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_plate_num_filename = uniqid() . '-' . $orig_plate_num_filename . '.' . $plate_num_img_file->guessClientExtension();
try
if (!empty($speed_img_file))
{
$speed_img_file->move($dest, $new_speed_filename);
$batt_img_file->move($dest, $new_batt_filename);
$plate_num_img_file->move($dest, $new_plate_num_filename);
// save speedometer file
$orig_speed_filename = pathinfo($speed_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_speed_filename = uniqid() . '-'. $orig_speed_filename . '.' . $speed_img_file->guessClientExtension();
try
{
$speed_img_file->move($dest, $new_speed_filename);
}
catch (FileException $e)
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
}
}
catch (FileException $e)
if (!empty($batt_img_file))
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
// save battery file
$orig_batt_filename = pathinfo($batt_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_batt_filename = uniqid() . '-' . $orig_batt_filename . '.' . $batt_img_file->guessClientExtension();
try
{
$batt_img_file->move($dest, $new_batt_filename);
}
catch (FileException $e)
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
}
}
if (!empty($plate_num_img_file))
{
// save plate number file
$orig_plate_num_filename = pathinfo($plate_num_img_file->getClientOriginalName(), PATHINFO_FILENAME);
$new_plate_num_filename = uniqid() . '-' . $orig_plate_num_filename . '.' . $plate_num_img_file->guessClientExtension();
try
{
$plate_num_img_file->move($dest, $new_plate_num_filename);
}
catch (FileException $e)
{
$data = [
'error' => 'Error saving image files.'
];
return $data;
}
}
$jo_extra = $jo->getJOExtra();