diff --git a/.htaccess b/.htaccess index f57bf478b3..65670e107a 100644 --- a/.htaccess +++ b/.htaccess @@ -1,17 +1,19 @@ - - Options -MultiViews - + +Options -MultiViews + - RewriteEngine On +RewriteEngine On - # Redirect Trailing Slashes... - RewriteRule ^(.*)/$ /$1 [L,R=301] +# Redirect Trailing Slashes… +#RewriteRule ^(.*)/$ /$1 [L,R=301] +RewriteCond %{HTTP_HOST} !^$ +RewriteCond %{HTTP_HOST} !^www\. [NC] +RewriteCond %{HTTPS}s ^on(s)| +RewriteRule ^ http%1://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L] - # Handle Front Controller... - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ index.php [L] +# Handle Front Controller… +RewriteCond %{REQUEST_FILENAME} !-d +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^ index.php [L] - - diff --git a/code/.gitignore b/code/.gitignore index dc150eb5da..c47965c25c 100644 --- a/code/.gitignore +++ b/code/.gitignore @@ -1,2 +1,3 @@ +/vendor /node_modules .env diff --git a/code/app/Events/ClientTicketForm.php b/code/app/Events/ClientTicketForm.php new file mode 100644 index 0000000000..ab534034e8 --- /dev/null +++ b/code/app/Events/ClientTicketForm.php @@ -0,0 +1,27 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + + } + +} diff --git a/code/app/Events/ClientTicketFormPost.php b/code/app/Events/ClientTicketFormPost.php new file mode 100644 index 0000000000..e3dc60f207 --- /dev/null +++ b/code/app/Events/ClientTicketFormPost.php @@ -0,0 +1,28 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + + } + + +} diff --git a/code/app/Events/FaveoAfterReply.php b/code/app/Events/FaveoAfterReply.php new file mode 100644 index 0000000000..0b51b947a1 --- /dev/null +++ b/code/app/Events/FaveoAfterReply.php @@ -0,0 +1,31 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + + +} diff --git a/code/app/Events/FormRegisterEvent.php b/code/app/Events/FormRegisterEvent.php new file mode 100644 index 0000000000..fe0bc0f515 --- /dev/null +++ b/code/app/Events/FormRegisterEvent.php @@ -0,0 +1,31 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + +} diff --git a/code/app/Events/LoginEvent.php b/code/app/Events/LoginEvent.php new file mode 100644 index 0000000000..8990845132 --- /dev/null +++ b/code/app/Events/LoginEvent.php @@ -0,0 +1,31 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + + +} diff --git a/code/app/Events/PostRegisterEvent.php b/code/app/Events/PostRegisterEvent.php new file mode 100644 index 0000000000..1d116ace7f --- /dev/null +++ b/code/app/Events/PostRegisterEvent.php @@ -0,0 +1,30 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + +} diff --git a/code/app/Events/ReadMailEvent.php b/code/app/Events/ReadMailEvent.php new file mode 100644 index 0000000000..f3c6b7cbd4 --- /dev/null +++ b/code/app/Events/ReadMailEvent.php @@ -0,0 +1,31 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + + +} diff --git a/code/app/Events/TicketBoxHeader.php b/code/app/Events/TicketBoxHeader.php new file mode 100644 index 0000000000..05c78ae486 --- /dev/null +++ b/code/app/Events/TicketBoxHeader.php @@ -0,0 +1,30 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + +} diff --git a/code/app/Events/TicketDetailTable.php b/code/app/Events/TicketDetailTable.php new file mode 100644 index 0000000000..b5f05a84a0 --- /dev/null +++ b/code/app/Events/TicketDetailTable.php @@ -0,0 +1,30 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + +} diff --git a/code/app/Events/TimeLineFormEvent.php b/code/app/Events/TimeLineFormEvent.php new file mode 100644 index 0000000000..3417a17731 --- /dev/null +++ b/code/app/Events/TimeLineFormEvent.php @@ -0,0 +1,30 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + +} diff --git a/code/app/Events/Timeline.php b/code/app/Events/Timeline.php new file mode 100644 index 0000000000..52cb947bac --- /dev/null +++ b/code/app/Events/Timeline.php @@ -0,0 +1,31 @@ +para1 = $para1; + $this->para2 = $para2; + $this->para3 = $para3; + $this->para4 = $para4; + $this->para5 = $para5; + } + +} diff --git a/code/app/Events/TopNavEvent.php b/code/app/Events/TopNavEvent.php new file mode 100644 index 0000000000..74c56f7e51 --- /dev/null +++ b/code/app/Events/TopNavEvent.php @@ -0,0 +1,21 @@ + + */ +class DashboardController extends Controller { + + /** + * Create a new controller instance. + * constructor to check + * 1. authentication + * 2. user roles + * 3. roles must be agent + * @return void + */ + public function __construct() { + $this->middleware('auth'); + $this->middleware('role.agent'); + } + + /** + * Show the form for creating a new resource. + * @return type Response + */ + public function index() { + try { + if(Auth::user()->role == "user"){ + return \Redirect::route('home'); + } + return View::make('themes.default1.agent.helpdesk.dashboard.dashboard'); + } catch (Exception $e) { + return view('404'); + } + } + + /** + * ChartData + * @return type + */ + public function ChartData() + { + $date2 = strtotime(Date('Y-m-d')); + $date3 = Date('Y-m-d'); + $format = 'Y-m-d'; + $date1 = strtotime(Date($format,strtotime('-1 month'. $date3))); + + $return = ""; + $last = ""; + for ( $i = $date1; $i <= $date2; $i = $i + 86400 ) { + $thisDate = date( 'Y-m-d', $i ); + + $created = \DB::table('tickets')->select('created_at')->where('created_at','LIKE','%'.$thisDate.'%')->count(); + $closed = \DB::table('tickets')->select('closed_at')->where('closed_at','LIKE','%'.$thisDate.'%')->count(); + $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at','LIKE','%'.$thisDate.'%')->count(); + + $value = ['date' => $thisDate, 'open' => $created, 'closed' => $closed, 'reopened' => $reopened]; + $array = array_map('htmlentities',$value); + $json = html_entity_decode(json_encode($array)); + $return .= $json.','; + } + $last = rtrim($return,','); + + return '['.$last.']'; + + + + // $ticketlist = DB::table('tickets') + // ->select(DB::raw('MONTH(updated_at) as month'),DB::raw('SUM(CASE WHEN status = 3 THEN 1 ELSE 0 END) as closed'),DB::raw('SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) as reopened'),DB::raw('SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) as open'), + // DB::raw('count(*) as totaltickets')) + // ->groupBy('month') + // ->orderBy('month', 'asc') + // ->get(); + + // return $ticketlist; + } + +} diff --git a/code/app/Http/Controllers/Agent/dashboard.blade.php b/code/app/Http/Controllers/Agent/dashboard.blade.php new file mode 100644 index 0000000000..e235138daf --- /dev/null +++ b/code/app/Http/Controllers/Agent/dashboard.blade.php @@ -0,0 +1,234 @@ +@extends('themes.default1.agent.layout.agent') + +@section('Dashboard') +class="active" +@stop + +@section('dashboard-bar') +active +@stop + +@section('dashboard') +class="active" +@stop + +@section('content') + +
+ + =',date('Y-m-d'))->get(); + + // echo count($tickets); + + ?> +
+

