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

update 1.0.8.0

Browse Source 
Commits for version update
This commit is contained in:
Manish Verma
2016-10-17 12:02:27 +05:30
parent dec927987b
commit 76e85db070
9674 changed files with 495757 additions and 58922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,10 @@
namespace App\Http\Controllers\Api\v1;
use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController;
use App\Http\Controllers\Controller;
use App\Http\Requests\helpdesk\TicketRequest;
//use Illuminate\Support\Facades\Request as Value;
use App\Http\Requests\helpdesk\TicketRequest;
use App\Model\helpdesk\Agent\Department;
use App\Model\helpdesk\Agent\Teams;
use App\Model\helpdesk\Manage\Help_topic;
@@ -119,24 +120,9 @@ class ApiController extends Controller
*
* @return json
*/
public function createTicket()
public function createTicket(\App\Http\Requests\helpdesk\CreateTicketRequest $request, \App\Model\helpdesk\Utility\CountryCode $code)
{
try {
$v = \Validator::make($this->request->all(), [
'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',
]);
if ($v->fails()) {
$error = $v->errors();
return response()->json(compact('error'));
}
$user_id = $this->request->input('user_id');
$subject = $this->request->input('subject');
@@ -159,15 +145,19 @@ class ApiController extends Controller
/*
* return s ticket number
*/
$response = $this->ticket->createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach);
$PhpMailController = new \App\Http\Controllers\Common\PhpMailController();
$NotificationController = new \App\Http\Controllers\Common\NotificationController();
$core = new CoreTicketController($PhpMailController, $NotificationController);
$response = $core->post_newticket($request, $code, true);
//$response = $this->ticket->createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach);
//return $response;
/*
* return ticket details
*/
//dd($response);
$result = $this->thread->where('id', $response)->first();
//$result = $this->thread->where('id', $response)->first();
//$result = $this->attach($result->id,$file);
return response()->json(compact('result'));
return response()->json(compact('response'));
} catch (\Exception $e) {
$error = $e->getMessage();
$line = $e->getLine();
@@ -347,6 +337,7 @@ class ApiController extends Controller
//dd('sdhjbc');
// $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$user = \JWTAuth::parseToken()->authenticate();
$unassigned = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
->whereNull('assigned_to')->where('status', '=', 1);
@@ -361,6 +352,11 @@ class ApiController extends Controller
->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')
->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
})
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -391,7 +387,7 @@ class ApiController extends Controller
try {
// $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$user = \JWTAuth::parseToken()->authenticate();
$result = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 3)->orWhere('status', '=', 2);
@@ -406,6 +402,11 @@ class ApiController extends Controller
->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')
->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
})
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -946,6 +947,7 @@ class ApiController extends Controller
public function inbox()
{
try {
$user = \JWTAuth::parseToken()->authenticate();
$inbox = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 1);
@@ -959,7 +961,12 @@ 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', 'department.id as department_id', 'users.primary_dpt as user_dpt')
->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
})
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -1021,6 +1028,7 @@ class ApiController extends Controller
public function getTrash()
{
try {
$user = \JWTAuth::parseToken()->authenticate();
$trash = $this->user->join('tickets', function ($join) {
$join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 5);
@@ -1035,6 +1043,11 @@ class ApiController extends Controller
->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')
->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
})
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -1072,9 +1085,10 @@ class ApiController extends Controller
return response()->json(compact('error'));
}
//$user = \JWTAuth::parseToken()->authenticate();
$result = $this->user->join('tickets', function ($join) use ($id) {
$join->on('users.id', '=', 'tickets.assigned_to')
->where('status', '=', 1);
->where('status', '=', 1);
//->where('user_id', '=', $id);
})
->join('department', 'department.id', '=', 'tickets.dept_id')
@@ -1088,6 +1102,11 @@ class ApiController extends Controller
})
->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(function($query) use($user) {
// if ($user->role != 'admin') {
// $query->where('tickets.dept_id', '=', $user->primary_dpt);
// }
// })
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
->distinct()
@@ -1182,9 +1201,9 @@ class ApiController extends Controller
->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';
//$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';
$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', 'tickets.created_at', 'tickets.updated_at')->first();
return response()->json(compact('result'));
} catch (\Exception $e) {

105
app/Http/Controllers/Api/v1/PushNotificationController.php
View File

@@ -1,105 +0,0 @@
<?php
namespace App\Http\Controllers\Api\v1;
// Controllers
use App\Http\Controllers\Controller;
// Requests
use App\Model\helpdesk\Ticket\Ticket_Thread;
// Models
use App\Model\helpdesk\Ticket\Tickets;
use App\User;
use FCM;
// classes
use Illuminate\Http\Request;
use LaravelFCM\Message\OptionsBuilder;
use LaravelFCM\Message\PayloadDataBuilder;
use LaravelFCM\Message\PayloadNotificationBuilder;
use LaravelFCM\Response\DownstreamResponse;
/**
* **********************************************
* PushNotificationController
* **********************************************
* 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)
{
$optionBuiler = new OptionsBuilder();
$optionBuiler->setTimeToLive(60 * 60);
$notificationBuilder = new PayloadNotificationBuilder();
$notificationBuilder->setBody($body)
->setSound('default')
->setIcon('ic_stat_f1')
->setClickAction('OPEN_ACTIVITY_1');
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]);
$dataBuilder->addData(['ticket_number' => $ticket_data->ticket_number]);
$dataBuilder->addData(['ticket_opened_by' => $ticket_data->user_id]);
$dataBuilder->addData(['ticket_subject' => $thread_data->title]);
}
$option = $optionBuiler->build();
$notification = $notificationBuilder->build();
$data = $dataBuilder->build();
$tokens = $token;
$downstreamResponse = FCM::sendTo($tokens, $option, $notification, $data);
// $downstreamResponse = new DownstreamResponse($response, $tokens);
// dd($downstreamResponse);
$downstreamResponse->numberSuccess();
$downstreamResponse->numberFailure();
$downstreamResponse->numberModification();
// return Array - you must remove all this tokens in your database
$downstreamResponse->tokensToDelete();
// return Array (key : oldToken, value : new token - you must change the token in your database )
$downstreamResponse->tokensToModify();
// return Array - you should try to resend the message to the tokens in the array
$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
$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 != '') {
// search the user_id in database
$user = $user->where('id', '=', $user_id)->first();
if ($user != null) {
$user->fcm_token = $fcm_token;
$user->save();
// success response for success case
return ['response' => 'success'];
} else {
// failure respunse for invalid user_id in the system
return ['response' => 'fail', 'reason' => 'Invalid user_id'];
}
} else {
// failure respunse for invalid input credentials
return ['response' => 'fail', 'reason' => 'Invalid Credentials'];
}
}
}

2
app/Http/Controllers/Api/v1/TicketController.php
View File

@@ -108,8 +108,6 @@ class TicketController extends Controller
return $thread;
} catch (\Exception $e) {
dd($e);
return $e->getMessage();
}
}