Applied fixes from StyleCI

This commit is contained in:
Sujit Prasad
2016-08-05 09:24:12 -04:00
committed by StyleCI Bot
parent 09bf25b5e2
commit e2390f67d4
53 changed files with 1397 additions and 1105 deletions

View File

@@ -33,8 +33,8 @@ use Illuminate\Support\Collection;
*
* @version v1
*/
class ApiController extends Controller {
class ApiController extends Controller
{
public $user;
public $request;
public $ticket;
@@ -54,7 +54,8 @@ class ApiController extends Controller {
/**
* @param Request $request
*/
public function __construct(Request $request) {
public function __construct(Request $request)
{
$this->request = $request;
$this->middleware('jwt.auth');
@@ -63,9 +64,7 @@ class ApiController extends Controller {
$user = \JWTAuth::parseToken()->authenticate();
$this->user = $user;
} catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {
} catch (\Tymon\JWTAuth\Exceptions\JWTException $e) {
}
$ticket = new TicketController();
@@ -120,16 +119,17 @@ class ApiController extends Controller {
*
* @return json
*/
public function createTicket() {
public function createTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
'subject' => 'required',
'body' => 'required',
'user_id' => 'required|exists:users,id',
'subject' => 'required',
'body' => 'required',
'helptopic' => 'required|exists:help_topic,id',
'sla' => 'required|exists:sla_plan,id',
'priority' => 'required|exists:ticket_priority,priority_id',
'dept' => 'required|exists:department,id',
'sla' => 'required|exists:sla_plan,id',
'priority' => 'required|exists:ticket_priority,priority_id',
'dept' => 'required|exists:department,id',
]);
if ($v->fails()) {
$error = $v->errors();
@@ -189,11 +189,12 @@ class ApiController extends Controller {
*
* @return json
*/
public function ticketReply() {
public function ticketReply()
{
//dd($this->request->all());
try {
$v = \Validator::make($this->request->all(), [
'ticket_ID' => 'required|exists:tickets,id',
'ticket_ID' => 'required|exists:tickets,id',
'reply_content' => 'required',
]);
if ($v->fails()) {
@@ -223,14 +224,15 @@ class ApiController extends Controller {
*
* @return json
*/
public function editTicket() {
public function editTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
'subject' => 'required',
'sla_plan' => 'required|exists:sla_plan,id',
'help_topic' => 'required|exists:help_topic,id',
'ticket_source' => 'required|exists:ticket_source,id',
'ticket_id' => 'required|exists:tickets,id',
'subject' => 'required',
'sla_plan' => 'required|exists:sla_plan,id',
'help_topic' => 'required|exists:help_topic,id',
'ticket_source' => 'required|exists:ticket_source,id',
'ticket_priority' => 'required|exists:ticket_priority,priority_id',
]);
if ($v->fails()) {
@@ -260,7 +262,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function deleteTicket() {
public function deleteTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
@@ -293,15 +296,16 @@ class ApiController extends Controller {
*
* @return json
*/
public function openedTickets() {
public function openedTickets()
{
try {
// $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$result = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
$join->on('users.id', '=', 'tickets.user_id')
->where('isanswered', '=', 0)->where('status', '=', 1)->whereNull('assigned_to');
})
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -337,15 +341,16 @@ class ApiController extends Controller {
*
* @return json
*/
public function unassignedTickets() {
public function unassignedTickets()
{
try {
//dd('sdhjbc');
// $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$unassigned = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
$join->on('users.id', '=', 'tickets.user_id')
->whereNull('assigned_to')->where('status', '=', 1);
})
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -355,7 +360,7 @@ class ApiController extends Controller {
$join->on('tickets.id', '=', 'ticket_thread.ticket_id')
->whereNotNull('title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -381,15 +386,16 @@ class ApiController extends Controller {
*
* @return json
*/
public function closeTickets() {
public function closeTickets()
{
try {
// $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$result = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
->where('status','=',3)->orWhere('status','=',2);
})
$join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 3)->orWhere('status', '=', 2);
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -399,7 +405,7 @@ class ApiController extends Controller {
$join->on('tickets.id', '=', 'ticket_thread.ticket_id')
->whereNotNull('title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -425,7 +431,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getAgents() {
public function getAgents()
{
try {
$result = $this->faveoUser->where('role', 'agent')->orWhere('role', 'admin')->where('active', 1)->get();
@@ -448,7 +455,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getTeams() {
public function getTeams()
{
try {
$result = $this->team->get();
@@ -471,11 +479,12 @@ class ApiController extends Controller {
*
* @return json
*/
public function assignTicket() {
public function assignTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required',
'user' => 'required',
'user' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
@@ -509,7 +518,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getCustomers() {
public function getCustomers()
{
try {
$v = \Validator::make($this->request->all(), [
'search' => 'required',
@@ -520,7 +530,7 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$search = $this->request->input('search');
$result = $this->faveoUser->where('first_name', 'like', '%' . $search . '%')->orWhere('last_name', 'like', '%' . $search . '%')->orWhere('user_name', 'like', '%' . $search . '%')->orWhere('email', 'like', '%' . $search . '%')->get();
$result = $this->faveoUser->where('first_name', 'like', '%'.$search.'%')->orWhere('last_name', 'like', '%'.$search.'%')->orWhere('user_name', 'like', '%'.$search.'%')->orWhere('email', 'like', '%'.$search.'%')->get();
return response()->json(compact('result'))
->header('X-Header-One', 'Header Value');
@@ -543,7 +553,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getCustomersWith() {
public function getCustomersWith()
{
try {
$users = $this->user
->leftJoin('user_assign_organization', 'user_assign_organization.user_id', '=', 'users.id')
@@ -574,7 +585,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getCustomer() {
public function getCustomer()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required',
@@ -606,7 +618,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function searchTicket() {
public function searchTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'search' => 'required',
@@ -617,7 +630,7 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$search = $this->request->input('search');
$result = $this->thread->select('ticket_id')->where('title', 'like', '%' . $search . '%')->orWhere('body', 'like', '%' . $search . '%')->get();
$result = $this->thread->select('ticket_id')->where('title', 'like', '%'.$search.'%')->orWhere('body', 'like', '%'.$search.'%')->get();
return response()->json(compact('result'));
} catch (Exception $e) {
@@ -638,7 +651,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function ticketThreads() {
public function ticketThreads()
{
try {
$v = \Validator::make($this->request->all(), [
'id' => 'required',
@@ -675,7 +689,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function checkUrl() {
public function checkUrl()
{
//dd($this->request);
try {
$v = \Validator::make($this->request->all(), [
@@ -692,7 +707,7 @@ class ApiController extends Controller {
$url = str_finish($url, '/');
}
$url = $url . '/api/v1/helpdesk/check-url?api_key=' . $this->request->input('api_key') . '&token=' . \Config::get('app.token');
$url = $url.'/api/v1/helpdesk/check-url?api_key='.$this->request->input('api_key').'&token='.\Config::get('app.token');
$result = $this->CallGetApi($url);
//dd($result);
return response()->json(compact('result'));
@@ -712,7 +727,8 @@ class ApiController extends Controller {
*
* @return string
*/
public function urlResult() {
public function urlResult()
{
return 'success';
}
@@ -723,7 +739,8 @@ class ApiController extends Controller {
*
* @return type int|string|json
*/
public function callGetApi($url) {
public function callGetApi($url)
{
$curl = curl_init($url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_URL, $url);
@@ -732,7 +749,7 @@ class ApiController extends Controller {
$response = curl_exec($curl);
if (curl_errno($curl)) {
echo 'error:' . curl_error($curl);
echo 'error:'.curl_error($curl);
}
return $response;
@@ -747,7 +764,8 @@ class ApiController extends Controller {
*
* @return type int|string|json
*/
public function callPostApi($url, $data) {
public function callPostApi($url, $data)
{
$curl = curl_init($url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_URL, $url);
@@ -757,7 +775,7 @@ class ApiController extends Controller {
$response = curl_exec($curl);
if (curl_errno($curl)) {
echo 'error:' . curl_error($curl);
echo 'error:'.curl_error($curl);
}
return $response;
@@ -769,7 +787,8 @@ class ApiController extends Controller {
*
* @return type | json
*/
public function generateApiKey() {
public function generateApiKey()
{
try {
$set = $this->setting->where('id', '1')->first();
//dd($set);
@@ -803,7 +822,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getHelpTopic() {
public function getHelpTopic()
{
try {
$result = $this->helptopic->get();
@@ -826,7 +846,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getSlaPlan() {
public function getSlaPlan()
{
try {
$result = $this->slaPlan->get();
@@ -849,7 +870,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getPriority() {
public function getPriority()
{
try {
$result = $this->priority->get();
@@ -872,7 +894,8 @@ class ApiController extends Controller {
*
* @return json
*/
public function getDepartment() {
public function getDepartment()
{
try {
$result = $this->department->get();
@@ -895,7 +918,8 @@ class ApiController extends Controller {
*
* @return type json
*/
public function getTickets() {
public function getTickets()
{
try {
$tickets = $this->model->orderBy('created_at', 'desc')->paginate(10);
$tickets->toJson();
@@ -919,13 +943,13 @@ class ApiController extends Controller {
*
* @return type json
*/
public function inbox() {
public function inbox()
{
try {
$inbox = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
$join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 1);
})
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -935,7 +959,7 @@ class ApiController extends Controller {
$join->on('tickets.id', '=', 'ticket_thread.ticket_id')
->whereNotNull('ticket_thread.title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -961,12 +985,13 @@ class ApiController extends Controller {
*
* @return type json
*/
public function internalNote() {
public function internalNote()
{
try {
$v = \Validator::make($this->request->all(), [
'userid' => 'required|exists:users,id',
'userid' => 'required|exists:users,id',
'ticketid' => 'required|exists:tickets,id',
'body' => 'required',
'body' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
@@ -993,12 +1018,13 @@ class ApiController extends Controller {
}
}
public function getTrash() {
public function getTrash()
{
try {
$trash = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
$join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 5);
})
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1008,7 +1034,7 @@ class ApiController extends Controller {
$join->on('tickets.id', '=', 'ticket_thread.ticket_id')
->whereNotNull('title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -1029,7 +1055,8 @@ class ApiController extends Controller {
}
}
public function getMyTicketsAgent() {
public function getMyTicketsAgent()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
@@ -1046,10 +1073,10 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$result = $this->user->join('tickets', function ($join) use ($id) {
$join->on('users.id', '=', 'tickets.assigned_to')
$join->on('users.id', '=', 'tickets.assigned_to')
->where('status', '=', 1);
//->where('user_id', '=', $id);
})
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1059,8 +1086,8 @@ class ApiController extends Controller {
$join->on('tickets.id', '=', 'ticket_thread.ticket_id')
->whereNotNull('title');
})
->where('users.id',$id)
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->where('users.id', $id)
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -1081,7 +1108,8 @@ class ApiController extends Controller {
}
}
public function getMyTicketsUser() {
public function getMyTicketsUser()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
@@ -1098,9 +1126,9 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$result = $this->user->join('tickets', function ($join) use ($id) {
$join->on('users.id', '=', 'tickets.user_id')
$join->on('users.id', '=', 'tickets.user_id')
->where('user_id', '=', $id);
})
})
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1132,7 +1160,8 @@ class ApiController extends Controller {
}
}
public function getTicketById() {
public function getTicketById()
{
try {
$v = \Validator::make($this->request->all(), [
'id' => 'required|exists:tickets,id',
@@ -1144,18 +1173,18 @@ class ApiController extends Controller {
}
$id = $this->request->input('id');
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'));
}
$query = $this->user->join('tickets', function ($join) use ($id) {
$join->on('users.id', '=', 'tickets.user_id')
$join->on('users.id', '=', 'tickets.user_id')
->where('tickets.id', '=', $id);
});
});
$response = $this->differenciateHelpTopic($query);
//$select = 'users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','num_sequence','user_id','priority_id','sla','max_open_ticket','captcha','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','is_transfer','transfer_at','reopened_at','duedate','closed_at','last_message_at','last_response_at';
$result = $response->addSelect('users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','user_id','priority_id','sla','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','reopened_at','duedate','closed_at','last_message_at','last_response_at','tickets.created_at','tickets.updated_at')->first();
$result = $response->addSelect('users.email', 'users.user_name', 'users.first_name', 'users.last_name', 'tickets.id', 'ticket_number', 'user_id', 'priority_id', 'sla', 'status', 'lock_by', 'lock_at', 'source', 'isoverdue', 'reopened', 'isanswered', 'is_deleted', 'closed', 'reopened_at', 'duedate', 'closed_at', 'last_message_at', 'last_response_at', 'tickets.created_at', 'tickets.updated_at')->first();
return response()->json(compact('result'));
} catch (\Exception $e) {
@@ -1171,7 +1200,8 @@ class ApiController extends Controller {
}
}
public function createPagination($array, $perPage) {
public function createPagination($array, $perPage)
{
try {
//Get current page form url e.g. &page=6
$currentPage = LengthAwarePaginator::resolveCurrentPage();
@@ -1199,7 +1229,8 @@ class ApiController extends Controller {
}
}
public function collaboratorSearch() {
public function collaboratorSearch()
{
$this->validate($this->request, ['term' => 'required']);
try {
$emails = $this->ticket->autosearch();
@@ -1209,7 +1240,7 @@ class ApiController extends Controller {
foreach ($emails as $key => $email) {
$user_model = $user->where('email', $email)->first();
//return $user_model;
$users[$key]['name'] = $user_model->first_name . ' ' . $user_model->last_name;
$users[$key]['name'] = $user_model->first_name.' '.$user_model->last_name;
$users[$key]['email'] = $email;
$users[$key]['avatar'] = $this->avatarUrl($email);
}
@@ -1226,12 +1257,13 @@ class ApiController extends Controller {
}
}
public function avatarUrl($email) {
public function avatarUrl($email)
{
try {
$user = new User();
$user = $user->where('email', $email)->first();
if ($user->profile_pic) {
$url = url('uploads/profilepic/' . $user->profile_pic);
$url = url('uploads/profilepic/'.$user->profile_pic);
} else {
$url = \Gravatar::src($email);
}
@@ -1243,10 +1275,11 @@ class ApiController extends Controller {
}
}
public function addCollaboratorForTicket() {
public function addCollaboratorForTicket()
{
try {
$v = \Validator::make(\Input::get(), [
'email' => 'required|email|unique:users',
'email' => 'required|email|unique:users',
'ticket_id' => 'required',
]
);
@@ -1273,7 +1306,8 @@ class ApiController extends Controller {
}
}
public function getCollaboratorForTicket() {
public function getCollaboratorForTicket()
{
try {
$v = \Validator::make(\Input::get(), [
'ticket_id' => 'required',
@@ -1302,11 +1336,12 @@ class ApiController extends Controller {
}
}
public function deleteCollaborator() {
public function deleteCollaborator()
{
try {
$v = \Validator::make(\Input::get(), [
'ticketid' => 'required',
'email' => 'required',
'email' => 'required',
]
);
if ($v->fails()) {
@@ -1326,7 +1361,8 @@ class ApiController extends Controller {
}
}
public function dependency() {
public function dependency()
{
try {
$department = $this->department->select('name', 'id')->get()->toArray();
$sla = $this->slaPlan->select('name', 'id')->get()->toArray();
@@ -1337,7 +1373,7 @@ class ApiController extends Controller {
$status = \DB::table('ticket_status')->select('name', 'id')->get();
$source = \DB::table('ticket_source')->select('name', 'id')->get();
$result = ['departments' => $department, 'sla' => $sla, 'staffs' => $staff, 'teams' => $team,
'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source,];
'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source, ];
return response()->json(compact('result'));
} catch (\Exception $e) {
@@ -1348,33 +1384,36 @@ class ApiController extends Controller {
return response()->json(compact('error', 'file', 'line'));
}
}
public function differenciateHelpTopic($query){
public function differenciateHelpTopic($query)
{
$ticket = $query->first();
$check = 'department';
if($ticket){
if($ticket->dept_id && $ticket->help_topic_id){
if ($ticket) {
if ($ticket->dept_id && $ticket->help_topic_id) {
return $this->getSystem($check, $query);
}
if(!$ticket->dept_id && $ticket->help_topic_id){
if (!$ticket->dept_id && $ticket->help_topic_id) {
return $query->select('tickets.help_topic_id');
}
if($ticket->dept_id && !$ticket->help_topic_id){
if ($ticket->dept_id && !$ticket->help_topic_id) {
return $query->select('tickets.dept_id');
}
}
}
public function getSystem($check,$query){
switch ($check){
public function getSystem($check, $query)
{
switch ($check) {
case 'department':
return $query->select('tickets.dept_id');
case 'helpTopic':
return $query->select('tickets.help_topic_id');
default :
default:
return $query->select('tickets.dept_id');
}
}
/**
* Register a user with username and password.
*
@@ -1399,8 +1438,8 @@ class ApiController extends Controller {
$username = $request->input('email');
$password = \Hash::make($request->input('password'));
$role = $request->input('role');
if($auth->role=='agent'){
$role = "user";
if ($auth->role == 'agent') {
$role = 'user';
}
$user = new User();
$user->password = $password;
@@ -1408,6 +1447,7 @@ class ApiController extends Controller {
$user->email = $email;
$user->role = $role;
$user->save();
return response()->json(compact('user'));
} catch (\Exception $e) {
$error = $e->getMessage();
@@ -1415,6 +1455,4 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
}
}

View File

@@ -98,7 +98,7 @@ class InstallerApiController extends Controller
$ENV['QUEUE_DRIVER'] = 'sync';
$config = '';
foreach ($ENV as $key => $val) {
$config .= "{$key}={$val}\n";
}

View File

@@ -5,33 +5,31 @@ namespace App\Http\Controllers\Api\v1;
// Controllers
use App\Http\Controllers\Controller;
// Requests
use Illuminate\Http\Request;
// Models
use App\User;
use App\Model\helpdesk\Ticket\Tickets;
use App\Model\helpdesk\Ticket\Ticket_Thread;
// Models
use App\Model\helpdesk\Ticket\Tickets;
use App\User;
use FCM;
// classes
use LaravelFCM\Message\PayloadNotificationBuilder;
use LaravelFCM\Message\Topics;
use Illuminate\Http\Request;
use LaravelFCM\Message\OptionsBuilder;
use LaravelFCM\Message\PayloadDataBuilder;
use LaravelFCM\Message\PayloadNotificationBuilder;
use LaravelFCM\Response\DownstreamResponse;
use FCM;
use FCMGroup;
/**
* **********************************************
* PushNotificationController
* **********************************************
* This controller is used to send notification to FCM cloud which later will
* foreward notification to Mobile Application
* This controller is used to send notification to FCM cloud which later will
* foreward notification to Mobile Application.
*
* @author Ladybird <info@ladybirdweb.com>
*/
class PushNotificationController extends Controller {
public function Response($token, $body, $ticket_id = null) {
class PushNotificationController extends Controller
{
public function Response($token, $body, $ticket_id = null)
{
$optionBuiler = new OptionsBuilder();
$optionBuiler->setTimeToLive(60 * 60);
@@ -41,8 +39,8 @@ class PushNotificationController extends Controller {
->setIcon('ic_stat_f1')
->setClickAction('OPEN_ACTIVITY_1');
if($ticket_id != null) {
$ticket_data = Tickets::where('id', '=', $ticket_id )->first();
if ($ticket_id != null) {
$ticket_data = Tickets::where('id', '=', $ticket_id)->first();
$thread_data = Ticket_Thread::where('ticket_id', '=', $ticket_id)->first();
$dataBuilder = new PayloadDataBuilder();
$dataBuilder->addData(['ticket_id' => $ticket_id]);
@@ -73,21 +71,24 @@ class PushNotificationController extends Controller {
$downstreamResponse->tokensToRetry();
// return Array (key:token, value:errror) - in production you should remove from your database the tokens
}
/**
* function to get the fcm token from the api under a user.
*
* @param \Illuminate\Http\Request $request
*
* @return type
*/
public function fcmToken(Request $request, User $user) {
// get the requested details
public function fcmToken(Request $request, User $user)
{
// get the requested details
$user_id = $request->input('user_id');
$fcm_token = $request->input('fcm_token');
// check for all the valid details
if($user_id != null && $user_id != "" && $fcm_token != null && $fcm_token != "") {
if ($user_id != null && $user_id != '' && $fcm_token != null && $fcm_token != '') {
// search the user_id in database
$user = $user->where('id', '=', $user_id)->first();
if($user != null) {
if ($user != null) {
$user->fcm_token = $fcm_token;
$user->save();
// success response for success case
@@ -101,5 +102,4 @@ class PushNotificationController extends Controller {
return ['response' => 'fail', 'reason' => 'Invalid Credentials'];
}
}
}

View File

@@ -50,7 +50,7 @@ class TokenAuthController extends Controller
//$credentials = $request->only('email', 'password');
try {
if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password,'active'=>1])) {
if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password, 'active' => 1])) {
return response()->json(['error' => 'invalid_credentials', 'status_code' => 401]);
}
} catch (JWTException $e) {