cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22 from ladybirdweb/analysis-zGDEpl

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
vijaysebastian
2016-02-22 15:08:18 +05:30
parent 42291015a7 16ef1dfb2f
commit d39ef2985d
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Api/v1/ApiController.php
View File

@@ -1039,33 +1039,36 @@ class ApiController extends Controller
} }
} }
public function getTicketById()
public function getTicketById(){ {
try { try {
$v = \Validator::make($this->request->all(), [ $v = \Validator::make($this->request->all(), [
'id' => 'required|exists:tickets,id' 'id' => 'required|exists:tickets,id',
]); ]);
if ($v->fails()) { if ($v->fails()) {
$error = $v->errors(); $error = $v->errors();
return response()->json(compact('error')); return response()->json(compact('error'));
} }
$id = $this->request->input('id'); $id = $this->request->input('id');
if (!$this->model->where('id', $id)->first()) { if (!$this->model->where('id', $id)->first()) {
$error = "There is no Ticket as ticket id: ".$id; $error = 'There is no Ticket as ticket id: '.$id;
return response()->json(compact('error')); return response()->json(compact('error'));
} }
$result = $this->model->where('id', $id)->first(); $result = $this->model->where('id', $id)->first();
return response()->json(compact('result')); return response()->json(compact('result'));
} catch (\Exception $e) { } catch (\Exception $e) {
$error = $e->getMessage(); $error = $e->getMessage();
$line = $e->getLine(); $line = $e->getLine();
$file = $e->getFile(); $file = $e->getFile();
return response()->json(compact('error', 'file', 'line')); return response()->json(compact('error', 'file', 'line'));
} catch (\TokenExpiredException $e) { } catch (\TokenExpiredException $e) {
$error = $e->getMessage(); $error = $e->getMessage();
return response()->json(compact('error')); return response()->json(compact('error'));
} }
} }
} }

9
app/Http/Controllers/Api/v1/TestController.php
View File

@@ -453,19 +453,20 @@ class TestController extends Controller
} }
} }
public function getTicketById(){ public function getTicketById()
{
try { try {
$url = $this->server . "helpdesk/my-tickets?id=1&api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token=" . \Config::get('app.token'); $url = $this->server.'helpdesk/my-tickets?id=1&api_key=9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN&token='.\Config::get('app.token');
$_this = new self(); $_this = new self();
$respose = $_this->callGetApi($url); $respose = $_this->callGetApi($url);
return $respose; return $respose;
} catch (\Exception $e) { } catch (\Exception $e) {
$error = $e->getMessage(); $error = $e->getMessage();
$line = $e->getLine(); $line = $e->getLine();
$file = $e->getFile(); $file = $e->getFile();
return response()->json(compact('error', 'file', 'line')); return response()->json(compact('error', 'file', 'line'));
} }
} }
} }