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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Manish Verma
2017-09-04 09:52:33 +00:00
committed by StyleCI Bot
parent 837c99db39
commit 7a78368037
39 changed files with 1023 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/FaveoStorage/Controllers/StorageController.php
View File

@@ -250,9 +250,9 @@ class StorageController extends Controller
if ($disposition == 'INLINE' || $disposition == 'inline') { if ($disposition == 'INLINE' || $disposition == 'inline') {
$id = str_replace('>', '', str_replace('<', '', $structure->id)); $id = str_replace('>', '', str_replace('<', '', $structure->id));
$body = $thread->body; $body = $thread->body;
// dd($id,$filename,$body); // dd($id,$filename,$body);
$body = str_replace('cid:'.$id, $filename, $body); $body = str_replace('cid:'.$id, $filename, $body);
// dd($body); // dd($body);
$thread->body = $body; $thread->body = $body;
$thread->save(); $thread->save();
} }

114
app/Helper/Finder.php
View File

@@ -58,26 +58,26 @@ class Finder
return $group->first()->name; return $group->first()->name;
} }
/** /**
* STATUS TYPE * STATUS TYPE
* This function is used for returning status type name with respect to id. * This function is used for returning status type name with respect to id.
* *
* @param $id type int * @param $id type int
* @param $custom type array/null * @param $custom type array/null
* *
* @return type string * @return type string
*/ */
public static function statusType($id, $custom = null) public static function statusType($id, $custom = null)
{ {
if ($custom == null) { if ($custom == null) {
$status_type = TicketStatusType::whereId($id)->select(['name']); $status_type = TicketStatusType::whereId($id)->select(['name']);
} elseif (isset($custom)) { } elseif (isset($custom)) {
$status_type = TicketStatusType::whereId($id)->select($custom); $status_type = TicketStatusType::whereId($id)->select($custom);
}
return $status_type->first()->name;
} }
return $status_type->first()->name;
}
/** /**
* STATUS * STATUS
* This function is used for returning status name with respect to id. * This function is used for returning status name with respect to id.
@@ -137,48 +137,48 @@ class Finder
} }
} }
/** /**
* ANY TYPE STATUS * ANY TYPE STATUS
* This function is used to return the set of status which are of any type passed in the param. * This function is used to return the set of status which are of any type passed in the param.
* *
* @param type $id * @param type $id
* *
* @return type array * @return type array
*/ */
public static function anyTypeStatus($id) public static function anyTypeStatus($id)
{ {
$status_group = Ticket_Status::where('purpose_of_status', '=', $id)->select(['id'])->get(); $status_group = Ticket_Status::where('purpose_of_status', '=', $id)->select(['id'])->get();
foreach ($status_group as $status) { foreach ($status_group as $status) {
$status_group2[] = $status->id; $status_group2[] = $status->id;
}
return $status_group2;
} }
/** return $status_group2;
* RETURNS ALL STATUS }
* This function is used to return all the status given in the system.
*
* @return type array
*/
public static function getAllStatus()
{
$status = Ticket_Status::where('purpose_of_status', '!=', 3)->orwhere('purpose_of_status', '!=', 4)->get();
return $status; /**
* RETURNS ALL STATUS
* This function is used to return all the status given in the system.
*
* @return type array
*/
public static function getAllStatus()
{
$status = Ticket_Status::where('purpose_of_status', '!=', 3)->orwhere('purpose_of_status', '!=', 4)->get();
return $status;
}
/**
* VARIABLE REPLACEMENT
* This function is used to replace the replaceable variables form a given content for templates.
*/
public static function replaceTemplateVariables($variables, $data, $contents)
{
foreach ($variables as $key => $variable) {
$messagebody = str_replace($variables[$key], $data[$key], $contents);
$contents = $messagebody;
} }
/** return $contents;
* VARIABLE REPLACEMENT }
* This function is used to replace the replaceable variables form a given content for templates.
*/
public static function replaceTemplateVariables($variables, $data, $contents)
{
foreach ($variables as $key => $variable) {
$messagebody = str_replace($variables[$key], $data[$key], $contents);
$contents = $messagebody;
}
return $contents;
}
} }

2
app/Http/Controllers/Admin/helpdesk/AgentController.php
View File