{!! Lang::get('lang.line_chart') !!}

+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+

{!! Lang::get('lang.statistics') !!}

+ +
+
+ + + + + + + + + + + +@foreach($departments as $department) +id)->where('status','=',1)->count(); +$resolve = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$department->id)->where('status','=',2)->count(); +$close = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$department->id)->where('status','=',3)->count(); +$delete = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$department->id)->where('status','=',5)->count(); + +?> + + + + + + + + + + + @endforeach +
{!! Lang::get('lang.department') !!}{!! Lang::get('lang.opened') !!}{!! Lang::get('lang.resolved') !!}{!! Lang::get('lang.closed') !!}{!! Lang::get('lang.deleted') !!}
{!! $department->name !!}{!! $open !!}{!! $resolve !!}{!! $close !!}{!! $delete !!}
+
+
+ + + + +@stop diff --git a/code/app/Http/Controllers/Agent/helpdesk/DashboardController.php b/code/app/Http/Controllers/Agent/helpdesk/DashboardController.php index a654993be1..a248eef309 100644 --- a/code/app/Http/Controllers/Agent/helpdesk/DashboardController.php +++ b/code/app/Http/Controllers/Agent/helpdesk/DashboardController.php @@ -54,14 +54,37 @@ public function index() { */ public function ChartData() { - $ticketlist = DB::table('tickets') - ->select(DB::raw('MONTH(updated_at) as month'), - DB::raw('count(*) as tickets')) - ->groupBy('month') - ->orderBy('month', 'asc') - ->get(); - - return $ticketlist; + $date2 = strtotime(Date('Y-m-d')); + $date3 = Date('Y-m-d'); + $format = 'Y-m-d'; + $date1 = strtotime(Date($format,strtotime('-1 month'. $date3))); + + $return = ""; + $last = ""; + for ( $i = $date1; $i <= $date2; $i = $i + 86400 ) { + $thisDate = date( 'Y-m-d', $i ); + + $created = \DB::table('tickets')->select('created_at')->where('created_at','LIKE','%'.$thisDate.'%')->count(); + $closed = \DB::table('tickets')->select('closed_at')->where('closed_at','LIKE','%'.$thisDate.'%')->count(); + $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at','LIKE','%'.$thisDate.'%')->count(); + + $value = ['date' => $thisDate, 'open' => $created, 'closed' => $closed, 'reopened' => $reopened]; + $array = array_map('htmlentities',$value); + $json = html_entity_decode(json_encode($array)); + $return .= $json.','; + } + $last = rtrim($return,','); + + return '['.$last.']'; + + // $ticketlist = DB::table('tickets') + // ->select(DB::raw('MONTH(updated_at) as month'),DB::raw('SUM(CASE WHEN status = 3 THEN 1 ELSE 0 END) as closed'),DB::raw('SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) as reopened'),DB::raw('SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) as open'),DB::raw('SUM(CASE WHEN status = 5 THEN 1 ELSE 0 END) as deleted'), + // DB::raw('count(*) as totaltickets')) + // ->groupBy('month') + // ->orderBy('month', 'asc') + // ->get(); + + // return $ticketlist; } } diff --git a/code/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/code/app/Http/Controllers/Agent/helpdesk/NotificationController.php new file mode 100644 index 0000000000..19304dca2b --- /dev/null +++ b/code/app/Http/Controllers/Agent/helpdesk/NotificationController.php @@ -0,0 +1,131 @@ + + */ +class NotificationController extends Controller { + + /** + * This function is for sending daily report/notification about the system + * @return mail + **/ + public function send_notification() { + // $this->test(); + $company = $this->company(); + $this->send_notification_to_admin($company); + $this->send_notification_to_team_lead($company); + $this->send_notification_to_manager($company); + $this->send_notification_to_agent($company); + } + + /** + * Admin Notification/Report + * @param company + * @return mail + **/ + public function send_notification_to_admin($company) { + // get all admin users + $users = User::where('role','=','admin')->get(); + foreach ($users as $user) { + $email = $user->email; + $user_name = $user->first_name . " " . $user->last_name; + \Mail::send('emails.notifications.admin', ['company' => $company, 'name'=>$user_name], function ($message)use ($email, $user_name, $company) { + $message->to($email, $user_name)->subject($company . ' Daily Report '); + }); + } + } + + /** + * Department Manager Notification/Report + * @return mail + **/ + public function send_notification_to_manager($company) { + $depts = Department::all(); + foreach ($depts as $dept) { + if(isset($dept->manager)) { + $dept_name = $dept->name; + $users = User::where('id','=',$dept->manager)->get(); + foreach ($users as $user) { + $email = $user->email; + $user_name = $user->first_name . " " . $user->last_name; + \Mail::send('emails.notifications.manager', ['company' => $company, 'name'=>$user_name,'dept_id' => $dept->id, 'dept_name' => $dept->name], function ($message)use ($email, $user_name, $company, $dept_name) { + $message->to($email, $user_name)->subject($company . ' Daily Report for department manager of '. $dept_name.' department.'); + }); + } + } + } + } + + /** + * Team Lead Notification/Report + * @return mail + **/ + public function send_notification_to_team_lead($company) { + $teams = Teams::all(); + foreach ($teams as $team) { + if(isset($team->team_lead)) { + $team_name = $team->name; + $users = User::where('id','=',$team->team_lead)->get(); + foreach ($users as $user) { + $email = $user->email; + $user_name = $user->first_name . " " . $user->last_name; + \Mail::send('emails.notifications.lead', ['company' => $company, 'name'=>$user_name,'team_id' => $team->id], function ($message)use ($email, $user_name, $company, $team_name) { + $message->to($email, $user_name)->subject($company . ' Daily Report for Team Lead of team '. $team_name); + }); + } + } + } + } + + /** + * Agent Notification/Report + * @return mail + **/ + public function send_notification_to_agent($company) { + // get all agents users + $users = User::where('role','=','agent')->get(); + foreach ($users as $user) { + $email = $user->email; + $user_name = $user->first_name . " " . $user->last_name; + \Mail::send('emails.notifications.agent', ['company' => $company, 'name'=>$user_name, 'user_id' => 1], function ($message)use ($email, $user_name, $company) { + $message->to($email, $user_name)->subject($company . ' Daily Report for Agents'); + }); + } + } + + /** + * company + * @return type + */ + public function company() + { + $company = Company::Where('id','=','1')->first(); + if($company->company_name == null){ + $company = "Support Center"; + }else{ + $company = $company->company_name; + } + return $company; + } + + public function test(){ + $email = "sujit.prasad@ladybirdweb.com"; + $user_name = "sujit prasad"; + \Mail::send('emails.notifications.test', ['user_id' => 1], function ($message) use($email, $user_name) { + $message->to($email, $user_name)->subject('testing reporting'); + }); + } + +} \ No newline at end of file diff --git a/code/app/Http/Controllers/Agent/helpdesk/TicketController.php b/code/app/Http/Controllers/Agent/helpdesk/TicketController.php index 0977a9a209..0f3ddcd72c 100644 --- a/code/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/code/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -304,6 +304,9 @@ public function thread($id) { public function reply(Ticket_Thread $thread, TicketRequest $request, Ticket_attachments $ta ) { $attachments = $request->file('attachment'); $check_attachment = null; + // Event fire + $eventthread = $thread->where('ticket_id',$request->input('ticket_ID'))->first();$eventuserid = $eventthread->user_id;$emailadd = User::where('id',$eventuserid)->first()->email;$source = $eventthread->source;$form_data = $request->except('ReplyContent','ticket_ID','attachment'); + \Event::fire(new \App\Events\ClientTicketFormPost($form_data,$emailadd,$source)); // dd($attachments); // } //return $attachments; @@ -389,6 +392,10 @@ public function reply(Ticket_Thread $thread, TicketRequest $request, Ticket_atta //dd($thread->id);\ // mail to main user //$path = 'C:\wamp\tmp\php5D3A.tmp'; + + // Event + \Event::fire(new \App\Events\FaveoAfterReply($reply_content,$user->phone_number,$request,$tickets)); + Mail::send(array('html'=>'emails.ticket_re-reply'), ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name'=>$username, 'Agent_Signature' => $agentsign], function ($message) use ($email, $user_name, $ticket_number, $ticket_subject, $attachments, $check_attachment) { $message->to($email, $user_name)->subject($ticket_subject . '[#' . $ticket_number . ']'); // if(isset($attachments)){ @@ -558,8 +565,11 @@ public function create_user($emailadd, $username, $subject, $body, $phone, $help $user->role = "user"; $user->active = "1"; // mail user his/her password - if ($user->save()) { + + if ($user->save()) { $user_id = $user->id; + // Event fire + \Event::fire(new \App\Events\ReadMailEvent($user_id,$password)); if (Mail::send('emails.pass', ['password' => $password, 'name' => $username, 'from'=>$company,'emailadd' => $emailadd], function ($message) use ($emailadd, $username,$company) { $message->to($emailadd, $username)->subject('Welcome to '.$company.' helpdesk'); })) { diff --git a/code/app/Http/Controllers/Auth/AuthController.php b/code/app/Http/Controllers/Auth/AuthController.php index c5b4bbe5a2..18a1cc5f6d 100644 --- a/code/app/Http/Controllers/Auth/AuthController.php +++ b/code/app/Http/Controllers/Auth/AuthController.php @@ -56,11 +56,15 @@ public function __construct(Guard $auth, Registrar $registrar) { $this->middleware('guest', ['except' => 'getLogout']); } + + /** * Get the form for registration * @return type Response */ public function getRegister() { + // Event for login + \Event::fire(new \App\Events\FormRegisterEvent()); if(Auth::user()) { if(Auth::user()->role == "admin" || Auth::user()->role == "agent") { return \Redirect::route('dashboard'); @@ -72,6 +76,7 @@ public function getRegister() { } } + /** * Post registration form * @param type User $user @@ -79,6 +84,9 @@ public function getRegister() { * @return type Response */ public function postRegister(User $user, RegisterRequest $request) { + // Event for login + \Event::fire(new \App\Events\LoginEvent($request)); + $password = Hash::make($request->input('password')); $user->password = $password; $name = $request->input('full_name'); diff --git a/code/app/Http/Controllers/Client/kb/UserController.php b/code/app/Http/Controllers/Client/kb/UserController.php index 0c4e3b9bd3..568ad1deed 100644 --- a/code/app/Http/Controllers/Client/kb/UserController.php +++ b/code/app/Http/Controllers/Client/kb/UserController.php @@ -101,13 +101,13 @@ public function getCategory($slug, Article $article, Category $category, Relatio /* get the article_id where category_id == current category */ $catid = $category->where('slug', $slug)->first(); $id = $catid->id; - $all = $relation->where('category_id', $id)->paginate(2); - $all->setPath(''); + $all = $relation->where('category_id', $id)->get(); + // $all->setPath(''); /* from whole attribute pick the article_id */ $article_id = $all->lists('article_id'); $categorys = $category->get(); /* direct to view with $article_id */ - return view('themes.default1.client.kb.article-list.category', compact('all', 'categorys', 'article_id')); + return view('themes.default1.client.kb.article-list.category', compact('all','id', 'categorys', 'article_id')); } public function home(Article $article, Category $category, Relationship $relation) { @@ -117,8 +117,8 @@ public function home(Article $article, Category $category, Relationship $relatio else { //$categorys = $category->get(); - $categorys = $category->paginate(3); - $categorys->setPath('home'); + $categorys = $category->get(); + // $categorys->setPath('home'); /* direct to view with $article_id */ return view('themes.default1.client.kb.article-list.home', compact('categorys', 'article_id')); } @@ -223,8 +223,8 @@ static function password() { public function getCategoryList(Article $article, Category $category, Relationship $relation) { //$categorys = $category->get(); - $categorys = $category->paginate(3); - $categorys->setPath('home'); + $categorys = $category->get(); + // $categorys->setPath('home'); /* direct to view with $article_id */ return view('themes.default1.client.kb.article-list.categoryList', compact('categorys', 'article_id')); diff --git a/code/app/Http/Controllers/HomeController.php b/code/app/Http/Controllers/HomeController.php index b16497f93a..fb68bbfa4d 100644 --- a/code/app/Http/Controllers/HomeController.php +++ b/code/app/Http/Controllers/HomeController.php @@ -1,5 +1,9 @@ host; } + Public function getdata(){ + return \View::make('emails/notifications/agent'); + } + + public function getreport(){ + return \View::make('test'); + } + + public function pushdata(){ + + $date2 = strtotime(Date('Y-m-d')); + $date3 = Date('Y-m-d'); + $format = 'Y-m-d'; + $date1 = strtotime(Date($format,strtotime('-1 month'. $date3))); + + $return = ""; + $last = ""; + for ( $i = $date1; $i <= $date2; $i = $i + 86400 ) { + $thisDate = date( 'Y-m-d', $i ); + + $created = \DB::table('tickets')->select('created_at')->where('created_at','LIKE','%'.$thisDate.'%')->count(); + $closed = \DB::table('tickets')->select('closed_at')->where('closed_at','LIKE','%'.$thisDate.'%')->count(); + $reopened = \DB::table('tickets')->select('reopened_at')->where('reopened_at','LIKE','%'.$thisDate.'%')->count(); + + $value = ['date' => $thisDate, 'open' => $created, 'closed' => $closed, 'reopened' => $reopened]; + $array = array_map('htmlentities',$value); + $json = html_entity_decode(json_encode($array)); + $return .= $json.','; + } + $last = rtrim($return,','); + + return '['.$last.']'; + + } + } diff --git a/code/app/Http/routes.php b/code/app/Http/routes.php index 52c76dc0cf..87198519bb 100644 --- a/code/app/Http/routes.php +++ b/code/app/Http/routes.php @@ -368,6 +368,7 @@ | */ Route::get('readmails',['as' => 'readmails', 'uses' => 'Agent\helpdesk\MailController@readmails']); +Route::get('notification',['as' => 'notification', 'uses' => 'Agent\helpdesk\NotificationController@send_notification']); /* @@ -518,3 +519,8 @@ Route::get('/inbox/data', ['as' => 'api.inbox', 'uses' => 'Agent\helpdesk\TicketController@get_inbox']); + + + +Route::get('/report','HomeController@getreport'); +Route::get('/reportdata','HomeController@pushdata'); \ No newline at end of file diff --git a/code/app/Model/helpdesk/Ticket/Tickets.php b/code/app/Model/helpdesk/Ticket/Tickets.php index 05a206aa90..f1109785b9 100644 --- a/code/app/Model/helpdesk/Ticket/Tickets.php +++ b/code/app/Model/helpdesk/Ticket/Tickets.php @@ -6,6 +6,6 @@ class Tickets extends Model { protected $table = 'tickets'; protected $fillable = [ - 'id','ticket_number','num_sequence','user_id','priority_id','sla','help_topic_id','max_open_ticket','collision_avoid','captcha','status','lock_by','lock_at','claim_response','assigned_ticket','answered_ticket','agent_mask','html','client_update','max_file_size','remember_token','created_at','updated_at' + 'id','ticket_number','num_sequence','user_id','priority_id','sla','help_topic_id','max_open_ticket','collision_avoid','captcha','status','lock_by','lock_at','claim_response','assigned_ticket','answered_ticket','agent_mask','html','client_update','max_file_size','remember_token','reopened_at','duedate','closed_at','last_message_at','last_response_at','created_at','updated_at' ]; -} +} \ No newline at end of file diff --git a/code/config/app.php b/code/config/app.php index 9f2bbada20..e5300d8bd5 100644 --- a/code/config/app.php +++ b/code/config/app.php @@ -24,7 +24,7 @@ | */ - 'version' => 'Community 1.0.2.1', + 'version' => '1.0.3', /* |-------------------------------------------------------------------------- diff --git a/code/database/migrations/2015_05_06_120651_create_ticket_table.php b/code/database/migrations/2015_05_06_120651_create_ticket_table.php index 01052b048a..2a88a89be9 100644 --- a/code/database/migrations/2015_05_06_120651_create_ticket_table.php +++ b/code/database/migrations/2015_05_06_120651_create_ticket_table.php @@ -16,8 +16,6 @@ public function up() { $table->string('ticket_number'); $table->integer('user_id'); $table->integer('dept_id'); - $table->integer('sla_id'); - $table->integer('staff_id'); $table->integer('team_id'); $table->integer('priority_id'); $table->integer('sla'); @@ -30,18 +28,16 @@ public function up() { $table->integer('lock_at'); $table->integer('source'); $table->integer('isoverdue'); - $table->date('duedate'); $table->integer('reopened'); $table->integer('isanswered'); $table->integer('html'); $table->integer('is_deleted'); $table->integer('closed'); - $table->string('last_message'); - $table->string('last_response'); - $table->dateTime('reopened_at'); - $table->dateTime('closed_at'); - $table->dateTime('last_message_at'); - $table->dateTime('last_response_at'); + $table->dateTime('reopened_at')->nullable(); + $table->dateTime('duedate')->nullable(); + $table->dateTime('closed_at')->nullable(); + $table->dateTime('last_message_at')->nullable(); + $table->dateTime('last_response_at')->nullable(); $table->timestamps(); }); } diff --git a/code/public/8513_361612538971482577_Color_Art_Wallpapers.jpg b/code/public/8513_361612538971482577_Color_Art_Wallpapers.jpg new file mode 100644 index 0000000000..710967fa1f Binary files /dev/null and b/code/public/8513_361612538971482577_Color_Art_Wallpapers.jpg differ diff --git a/code/public/8513_ii_ihyoc2s21_151864a0d59e9c13_mobilescreens.png b/code/public/8513_ii_ihyoc2s21_151864a0d59e9c13_mobilescreens.png new file mode 100644 index 0000000000..05ef0d185d Binary files /dev/null and b/code/public/8513_ii_ihyoc2s21_151864a0d59e9c13_mobilescreens.png differ diff --git a/code/resources/lang/en/lang.php b/code/resources/lang/en/lang.php index 24bbd823c1..7c54b1ae03 100644 --- a/code/resources/lang/en/lang.php +++ b/code/resources/lang/en/lang.php @@ -39,7 +39,6 @@ 'login' => 'Login', 'e-mail' => 'E-mail', 'reg_new_member' => 'Register a new membership', - 'loading' => 'Loading', /* |-------------------------------------- @@ -566,6 +565,7 @@ 'tools' => 'Tools', 'canned' => 'Canned', 'knowledge_base' => 'Knowledge Base', + 'loading' => 'Loading', /* |----------------------------------------------- @@ -824,4 +824,8 @@ 'ticket_status' => 'Ticket Status', 'post_comment' => 'Post Comment', - ); + + +'plugin' => 'Plugin', + + ); \ No newline at end of file diff --git a/code/resources/views/emails/notifications/admin.blade.php b/code/resources/views/emails/notifications/admin.blade.php new file mode 100644 index 0000000000..e6831f01ad --- /dev/null +++ b/code/resources/views/emails/notifications/admin.blade.php @@ -0,0 +1,154 @@ +name; + $created = DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count(); + $closed = DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count(); + $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->get(); + $i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + // echo "created=".$created."
"; + // echo "closed=".$closed."
"; + // echo "inprogress=".$inprogress."
"; + // echo "overdue=".$i."
"; +} + +?> + + + + + +SmoothDeal + + + + + + + + + + + + + + + + + + + + +
+ + +

+ {!! $company !!} +

+ +

+ Daily Report +

+

+ Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. +

+ +
+ + + + +

+ Overview +

+ +@foreach ($depts as $dept) + name; + $created = DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count(); + $closed = DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count(); + $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->get(); + $i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + // echo "created=".$created."
"; + // echo "closed=".$closed."
"; + // echo "inprogress=".$inprogress."
"; + // echo "overdue=".$i."
"; + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {!! $dept->name !!} +
New tickets{!! $created !!}
Closed tickets{!! $closed !!}
Inprogress tickets{!! $inprogress !!}
Overdue tickets{!! $i !!}
+ + @endforeach + + + +
+

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.  + +

+ +

+ Thank You,
Kind Regards,
{!! $company !!} +

+ + +

+ Powered by Faveo +

+ +
+ + + + diff --git a/code/resources/views/emails/notifications/agent.blade.php b/code/resources/views/emails/notifications/agent.blade.php new file mode 100644 index 0000000000..8b19378103 --- /dev/null +++ b/code/resources/views/emails/notifications/agent.blade.php @@ -0,0 +1,135 @@ +first(); + +$dept = App\Model\helpdesk\Agent\Department::where('name','=',$user->primary_dpt)->first(); + + $created = DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('created_at','LIKE','%'.$day1.'%')->count(); + $closed = DB::table('tickets')->where('dept_id','=',$dept->id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->count(); + $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('status', '=', 1)->get(); + $i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + // echo "created=".$created."
"; + // echo "closed=".$closed."
"; + // echo "inprogress=".$inprogress."
"; + // echo "overdue=".$i."
"; + +?> + + + + + +SmoothDeal + + + + + + + + + + + + + + + + + + + + + + + +
+ + +

+ {!! $company !!} +

+ +

+ Daily Report +

+

+ Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. +

+ +
+ + + + +

+ Overview +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {!! $dept->name !!} +
New tickets{!! $created !!}
Closed tickets{!! $closed !!}
Inprogress tickets{!! $inprogress !!}
Overdue tickets{!! $i !!}
+ + + +
+

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.  + +

+ +

+ Thank You,
Kind Regards,
{!! $company !!} +

+ + +

+ Powered by Faveo +

+ +
+ + + + diff --git a/code/resources/views/emails/notifications/lead.blade.php b/code/resources/views/emails/notifications/lead.blade.php new file mode 100644 index 0000000000..4a176d3271 --- /dev/null +++ b/code/resources/views/emails/notifications/lead.blade.php @@ -0,0 +1,590 @@ +name; + $created = DB::table('tickets')->select('created_at')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('created_at','LIKE','%'.$day1.'%')->count(); + + $closed = DB::table('tickets')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + + $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->count(); + + $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->get(); + + $i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + // echo "created=".$created."
"; + // echo "closed=".$closed."
"; + // echo "inprogress=".$inprogress."
"; + // echo "overdue=".$i."
"; +} + +?> + + + + + + + + + Simples-Minimalistic Responsive Template + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + +
+ FaveoHELPDESK +
+ Daily Report +
+
+
+
+ + + + + + + + +
+ + + + + + + +
 
+
+ + + + + + + + +
+ + + + + + +
+ + + + + + + +
+ + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + +
+ Hi {!! $name !!} +
+ Below mentioned are your daily reportfor your {!! $company !!}. +
+
+
+ +
+
+
+ + + +select('created_at')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('created_at','LIKE','%'.$day1.'%')->count(); + + $closed = DB::table('tickets')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + + $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->count(); + + $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->get(); + + $i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + ?> + + + + + + +
+ + + + + + +
+ + + + + + + + + + + +
 
+ + + + + + + + + + + + +
+ {!! $dept->name !!} +
+ + + + + + + + + + + + + + + + + + +
Opened{!! $created !!}
Closed{!! $closed !!}
Inprogress{!! $inprogress !!}
Overdue{!! $i !!}
+
+
+
+
+ + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ We should all work hard to guarantee that all tickets are being addressed in a timely manner. +
+ Thank You, +
+ Kind Regards, +
+ {!! $company !!} +
+
+
+ + +
+
+
+ + + + + + + + +
+ + + + + + + + + + + + +
 
 
 
+
+ + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + +
+ Powered by Faveo +
+
+
+ + + + + + + + + + + + + + + + + + +SmoothDeal + + + + + + + + + + + + + + + + + + + + + + + +
+ + +

+ {!! $company !!} +

+ +

+ Daily Report +

+

+ Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. +

+ +
+ + + + +

+ Overview +

+select('created_at')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('created_at','LIKE','%'.$day1.'%')->count(); + + $closed = DB::table('tickets')->where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + + $inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->count(); + + $overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept->id)->where('team_id','=',$team_id)->where('status', '=', 1)->get(); + + $i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {!! $dept->name !!} +
New tickets{!! $created !!}
Closed tickets{!! $closed !!}
Inprogress tickets{!! $inprogress !!}
Overdue tickets{!! $i !!}
+ + + + +
+

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.  + +

+ +

+ Thank You,
Kind Regards,
{!! $company !!} +

+ + +

+ Powered by Faveo +

+ +
+ + + + diff --git a/code/resources/views/emails/notifications/manager.blade.php b/code/resources/views/emails/notifications/manager.blade.php new file mode 100644 index 0000000000..bc67d14f70 --- /dev/null +++ b/code/resources/views/emails/notifications/manager.blade.php @@ -0,0 +1,133 @@ +select('created_at')->where('dept_id','=',$dept_id)->where('created_at','LIKE','%'.$day1.'%')->count(); + +$closed = DB::table('tickets')->where('dept_id','=',$dept_id)->where('closed_at','LIKE','%'.$day1.'%')->count(); + +$inprogress = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept_id)->where('status', '=', 1)->count(); + +$overdues = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$dept_id)->where('status', '=', 1)->get(); + +$i = 0; + foreach ($overdues as $overdue) { + $sla_plan = App\Model\helpdesk\Manage\Sla_plan::where('id','=',$overdue->sla)->first(); + $ovdate = $overdue->created_at; + $new_date = date_add($ovdate, date_interval_create_from_date_string($sla_plan->grace_period)).'

'; + if(date('Y-m-d H:i:s') > $new_date){ + $i++; + } + } + // echo "created=".$created."
"; + // echo "closed=".$closed."
"; + // echo "inprogress=".$inprogress."
"; + // echo "overdue=".$i."
"; +?> + + + + + +SmoothDeal + + + + + + + + + + + + + + + + + + + + + + + +
+ + +

+ {!! $company !!} +

+ +

+ Daily Report +

+

+ Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. +

+ +
+ + + + +

+ Overview +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {!! $dept->name !!} +
New tickets{!! $created !!}
Closed tickets{!! $closed !!}
Inprogress tickets{!! $inprogress !!}
Overdue tickets{!! $i !!}
+ + +
+

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.  + +

+ +

+ Thank You,
Kind Regards,
{!! $company !!} +

+ + +

+ Powered by Faveo +

+ +
+ + + + diff --git a/code/resources/views/emails/notifications/test.blade.php b/code/resources/views/emails/notifications/test.blade.php new file mode 100644 index 0000000000..024fe0cd7e --- /dev/null +++ b/code/resources/views/emails/notifications/test.blade.php @@ -0,0 +1,186 @@ + + + + +SmoothDeal + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +

+ Faveo HELPDESK +

+ +

+ Daily Report +

+

+ Hi Bhanu,
Below mentioned are your daily report for your Helpdesk Support system. + +

+ +
+ + + + +

+ A quick overview of our starter package +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ $ 25,00 today only! +
BandwithBandwith
WebspaceBandwith
BandwithBandwith
WebspaceBandwith
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ $ 25,00 today only! +
BandwithBandwith
WebspaceBandwith
BandwithBandwith
WebspaceBandwith
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ $ 25,00 today only! +
BandwithBandwith
WebspaceBandwith
BandwithBandwith
WebspaceBandwith
+ + + +
+

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.  + +

+ +

+ Thank You,
Kind Regards,
Faveo HELPDESK/ Ladybird Support +

+ +

+ To view or respond to the ticket, please login to the support ticket system. You're receiving this notice because + the ticket is assigned directly to you or to a team or department of which you're a member. +

+ +

+ Your friendly (although with limited patience) Customer Support System +

+ + +

+ Powered by Faveo +

+ + +
+ + + + diff --git a/code/resources/views/test.blade.php b/code/resources/views/test.blade.php new file mode 100644 index 0000000000..d1102d5f52 --- /dev/null +++ b/code/resources/views/test.blade.php @@ -0,0 +1,156 @@ +@extends('themes.default1.agent.layout.agent') + +@section('Dashboard') +class="active" +@stop + +@section('dashboard-bar') +active +@stop + +@section('dashboard') +class="active" +@stop + +@section('content') + +
+ +
+

{!! Lang::get('lang.line_chart') !!}

+
+ + +
+
+
+
+
+ +
+
+
+
+ + + + + +@stop diff --git a/code/resources/views/themes/default1/admin/layout/admin.blade.php b/code/resources/views/themes/default1/admin/layout/admin.blade.php index 957f1c2051..e35b46da7c 100644 --- a/code/resources/views/themes/default1/admin/layout/admin.blade.php +++ b/code/resources/views/themes/default1/admin/layout/admin.blade.php @@ -56,6 +56,7 @@
  • {!! Lang::get('lang.manage') !!}
  • {!! Lang::get('lang.settings') !!}
  • {!! Lang::get('lang.themes') !!}
    • +
  • {!! Lang::get('lang.plugin') !!}
    • +
    + {{-- Event fire --}} + +
    diff --git a/code/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php b/code/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php index ab2c2ccf3b..6947fdd0d5 100644 --- a/code/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php +++ b/code/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php @@ -15,14 +15,7 @@ class="active" @section('content')
    - - =',date('Y-m-d'))->get(); - - // echo count($tickets); - ?>

    {!! Lang::get('lang.line_chart') !!}

    @@ -83,75 +76,65 @@ class="active" $(function(){ $.getJSON("agen", function (result) { - - var labels = [],data=[],data2=[]; + var labels=[], open=[], closed=[], reopened=[]; + //,data2=[],data3=[],data4=[]; for (var i = 0; i < result.length; i++) { -$var12 = result[i].month; -if($var12 == 1){ - $var13 = "January"; -} -if($var12 == 2){ - $var13 = "Febuary"; -} -if($var12 == 3){ - $var13 = "March"; -} -if($var12 == 4){ - $var13 = "April"; -} -if($var12 == 5){ - $var13 = "May"; -} -if($var12 == 6){ - $var13 = "June"; -} -if($var12 == 7){ - $var13 = "July"; -} -if($var12 == 8){ - $var13 = "August"; -} -if($var12 == 9){ - $var13 = "September"; -} -if($var12 == 10){ - $var13 = "October"; -} -if($var12 == 11){ - $var13 = "November"; -} -if($var12 == 12){ - $var13 = "December"; -} - labels.push($var13); - data.push(result[i].tickets); - // data2.push(result[i].monthNum); + + // $var12 = result[i].day; + + // labels.push($var12); + labels.push(result[i].date); + open.push(result[i].open); + closed.push(result[i].closed); + reopened.push(result[i].reopened); + // data4.push(result[i].open); } var buyerData = { labels : labels, datasets : [ { - label : "Tickets" , + label : "Total Tickets" , fillColor : "rgba(240, 127, 110, 0.3)", strokeColor : "#f56954", pointColor : "#A62121", - pointStrokeColor : "#741F1F", - data : data + pointStrokeColor : "#E60073", + pointHighlightFill : "#FF4DC3", + pointHighlightStroke : "rgba(151,187,205,1)", + data : open + } + ,{ + label : "Open Tickets" , + fillColor : "rgba(255, 102, 204, 0.4)", + strokeColor : "#f56954", + pointColor : "#FF66CC", + pointStrokeColor : "#fff", + pointHighlightFill : "#FF4DC3", + pointHighlightStroke : "rgba(151,187,205,1)", + data : closed } -//, - // { - // label : "Closed Tickets", - // fillColor : "rgba(151,187,205,0.2)", - // strokeColor : "rgba(151,187,205,1)", - // pointColor : "rgba(151,187,205,1)", - // pointStrokeColor : "#fff", - // pointHighlightFill : "#fff", - // pointHighlightStroke : "rgba(151,187,205,1)", - // data : data2 - // } + ,{ + label : "Closed Tickets", + fillColor : "rgba(151,187,205,0.2)", + strokeColor : "rgba(151,187,205,1)", + pointColor : "rgba(151,187,205,1)", + pointStrokeColor : "#0000CC", + pointHighlightFill : "#0000E6", + pointHighlightStroke : "rgba(151,187,205,1)", + data : reopened + } + // ,{ + // label : "Reopened Tickets", + // fillColor : "rgba(102,255,51,0.2)", + // strokeColor : "rgba(151,187,205,1)", + // pointColor : "rgba(46,184,0,1)", + // pointStrokeColor : "#fff", + // pointHighlightFill : "#fff", + // pointHighlightStroke : "rgba(151,187,205,1)", + // data : data3 + // } ] }; diff --git a/code/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/code/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index 36e0107a62..8c4ee17987 100644 --- a/code/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/code/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -50,7 +50,10 @@ class="active"

    @if($thread->title){!! $thread->title !!} @endif

    - can_edit_ticket == 1) {?> +id)); + + if ($group->can_edit_ticket == 1) {?> @@ -195,8 +198,9 @@ class="active" @if($user->mobile !=null)Phone: {{$user->ext . $user->phone_number}}@endif {!! Lang::get('lang.source') !!}: {{$ticket_source}} {!! Lang::get('lang.help_topic') !!}: help_topic_id)->first();?>{{$help_topic->topic}} + {!! Lang::get('lang.last_message') !!}: {{$username}} - +
    @@ -204,6 +208,8 @@ class="active"
    +{{-- Event fire --}} +
    @@ -620,7 +626,11 @@ class="active"
    @endif @endif +
    + @if(!$conversation->is_internal) + + @endif id)->get(); $i = 0; diff --git a/code/resources/views/themes/default1/client/helpdesk/form.blade.php b/code/resources/views/themes/default1/client/helpdesk/form.blade.php index 20437344a6..3683a1a8fa 100644 --- a/code/resources/views/themes/default1/client/helpdesk/form.blade.php +++ b/code/resources/views/themes/default1/client/helpdesk/form.blade.php @@ -130,6 +130,9 @@ class = "active" {!! Form::textarea('Details',null,['class' => 'form-control']) !!}
    + {{-- Event fire --}} + +
    diff --git a/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php b/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php index 629b6478ca..29b5fae922 100644 --- a/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php +++ b/code/resources/views/themes/default1/client/kb/article-list/articles.blade.php @@ -10,47 +10,56 @@ class = "active" @section('breadcrumb')
    -
    1. {!! Lang::get('lang.you_are_here')!!}:
    2. {!! Lang::get('lang.home') !!}
      3. -
    3. {!! Lang::get('lang.frequently_asked_questions') !!}
      4. +
    4. {!! Lang::get('lang.knowledge_base') !!}
    5. {!! Lang::get('lang.allarticle') !!}
    @stop @section('content') -
    +
    @foreach($article as $arti) -

    {{$arti->name}}

    -
    -
      -
    •    created_at; -$time = UTC::usertimezone($utc); -?>{!! $time !!}   - id)->lists('category_id'); - foreach ($category_id as $id) { - $category = App\Model\kb\Category::where('id', $id)->first(); - ?> -    {{$category->name}}   
      • - -
    - -
    -
    - -description ?> - - -

    {!!$excerpt!!} {!! Lang::get('lang.read_more') !!}

    - - + + {{--
    --}} @endforeach
    +@stop + +@section('category') +

    {!! Lang::get('lang.categories') !!}

    + @stop \ No newline at end of file diff --git a/code/resources/views/themes/default1/client/kb/article-list/category.blade.php b/code/resources/views/themes/default1/client/kb/article-list/category.blade.php index 3c4e24506b..5d95ca2b3f 100644 --- a/code/resources/views/themes/default1/client/kb/article-list/category.blade.php +++ b/code/resources/views/themes/default1/client/kb/article-list/category.blade.php @@ -7,26 +7,28 @@ @section('kb') class = "active" @stop +first(); ?> @section('breadcrumb')
    1. {!! Lang::get('lang.you_are_here') !!}:
    2. {!! Lang::get('lang.home') !!}
      3. -
    3. {!! Lang::get('lang.allcategory') !!}
      4. +
    4. {!! Lang::get('lang.knowledge_base') !!}
      5. +
    5. {!! Lang::get('lang.category') !!}
      6. +
    6. {!! $category->name !!}
    @stop @section('content') -
    +
    - @foreach($categorys as $category) +

    {!! $category->name !!}

    - @endforeach
    get(); ?> @@ -39,7 +41,8 @@ class = "active" description; ?>
    -

    {!!$excerpt!!}


    + ]+\>/i", "", $excerpt), " \t.") ?> +

    {!! strip_tags($content) !!}

    {!! Lang::get('lang.read_more') !!}
    @@ -51,7 +54,7 @@ class = "active" @endforeach render(); + //echo $all->render(); ?>
    @@ -70,3 +73,18 @@ function toggle_visibility(id) { @stop + + +@section('category') +

    {!! Lang::get('lang.categories') !!}

    +
      + @foreach($categorys as $category) +id)->get(); +$article_id = $num->lists('article_id'); +$numcount = count($article_id); +?> +
    • {{$numcount}}{{$category->name}}
      • + @endforeach +
    +@stop \ No newline at end of file diff --git a/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php b/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php index 6dd9cecccc..e9b21b1b18 100644 --- a/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php +++ b/code/resources/views/themes/default1/client/kb/article-list/categoryList.blade.php @@ -14,8 +14,8 @@ class = "active"
    1. {!! Lang::get('lang.you_are_here')!!}:
    2. {!! Lang::get('lang.home') !!}
      3. -
    3. {!! Lang::get('lang.frequently_asked_questions') !!}
      4. -
    4. {!! Lang::get('lang.allcategory') !!}
      5. +
    5. {!! Lang::get('lang.knowledge_base') !!}
      6. +
    6. {!! Lang::get('lang.category') !!}
    @stop @@ -41,7 +41,7 @@ class = "active" ?>
    -

    {{$category->name}} ({{count($all)}})

    +

    {{$category->name}} ({{count($all)}})

      {{$arti->name}}

      - {{$arti->created_at}} + {{$arti->created_at->format('l, d-m-Y')}} description ?> @@ -72,10 +72,8 @@ class = "active" @endforeach
    -
    - {!! $categorys->render() !!} -
    @stop + diff --git a/code/resources/views/themes/default1/client/kb/article-list/home.blade.php b/code/resources/views/themes/default1/client/kb/article-list/home.blade.php index ada500d536..bf6c383362 100644 --- a/code/resources/views/themes/default1/client/kb/article-list/home.blade.php +++ b/code/resources/views/themes/default1/client/kb/article-list/home.blade.php @@ -28,22 +28,24 @@ class = "active" @endif @section('breadcrumb')
    -
    +
      -
    1. {!! Lang::get('lang.you_are_here') !!}:
      2. -
    2. {!! Lang::get('lang.knowledge_base') !!}
      3. + +
    3. {!! Lang::get('lang.you_are_here') !!}:
      4. +
    4. {!! Lang::get('lang.home') !!}
      5. +
    5. {!! Lang::get('lang.knowledge_base') !!}
    -
    +
    @stop
    - @foreach($categorys as $category) {{-- get the article_id where category_id == current category --}} id)->get(); + $all = App\Model\kb\Relationship::all(); /* from whole attribute pick the article_id */ $page = App\Model\kb\Relationship::where('category_id', '=',$category->id)->paginate('3'); /* from whole attribute pick the article_id */ @@ -59,19 +61,19 @@ class = "active"
    @endforeach - {!! $categories->setPath('show/'); !!} +
    +@stop + @section('category') -

    {!! Lang::get('lang.categories') !!}

    +

    {!! Lang::get('lang.categories') !!}