@@ -271,10 +271,12 @@ class AgentController extends Controller
$team_assign_agent = $team_assign_agent->where('agent_id', $id); $team_assign_agent = $team_assign_agent->where('agent_id', $id);
$team_assign_agent->delete(); $team_assign_agent->delete();
$user = $user->whereId($id)->first(); $user = $user->whereId($id)->first();
try { try {
$error = Lang::get('lang.this_staff_is_related_to_some_tickets'); $error = Lang::get('lang.this_staff_is_related_to_some_tickets');
$user->id; $user->id;
$user->delete(); $user->delete();
throw new \Exception($error); throw new \Exception($error);
return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully')); return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully'));
} catch (\Exception $e) { } catch (\Exception $e) {

1
app/Http/Controllers/Admin/helpdesk/EmailsController.php
View File

@@ -428,6 +428,7 @@ class EmailsController extends Controller
return redirect('emails')->with('fails', Lang::get('lang.you_cannot_delete_system_default_email')); return redirect('emails')->with('fails', Lang::get('lang.you_cannot_delete_system_default_email'));
} }
} }
try { try {
// fetching the database instance of the current email // fetching the database instance of the current email
$emails = $email->whereId($id)->first(); $emails = $email->whereId($id)->first();

6
app/Http/Controllers/Admin/helpdesk/FormController.php
View File

@@ -106,6 +106,7 @@ class FormController extends Controller
return view('themes.default1.admin.helpdesk.manage.form.preview', compact('form', 'fields')); return view('themes.default1.admin.helpdesk.manage.form.preview', compact('form', 'fields'));
} }
throw new Exception("Sorry we can't find your request"); throw new Exception("Sorry we can't find your request");
} catch (Exception $ex) { } catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage()); return redirect()->back()->with('fails', $ex->getMessage());
@@ -125,6 +126,7 @@ class FormController extends Controller
'name.*' => 'required', 'name.*' => 'required',
'type.*' => 'required', 'type.*' => 'required',
]); ]);
try { try {
$forms = new Forms(); $forms = new Forms();
$require = Input::get('required'); $require = Input::get('required');
@@ -195,6 +197,7 @@ class FormController extends Controller
//dd($fields); //dd($fields);
return view('themes.default1.admin.helpdesk.manage.form.edit', compact('form', 'fields', 'select_forms')); return view('themes.default1.admin.helpdesk.manage.form.edit', compact('form', 'fields', 'select_forms'));
} }
throw new Exception("Sorry we can't find your request"); throw new Exception("Sorry we can't find your request");
} catch (Exception $ex) { } catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage()); return redirect()->back()->with('fails', $ex->getMessage());
@@ -213,6 +216,7 @@ class FormController extends Controller
//dd($fields); //dd($fields);
return view('themes.default1.admin.helpdesk.manage.form.add-child', compact('form', 'fields', 'select_forms')); return view('themes.default1.admin.helpdesk.manage.form.add-child', compact('form', 'fields', 'select_forms'));
} }
throw new Exception("Sorry we can't find your request"); throw new Exception("Sorry we can't find your request");
} catch (Exception $ex) { } catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage()); return redirect()->back()->with('fails', $ex->getMessage());
@@ -227,6 +231,7 @@ class FormController extends Controller
'name.*' => 'required', 'name.*' => 'required',
'type.*' => 'required', 'type.*' => 'required',
]); ]);
try { try {
if (!$request->input('formname')) { if (!$request->input('formname')) {
throw new Exception(Lang::get('lang.please_fill_form_name')); throw new Exception(Lang::get('lang.please_fill_form_name'));
@@ -391,6 +396,7 @@ class FormController extends Controller
public function addChild($fieldid, Request $request) public function addChild($fieldid, Request $request)
{ {
$ids = $request->except('_token'); $ids = $request->except('_token');
try { try {
foreach ($ids as $valueid => $formid) { foreach ($ids as $valueid => $formid) {
$field_value = new \App\Model\helpdesk\Form\FieldValue(); $field_value = new \App\Model\helpdesk\Form\FieldValue();

4
app/Http/Controllers/Admin/helpdesk/PriorityController.php
View File

@@ -46,7 +46,7 @@ class PriorityController extends Controller
$user_status = CommonSettings::where('option_name', '=', 'user_priority')->first(); $user_status = CommonSettings::where('option_name', '=', 'user_priority')->first();
// dd( $user_status); // dd( $user_status);
return view('themes.default1.admin.helpdesk.manage.ticket_priority.index', compact('user_status')); return view('themes.default1.admin.helpdesk.manage.ticket_priority.index', compact('user_status'));
} }
/** /**
@@ -172,7 +172,7 @@ class PriorityController extends Controller
public function destroy($priority_id) public function destroy($priority_id)
{ {
$default_priority = Ticket_Priority::where('is_default', '>', '0')->first(); $default_priority = Ticket_Priority::where('is_default', '>', '0')->first();
// dd($default_priority->is_default); // dd($default_priority->is_default);
$topic = DB::table('help_topic')->where('priority', '=', $priority_id)->update(['priority' => $default_priority->is_default]); $topic = DB::table('help_topic')->where('priority', '=', $priority_id)->update(['priority' => $default_priority->is_default]);
// if ($topic > 0) { // if ($topic > 0) {
// if ($topic > 1) { // if ($topic > 1) {

26
app/Http/Controllers/Admin/helpdesk/SettingsController2.php
View File

@@ -150,8 +150,8 @@ class SettingsController2 extends Controller
public function createStatuses(\App\Model\helpdesk\Ticket\Ticket_Status $statuss) public function createStatuses(\App\Model\helpdesk\Ticket\Ticket_Status $statuss)
{ {
// try { // try {
/* fetch the values of company from company table */ /* fetch the values of company from company table */
$statuss->name = Input::get('name'); $statuss->name = Input::get('name');
$statuss->icon_class = Input::get('icon_class'); $statuss->icon_class = Input::get('icon_class');
$statuss->email_user = Input::get('email_user'); $statuss->email_user = Input::get('email_user');
$statuss->sort = Input::get('sort'); $statuss->sort = Input::get('sort');
@@ -164,7 +164,7 @@ class SettingsController2 extends Controller
$statuss->sort = Input::get('sort'); $statuss->sort = Input::get('sort');
$statuss->save(); $statuss->save();
/* Direct to Company Settings Page */ /* Direct to Company Settings Page */
return redirect()->back()->with('success', 'Status has been created!'); return redirect()->back()->with('success', 'Status has been created!');
// } catch (Exception $ex) { // } catch (Exception $ex) {
// return redirect()->back()->with('fails', $ex->errorInfo[2]); // return redirect()->back()->with('fails', $ex->errorInfo[2]);
// } // }
@@ -175,9 +175,9 @@ class SettingsController2 extends Controller
try { try {
if ($id > 5) { if ($id > 5) {
/* fetch the values of company from company table */ /* fetch the values of company from company table */
\App\Model\helpdesk\Ticket\Ticket_Status::whereId($id)->delete(); \App\Model\helpdesk\Ticket\Ticket_Status::whereId($id)->delete();
/* Direct to Company Settings Page */ /* Direct to Company Settings Page */
return redirect()->back()->with('success', 'Status has been deleted'); return redirect()->back()->with('success', 'Status has been deleted');
} else { } else {
return redirect()->back()->with('failed', 'You cannot delete this status'); return redirect()->back()->with('failed', 'You cannot delete this status');
} }
@@ -446,12 +446,12 @@ class SettingsController2 extends Controller
public function getSchedular(Email $email, Template $template, Emails $email1) public function getSchedular(Email $email, Template $template, Emails $email1)
{ {
// try { // try {
/* fetch the values of email from Email table */ /* fetch the values of email from Email table */
$emails = $email->whereId('1')->first(); $emails = $email->whereId('1')->first();
/* Fetch the values from Template table */ /* Fetch the values from Template table */
$templates = $template->get(); $templates = $template->get();
/* Fetch the values from Emails table */ /* Fetch the values from Emails table */
$emails1 = $email1->get(); $emails1 = $email1->get();
return view('themes.default1.admin.helpdesk.settings.crone', compact('emails', 'templates', 'emails1')); return view('themes.default1.admin.helpdesk.settings.crone', compact('emails', 'templates', 'emails1'));
// } catch { // } catch {
@@ -503,7 +503,7 @@ class SettingsController2 extends Controller
// try { // try {
// /* fetch the values of access from access table */ // /* fetch the values of access from access table */
// $accesses = $access->whereId('1')->first(); // $accesses = $access->whereId('1')->first();
// // Direct to Access Settings Page // // Direct to Access Settings Page
// return view('themes.default1.admin.helpdesk.settings.access', compact('accesses')); // return view('themes.default1.admin.helpdesk.settings.access', compact('accesses'));
// } catch (Exception $e) { // } catch (Exception $e) {
// return view('404'); // return view('404');

1
app/Http/Controllers/Admin/helpdesk/SocialMedia/SocialMediaController.php
View File

@@ -32,6 +32,7 @@ class SocialMediaController extends Controller
'client_secret' => 'required', 'client_secret' => 'required',
'redirect' => 'required|url', 'redirect' => 'required|url',
]); ]);
try { try {
$requests = $request->except('_token'); $requests = $request->except('_token');
$this->insertProvider($provider, $requests); $this->insertProvider($provider, $requests);

10
app/Http/Controllers/Admin/helpdesk/TeamController.php
View File

@@ -143,16 +143,16 @@ class TeamController extends Controller
{ {
// dd($request); // dd($request);
// $id = $request->input('show_id'); // $id = $request->input('show_id');
// dd($id); // dd($id);
$users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_assign_agent.team_id', 'users.user_name', 'users.first_name', 'users.last_name', 'users.active', 'users.assign_group', 'users.primary_dpt', 'users.role') $users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_assign_agent.team_id', 'users.user_name', 'users.first_name', 'users.last_name', 'users.active', 'users.assign_group', 'users.primary_dpt', 'users.role')
->join('users', 'users.id', '=', 'team_assign_agent.agent_id') ->join('users', 'users.id', '=', 'team_assign_agent.agent_id')
->where('team_assign_agent.team_id', '=', $id); ->where('team_assign_agent.team_id', '=', $id);
// ->get(); // ->get();
// dd($users); // dd($users);
return \Datatable::query($users) return \Datatable::query($users)
->showColumns('user_name') ->showColumns('user_name')
->addColumn('first_name', function ($model) { ->addColumn('first_name', function ($model) {

10
app/Http/Controllers/Admin/helpdesk/TemplateController.php
View File

@@ -157,11 +157,11 @@ class TemplateController extends Controller
$fname = Input::get('folder_name'); $fname = Input::get('folder_name');
$filename = $directory.$fname; $filename = $directory.$fname;
// images folder creation using php // images folder creation using php
// $mydir = dirname( __FILE__ )."/html/images"; // $mydir = dirname( __FILE__ )."/html/images";
// if(!is_dir($mydir)){ // if(!is_dir($mydir)){
// mkdir("html/images"); // mkdir("html/images");
// } // }
// Move all images files // Move all images files
if (!file_exists($filename)) { if (!file_exists($filename)) {

2
app/Http/Controllers/Admin/helpdesk/UrlSettingController.php
View File

@@ -91,7 +91,7 @@ RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]\n";
public function changeHttp() public function changeHttp()
{ {
//$string = "RewriteCond %{HTTPS} off //$string = "RewriteCond %{HTTPS} off
//RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]\n"; //RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]\n";
$string = ''; $string = '';
return $string; return $string;

1
app/Http/Controllers/Admin/helpdesk/WorkflowController.php
View File

@@ -149,6 +149,7 @@ class WorkflowController extends Controller
$email_data["E-$key"] = $email; $email_data["E-$key"] = $email;
} }
$emails = $email_data; $emails = $email_data;
try { try {
return view('themes.default1.admin.helpdesk.manage.workflow.create', compact('emails')); return view('themes.default1.admin.helpdesk.manage.workflow.create', compact('emails'));
} catch (Exception $e) { } catch (Exception $e) {

2
app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php
View File

@@ -232,7 +232,7 @@ class FilterController extends Controller
public function table() public function table()
{ {
// if (Auth::user()->role == 'admin') { // if (Auth::user()->role == 'admin') {
$ticket = new Tickets(); $ticket = new Tickets();
$tickets = $ticket $tickets = $ticket
->leftJoin('ticket_thread', function ($join) { ->leftJoin('ticket_thread', function ($join) {
$join->on('tickets.id', '=', 'ticket_thread.ticket_id') $join->on('tickets.id', '=', 'ticket_thread.ticket_id')

28
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -284,24 +284,22 @@ class TicketController extends Controller
if ($result[1]) { if ($result[1]) {
$status = $this->checkUserVerificationStatus(); $status = $this->checkUserVerificationStatus();
if ($status == 1) { if ($status == 1) {
if ($api != false) if ($api != false) {
{
$ticket = Tickets::where('ticket_number', '=', $result[0])->select('id')->first(); $ticket = Tickets::where('ticket_number', '=', $result[0])->select('id')->first();
return ['ticket_id' => $ticket->id, 'message' => Lang::get('lang.Ticket-created-successfully')]; return ['ticket_id' => $ticket->id, 'message' => Lang::get('lang.Ticket-created-successfully')];
} }
return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully')); return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully'));
} else { } else {
if ($api != false) if ($api != false) {
{
return response()->json(['success' => Lang::get('lang.Ticket-created-successfully')]); return response()->json(['success' => Lang::get('lang.Ticket-created-successfully')]);
} }
return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully2')); return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully2'));
} }
} else { } else {
if ($api != false) if ($api != false) {
{
return response()->json(['error' => Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken')], 500); return response()->json(['error' => Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken')], 500);
} }
@@ -309,8 +307,7 @@ class TicketController extends Controller
} }
} catch (Exception $e) { } catch (Exception $e) {
dd($e); dd($e);
if ($api != false) if ($api != false) {
{
return response()->json(['error' => $e->getMessage()], 500); return response()->json(['error' => $e->getMessage()], 500);
} }
@@ -403,6 +400,7 @@ class TicketController extends Controller
public function reply(Ticket_Thread $thread, Request $request, Ticket_attachments $ta, $mail = true, $system_reply = true, $user_id = '') public function reply(Ticket_Thread $thread, Request $request, Ticket_attachments $ta, $mail = true, $system_reply = true, $user_id = '')
{ {
\Event::fire('reply.request', [$request]); \Event::fire('reply.request', [$request]);
try { try {
if (is_array($request->file('attachment'))) { if (is_array($request->file('attachment'))) {
} else { } else {
@@ -815,6 +813,7 @@ class TicketController extends Controller
} }
// Event fire // Event fire
\Event::fire(new \App\Events\ReadMailEvent($user_id, $password)); \Event::fire(new \App\Events\ReadMailEvent($user_id, $password));
try { try {
if ($auto_response == 0) { if ($auto_response == 0) {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->first_name, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $user->first_name, 'email_address' => $emailadd, 'user_password' => $password]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->first_name, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $user->first_name, 'email_address' => $emailadd, 'user_password' => $password]);
@@ -867,6 +866,7 @@ class TicketController extends Controller
} }
} else { } else {
$body2 = null; $body2 = null;
try { try {
if ($auto_response == 0) { if ($auto_response == 0) {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'],
@@ -1234,10 +1234,10 @@ class TicketController extends Controller
} else { } else {
$ticket_status = $ticket->where('id', '=', $id)->first(); $ticket_status = $ticket->where('id', '=', $id)->first();
} }
// checking for unautherised access attempt on other than owner ticket id // checking for unautherised access attempt on other than owner ticket id
if ($ticket_status == null) { if ($ticket_status == null) {
return redirect()->route('unauth'); return redirect()->route('unauth');
} }
$ticket_status->status = 3; $ticket_status->status = 3;
$ticket_status->closed = 1; $ticket_status->closed = 1;
$ticket_status->closed_at = date('Y-m-d H:i:s'); $ticket_status->closed_at = date('Y-m-d H:i:s');
@@ -1265,6 +1265,7 @@ class TicketController extends Controller
} else { } else {
$from_email = $sending_emails->id; $from_email = $sending_emails->id;
} }
try { try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]);
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -1501,6 +1502,7 @@ class TicketController extends Controller
$agent_email = $user_detail->email; $agent_email = $user_detail->email;
$ticket_link = route('ticket.thread', $id); $ticket_link = route('ticket.thread', $id);
$master = Auth::user()->first_name.' '.Auth::user()->last_name; $master = Auth::user()->first_name.' '.Auth::user()->last_name;
try { try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master, 'ticket_link' => $ticket_link]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master, 'ticket_link' => $ticket_link]);
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -1634,6 +1636,7 @@ class TicketController extends Controller
$create_user->password = Hash::make($password); $create_user->password = Hash::make($password);
$create_user->save(); $create_user->save();
$user_id = $create_user->id; $user_id = $create_user->id;
try { try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -2321,6 +2324,7 @@ class TicketController extends Controller
$user->role = 'user'; $user->role = 'user';
if ($user->save()) { if ($user->save()) {
$user_id = $user->id; $user_id = $user->id;
try { try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
} catch (\Exception $e) { } catch (\Exception $e) {

68
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -149,7 +149,7 @@ class UserController extends Controller
} }
// displaying list of users with chumper datatables // displaying list of users with chumper datatables
// return \Datatable::collection(User::where('role', "!=", "admin")->get()) // return \Datatable::collection(User::where('role', "!=", "admin")->get())
return \Datatables::of($users) return \Datatables::of($users)
/* column username */ /* column username */
->removeColumn('id', 'last_name', 'country_code', 'phone_number') ->removeColumn('id', 'last_name', 'country_code', 'phone_number')
->addColumn('user_name', function ($model) { ->addColumn('user_name', function ($model) {
@@ -218,14 +218,14 @@ class UserController extends Controller
if (Auth::user()->role == 'admin') { if (Auth::user()->role == 'admin') {
// @if(Auth::user()->role == 'admin') // @if(Auth::user()->role == 'admin')
return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>'; return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
} }
if (Auth::user()->role == 'agent') { if (Auth::user()->role == 'agent') {
// @if(Auth::user()->role == 'admin') // @if(Auth::user()->role == 'admin')
if ($model->role == 'user') { if ($model->role == 'user') {
return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>'; return '<a href="'.route('user.show', $model->id).'" class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>';
} }
} }
} }
}) })
@@ -235,7 +235,7 @@ class UserController extends Controller
public function restoreUser($id) public function restoreUser($id)
{ {
// dd($id); // dd($id);
// $delete_all = Input::get('delete_all'); // $delete_all = Input::get('delete_all');
$users = User::where('id', '=', $id)->first(); $users = User::where('id', '=', $id)->first();
$users->is_delete = 0; $users->is_delete = 0;
$users->active = 1; $users->active = 1;
@@ -298,6 +298,7 @@ class UserController extends Controller
$password = $this->generateRandomString(); $password = $this->generateRandomString();
$user->password = Hash::make($password); $user->password = Hash::make($password);
$user->role = 'user'; $user->role = 'user';
try { try {
if ($request->get('country_code') == '' && ($request->get('phone_number') != '' || $request->get('mobile') != '')) { if ($request->get('country_code') == '' && ($request->get('phone_number') != '' || $request->get('mobile') != '')) {
return redirect()->back()->with(['fails' => Lang::get('lang.country-code-required-error'), 'country_code_error' => 1])->withInput(); return redirect()->back()->with(['fails' => Lang::get('lang.country-code-required-error'), 'country_code_error' => 1])->withInput();
@@ -514,19 +515,19 @@ class UserController extends Controller
// $ticket_logic4 = User_org::where('user_id', '=', $id)->update(['user_id' => $assign_to[1]]); // $ticket_logic4 = User_org::where('user_id', '=', $id)->update(['user_id' => $assign_to[1]]);
// } // }
// $thread2 = Ticket_Thread::where('ticket_id', '=', $ticket->id)->first(); // $thread2 = Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
// $thread2->body = 'This Ticket have been Reassigned to' .' '. $assignee; // $thread2->body = 'This Ticket have been Reassigned to' .' '. $assignee;
// $thread2->save(); // $thread2->save();
// UserNotification::where('notification_id', '=', $ticket->id)->delete(); // UserNotification::where('notification_id', '=', $ticket->id)->delete();
// $users = User::where('id', '=', $id)->get(); // $users = User::where('id', '=', $id)->get();
// $organization = User_org::where('user_id', '=', $id)->delete(); // $organization = User_org::where('user_id', '=', $id)->delete();
// Assign_team_agent::where('agent_id', '=', $id)->update(['agent_id' => $assign_to[1]]); // Assign_team_agent::where('agent_id', '=', $id)->update(['agent_id' => $assign_to[1]]);
$tickets = Tickets::where('assigned_to', '=', $id)->get(); $tickets = Tickets::where('assigned_to', '=', $id)->get();
foreach ($tickets as $ticket) { foreach ($tickets as $ticket) {
// code... // code...
$ticket->assigned_to = $assign_to[1]; $ticket->assigned_to = $assign_to[1];
$user_detail = User::where('id', '=', $assign_to[1])->first(); $user_detail = User::where('id', '=', $assign_to[1])->first();
$assignee = $user_detail->first_name.' '.$user_detail->last_name; $assignee = $user_detail->first_name.' '.$user_detail->last_name;
$ticket_number = $ticket->ticket_number; $ticket_number = $ticket->ticket_number;
@@ -561,20 +562,20 @@ class UserController extends Controller
} elseif ($delete_all == 1) { } elseif ($delete_all == 1) {
if ($delete_all) { if ($delete_all) {
// dd('here'); // dd('here');
$tickets = Tickets::where('assigned_to', '=', $id)->get(); $tickets = Tickets::where('assigned_to', '=', $id)->get();
// dd($tickets); // dd($tickets);
foreach ($tickets as $ticket) { foreach ($tickets as $ticket) {
$ticket->assigned_to = null; $ticket->assigned_to = null;
$ticket_number = $ticket->ticket_number; $ticket_number = $ticket->ticket_number;
$ticket->save(); $ticket->save();
$thread = new Ticket_Thread(); $thread = new Ticket_Thread();
$thread->ticket_id = $ticket->id; $thread->ticket_id = $ticket->id;
$thread->user_id = Auth::user()->id; $thread->user_id = Auth::user()->id;
$thread->is_internal = 1; $thread->is_internal = 1;
$thread->body = 'This Ticket has been unassigned '; $thread->body = 'This Ticket has been unassigned ';
$thread->save(); $thread->save();
} }
// $users = User::where('id', '=', $id)->get(); // $users = User::where('id', '=', $id)->get();
$user = User::find($id); $user = User::find($id);
$users->is_delete = 1; $users->is_delete = 1;
@@ -708,6 +709,7 @@ class UserController extends Controller
public function getProfile() public function getProfile()
{ {
$user = Auth::user(); $user = Auth::user();
try { try {
return view('themes.default1.agent.helpdesk.user.profile', compact('user')); return view('themes.default1.agent.helpdesk.user.profile', compact('user'));
} catch (Exception $e) { } catch (Exception $e) {
@@ -727,6 +729,7 @@ class UserController extends Controller
$phonecode = $code->where('iso', '=', $location->iso_code)->first(); $phonecode = $code->where('iso', '=', $location->iso_code)->first();
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
$status = $settings->status; $status = $settings->status;
try { try {
return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user')) return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'))
->with(['phonecode' => $phonecode->phonecode, ->with(['phonecode' => $phonecode->phonecode,
@@ -766,13 +769,13 @@ class UserController extends Controller
$name = Input::file('profile_pic')->getClientOriginalName(); $name = Input::file('profile_pic')->getClientOriginalName();
// dd($name); // dd($name);
// dd(str_replace(" ", "_", $name)); // dd(str_replace(" ", "_", $name));
// fetching upload destination path // fetching upload destination path
$destinationPath = 'uploads/profilepic'; $destinationPath = 'uploads/profilepic';
// adding a random value to profile picture filename // adding a random value to profile picture filename
$fileName = rand(0000, 9999).'.'.str_replace(' ', '_', $name); $fileName = rand(0000, 9999).'.'.str_replace(' ', '_', $name);
// moving the picture to a destination folder // moving the picture to a destination folder
Input::file('profile_pic')->move($destinationPath, $fileName); Input::file('profile_pic')->move($destinationPath, $fileName);
// saving filename to database // saving filename to database
$user->profile_pic = $fileName; $user->profile_pic = $fileName;
} }
if ($request->get('mobile')) { if ($request->get('mobile')) {
@@ -805,6 +808,7 @@ class UserController extends Controller
// checking if the old password matches the new password // checking if the old password matches the new password
if (Hash::check($request->input('old_password'), $user->getAuthPassword())) { if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
$user->password = Hash::make($request->input('new_password')); $user->password = Hash::make($request->input('new_password'));
try { try {
$user->save(); $user->save();

3
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -51,6 +51,7 @@ class PageController extends Controller
{ {
$pages = $this->page->paginate(3); $pages = $this->page->paginate(3);
$pages->setPath('page'); $pages->setPath('page');
try { try {
return view('themes.default1.agent.kb.pages.index', compact('pages')); return view('themes.default1.agent.kb.pages.index', compact('pages'));
} catch (Exception $e) { } catch (Exception $e) {
@@ -128,6 +129,7 @@ class PageController extends Controller
$sl = $request->input('name'); $sl = $request->input('name');
$slug = str_slug($sl, '-'); $slug = str_slug($sl, '-');
$this->page->slug = $slug; $this->page->slug = $slug;
try { try {
$this->page->fill($request->input())->save(); $this->page->fill($request->input())->save();
@@ -169,6 +171,7 @@ class PageController extends Controller
$pages = $this->page->where('slug', $slug)->first(); $pages = $this->page->where('slug', $slug)->first();
$sl = $request->input('name'); $sl = $request->input('name');
$slug = str_slug($sl, '-'); $slug = str_slug($sl, '-');
try { try {
$pages->fill($request->all())->save(); $pages->fill($request->all())->save();
$pages->slug = $slug; $pages->slug = $slug;

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

File diff suppressed because it is too large Load Diff

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

@@ -32,7 +32,6 @@ use Mail;
*/ */
class TicketController extends Controller class TicketController extends Controller
{ {
/** /**
* Create a new controller instance. * Create a new controller instance.
* *
@@ -40,7 +39,7 @@ class TicketController extends Controller
*/ */
public function __construct() public function __construct()
{ {
$PhpMailController = new PhpMailController(); $PhpMailController = new PhpMailController();
$this->PhpMailController = $PhpMailController; $this->PhpMailController = $PhpMailController;
} }
@@ -58,51 +57,42 @@ class TicketController extends Controller
*/ */
public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '') public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '')
{ {
try try {
{
//return $headers; //return $headers;
$max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first(); $max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first();
//dd($max_number); //dd($max_number);
if ($max_number == null) if ($max_number == null) {
{
$ticket_number = 'AAAA-9999-9999999'; $ticket_number = 'AAAA-9999-9999999';
} } else {
else foreach ($max_number as $number) {
{
foreach ($max_number as $number)
{
$ticket_number = $max_number->ticket_number; $ticket_number = $max_number->ticket_number;
} }
} }
$ticket = new Tickets(); $ticket = new Tickets();
$ticket->ticket_number = $this->ticketNumber($ticket_number); $ticket->ticket_number = $this->ticketNumber($ticket_number);
//dd($this->ticketNumber($ticket_number)); //dd($this->ticketNumber($ticket_number));
$ticket->user_id = $user_id; $ticket->user_id = $user_id;
$ticket->dept_id = $dept; $ticket->dept_id = $dept;
$ticket->help_topic_id = $helptopic; $ticket->help_topic_id = $helptopic;
$ticket->sla = $sla; $ticket->sla = $sla;
$ticket->assigned_to = $assignto; $ticket->assigned_to = $assignto;
$ticket->status = '1'; $ticket->status = '1';
$ticket->priority_id = $priority; $ticket->priority_id = $priority;
$ticket->source = $source; $ticket->source = $source;
$ticket->save(); $ticket->save();
//dd($ticket); //dd($ticket);
$ticket_number = $ticket->ticket_number; $ticket_number = $ticket->ticket_number;
$id = $ticket->id; $id = $ticket->id;
if ($form_data != null) if ($form_data != null) {
{
$help_topic = Help_topic::where('id', '=', $helptopic)->first(); $help_topic = Help_topic::where('id', '=', $helptopic)->first();
$forms = Fields::where('forms_id', '=', $help_topic->custom_form)->get(); $forms = Fields::where('forms_id', '=', $help_topic->custom_form)->get();
foreach ($form_data as $key => $form_details) foreach ($form_data as $key => $form_details) {
{ foreach ($forms as $from) {
foreach ($forms as $from) if ($from->name == $key) {
{ $form_value = new Ticket_Form_Data();
if ($from->name == $key)
{
$form_value = new Ticket_Form_Data();
$form_value->ticket_id = $id; $form_value->ticket_id = $id;
$form_value->title = $from->label; $form_value->title = $from->label;
$form_value->content = $form_details; $form_value->content = $form_details;
$form_value->save(); $form_value->save();
} }
} }
@@ -112,15 +102,12 @@ class TicketController extends Controller
$this->storeCollaborators($headers, $id); $this->storeCollaborators($headers, $id);
$thread = $this->ticketThread($subject, $body, $id, $user_id); $thread = $this->ticketThread($subject, $body, $id, $user_id);
if (!empty($attach)) if (!empty($attach)) {
{
$this->attach($thread, $attach); $this->attach($thread, $attach);
} }
return $thread; return $thread;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -134,52 +121,44 @@ class TicketController extends Controller
*/ */
public function storeCollaborators($headers, $id) public function storeCollaborators($headers, $id)
{ {
try try {
{
//return $headers; //return $headers;
$company = $this->company(); $company = $this->company();
if (isset($headers)) if (isset($headers)) {
{ foreach ($headers as $email) {
foreach ($headers as $email) $name = $email;
{
$name = $email;
$email = $email; $email = $email;
if ($this->checkEmail($email) == false) if ($this->checkEmail($email) == false) {
{ $create_user = new User();
$create_user = new User();
$create_user->user_name = $name; $create_user->user_name = $name;
$create_user->email = $email; $create_user->email = $email;
$create_user->active = 1; $create_user->active = 1;
$create_user->role = 'user'; $create_user->role = 'user';
$password = $this->generateRandomString(); $password = $this->generateRandomString();
$create_user->password = Hash::make($password); $create_user->password = Hash::make($password);
$create_user->save(); $create_user->save();
$user_id = $create_user->id; $user_id = $create_user->id;
// Mail::send('emails.pass', ['password' => $password, 'name' => $name, 'from' => $company, 'emailadd' => $email], function ($message) use ($email, $name) { // Mail::send('emails.pass', ['password' => $password, 'name' => $name, 'from' => $company, 'emailadd' => $email], function ($message) use ($email, $name) {
// $message->to($email, $name)->subject('password'); // $message->to($email, $name)->subject('password');
// }); // });
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
} } else {
else $user = $this->checkEmail($email);
{
$user = $this->checkEmail($email);
$user_id = $user->id; $user_id = $user->id;
} }
//return $user_id; //return $user_id;
$collaborator_store = new Ticket_Collaborator(); $collaborator_store = new Ticket_Collaborator();
$collaborator_store->isactive = 1; $collaborator_store->isactive = 1;
$collaborator_store->ticket_id = $id; $collaborator_store->ticket_id = $id;
$collaborator_store->user_id = $user_id; $collaborator_store->user_id = $user_id;
$collaborator_store->role = 'ccc'; $collaborator_store->role = 'ccc';
$collaborator_store->save(); $collaborator_store->save();
} }
} }
return true; return true;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -196,20 +175,17 @@ class TicketController extends Controller
*/ */
public function ticketThread($subject, $body, $id, $user_id) public function ticketThread($subject, $body, $id, $user_id)
{ {
try try {
{ $thread = new Ticket_Thread();
$thread = new Ticket_Thread(); $thread->user_id = $user_id;
$thread->user_id = $user_id;
$thread->ticket_id = $id; $thread->ticket_id = $id;
$thread->poster = 'client'; $thread->poster = 'client';
$thread->title = $subject; $thread->title = $subject;
$thread->body = $body; $thread->body = $body;
$thread->save(); $thread->save();
return $thread->id; return $thread->id;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -223,24 +199,20 @@ class TicketController extends Controller
*/ */
public function ticketNumber($ticket_number) public function ticketNumber($ticket_number)
{ {
try try {
{
//dd($ticket_number); //dd($ticket_number);
$number = $ticket_number; $number = $ticket_number;
$number = explode('-', $number); $number = explode('-', $number);
$number1 = $number[0]; $number1 = $number[0];
if ($number1 == 'ZZZZ') if ($number1 == 'ZZZZ') {
{
$number1 = 'AAAA'; $number1 = 'AAAA';
} }
$number2 = $number[1]; $number2 = $number[1];
if ($number2 == '9999') if ($number2 == '9999') {
{
$number2 = '0000'; $number2 = '0000';
} }
$number3 = $number[2]; $number3 = $number[2];
if ($number3 == '9999999') if ($number3 == '9999999') {
{
$number3 = '0000000'; $number3 = '0000000';
} }
$number1++; $number1++;
@@ -248,13 +220,11 @@ class TicketController extends Controller
$number3++; $number3++;
$number2 = sprintf('%04s', $number2); $number2 = sprintf('%04s', $number2);
$number3 = sprintf('%07s', $number3); $number3 = sprintf('%07s', $number3);
$array = [$number1, $number2, $number3]; $array = [$number1, $number2, $number3];
$number = implode('-', $array); $number = implode('-', $array);
return $number; return $number;
} } catch (\Exception $e) {
catch (\Exception $e)
{
dd($e); dd($e);
return $e->getMessage(); return $e->getMessage();
@@ -270,20 +240,16 @@ class TicketController extends Controller
*/ */
public function generateRandomString($length = 10) public function generateRandomString($length = 10)
{ {
try try {
{ $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters); $charactersLength = strlen($characters);
$randomString = ''; $randomString = '';
for ($i = 0; $i < $length; $i++) for ($i = 0; $i < $length; $i++) {
{
$randomString .= $characters[rand(0, $charactersLength - 1)]; $randomString .= $characters[rand(0, $charactersLength - 1)];
} }
return $randomString; return $randomString;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -298,71 +264,64 @@ class TicketController extends Controller
*/ */
public function reply($thread, $request, $ta, $attach = '') public function reply($thread, $request, $ta, $attach = '')
{ {
try try {
{
$check_attachment = null; $check_attachment = null;
$eventthread = $thread->where('ticket_id', $request->input('ticket_ID'))->first(); $eventthread = $thread->where('ticket_id', $request->input('ticket_ID'))->first();
//dd($request->input('ticket_ID')); //dd($request->input('ticket_ID'));
//dd($eventthread); //dd($eventthread);
$eventuserid = $eventthread->user_id; $eventuserid = $eventthread->user_id;
$emailadd = User::where('id', $eventuserid)->first()->email; $emailadd = User::where('id', $eventuserid)->first()->email;
//dd($emailadd); //dd($emailadd);
$source = $eventthread->source; $source = $eventthread->source;
$form_data = $request->except('reply_content', 'ticket_ID', 'attachment'); $form_data = $request->except('reply_content', 'ticket_ID', 'attachment');
\Event::fire(new \App\Events\ClientTicketFormPost($form_data, $emailadd, $source)); \Event::fire(new \App\Events\ClientTicketFormPost($form_data, $emailadd, $source));
//dd('yes'); //dd('yes');
$reply_content = $request->input('reply_content'); $reply_content = $request->input('reply_content');
$thread->ticket_id = $request->input('ticket_ID'); $thread->ticket_id = $request->input('ticket_ID');
$thread->poster = 'support'; $thread->poster = 'support';
$thread->body = $request->input('reply_content'); $thread->body = $request->input('reply_content');
$thread->user_id = Auth::user()->id; $thread->user_id = Auth::user()->id;
$ticket_id = $request->input('ticket_ID'); $ticket_id = $request->input('ticket_ID');
$tickets = Tickets::where('id', '=', $ticket_id)->first(); $tickets = Tickets::where('id', '=', $ticket_id)->first();
$tickets->isanswered = '1'; $tickets->isanswered = '1';
$tickets->save(); $tickets->save();
$ticket_user = User::where('id', '=', $tickets->user_id)->first(); $ticket_user = User::where('id', '=', $tickets->user_id)->first();
if ($tickets->assigned_to == 0) if ($tickets->assigned_to == 0) {
{
$tickets->assigned_to = Auth::user()->id; $tickets->assigned_to = Auth::user()->id;
$tickets->save(); $tickets->save();
$thread2 = new Ticket_Thread(); $thread2 = new Ticket_Thread();
$thread2->ticket_id = $thread->ticket_id; $thread2->ticket_id = $thread->ticket_id;
$thread2->user_id = Auth::user()->id; $thread2->user_id = Auth::user()->id;
$thread2->is_internal = 1; $thread2->is_internal = 1;
$thread2->body = 'This Ticket have been assigned to ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; $thread2->body = 'This Ticket have been assigned to '.Auth::user()->first_name.' '.Auth::user()->last_name;
$thread2->save(); $thread2->save();
} }
if ($tickets->status > 1) if ($tickets->status > 1) {
{ $tickets->status = '1';
$tickets->status = '1';
$tickets->isanswered = '1'; $tickets->isanswered = '1';
$tickets->save(); $tickets->save();
} }
$thread->save(); $thread->save();
if (!empty($attach)) if (!empty($attach)) {
{
$check_attachment = $this->attach($thread->id, $attach); $check_attachment = $this->attach($thread->id, $attach);
} }
$thread1 = Ticket_Thread::where('ticket_id', '=', $ticket_id)->first(); $thread1 = Ticket_Thread::where('ticket_id', '=', $ticket_id)->first();
$ticket_subject = $thread1->title; $ticket_subject = $thread1->title;
$user_id = $tickets->user_id; $user_id = $tickets->user_id;
$user = User::where('id', '=', $user_id)->first(); $user = User::where('id', '=', $user_id)->first();
$email = $user->email; $email = $user->email;
$user_name = $user->user_name; $user_name = $user->user_name;
$ticket_number = $tickets->ticket_number; $ticket_number = $tickets->ticket_number;
$company = $this->company(); $company = $this->company();
$username = $ticket_user->user_name; $username = $ticket_user->user_name;
if (!empty(Auth::user()->agent_sign)) if (!empty(Auth::user()->agent_sign)) {
{
$agentsign = Auth::user()->agent_sign; $agentsign = Auth::user()->agent_sign;
} } else {
else
{
$agentsign = null; $agentsign = null;
} }
\Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets)); \Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets));
@@ -370,67 +329,54 @@ class TicketController extends Controller
// 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, $check_attachment) { // 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, $check_attachment) {
// $message->to($email, $user_name)->subject($ticket_subject . '[#' . $ticket_number . ']'); // $message->to($email, $user_name)->subject($ticket_subject . '[#' . $ticket_number . ']');
// // if(isset($attachments)){ // // if(isset($attachments)){
// // if ($check_attachment == 1) { // // if ($check_attachment == 1) {
// // $size = count($attach); // // $size = count($attach);
// // for ($i = 0; $i < $size; $i++) { // // for ($i = 0; $i < $size; $i++) {
// // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]); // // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]);
// // } // // }
// // } // // }
// }, true); // }, true);
//dd('reply'); //dd('reply');
/* /*
* Getting the subject of the thread * Getting the subject of the thread
*/ */
//dd($eventthread); //dd($eventthread);
try try {
{ $re = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $eventthread->title, 'scenario' => 'create-ticket-by-agent', 'body' => $thread->body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $tickets->number]);
$re = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $eventthread->title, 'scenario' => 'create-ticket-by-agent', 'body' => $thread->body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $tickets->number]);
//dd($re); //dd($re);
} } catch (\Exception $e) {
catch (\Exception $e)
{
//throw new \Exception($e->getMessage()); //throw new \Exception($e->getMessage());
} }
$collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get(); $collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get();
foreach ($collaborators as $collaborator) foreach ($collaborators as $collaborator) {
{
//mail to collaborators //mail to collaborators
$collab_user_id = $collaborator->user_id; $collab_user_id = $collaborator->user_id;
$user_id_collab = User::where('id', '=', $collab_user_id)->first(); $user_id_collab = User::where('id', '=', $collab_user_id)->first();
$collab_email = $user_id_collab->email; $collab_email = $user_id_collab->email;
if ($user_id_collab->role == 'user') if ($user_id_collab->role == 'user') {
{
$collab_user_name = $user_id_collab->user_name; $collab_user_name = $user_id_collab->user_name;
} } else {
else $collab_user_name = $user_id_collab->first_name.' '.$user_id_collab->last_name;
{
$collab_user_name = $user_id_collab->first_name . ' ' . $user_id_collab->last_name;
} }
// Mail::send('emails.ticket_re-reply', ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $collab_user_name, 'Agent_Signature' => $agentsign], function ($message) use ($collab_email, $collab_user_name, $ticket_number, $ticket_subject, $check_attachment) { // Mail::send('emails.ticket_re-reply', ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $collab_user_name, 'Agent_Signature' => $agentsign], function ($message) use ($collab_email, $collab_user_name, $ticket_number, $ticket_subject, $check_attachment) {
// $message->to($collab_email, $collab_user_name)->subject($ticket_subject . '[#' . $ticket_number . ']'); // $message->to($collab_email, $collab_user_name)->subject($ticket_subject . '[#' . $ticket_number . ']');
// // if ($check_attachment == 1) { // // if ($check_attachment == 1) {
// // $size = sizeOf($attachments); // // $size = sizeOf($attachments);
// // for ($i = 0; $i < $size; $i++) { // // for ($i = 0; $i < $size; $i++) {
// // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]); // // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]);
// // } // // }
// // } // // }
// }, true); // }, true);
try try {
{ $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]); } catch (\Exception $e) {
}
catch (\Exception $e)
{
} }
} }
return $thread; return $thread;
} } catch (\Exception $e) {
catch (\Exception $e)
{
//dd($e); //dd($e);
return $e->getMessage(); return $e->getMessage();
} }
@@ -443,22 +389,16 @@ class TicketController extends Controller
*/ */
public function company() public function company()
{ {
try try {
{
$company = Company::Where('id', '=', '1')->first(); $company = Company::Where('id', '=', '1')->first();
if ($company->company_name == null) if ($company->company_name == null) {
{
$company = 'Support Center'; $company = 'Support Center';
} } else {
else
{
$company = $company->company_name; $company = $company->company_name;
} }
return $company; return $company;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -473,27 +413,26 @@ class TicketController extends Controller
*/ */
public function ticketEditPost($ticket_id, $thread, $ticket) public function ticketEditPost($ticket_id, $thread, $ticket)
{ {
try try {
{
$ticket = $ticket->where('id', '=', $ticket_id)->first(); $ticket = $ticket->where('id', '=', $ticket_id)->first();
$ticket->sla = Input::get('sla_plan'); $ticket->sla = Input::get('sla_plan');
$ticket->help_topic_id = Input::get('help_topic'); $ticket->help_topic_id = Input::get('help_topic');
$ticket->source = Input::get('ticket_source'); $ticket->source = Input::get('ticket_source');
$ticket->priority_id = Input::get('ticket_priority'); $ticket->priority_id = Input::get('ticket_priority');
$ticket->status = Input::get('status'); $ticket->status = Input::get('status');
$ticket->save(); $ticket->save();
$threads = $thread->where('ticket_id', '=', $ticket_id)->first(); $threads = $thread->where('ticket_id', '=', $ticket_id)->first();
$threads->title = Input::get('subject'); $threads->title = Input::get('subject');
$threads->save(); $threads->save();
} } catch (\Exception $ex) {
catch (\Exception $ex)
{
$result = $ex->getMessage(); $result = $ex->getMessage();
return response()->json(compact('result'), 500); return response()->json(compact('result'), 500);
} }
$result = ["success" => "Edited successfully"]; $result = ['success' => 'Edited successfully'];
return response()->json(compact('result')); return response()->json(compact('result'));
} }
@@ -506,66 +445,56 @@ class TicketController extends Controller
*/ */
public function assign($id) public function assign($id)
{ {
try try {
{
$UserEmail = Input::get('user'); $UserEmail = Input::get('user');
//dd($UserEmail); //dd($UserEmail);
// $UserEmail = 'sujitprasad12@yahoo.in'; // $UserEmail = 'sujitprasad12@yahoo.in';
$user = User::where('email', '=', $UserEmail)->first(); $user = User::where('email', '=', $UserEmail)->first();
if (!$user) if (!$user) {
{
return ['error' => 'No agent not found']; return ['error' => 'No agent not found'];
} }
$user_id = $user->id; $user_id = $user->id;
$ticket = Tickets::where('id', '=', $id)->first(); $ticket = Tickets::where('id', '=', $id)->first();
if (!$ticket) if (!$ticket) {
{
return ['error' => 'No ticket not found']; return ['error' => 'No ticket not found'];
} }
$ticket_number = $ticket->ticket_number; $ticket_number = $ticket->ticket_number;
$ticket->assigned_to = $user_id; $ticket->assigned_to = $user_id;
$ticket->save(); $ticket->save();
$ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
if (!$ticket_thread) if (!$ticket_thread) {
{
return ['error' => 'No thread not found']; return ['error' => 'No thread not found'];
} }
$ticket_subject = $ticket_thread->title; $ticket_subject = $ticket_thread->title;
$thread = new Ticket_Thread(); $thread = new Ticket_Thread();
$thread->ticket_id = $ticket->id; $thread->ticket_id = $ticket->id;
$thread->user_id = Auth::user()->id; $thread->user_id = Auth::user()->id;
$thread->is_internal = 1; $thread->is_internal = 1;
$thread->body = 'This Ticket has been assigned to ' . $user->first_name . ' ' . $user->last_name; $thread->body = 'This Ticket has been assigned to '.$user->first_name.' '.$user->last_name;
$thread->save(); $thread->save();
$company = $this->company(); $company = $this->company();
$system = $this->system(); $system = $this->system();
$agent = $user->first_name; $agent = $user->first_name;
$agent_email = $user->email; $agent_email = $user->email;
$master = Auth::user()->first_name . ' ' . Auth::user()->last_name; $master = Auth::user()->first_name.' '.Auth::user()->last_name;
if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) {
{
// // ticket assigned send mail // // ticket assigned send mail
// Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) { // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) {
// $message->to($agent_email, $agent)->subject($ticket_subject . '[#' . $ticket_number . ']'); // $message->to($agent_email, $agent)->subject($ticket_subject . '[#' . $ticket_number . ']');
// }); // });
try try {
{ $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]); } catch (\Exception $e) {
}
catch (\Exception $e)
{
return 0; return 0;
} }
} }
return 1; return 1;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -580,63 +509,47 @@ class TicketController extends Controller
*/ */
public function delete($ids, $ticket) public function delete($ids, $ticket)
{ {
try try {
{ foreach ($ids as $id) {
foreach ($ids as $id)
{
$ticket_delete = $ticket->where('id', '=', $id)->first(); $ticket_delete = $ticket->where('id', '=', $id)->first();
if ($ticket_delete) if ($ticket_delete) {
{ if ($ticket_delete->status == 5) {
if ($ticket_delete->status == 5)
{
$ticket_delete->delete(); $ticket_delete->delete();
$ticket_threads = Ticket_Thread::where('ticket_id', '=', $id)->get(); $ticket_threads = Ticket_Thread::where('ticket_id', '=', $id)->get();
if ($ticket_threads) if ($ticket_threads) {
{ foreach ($ticket_threads as $ticket_thread) {
foreach ($ticket_threads as $ticket_thread) if ($ticket_thread) {
{
if ($ticket_thread)
{
$ticket_thread->delete(); $ticket_thread->delete();
} }
} }
} }
$ticket_attachments = Ticket_attachments::where('thread_id', '=', $id)->get(); $ticket_attachments = Ticket_attachments::where('thread_id', '=', $id)->get();
if ($ticket_attachments) if ($ticket_attachments) {
{ foreach ($ticket_attachments as $ticket_attachment) {
foreach ($ticket_attachments as $ticket_attachment) if ($ticket_attachment) {
{
if ($ticket_attachment)
{
$ticket_attachment->delete(); $ticket_attachment->delete();
} }
} }
} }
} } else {
else
{
$ticket_delete->is_deleted = 0; $ticket_delete->is_deleted = 0;
$ticket_delete->status = 5; $ticket_delete->status = 5;
$ticket_delete->save(); $ticket_delete->save();
$ticket_status_message = Ticket_Status::where('id', '=', $ticket_delete->status)->first(); $ticket_status_message = Ticket_Status::where('id', '=', $ticket_delete->status)->first();
$thread = new Ticket_Thread(); $thread = new Ticket_Thread();
$thread->ticket_id = $ticket_delete->id; $thread->ticket_id = $ticket_delete->id;
$thread->user_id = Auth::user()->id; $thread->user_id = Auth::user()->id;
$thread->is_internal = 1; $thread->is_internal = 1;
$thread->body = $ticket_status_message->message . ' ' . Auth::user()->first_name . ' ' . Auth::user()->last_name; $thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name;
$thread->save(); $thread->save();
} }
} } else {
else
{
return 'ticket not found'; return 'ticket not found';
} }
} }
return 'your tickets has been deleted'; return 'your tickets has been deleted';
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -650,20 +563,14 @@ class TicketController extends Controller
*/ */
public function checkEmail($email) public function checkEmail($email)
{ {
try try {
{
$check = User::where('email', '=', $email)->first(); $check = User::where('email', '=', $email)->first();
if ($check) if ($check) {
{
return $check; return $check;
} } else {
else
{
return false; return false;
} }
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -675,22 +582,16 @@ class TicketController extends Controller
*/ */
public function system() public function system()
{ {
try try {
{
$system = System::Where('id', '=', '1')->first(); $system = System::Where('id', '=', '1')->first();
if ($system->name == null) if ($system->name == null) {
{
$system = 'Support Center'; $system = 'Support Center';
} } else {
else
{
$system = $system->name; $system = $system->name;
} }
return $system; return $system;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -705,19 +606,15 @@ class TicketController extends Controller
*/ */
public function attach($thread, $attach) public function attach($thread, $attach)
{ {
try try {
{
$ta = new Ticket_attachments(); $ta = new Ticket_attachments();
foreach ($attach as $file) foreach ($attach as $file) {
{
$ta->create(['thread_id' => $thread, 'name' => $file['name'], 'size' => $file['size'], 'type' => $file['type'], 'file' => $file['file'], 'poster' => 'ATTACHMENT']); $ta->create(['thread_id' => $thread, 'name' => $file['name'], 'size' => $file['size'], 'type' => $file['type'], 'file' => $file['file'], 'poster' => 'ATTACHMENT']);
} }
$ta->create(['thread_id' => $thread, 'name' => $name, 'size' => $size, 'type' => $type, 'file' => $file, 'poster' => 'ATTACHMENT']); $ta->create(['thread_id' => $thread, 'name' => $name, 'size' => $size, 'type' => $type, 'file' => $file, 'poster' => 'ATTACHMENT']);
return 1; return 1;
} } catch (\Exception $e) {
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -730,7 +627,7 @@ class TicketController extends Controller
public function autosearch() public function autosearch()
{ {
$term = \Input::get('term'); $term = \Input::get('term');
$user = \App\User::where('email', 'LIKE', '%' . $term . '%')->orWhere('first_name', 'LIKE', '%' . $term . '%')->orWhere('last_name', 'LIKE', '%' . $term . '%')->orWhere('user_name', 'LIKE', '%' . $term . '%')->lists('email'); $user = \App\User::where('email', 'LIKE', '%'.$term.'%')->orWhere('first_name', 'LIKE', '%'.$term.'%')->orWhere('last_name', 'LIKE', '%'.$term.'%')->orWhere('user_name', 'LIKE', '%'.$term.'%')->lists('email');
return $user; return $user;
} }
@@ -744,27 +641,26 @@ class TicketController extends Controller
*/ */
public function useradd() public function useradd()
{ {
$email = Input::get('email'); $email = Input::get('email');
$ticket_id = Input::get('ticket_id'); $ticket_id = Input::get('ticket_id');
$company = $this->company(); $company = $this->company();
$user = new User(); $user = new User();
$user->user_name = $email; $user->user_name = $email;
$user->email = $email; $user->email = $email;
$password = $this->generateRandomString(); $password = $this->generateRandomString();
$user->password = \Hash::make($password); $user->password = \Hash::make($password);
$user->role = 'user'; $user->role = 'user';
$user->active = 1; $user->active = 1;
if ($user->save()) if ($user->save()) {
{ $user_id = $user->id;
$user_id = $user->id; $php_mailer = new PhpMailController();
$php_mailer = new PhpMailController(); $php_mailer->sendmail($from = $php_mailer->mailfrom('1', '0'), $to = ['name' => $email, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $email, 'email_address' => $email, 'user_password' => $password]);
$php_mailer->sendmail($from = $php_mailer->mailfrom('1', '0'), $to = ['name' => $email, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $email, 'email_address' => $email, 'user_password' => $password]);
} }
$ticket_collaborator = new Ticket_Collaborator(); $ticket_collaborator = new Ticket_Collaborator();
$ticket_collaborator->isactive = 1; $ticket_collaborator->isactive = 1;
$ticket_collaborator->ticket_id = $ticket_id; $ticket_collaborator->ticket_id = $ticket_id;
$ticket_collaborator->user_id = $user->id; $ticket_collaborator->user_id = $user->id;
$ticket_collaborator->role = 'ccc'; $ticket_collaborator->role = 'ccc';
$ticket_collaborator->save(); $ticket_collaborator->save();
$result = [$user->user_name => $user->email]; $result = [$user->user_name => $user->email];
@@ -779,84 +675,67 @@ class TicketController extends Controller
*/ */
public function userremove() public function userremove()
{ {
$email = Input::get('email'); $email = Input::get('email');
$ticketid = Input::get('ticketid'); $ticketid = Input::get('ticketid');
$user = new User(); $user = new User();
$user = $user->where('email', $email)->first(); $user = $user->where('email', $email)->first();
$ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticketid) $ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticketid)
->where('user_id', $user->id) ->where('user_id', $user->id)
->first(); ->first();
if ($ticket_collaborator) if ($ticket_collaborator) {
{
$ticket_collaborator->delete(); $ticket_collaborator->delete();
return 'deleted successfully'; return 'deleted successfully';
} } else {
else
{
return 'not found'; return 'not found';
} }
} }
public function getCollaboratorForTicket() public function getCollaboratorForTicket()
{ {
try try {
{
$ticketid = Input::get('ticket_id'); $ticketid = Input::get('ticket_id');
$ticket_collaborator = \DB::table('users') $ticket_collaborator = \DB::table('users')
->join('ticket_collaborator', function ($join) use ($ticketid) ->join('ticket_collaborator', function ($join) use ($ticketid) {
{
$join->on('users.id', '=', 'ticket_collaborator.user_id') $join->on('users.id', '=', 'ticket_collaborator.user_id')
->where('ticket_collaborator.ticket_id', '=', $ticketid); ->where('ticket_collaborator.ticket_id', '=', $ticketid);
}) })
->select('users.email', 'users.user_name') ->select('users.email', 'users.user_name')
->get(); ->get();
if (count($ticket_collaborator) > 0) if (count($ticket_collaborator) > 0) {
{ foreach ($ticket_collaborator as $key => $collaborator) {
foreach ($ticket_collaborator as $key => $collaborator) $collab[$key]['email'] = $collaborator->email;
{
$collab[$key]['email'] = $collaborator->email;
$collab[$key]['user_name'] = $collaborator->user_name; $collab[$key]['user_name'] = $collaborator->user_name;
$collab[$key]['avatar'] = $this->avatarUrl($collaborator->email); $collab[$key]['avatar'] = $this->avatarUrl($collaborator->email);
} }
} } else {
else
{
$collab = $ticket_collaborator; $collab = $ticket_collaborator;
} }
return $collab; return $collab;
} } catch (\Exception $ex) {
catch (\Exception $ex)
{
return $ex->getMessage(); return $ex->getMessage();
throw new \Exception('get collaborator for ticket fails'); throw new \Exception('get collaborator for ticket fails');
} }
} }
public function avatarUrl($email) public function avatarUrl($email)
{ {
try try {
{
$user = new User(); $user = new User();
$user = $user->where('email', $email)->first(); $user = $user->where('email', $email)->first();
if ($user->profile_pic) if ($user->profile_pic) {
{ $url = url('uploads/profilepic/'.$user->profile_pic);
$url = url('uploads/profilepic/' . $user->profile_pic); } else {
}
else
{
$url = \Gravatar::src($email); $url = \Gravatar::src($email);
} }
return $url; return $url;
} } catch (\Exception $ex) {
catch (\Exception $ex)
{
//return $ex->getMessage(); //return $ex->getMessage();
throw new \Exception($ex->getMessage()); throw new \Exception($ex->getMessage());
} }
} }
} }

8
app/Http/Controllers/Api/v1/TokenAuthController.php
View File

@@ -47,7 +47,7 @@ class TokenAuthController extends Controller
$password = $request->input('password'); $password = $request->input('password');
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
//$credentials = $request->only('email', 'password'); //$credentials = $request->only('email', 'password');
try { try {
if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password, 'active'=>1])) { if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password, 'active'=>1])) {
@@ -62,7 +62,7 @@ class TokenAuthController extends Controller
} }
$user_id = \Auth::user(); $user_id = \Auth::user();
// if no errors are encountered we can return a JWT // if no errors are encountered we can return a JWT
return response()->json(compact('token', 'user_id')); return response()->json(compact('token', 'user_id'));
} }
@@ -89,7 +89,7 @@ class TokenAuthController extends Controller
return response()->json(compact('error')); return response()->json(compact('error'));
} }
//dd($user); //dd($user);
return response()->json(compact('user')); return response()->json(compact('user'));
} }
@@ -172,7 +172,7 @@ class TokenAuthController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first(); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code; // $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);

441
app/Http/Controllers/Auth/AuthController.php
View File

@@ -38,17 +38,16 @@ use Socialite;
*/ */
class AuthController extends Controller class AuthController extends Controller
{ {
use AuthenticatesAndRegistersUsers; use AuthenticatesAndRegistersUsers;
/* to redirect after login */ /* to redirect after login */
// if auth is agent // if auth is agent
protected $redirectTo = '/dashboard'; protected $redirectTo = '/dashboard';
// if auth is user // if auth is user
protected $redirectToUser = '/profile'; protected $redirectToUser = '/profile';
/* Direct After Logout */ /* Direct After Logout */
protected $redirectAfterLogout = '/'; protected $redirectAfterLogout = '/';
protected $loginPath = '/auth/login'; protected $loginPath = '/auth/login';
protected $social; protected $social;
/** /**
@@ -69,8 +68,7 @@ class AuthController extends Controller
public function redirectToProvider($provider, $redirect = '') public function redirectToProvider($provider, $redirect = '')
{ {
if ($redirect !== '') if ($redirect !== '') {
{
$this->setSession($provider, $redirect); $this->setSession($provider, $redirect);
} }
//dd(\Config::get('services')); //dd(\Config::get('services'));
@@ -81,23 +79,19 @@ class AuthController extends Controller
public function handleProviderCallback($provider) public function handleProviderCallback($provider)
{ {
try try {
{
//notice we are not doing any validation, you should do it //notice we are not doing any validation, you should do it
$this->changeRedirect(); $this->changeRedirect();
$user = Socialite::driver($provider)->user(); $user = Socialite::driver($provider)->user();
if ($user) if ($user) {
{
// stroing data to our use table and logging them in // stroing data to our use table and logging them in
$username = $user->getEmail(); $username = $user->getEmail();
$first_name = $user->getName(); $first_name = $user->getName();
if ($user->nickname) if ($user->nickname) {
{
$username = $user->nickname; $username = $user->nickname;
} }
if (!$first_name) if (!$first_name) {
{
$first_name = $username; $first_name = $username;
} }
$data = [ $data = [
@@ -108,21 +102,17 @@ class AuthController extends Controller
'active' => 1, 'active' => 1,
]; ];
$user = User::where('email', $data['email'])->first(); $user = User::where('email', $data['email'])->first();
if (!$user) if (!$user) {
{
$user = User::where('user_name', $data['user_name'])->first(); $user = User::where('user_name', $data['user_name'])->first();
} }
if (!$user) if (!$user) {
{
$user = User::firstOrCreate($data); $user = User::firstOrCreate($data);
} }
Auth::login($user); Auth::login($user);
} }
//after login redirecting to home page //after login redirecting to home page
return redirect('/'); return redirect('/');
} } catch (\Exception $ex) {
catch (\Exception $ex)
{
return redirect()->back()->with('fails', $ex->getMessage()); return redirect()->back()->with('fails', $ex->getMessage());
} }
} }
@@ -135,23 +125,17 @@ class AuthController extends Controller
public function getRegister(CommonSettings $settings) public function getRegister(CommonSettings $settings)
{ {
// Event for login // Event for login
$settings = $settings->select('status')->where('option_name', '=', 'send_otp')->first(); $settings = $settings->select('status')->where('option_name', '=', 'send_otp')->first();
$email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first(); $email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first();
//dd($settings->status); //dd($settings->status);
\Event::fire(new \App\Events\FormRegisterEvent()); \Event::fire(new \App\Events\FormRegisterEvent());
if (Auth::user()) if (Auth::user()) {
{ if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') {
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent')
{
return \Redirect::route('dashboard'); return \Redirect::route('dashboard');
} } elseif (Auth::user()->role == 'user') {
elseif (Auth::user()->role == 'user')
{
// return view('auth.register'); // return view('auth.register');
} }
} } else {
else
{
return view('auth.register', compact('settings', 'email_mandatory')); return view('auth.register', compact('settings', 'email_mandatory'));
} }
} }
@@ -167,99 +151,71 @@ class AuthController extends Controller
public function postRegister(User $user, RegisterRequest $request, $api = false) public function postRegister(User $user, RegisterRequest $request, $api = false)
{ {
//dd($request->all()); //dd($request->all());
try try {
{ $request_array = $request->input();
$request_array = $request->input(); $password = Hash::make($request->input('password'));
$password = Hash::make($request->input('password')); $user->password = $password;
$user->password = $password; $name = $request->input('full_name');
$name = $request->input('full_name');
$user->first_name = $name; $user->first_name = $name;
if ($request_array['email'] == '') if ($request_array['email'] == '') {
{
$user->email = null; $user->email = null;
} } else {
else
{
$user->email = $request->input('email'); $user->email = $request->input('email');
} }
if (!checkArray('mobile', $request_array)) if (!checkArray('mobile', $request_array)) {
{
$user->mobile = null; $user->mobile = null;
} } else {
else
{
$user->mobile = $request->input('mobile'); $user->mobile = $request->input('mobile');
} }
if (!checkArray('code', $request_array)) if (!checkArray('code', $request_array)) {
{
$user->country_code = 0; $user->country_code = 0;
} } else {
else
{
$user->country_code = $request->input('code'); $user->country_code = $request->input('code');
} }
if (checkArray('username', $request_array)) if (checkArray('username', $request_array)) {
{
$user->user_name = checkArray('username', $request_array); $user->user_name = checkArray('username', $request_array);
} } else {
else
{
$user->user_name = $request->input('email'); $user->user_name = $request->input('email');
} }
$user->role = 'user'; $user->role = 'user';
$code = str_random(60); $code = str_random(60);
$user->remember_token = $code; $user->remember_token = $code;
$user->save(); $user->save();
$message12 = ''; $message12 = '';
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
// Event for login // Event for login
\Event::fire(new \App\Events\LoginEvent($request)); \Event::fire(new \App\Events\LoginEvent($request));
if ($request->input('email') !== '') if ($request->input('email') !== '') {
{ $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]);
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]);
} }
if ($settings->status == 1 || $settings->status == '1') if ($settings->status == 1 || $settings->status == '1') {
{ if (count($sms) > 0) {
if (count($sms) > 0) if ($sms->status == 1 || $sms->status == '1') {
{
if ($sms->status == 1 || $sms->status == '1')
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble');
} } else {
else
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
} }
} } else {
else if ($request->input('email') !== '') {
{
if ($request->input('email') !== '')
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
} } else {
else
{
$message12 = Lang::get('lang.account-created-contact-admin-as-we-were-not-able-to-send-opt'); $message12 = Lang::get('lang.account-created-contact-admin-as-we-were-not-able-to-send-opt');
} }
} }
} } else {
else
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
} }
if ($api == true) if ($api == true) {
{
return ['message' => $message12, 'user' => $user->toArray()]; return ['message' => $message12, 'user' => $user->toArray()];
} }
return redirect('home')->with('success', $message12); return redirect('home')->with('success', $message12);
} } catch (\Exception $e) {
catch (\Exception $e) if ($api == true) {
{ throw new \Exception($e->getMessage());
if ($api == true)
{
throw new \Exception($e->getMessage());
} }
return redirect()->back()->with('fails', $e->getMessage()); return redirect()->back()->with('fails', $e->getMessage());
} }
} }
@@ -274,17 +230,14 @@ class AuthController extends Controller
public function accountActivate($token) public function accountActivate($token)
{ {
$user = User::where('remember_token', '=', $token)->first(); $user = User::where('remember_token', '=', $token)->first();
if ($user) if ($user) {
{ $user->active = 1;
$user->active = 1;
$user->remember_token = null; $user->remember_token = null;
$user->save(); $user->save();
$this->openTicketAfterVerification($user->id); $this->openTicketAfterVerification($user->id);
return redirect('/auth/login')->with('status', 'Acount activated. Login to start'); return redirect('/auth/login')->with('status', 'Acount activated. Login to start');
} } else {
else
{
return redirect('/auth/login')->with('fails', 'Invalid Token'); return redirect('/auth/login')->with('fails', 'Invalid Token');
} }
} }
@@ -300,15 +253,12 @@ class AuthController extends Controller
public function getMail($token, User $user) public function getMail($token, User $user)
{ {
$user = $user->where('remember_token', $token)->where('active', 0)->first(); $user = $user->where('remember_token', $token)->where('active', 0)->first();
if ($user) if ($user) {
{
$user->active = 1; $user->active = 1;
$user->save(); $user->save();
return redirect('auth/login'); return redirect('auth/login');
} } else {
else
{
return redirect('auth/login'); return redirect('auth/login');
} }
} }
@@ -321,26 +271,17 @@ class AuthController extends Controller
public function getLogin() public function getLogin()
{ {
$directory = base_path(); $directory = base_path();
if (file_exists($directory . DIRECTORY_SEPARATOR . '.env')) if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
{ if (Auth::user()) {
if (Auth::user()) if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') {
{
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent')
{
return \Redirect::route('dashboard'); return \Redirect::route('dashboard');
} } elseif (Auth::user()->role == 'user') {
elseif (Auth::user()->role == 'user')
{
return \Redirect::route('home'); return \Redirect::route('home');
} }
} } else {
else
{
return view('auth.login'); return view('auth.login');
} }
} } else {
else
{
return Redirect::route('licence'); return Redirect::route('licence');
} }
} }
@@ -354,153 +295,119 @@ class AuthController extends Controller
*/ */
public function postLogin(LoginRequest $request) public function postLogin(LoginRequest $request)
{ {
try try {
{
// dd($request->input()); // dd($request->input());
\Event::fire('auth.login.event', []); //added 5/5/2016 \Event::fire('auth.login.event', []); //added 5/5/2016
// Set login attempts and login time // Set login attempts and login time
$value = $_SERVER['REMOTE_ADDR']; $value = $_SERVER['REMOTE_ADDR'];
$usernameinput = $request->input('email'); $usernameinput = $request->input('email');
$password = $request->input('password'); $password = $request->input('password');
if ($request->input('referer')) if ($request->input('referer')) {
{
$referer = 'form'; $referer = 'form';
} } else {
else
{
$referer = '/'; $referer = '/';
} }
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
$result = $this->confirmIPAddress($value, $usernameinput); $result = $this->confirmIPAddress($value, $usernameinput);
// If attempts > 3 and time < 30 minutes // If attempts > 3 and time < 30 minutes
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
if ($result == 1) if ($result == 1) {
{
return redirect()->back()->withErrors('email', 'Incorrect details')->with(['error' => $security->lockout_message, 'referer' => $referer]); return redirect()->back()->withErrors('email', 'Incorrect details')->with(['error' => $security->lockout_message, 'referer' => $referer]);
} }
$check_active = User::where('email', '=', $request->input('email'))->orwhere('user_name', '=', $request->input('email'))->first(); $check_active = User::where('email', '=', $request->input('email'))->orwhere('user_name', '=', $request->input('email'))->first();
if (!$check_active) if (!$check_active) { //check if user exists or not
{ //check if user exists or not
//if user deos not exist then return back with error that user is not registered //if user deos not exist then return back with error that user is not registered
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
->withErrors([ ->withErrors([
'email' => $this->getFailedLoginMessage(), 'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.not-registered'), ])->with(['error' => Lang::get('lang.not-registered'),
'referer' => $referer,]); 'referer' => $referer, ]);
} }
//if user exists //if user exists
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
if ($settings->status == '1' || $settings->status == 1) if ($settings->status == '1' || $settings->status == 1) { // check for otp verification setting
{ // check for otp verification setting
// setting is enabled // setting is enabled
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
if ($sms) if ($sms) { //check sms plugin installed or not
{ //check sms plugin installed or not
// plugin is installed // plugin is installed
if ($sms->status == 1 || $sms->status === '1') if ($sms->status == 1 || $sms->status === '1') { //check plugin is active or not
{ //check plugin is active or not
// plugin is active // plugin is active
if (!$check_active->active) if (!$check_active->active) { //check account is active or not
{ //check account is active or not
// account is not active show verify otp window // account is not active show verify otp window
if ($check_active->mobile) if ($check_active->mobile) { //check user has mobile or not
{ //check user has mobile or not
// user has mobile number return verify OTP screen // user has mobile number return verify OTP screen
return \Redirect::route('otp-verification') return \Redirect::route('otp-verification')
->withInput($request->input()) ->withInput($request->input())
->with(['values' => $request->input(), ->with(['values' => $request->input(),
'referer' => $referer, 'referer' => $referer,
'name' => $check_active->first_name, 'name' => $check_active->first_name,
'number' => $check_active->mobile, 'number' => $check_active->mobile,
'code' => $check_active->country_code,]); 'code' => $check_active->country_code, ]);
} } else {
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} } else {
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} } else {
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} } else {
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} } else {
else
{
// setting is disabled // setting is disabled
a: if (!$check_active->active) a: if (!$check_active->active) { //check account is active or not
{ //check account is active or not
// if accoutn is not active return back with error message that account is inactive // if accoutn is not active return back with error message that account is inactive
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
->withErrors([ ->withErrors([
'email' => $this->getFailedLoginMessage(), 'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'), ])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'),
'referer' => $referer,]); 'referer' => $referer, ]);
} } else {
else
{
// try login // try login
$loginAttempts = 1; $loginAttempts = 1;
// If session has login attempts, retrieve attempts counter and attempts time // If session has login attempts, retrieve attempts counter and attempts time
if (\Session::has('loginAttempts')) if (\Session::has('loginAttempts')) {
{ $loginAttempts = \Session::get('loginAttempts');
$loginAttempts = \Session::get('loginAttempts');
$loginAttemptTime = \Session::get('loginAttemptTime'); $loginAttemptTime = \Session::get('loginAttemptTime');
$this->addLoginAttempt($value, $usernameinput); $this->addLoginAttempt($value, $usernameinput);
// $credentials = $request->only('email', 'password'); // $credentials = $request->only('email', 'password');
$usernameinput = $request->input('email'); $usernameinput = $request->input('email');
$password = $request->input('password'); $password = $request->input('password');
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
// If attempts > 3 and time < 10 minutes // If attempts > 3 and time < 10 minutes
if ($loginAttempts > $security->backlist_threshold && (time() - $loginAttemptTime <= ($security->lockout_period * 60))) if ($loginAttempts > $security->backlist_threshold && (time() - $loginAttemptTime <= ($security->lockout_period * 60))) {
{
return redirect()->back()->withErrors('email', 'incorrect email')->with('error', $security->lockout_message); return redirect()->back()->withErrors('email', 'incorrect email')->with('error', $security->lockout_message);
} }
// If time > 10 minutes, reset attempts counter and time in session // If time > 10 minutes, reset attempts counter and time in session
if (time() - $loginAttemptTime > ($security->lockout_period * 60)) if (time() - $loginAttemptTime > ($security->lockout_period * 60)) {
{
\Session::put('loginAttempts', 1); \Session::put('loginAttempts', 1);
\Session::put('loginAttemptTime', time()); \Session::put('loginAttemptTime', time());
} }
} } else { // If no login attempts stored, init login attempts and time
else
{ // If no login attempts stored, init login attempts and time
\Session::put('loginAttempts', $loginAttempts); \Session::put('loginAttempts', $loginAttempts);
\Session::put('loginAttemptTime', time()); \Session::put('loginAttemptTime', time());
$this->clearLoginAttempts($value, $usernameinput); $this->clearLoginAttempts($value, $usernameinput);
} }
// If auth ok, redirect to restricted area // If auth ok, redirect to restricted area
\Session::put('loginAttempts', $loginAttempts + 1); \Session::put('loginAttempts', $loginAttempts + 1);
if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember'))) if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember'))) {
{ if (Auth::user()->role == 'user') {
if (Auth::user()->role == 'user') if ($request->input('referer')) {
{
if ($request->input('referer'))
{
return \Redirect::route($request->input('referer')); return \Redirect::route($request->input('referer'));
} }
return \Redirect::route('/'); return \Redirect::route('/');
} } else {
else
{
return redirect()->intended($this->redirectPath()); return redirect()->intended($this->redirectPath());
} }
} }
@@ -510,14 +417,12 @@ class AuthController extends Controller
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
->withErrors([ ->withErrors([
'email' => $this->getFailedLoginMessage(), 'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.invalid'), ])->with(['error' => Lang::get('lang.invalid'),
'referer' => $referer,]); 'referer' => $referer, ]);
// Increment login attempts // Increment login attempts
} } catch (\Exception $e) {
catch (\Exception $e)
{
return redirect()->back()->with('fails', $e->getMessage()); return redirect()->back()->with('fails', $e->getMessage());
} }
} }
@@ -531,26 +436,20 @@ class AuthController extends Controller
*/ */
public function addLoginAttempt($value, $field) public function addLoginAttempt($value, $field)
{ {
$result = DB::table('login_attempts')->where('IP', '=', $value)->first(); $result = DB::table('login_attempts')->where('IP', '=', $value)->first();
$data = $result; $data = $result;
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
$apt = $security->backlist_threshold; $apt = $security->backlist_threshold;
if ($data) if ($data) {
{
$attempts = $data->Attempts + 1; $attempts = $data->Attempts + 1;
if ($attempts == $apt) if ($attempts == $apt) {
{
// $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'"); // $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'");
$result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts, 'LastLogin' => date('Y-m-d H:i:s')]); $result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts, 'LastLogin' => date('Y-m-d H:i:s')]);
} } else {
else
{
$result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts]); $result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts]);
// $result = DB::select("UPDATE login_attempts SET Attempts=".$attempts." WHERE IP = '$value' OR User = '$field'"); // $result = DB::select("UPDATE login_attempts SET Attempts=".$attempts." WHERE IP = '$value' OR User = '$field'");
} }
} } else {
else
{
// $result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())"); // $result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())");
$result = DB::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => date('Y-m-d H:i:s')]); $result = DB::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => date('Y-m-d H:i:s')]);
} }
@@ -579,26 +478,21 @@ class AuthController extends Controller
*/ */
public function confirmIPAddress($value, $field) public function confirmIPAddress($value, $field)
{ {
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
$time = $security->lockout_period; $time = $security->lockout_period;
$max_attempts = $security->backlist_threshold; $max_attempts = $security->backlist_threshold;
$table = 'login_attempts'; $table = 'login_attempts';
$result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL ' . $time . ' MINUTE)>NOW() then 1 else 0 end) as Denied ' . $result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL '.$time.' MINUTE)>NOW() then 1 else 0 end) as Denied '.
' FROM ' . $table . " WHERE IP = '$value' OR User = '$field'"); ' FROM '.$table." WHERE IP = '$value' OR User = '$field'");
$data = $result; $data = $result;
//Verify that at least one login attempt is in database //Verify that at least one login attempt is in database
if (!$data) if (!$data) {
{
return 0; return 0;
} }
if ($data[0]->Attempts >= $max_attempts) if ($data[0]->Attempts >= $max_attempts) {
{ if ($data[0]->Denied == 1) {
if ($data[0]->Denied == 1)
{
return 1; return 1;
} } else {
else
{
$this->clearLoginAttempts($value, $field); $this->clearLoginAttempts($value, $field);
return 0; return 0;
@@ -627,12 +521,9 @@ class AuthController extends Controller
*/ */
public function getVerifyOTP() public function getVerifyOTP()
{ {
if (\Session::has('values')) if (\Session::has('values')) {
{
return view('auth.otp-verify'); return view('auth.otp-verify');
} } else {
else
{
return redirect('auth/login'); return redirect('auth/login');
} }
} }
@@ -646,35 +537,26 @@ class AuthController extends Controller
*/ */
public function verifyOTP(LoginRequest $request) public function verifyOTP(LoginRequest $request)
{ {
$user = User::select('id', 'mobile', 'user_name')->where('email', '=', $request->input('email')) $user = User::select('id', 'mobile', 'user_name')->where('email', '=', $request->input('email'))
->orWhere('user_name', '=', $request->input('email'))->first(); ->orWhere('user_name', '=', $request->input('email'))->first();
$otp_length = strlen($request->input('otp')); $otp_length = strlen($request->input('otp'));
if (!\Schema::hasTable('user_verification')) if (!\Schema::hasTable('user_verification')) {
{
$message = Lang::get('lang.opt-can-not-be-verified'); $message = Lang::get('lang.opt-can-not-be-verified');
} } else {
else
{
$otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id) $otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id)
->first(); ->first();
if ($otp != null) if ($otp != null) {
{ if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp')))) {
if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp')))) $otp2 = Hash::make($request->input('otp'));
{ $date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa');
$otp2 = Hash::make($request->input('otp')); $date2 = date('Y-m-d h:i:sa');
$date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa'); $time1 = new DateTime($date2);
$date2 = date('Y-m-d h:i:sa'); $time2 = new DateTime($date1);
$time1 = new DateTime($date2);
$time2 = new DateTime($date1);
$interval = $time1->diff($time2); $interval = $time1->diff($time2);
if ($interval->i > 30 || $interval->h > 0) if ($interval->i > 30 || $interval->h > 0) {
{
$message = Lang::get('lang.otp-expired'); $message = Lang::get('lang.otp-expired');
} } else {
else if (Hash::check($request->input('otp'), $otp->otp)) {
{
if (Hash::check($request->input('otp'), $otp->otp))
{
Otp::where('user_id', '=', $user->id) Otp::where('user_id', '=', $user->id)
->update(['otp' => '']); ->update(['otp' => '']);
User::where('id', '=', $user->id) User::where('id', '=', $user->id)
@@ -682,20 +564,14 @@ class AuthController extends Controller
$this->openTicketAfterVerification($user->id); $this->openTicketAfterVerification($user->id);
return $this->postLogin($request); return $this->postLogin($request);
} } else {
else
{
$message = Lang::get('lang.otp-not-matched'); $message = Lang::get('lang.otp-not-matched');
} }
} }
} } else {
else
{
$message = Lang::get('lang.otp-invalid'); $message = Lang::get('lang.otp-invalid');
} }
} } else {
else
{
$message = Lang::get('lang.otp-not-matched'); $message = Lang::get('lang.otp-not-matched');
} }
} }
@@ -703,30 +579,24 @@ class AuthController extends Controller
return \Redirect::route('otp-verification') return \Redirect::route('otp-verification')
->withInput($request->input()) ->withInput($request->input())
->with(['values' => $request->input(), ->with(['values' => $request->input(),
'number' => $user->mobile, 'number' => $user->mobile,
'name' => $user->user_name, 'name' => $user->user_name,
'fails' => $message,]); 'fails' => $message, ]);
} }
public function resendOTP(OtpVerifyRequest $request) public function resendOTP(OtpVerifyRequest $request)
{ {
if (!\Schema::hasTable('user_verification') || !\Schema::hasTable('sms')) if (!\Schema::hasTable('user_verification') || !\Schema::hasTable('sms')) {
{
$message = Lang::get('lang.opt-can-not-be-verified'); $message = Lang::get('lang.opt-can-not-be-verified');
return $message; return $message;
} } else {
else
{
$sms = DB::table('sms')->get(); $sms = DB::table('sms')->get();
if (count($sms) > 0) if (count($sms) > 0) {
{
\Event::fire(new \App\Events\LoginEvent($request)); \Event::fire(new \App\Events\LoginEvent($request));
return 1; return 1;
} } else {
else
{
$message = Lang::get('lang.opt-can-not-be-verified'); $message = Lang::get('lang.opt-can-not-be-verified');
return $message; return $message;
@@ -751,10 +621,8 @@ class AuthController extends Controller
->get(); ->get();
Tickets::where(['user_id' => $id, 'status' => 6]) Tickets::where(['user_id' => $id, 'status' => 6])
->update(['status' => 1]); ->update(['status' => 1]);
if ($ticket != null) if ($ticket != null) {
{ foreach ($ticket as $value) {
foreach ($ticket as $value)
{
$ticket_id = $value->id; $ticket_id = $value->id;
Ticket_Thread::where('ticket_id', '=', $ticket_id) Ticket_Thread::where('ticket_id', '=', $ticket_id)
->update(['updated_at' => date('Y-m-d H:i:s')]); ->update(['updated_at' => date('Y-m-d H:i:s')]);
@@ -765,7 +633,7 @@ class AuthController extends Controller
public function changeRedirect() public function changeRedirect()
{ {
$provider = \Session::get('provider'); $provider = \Session::get('provider');
$url = \Session::get($provider . 'redirect'); $url = \Session::get($provider.'redirect');
\Config::set("services.$provider.redirect", $url); \Config::set("services.$provider.redirect", $url);
} }
@@ -773,8 +641,7 @@ class AuthController extends Controller
{ {
$url = url($redirect); $url = url($redirect);
\Session::set('provider', $provider); \Session::set('provider', $provider);
\Session::set($provider . 'redirect', $url); \Session::set($provider.'redirect', $url);
$this->changeRedirect(); $this->changeRedirect();
} }
} }

8
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -57,12 +57,12 @@ class PasswordController extends Controller
$user = User::where('email', '=', $request->only('email'))->orWhere('mobile', '=', $request->only('email'))->first(); $user = User::where('email', '=', $request->only('email'))->orWhere('mobile', '=', $request->only('email'))->first();
if (isset($user)) { if (isset($user)) {
$user1 = $user->email; $user1 = $user->email;
//gen new code and pass //gen new code and pass
$code = str_random(60); $code = str_random(60);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first(); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code; // $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
@@ -107,7 +107,7 @@ class PasswordController extends Controller
$this->getResetValidationCustomAttributes() $this->getResetValidationCustomAttributes()
); );
$credentials = $this->getResetCredentials($request); $credentials = $this->getResetCredentials($request);
// dd($credentials); // dd($credentials);
$email = $credentials['email']; $email = $credentials['email'];
$password = $credentials['password']; $password = $credentials['password'];
$token = $credentials['token']; $token = $credentials['token'];

2
app/Http/Controllers/Client/helpdesk/ClientTicketController.php
View File

@@ -32,7 +32,7 @@ class ClientTicketController extends Controller
$this->TicketWorkflowController = $TicketWorkflowController; $this->TicketWorkflowController = $TicketWorkflowController;
// $this->middleware('auth'); // $this->middleware('auth');
// $this->middleware('role.user'); // $this->middleware('role.user');
$this->middleware('board'); $this->middleware('board');
} }
/** /**

9
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -98,13 +98,13 @@ class GuestController extends Controller
if (Input::file('profile_pic')) { if (Input::file('profile_pic')) {
// fetching picture name // fetching picture name
$name = Input::file('profile_pic')->getClientOriginalName(); $name = Input::file('profile_pic')->getClientOriginalName();
// fetching upload destination path // fetching upload destination path
$destinationPath = 'uploads/profilepic'; $destinationPath = 'uploads/profilepic';
// adding a random value to profile picture filename // adding a random value to profile picture filename
$fileName = rand(0000, 9999).'.'.str_replace(' ', '_', $name); $fileName = rand(0000, 9999).'.'.str_replace(' ', '_', $name);
// moving the picture to a destination folder // moving the picture to a destination folder
Input::file('profile_pic')->move($destinationPath, $fileName); Input::file('profile_pic')->move($destinationPath, $fileName);
// saving filename to database // saving filename to database
$user->profile_pic = $fileName; $user->profile_pic = $fileName;
} }
if ($request->get('mobile')) { if ($request->get('mobile')) {
@@ -237,6 +237,7 @@ class GuestController extends Controller
//echo $user->password; //echo $user->password;
if (Hash::check($request->input('old_password'), $user->getAuthPassword())) { if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
$user->password = Hash::make($request->input('new_password')); $user->password = Hash::make($request->input('new_password'));
try { try {
$user->save(); $user->save();

56
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -94,6 +94,7 @@ class UnAuthController extends Controller
$ticket_token->token = $hashed_token; $ticket_token->token = $hashed_token;
$ticket_token->save(); $ticket_token->save();
} }
try { try {
$this->PhpMailController->sendmail( $this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $user_details->email], $message = ['subject' => 'Ticket link Request ['.$ticket_number.']', 'scenario' => 'check-ticket'], $template_variables = ['user' => $username, 'ticket_link_with_number' => url('show-ticket/'.$ticket->id.'/'.$token)] $from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $user_details->email], $message = ['subject' => 'Ticket link Request ['.$ticket_number.']', 'scenario' => 'check-ticket'], $template_variables = ['user' => $username, 'ticket_link_with_number' => url('show-ticket/'.$ticket->id.'/'.$token)]
@@ -270,6 +271,7 @@ class UnAuthController extends Controller
} else { } else {
$from_email = $sending_emails->id; $from_email = $sending_emails->id;
} }
try { try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]);
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -347,11 +349,11 @@ class UnAuthController extends Controller
} }
// Follow up tickets // Follow up tickets
public function followup() public function followup()
{ {
$followup = Followup::whereId('1')->first(); $followup = Followup::whereId('1')->first();
$condition = $followup->condition; $condition = $followup->condition;
// dd($condition); // dd($condition);
switch ($condition) { switch ($condition) {
case 'everyMinute': case 'everyMinute':
@@ -383,34 +385,34 @@ class UnAuthController extends Controller
break; break;
} }
if ($followup->status = 1) { if ($followup->status = 1) {
$tickets = Tickets::where('id', '>=', 1)->where('status', '!=', 5)->get(); $tickets = Tickets::where('id', '>=', 1)->where('status', '!=', 5)->get();
// dd( $tickets); // dd( $tickets);
// $tickets=Tickets::where('id', '>=', 1)->where('status', '!=', 5)->pluck('id'); // $tickets=Tickets::where('id', '>=', 1)->where('status', '!=', 5)->pluck('id');
// dd( $tickets); // dd( $tickets);
// $id=1;
foreach ($tickets as $ticket) {
// $id=1; // $id=1;
// $id++; foreach ($tickets as $ticket) {
// $ticket=Tickets::where('status', '!=', 5)->get(); // $id=1;
// $id++;
// $ticket=Tickets::where('status', '!=', 5)->get();
// dd($ticket); // dd($ticket);
// if($ticket != null){ // if($ticket != null){
// dd('here'); // dd('here');
$ck = date('Y-m-d H:i:s', strtotime($ticket->updated_at.$followup_set)); $ck = date('Y-m-d H:i:s', strtotime($ticket->updated_at.$followup_set));
// dd($ck); // dd($ck);
$current_time = date('Y-m-d H:i:s'); $current_time = date('Y-m-d H:i:s');
if ($current_time > $ck) { if ($current_time > $ck) {
$ticket->follow_up = 1; $ticket->follow_up = 1;
$ticket->save(); $ticket->save();
// Tickets::where('id', '=',$id) // Tickets::where('id', '=',$id)
// ->update(['follow_up' => 1]); // ->update(['follow_up' => 1]);
// } // }
} }
// if($id=2) // if($id=2)
// {dd($ticket);} // {dd($ticket);}
}
} }
} }
}
} }

3
app/Http/Controllers/Common/ApiSettings.php
View File

@@ -51,6 +51,7 @@ class ApiSettings extends Controller
$this->validate($request, [ $this->validate($request, [
'ticket_detail' => 'url', 'ticket_detail' => 'url',
]); ]);
try { try {
// dd($request->input()); // dd($request->input());
DB::table('settings_system') DB::table('settings_system')
@@ -91,6 +92,7 @@ class ApiSettings extends Controller
$this->postHook($data); $this->postHook($data);
} catch (Exception $ex) { } catch (Exception $ex) {
dd($ex); dd($ex);
throw new Exception($ex->getMessage()); throw new Exception($ex->getMessage());
} }
} }
@@ -106,6 +108,7 @@ class ApiSettings extends Controller
} }
} catch (Exception $ex) { } catch (Exception $ex) {
dd($ex); dd($ex);
throw new Exception($ex->getMessage()); throw new Exception($ex->getMessage());
} }
} }

6
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -234,15 +234,15 @@ class PhpMailController extends Controller
if ($cc != null) { if ($cc != null) {
foreach ($cc as $collaborator) { foreach ($cc as $collaborator) {
//mail to collaborators //mail to collaborators
$collab_user_id = $collaborator->user_id; $collab_user_id = $collaborator->user_id;
$user_id_collab = User::where('id', '=', $collab_user_id)->first(); $user_id_collab = User::where('id', '=', $collab_user_id)->first();
$collab_email = $user_id_collab->email; $collab_email = $user_id_collab->email;
$m->cc($collab_email); $m->cc($collab_email);
} }
} }
// $mail->addBCC($bc); // $mail->addBCC($bc);
$size = count($attach); $size = count($attach);
if ($size > 0) { if ($size > 0) {
for ($i = 0; $i < $size; $i++) { for ($i = 0; $i < $size; $i++) {
if (is_array($attach) && array_key_exists($i, $attach)) { if (is_array($attach) && array_key_exists($i, $attach)) {

6
app/Http/Controllers/Common/SettingsController.php
View File

@@ -120,6 +120,7 @@ class SettingsController extends Controller
$widget = $widgets->where('id', '=', $id)->first(); $widget = $widgets->where('id', '=', $id)->first();
$widget->title = $request->title; $widget->title = $request->title;
$widget->value = $request->content; $widget->value = $request->content;
try { try {
$widget->save(); $widget->save();
@@ -198,6 +199,7 @@ class SettingsController extends Controller
$widget = $widgets->where('id', '=', $id)->first(); $widget = $widgets->where('id', '=', $id)->first();
$widget->title = $request->title; $widget->title = $request->title;
$widget->value = $request->content; $widget->value = $request->content;
try { try {
$widget->save(); $widget->save();
@@ -234,6 +236,7 @@ class SettingsController extends Controller
$data->name = $request->input('name'); $data->name = $request->input('name');
$data->email = $request->input('email'); $data->email = $request->input('email');
$data->password = Crypt::encrypt($request->input('password')); $data->password = Crypt::encrypt($request->input('password'));
try { try {
$data->save(); $data->save();
@@ -257,6 +260,7 @@ class SettingsController extends Controller
$pass = $request->input('password'); $pass = $request->input('password');
$password = Crypt::encrypt($pass); $password = Crypt::encrypt($pass);
$settings->password = $password; $settings->password = $password;
try { try {
$settings->save(); $settings->save();
} catch (Exception $e) { } catch (Exception $e) {
@@ -270,6 +274,7 @@ class SettingsController extends Controller
$settings->logo = $fileName; $settings->logo = $fileName;
$settings->save(); $settings->save();
} }
try { try {
$settings->fill($request->except('logo', 'password'))->save(); $settings->fill($request->except('logo', 'password'))->save();
@@ -364,6 +369,7 @@ class SettingsController extends Controller
public function PostPlugins(Request $request) public function PostPlugins(Request $request)
{ {
$this->validate($request, ['plugin' => 'required|mimes:application/zip,zip,Zip']); $this->validate($request, ['plugin' => 'required|mimes:application/zip,zip,Zip']);
try { try {
if (!extension_loaded('zip')) { if (!extension_loaded('zip')) {
throw new Exception('Please enable zip extension in your php'); throw new Exception('Please enable zip extension in your php');

3
app/Http/Controllers/Installer/helpdesk/InstallController.php
View File

@@ -364,7 +364,7 @@ class InstallController extends Controller
$datacontent = File::get($install); $datacontent = File::get($install);
$datacontent = str_replace('%0%', $value, $datacontent); $datacontent = str_replace('%0%', $value, $datacontent);
File::put($install, $datacontent); File::put($install, $datacontent);
// setting email settings in route // setting email settings in route
$smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()"; $smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
$link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; $link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
@@ -375,6 +375,7 @@ class InstallController extends Controller
$datacontent2 = str_replace('http://localhost', $link, $datacontent2); $datacontent2 = str_replace('http://localhost', $link, $datacontent2);
File::put($app_url, $datacontent2); File::put($app_url, $datacontent2);
$language = Cache::get('language'); $language = Cache::get('language');
try { try {
Cache::flush(); Cache::flush();

1
app/Http/Controllers/Job/MailController.php
View File

@@ -43,6 +43,7 @@ class MailController extends Controller
public function getServiceForm($short_name) public function getServiceForm($short_name)
{ {
$form = ''; $form = '';
try { try {
switch ($short_name) { switch ($short_name) {
case 'smtp': case 'smtp':

4
app/Http/Middleware/CheckUpdate.php
View File

@@ -49,8 +49,8 @@ class CheckUpdate
$notify = new BarNotification(); $notify = new BarNotification();
if (!\Schema::hasTable('bar_notifications')) { if (!\Schema::hasTable('bar_notifications')) {
$url = url('database-upgrade'); $url = url('database-upgrade');
//$string = "Your Database is outdated please upgrade <a href=$url>Now !</a>"; //$string = "Your Database is outdated please upgrade <a href=$url>Now !</a>";
echo view('themes.default1.update.database', compact('url')); echo view('themes.default1.update.database', compact('url'));
exit; exit;
} }
$not = $notify->get(); $not = $notify->get();

1
app/Http/Requests/helpdesk/TicketRequest.php
View File

@@ -29,6 +29,7 @@ class TicketRequest extends Request
public function rules() public function rules()
{ {
$error = ''; $error = '';
try { try {
$size = $this->size(); $size = $this->size();
if ($size > 800 || $size == 0) { if ($size > 800 || $size == 0) {

50
app/Http/routes.php
View File

@@ -28,7 +28,7 @@ Route::group(['middleware' => ['web']], function () {
| Here is defining entire routes for the Admin Panel | Here is defining entire routes for the Admin Panel
| |
*/ */
Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']); Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
Breadcrumbs::register('password.email', function ($breadcrumbs) { Breadcrumbs::register('password.email', function ($breadcrumbs) {
$breadcrumbs->parent('/'); $breadcrumbs->parent('/');
$breadcrumbs->push('Login', url('auth/login')); $breadcrumbs->push('Login', url('auth/login'));
@@ -36,15 +36,15 @@ Route::group(['middleware' => ['web']], function () {
}); });
// register page // register page
Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']); Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']);
Breadcrumbs::register('auth.register', function ($breadcrumbs) { Breadcrumbs::register('auth.register', function ($breadcrumbs) {
$breadcrumbs->parent('/'); $breadcrumbs->parent('/');
$breadcrumbs->push('Login', url('auth/login')); $breadcrumbs->push('Login', url('auth/login'));
$breadcrumbs->push('Create Account', url('auth/register')); $breadcrumbs->push('Create Account', url('auth/register'));
}); });
// Auth login // Auth login
Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']); Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']);
Breadcrumbs::register('auth.login', function ($breadcrumbs) { Breadcrumbs::register('auth.login', function ($breadcrumbs) {
$breadcrumbs->parent('/'); $breadcrumbs->parent('/');
$breadcrumbs->push('Create Account', url('auth/register')); $breadcrumbs->push('Create Account', url('auth/register'));
@@ -83,10 +83,10 @@ Route::group(['middleware' => ['web']], function () {
Route::resource('teams', 'Admin\helpdesk\TeamController'); // in teams module, for CRUD Route::resource('teams', 'Admin\helpdesk\TeamController'); // in teams module, for CRUD
Route::get('/teams/show/{id}', ['as' => 'teams.show', 'uses' => 'Admin\helpdesk\TeamController@show']); /* Get Team View */ Route::get('/teams/show/{id}', ['as' => 'teams.show', 'uses' => 'Admin\helpdesk\TeamController@show']); /* Get Team View */
Breadcrumbs::register('teams.show', function ($breadcrumbs) { Breadcrumbs::register('teams.show', function ($breadcrumbs) {
$breadcrumbs->parent('teams.index'); $breadcrumbs->parent('teams.index');
$breadcrumbs->push(Lang::get('lang.show'), url('teams/{teams}/show')); $breadcrumbs->push(Lang::get('lang.show'), url('teams/{teams}/show'));
}); });
Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpdesk\TeamController@getshow']); Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpdesk\TeamController@getshow']);
Route::resource('agents', 'Admin\helpdesk\AgentController'); // in agents module, for CRUD Route::resource('agents', 'Admin\helpdesk\AgentController'); // in agents module, for CRUD
@@ -428,7 +428,7 @@ Route::group(['middleware' => ['web']], function () {
// route to get the data on change // route to get the data on change
Route::post('help-topic-report/{date1}/{date2}/{id}', ['as' => 'report.helptopic', 'uses' => 'Agent\helpdesk\ReportController@chartdataHelptopic']); /* To show dashboard pages */ Route::post('help-topic-report/{date1}/{date2}/{id}', ['as' => 'report.helptopic', 'uses' => 'Agent\helpdesk\ReportController@chartdataHelptopic']); /* To show dashboard pages */
Route::post('help-topic-pdf', ['as' => 'help.topic.pdf', 'uses' => 'Agent\helpdesk\ReportController@helptopicPdf']); Route::post('help-topic-pdf', ['as' => 'help.topic.pdf', 'uses' => 'Agent\helpdesk\ReportController@helptopicPdf']);
// Route to get details of agents // Route to get details of agents
Route::post('get-agents', ['as' => 'get-agents', 'uses' => 'Agent\helpdesk\UserController@getAgentDetails']); Route::post('get-agents', ['as' => 'get-agents', 'uses' => 'Agent\helpdesk\UserController@getAgentDetails']);
/* /*
@@ -446,12 +446,12 @@ Route::group(['middleware' => ['web']], function () {
Route::get('get-tag', ['as'=>'tag.get', 'uses'=>'Agent\helpdesk\Filter\TagController@getTag']); Route::get('get-tag', ['as'=>'tag.get', 'uses'=>'Agent\helpdesk\Filter\TagController@getTag']);
}); });
/* /*
* Followup tickets * Followup tickets
*/ */
Route::get('/ticket/followup', ['as' => 'followup.ticket', 'uses' => 'Agent\helpdesk\TicketController@followupTicketList']); // Get Closed Ticket / Route::get('/ticket/followup', ['as' => 'followup.ticket', 'uses' => 'Agent\helpdesk\TicketController@followupTicketList']); // Get Closed Ticket /
Route::get('/ticket/get-followup', ['as' => 'get.followup.ticket', 'uses' => 'Agent\helpdesk\TicketController@getFollowup']); // Get tickets in datatable / Route::get('/ticket/get-followup', ['as' => 'get.followup.ticket', 'uses' => 'Agent\helpdesk\TicketController@getFollowup']); // Get tickets in datatable /
Route::get('/ticket/close/get-approval/{id}', ['as' => 'get.close.approval.ticket', 'uses' => 'Agent\helpdesk\TicketController@getCloseapproval']); // Get tickets in datatable / Route::get('/ticket/close/get-approval/{id}', ['as' => 'get.close.approval.ticket', 'uses' => 'Agent\helpdesk\TicketController@getCloseapproval']); // Get tickets in datatable /
/* /*
|------------------------------------------------------------------ |------------------------------------------------------------------
@@ -494,11 +494,11 @@ Route::group(['middleware' => ['web']], function () {
Route::get('check_ticket/{id}', ['as' => 'check_ticket', 'uses' => 'Client\helpdesk\GuestController@get_ticket_email']); //detail ticket information Route::get('check_ticket/{id}', ['as' => 'check_ticket', 'uses' => 'Client\helpdesk\GuestController@get_ticket_email']); //detail ticket information
// show ticket via have a ticket // show ticket via have a ticket
Route::get('show-ticket/{id}/{code}', ['as' => 'show.ticket', 'uses' => 'Client\helpdesk\UnAuthController@showTicketCode']); //detail ticket information Route::get('show-ticket/{id}/{code}', ['as' => 'show.ticket', 'uses' => 'Client\helpdesk\UnAuthController@showTicketCode']); //detail ticket information
//testing ckeditor //testing ckeditor
//=================================================================================== //===================================================================================
Route::group(['middleware' => 'role.user', 'middleware' => 'auth'], function () { Route::group(['middleware' => 'role.user', 'middleware' => 'auth'], function () {
Route::get('client-profile', ['as' => 'client.profile', 'uses' => 'Client\helpdesk\GuestController@getProfile']); /* User profile get */ Route::get('client-profile', ['as' => 'client.profile', 'uses' => 'Client\helpdesk\GuestController@getProfile']); /* User profile get */
@@ -511,7 +511,7 @@ Route::group(['middleware' => ['web']], function () {
Route::post('verify-client-number2', ['as' => 'post-client-verify-number', 'uses' => 'Client\helpdesk\GuestController@verifyOTP']); Route::post('verify-client-number2', ['as' => 'post-client-verify-number', 'uses' => 'Client\helpdesk\GuestController@verifyOTP']);
}); });
//==================================================================================== //====================================================================================
Route::get('checkticket', 'Client\helpdesk\ClientTicketController@getCheckTicket'); /* Check your Ticket */ Route::get('checkticket', 'Client\helpdesk\ClientTicketController@getCheckTicket'); /* Check your Ticket */
Route::get('myticket', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@getMyticket']); /* Get my tickets */ Route::get('myticket', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@getMyticket']); /* Get my tickets */
Route::get('myticket/{id}', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@thread']); /* Get my tickets */ Route::get('myticket/{id}', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@thread']); /* Get my tickets */
@@ -705,7 +705,7 @@ Route::group(['middleware' => ['web']], function () {
* @author Vijay Sebastian<vijay.sebastian@ladybirdweb.com> * @author Vijay Sebastian<vijay.sebastian@ladybirdweb.com>
* @name Faveo * @name Faveo
*/ */
Route::group(['prefix' => 'api/v1'], function () { Route::group(['prefix' => 'api/v1'], function () {
Route::post('authenticate', 'Api\v1\TokenAuthController@authenticate'); Route::post('authenticate', 'Api\v1\TokenAuthController@authenticate');
Route::get('authenticate/user', 'Api\v1\TokenAuthController@getAuthenticatedUser'); Route::get('authenticate/user', 'Api\v1\TokenAuthController@getAuthenticatedUser');
Route::get('/database-config', ['as' => 'database-config', 'uses' => 'Api\v1\InstallerApiController@config_database']); Route::get('/database-config', ['as' => 'database-config', 'uses' => 'Api\v1\InstallerApiController@config_database']);
@@ -816,8 +816,8 @@ Route::group(['middleware' => ['web']], function () {
Route::post('ticket/priority/edit1', ['as' => 'priority.edit1', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit1']); Route::post('ticket/priority/edit1', ['as' => 'priority.edit1', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit1']);
Route::get('ticket/priority/{ticket_priority}/edit', ['as' => 'priority.edit', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit']); Route::get('ticket/priority/{ticket_priority}/edit', ['as' => 'priority.edit', 'uses' => 'Admin\helpdesk\PriorityController@priorityEdit']);
Route::get('ticket/priority/{ticket_priority}/destroy', ['as' => 'priority.destroy', 'uses' => 'Admin\helpdesk\PriorityController@destroy']); Route::get('ticket/priority/{ticket_priority}/destroy', ['as' => 'priority.destroy', 'uses' => 'Admin\helpdesk\PriorityController@destroy']);
// user---arindam // user---arindam
Route::post('rolechangeadmin/{id}', ['as' => 'user.post.rolechangeadmin', 'uses' =>'Agent\helpdesk\UserController@changeRoleAdmin']); Route::post('rolechangeadmin/{id}', ['as' => 'user.post.rolechangeadmin', 'uses' =>'Agent\helpdesk\UserController@changeRoleAdmin']);
Route::post('rolechangeagent/{id}', ['as' => 'user.post.rolechangeagent', 'uses' =>'Agent\helpdesk\UserController@changeRoleAgent']); Route::post('rolechangeagent/{id}', ['as' => 'user.post.rolechangeagent', 'uses' =>'Agent\helpdesk\UserController@changeRoleAgent']);
Route::post('rolechangeuser/{id}', ['as' => 'user.post.rolechangeuser', 'uses' =>'Agent\helpdesk\UserController@changeRoleUser']); Route::post('rolechangeuser/{id}', ['as' => 'user.post.rolechangeuser', 'uses' =>'Agent\helpdesk\UserController@changeRoleUser']);
Route::get('password', ['as' => 'user.changepassword', 'uses' =>'Agent\helpdesk\UserController@randomPassword']); Route::get('password', ['as' => 'user.changepassword', 'uses' =>'Agent\helpdesk\UserController@randomPassword']);
@@ -825,15 +825,15 @@ Route::group(['middleware' => ['web']], function () {
Route::post('delete/{id}', ['as' => 'user.post.delete', 'uses' =>'Agent\helpdesk\UserController@deleteAgent']); Route::post('delete/{id}', ['as' => 'user.post.delete', 'uses' =>'Agent\helpdesk\UserController@deleteAgent']);
// deleted user list // deleted user list
Route::get('deleted/user', ['as' => 'user.deleted', 'uses' => 'Agent\helpdesk\UserController@deletedUser']); Route::get('deleted/user', ['as' => 'user.deleted', 'uses' => 'Agent\helpdesk\UserController@deletedUser']);
Route::post('restore/{id}', ['as' => 'user.restore', 'uses' => 'Agent\helpdesk\UserController@restoreUser']); Route::post('restore/{id}', ['as' => 'user.restore', 'uses' => 'Agent\helpdesk\UserController@restoreUser']);
//due today ticket //due today ticket
Route::get('duetoday', ['as' => 'ticket.duetoday', 'uses' =>'Agent\helpdesk\TicketController@dueTodayTicketlist']); Route::get('duetoday', ['as' => 'ticket.duetoday', 'uses' =>'Agent\helpdesk\TicketController@dueTodayTicketlist']);
// Route::post('duetoday/list/ticket', ['as' => 'ticket.post.duetoday', 'uses' =>'Agent\helpdesk\TicketController@getDueToday']); // Route::post('duetoday/list/ticket', ['as' => 'ticket.post.duetoday', 'uses' =>'Agent\helpdesk\TicketController@getDueToday']);
Route::get('duetoday/list/ticket', ['as' => 'ticket.post.duetoday', 'uses' =>'Agent\helpdesk\TicketController@getDueToday']); /* Get Open Ticket */ Route::get('duetoday/list/ticket', ['as' => 'ticket.post.duetoday', 'uses' =>'Agent\helpdesk\TicketController@getDueToday']); /* Get Open Ticket */
// Breadcrumbs::register('open.ticket', function ($breadcrumbs) { // Breadcrumbs::register('open.ticket', function ($breadcrumbs) {
// $breadcrumbs->parent('dashboard'); // $breadcrumbs->parent('dashboard');
// $breadcrumbs->push(Lang::get('lang.tickets') . '&nbsp; > &nbsp;' . Lang::get('lang.open'), route('open.ticket')); // $breadcrumbs->push(Lang::get('lang.tickets') . '&nbsp; > &nbsp;' . Lang::get('lang.open'), route('open.ticket'));

2
app/Model/helpdesk/Notification/Notification.php
View File

@@ -59,7 +59,7 @@ class Notification extends BaseModel
public function delete() public function delete()
{ {
$this->deleteUserNotification(); $this->deleteUserNotification();
// $this->dummyDelete(); // $this->dummyDelete();
parent::delete(); parent::delete();
} }
} }

2
config/app.php
View File

@@ -187,8 +187,6 @@ return [
App\FaveoLog\LaravelLogViewerServiceProvider::class, App\FaveoLog\LaravelLogViewerServiceProvider::class,
App\FaveoStorage\StorageServiceProvider::class, App\FaveoStorage\StorageServiceProvider::class,
Yajra\Datatables\DatatablesServiceProvider::class, Yajra\Datatables\DatatablesServiceProvider::class,
], ],
/* /*

18
database/migrations/2016_04_18_115852_create_workflow_name_table.php
View File

@@ -23,13 +23,13 @@ class CreateWorkflowNameTable extends Migration
}); });
} }
/** /**
* Reverse the migrations. * Reverse the migrations.
* *
* @return void * @return void
*/ */
public function down() public function down()
{ {
Schema::drop('workflow_name'); Schema::drop('workflow_name');
} }
} }

24
database/migrations/2016_04_18_115900_create_workflow_rule_table.php
View File

@@ -27,16 +27,16 @@ class CreateWorkflowRuleTable extends Migration
}); });
} }
/** /**
* Reverse the migrations. * Reverse the migrations.
* *
* @return void * @return void
*/ */
public function down() public function down()
{ {
Schema::table('workflow_rules', function (Blueprint $table) { Schema::table('workflow_rules', function (Blueprint $table) {
$table->dropForeign('workflow_rules_1'); $table->dropForeign('workflow_rules_1');
}); });
Schema::drop('workflow_rules'); Schema::drop('workflow_rules');
} }
} }

24
database/migrations/2016_04_18_115908_create_workflow_action_table.php
View File

@@ -24,16 +24,16 @@ class CreateWorkflowActionTable extends Migration
}); });
} }
/** /**
* Reverse the migrations. * Reverse the migrations.
* *
* @return void * @return void
*/ */
public function down() public function down()
{ {
Schema::drop('workflow_action'); Schema::drop('workflow_action');
Schema::table('workflow_action', function (Blueprint $table) { Schema::table('workflow_action', function (Blueprint $table) {
$table->dropForeign('workflow_action_idfk_1'); $table->dropForeign('workflow_action_idfk_1');
}); });
} }
} }

2
database/migrations/2016_05_10_102604_create_bar_notifications_table.php
View File

@@ -20,7 +20,7 @@ class CreateBarNotificationsTable extends Migration
}); });
$version = \Config::get('app.version'); $version = \Config::get('app.version');
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');
//\DB::table('bar_notifications')->insert(['key'=>'new-install','value'=>"Congrates ! You have installed $version",'created_at'=>$date]); //\DB::table('bar_notifications')->insert(['key'=>'new-install','value'=>"Congrates ! You have installed $version",'created_at'=>$date]);
} }
/** /**

1
public/ckeditor/samples/old/assets/posteddata.php
View File

@@ -41,7 +41,6 @@ if (!empty($_POST)) {
<td><pre class="samples"><?php echo $value; ?></pre></td> <td><pre class="samples"><?php echo $value; ?></pre></td>
</tr> </tr>
<?php <?php
} }
} }
?> ?>