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
2020-03-17 05:14:38 +00:00
committed by StyleCI Bot
parent 9fe479b141
commit ed3bbd76d7
75 changed files with 1285 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php
View File

@@ -62,24 +62,32 @@ class ErrorAndDebuggingController extends Controller
// dd($request->input());
$debug_new = base_path().DIRECTORY_SEPARATOR.'.env';
$datacontent = File::get($debug_new);
$datacontent = str_replace('APP_DEBUG='.$debug,
'APP_DEBUG='.\Input::get('debug'),
$datacontent);
$datacontent = str_replace(
'APP_DEBUG='.$debug,
'APP_DEBUG='.\Input::get('debug'),
$datacontent
);
File::put($debug_new, $datacontent);
// dd($request->input());
$bugsnag_debug_new = base_path().DIRECTORY_SEPARATOR.'.env';
$datacontent2 = File::get($bugsnag_debug_new);
$datacontent2 = str_replace('APP_BUGSNAG='.$bugsnag_debug,
'APP_BUGSNAG='.\Input::get('bugsnag'),
$datacontent2);
$datacontent2 = str_replace(
'APP_BUGSNAG='.$bugsnag_debug,
'APP_BUGSNAG='.\Input::get('bugsnag'),
$datacontent2
);
File::put($bugsnag_debug_new, $datacontent2);
return redirect()->back()->with('success',
Lang::get('lang.error-debug-settings-saved-message'));
return redirect()->back()->with(
'success',
Lang::get('lang.error-debug-settings-saved-message')
);
} else {
return redirect()->back()->with('fails',
Lang::get('lang.error-debug-settings-error-message'));
return redirect()->back()->with(
'fails',
Lang::get('lang.error-debug-settings-error-message')
);
}
} catch (Exception $e) {
/* redirect to Index page with Fails Message */

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

@@ -139,11 +139,11 @@ class FormController extends Controller
if (!empty(Input::get('name')[$i])) {
$name = str_slug(Input::get('name')[$i], '_');
$field = Fields::create([
'forms_id' => $forms->id,
'label' => Input::get('label')[$i],
'name' => $name,
'type' => Input::get('type')[$i],
'required' => $require[$i],
'forms_id' => $forms->id,
'label' => Input::get('label')[$i],
'name' => $name,
'type' => Input::get('type')[$i],
'required' => $require[$i],
]);
$field_id = $field->id;
$this->createValues($field_id, Input::get('value')[$i], null, $name);

29
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -1099,8 +1099,13 @@ class SettingsController extends Controller
{
try {
$user = \App\User::select(
'user_name', 'first_name', 'last_name', 'email', 'password', 'agent_tzone'
)->where('id', '=', 1)->first();
'user_name',
'first_name',
'last_name',
'email',
'password',
'agent_tzone'
)->where('id', '=', 1)->first();
$system = System::where('id', '=', 1)->first();
\Schema::disableForeignKeyConstraints();
$tableNames = \Schema::getConnection()->getDoctrineSchemaManager()->listTableNames();
@@ -1123,16 +1128,16 @@ class SettingsController extends Controller
DB::commit();
\Artisan::call('db:seed', ['--force' => true]);
$user2 = \App\User::updateOrCreate(['id' => 1], [
'first_name' => $user->first_name,
'last_name' => $user->last_name,
'email' => $user->email,
'user_name' => $user->user_name,
'password' => $user->password,
'assign_group' => 1,
'primary_dpt' => 1,
'active' => 1,
'agent_tzone' => $user->agent_tzone,
'role' => 'admin',
'first_name' => $user->first_name,
'last_name' => $user->last_name,
'email' => $user->email,
'user_name' => $user->user_name,
'password' => $user->password,
'assign_group' => 1,
'primary_dpt' => 1,
'active' => 1,
'agent_tzone' => $user->agent_tzone,
'role' => 'admin',
]);
$system2 = System::find(1);
$system2->time_zone = $system->time_zone;

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

@@ -341,7 +341,8 @@ class TemplateController extends Controller
return redirect()->back()->with(
'success',
trans('lang.mail-sent-to-job-for-process'));
trans('lang.mail-sent-to-job-for-process')
);
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}

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

@@ -88,7 +88,7 @@ class FilterController extends Controller
*
* @param null
*
* @var $tickets
* @var
*
* @return builder $tickets
*/
@@ -105,7 +105,35 @@ class FilterController extends Controller
->leftJoin('ticket_thread as th', 'th.ticket_id', '=', 'tickets.id')
->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'th.id')
->select(
'tickets.id', 'th.title', 'tickets.ticket_number', 'u1.user_name as c_uname', 'u2.user_name as a_uname', \DB::raw('CONVERT_TZ(max(th.updated_at), "+00:00", "'.$this->gmt.'") as updated_at2'), \DB::raw('CONVERT_TZ(min(th.updated_at), "+00:00", "'.$this->gmt.'") as created_at2'), \DB::raw('CONVERT_TZ(max(tickets.duedate), "+00:00", "'.$this->gmt.'") as duedate'), \DB::raw('max(th.updated_at) as updated_at'), \DB::raw('min(th.updated_at) as created_at'), 'tickets.duedate as due', 'u1.id as c_uid', 'ticket_priority.priority as priority', 'u1.first_name AS c_fname', 'u1.last_name as c_lname', 'u2.id as a_uid', 'u2.first_name as a_fname', 'u2.last_name as a_lname', 'u1.active as verified', 'teams.name', 'tickets.assigned_to', 'ticket_priority.priority_color as color', 'ticket_source.css_class as css', \DB::raw('COUNT(ticket_attachment.thread_id) as countattachment'), DB::raw('COUNT(ticket_collaborator.ticket_id) as countcollaborator'), \DB::raw('COUNT(DISTINCT th.id) as countthread'), \DB::raw('substring_index(group_concat(if(`th`.`is_internal` = 0, `th`.`poster`,null)ORDER By th.id desc) , ",", 1) as last_replier'), \DB::raw('substring_index(group_concat(th.title order by th.id asc SEPARATOR "-||,||-") , "-||,||-", 1) as ticket_title'), 'ticket_source.name as source'
'tickets.id',
'th.title',
'tickets.ticket_number',
'u1.user_name as c_uname',
'u2.user_name as a_uname',
\DB::raw('CONVERT_TZ(max(th.updated_at), "+00:00", "'.$this->gmt.'") as updated_at2'),
\DB::raw('CONVERT_TZ(min(th.updated_at), "+00:00", "'.$this->gmt.'") as created_at2'),
\DB::raw('CONVERT_TZ(max(tickets.duedate), "+00:00", "'.$this->gmt.'") as duedate'),
\DB::raw('max(th.updated_at) as updated_at'),
\DB::raw('min(th.updated_at) as created_at'),
'tickets.duedate as due',
'u1.id as c_uid',
'ticket_priority.priority as priority',
'u1.first_name AS c_fname',
'u1.last_name as c_lname',
'u2.id as a_uid',
'u2.first_name as a_fname',
'u2.last_name as a_lname',
'u1.active as verified',
'teams.name',
'tickets.assigned_to',
'ticket_priority.priority_color as color',
'ticket_source.css_class as css',
\DB::raw('COUNT(ticket_attachment.thread_id) as countattachment'),
DB::raw('COUNT(ticket_collaborator.ticket_id) as countcollaborator'),
\DB::raw('COUNT(DISTINCT th.id) as countthread'),
\DB::raw('substring_index(group_concat(if(`th`.`is_internal` = 0, `th`.`poster`,null)ORDER By th.id desc) , ",", 1) as last_replier'),
\DB::raw('substring_index(group_concat(th.title order by th.id asc SEPARATOR "-||,||-") , "-||,||-", 1) as ticket_title'),
'ticket_source.name as source'
)->groupby('tickets.id');
return $tickets;
@@ -387,7 +415,7 @@ class FilterController extends Controller
*
* @param $table querybuilder
*
* @var $id, $dept
* @var, $dept
*
* @return $table
*/
@@ -410,7 +438,7 @@ class FilterController extends Controller
*
* @param array $value //requested department, $table
*
* @var array $departmentTickets
* @var array
*
* @return $table
*/
@@ -440,7 +468,7 @@ class FilterController extends Controller
*
* @param array $departments
*
* @var array $requested_dept
* @var array
*
* @return array of boolean and array values
*/
@@ -464,7 +492,7 @@ class FilterController extends Controller
*
* @param array $priority, builder $table
*
* @var array $priority_ids
* @var array
*
* @return builder
*/
@@ -483,7 +511,7 @@ class FilterController extends Controller
*
* @param string array $user_name, builder $table
*
* @var array $users
* @var array
*
* @return filtered builder
*/
@@ -508,7 +536,7 @@ class FilterController extends Controller
*
* @param array of string values $name
*
* @var $query, array $teams(all fetched teams id)
* @var, array $teams(all fetched teams id)
*
* @return array $teams
*/
@@ -525,7 +553,7 @@ class FilterController extends Controller
*
* @param string array $name, builder $table
*
* @var array $users (stores id's of agents and admin),
* @var array (stores id's of agents and admin),
* array $teams (stores ids of teams), array asssigned merged arrya of unique elements in $teams and $users
*
* @return builder $table
@@ -557,7 +585,7 @@ class FilterController extends Controller
*
* @param string $type (to check type of filter to apply on date), string $value for filters, builder $table
*
* @var array $date [start and end dates]
* @var array [start and end dates]
*
* @return builder
*/
@@ -599,7 +627,7 @@ class FilterController extends Controller
*
* @param string $value
*
* @var date string $start, date string $end
* @var date string, date string $end
*
* @return array of start and end date
*/
@@ -846,7 +874,7 @@ class FilterController extends Controller
*
* @param array $dates, builder $table, $column (type of filter based on which column is being chosen), $value
*
* @var string $check_column (name of column), array $dates
* @var string (name of column), array $dates
*
* @return builder
*/
@@ -880,7 +908,7 @@ class FilterController extends Controller
*
* @param array $name of source, builder $table
*
* @var array $sources
* @var array
*
* @return builder
*/
@@ -894,7 +922,7 @@ class FilterController extends Controller
return $table->whereIn('tickets.source', $sources);
}
/** DEPRICATED
/** DEPRICATED.
* @category function to get array of status to filter tickets
*
* @param string $status
@@ -1024,7 +1052,7 @@ class FilterController extends Controller
*
* @param null
*
* @var $system, $tz
* @var, $tz
*
* @return string GMT value of timezone
*/

6
app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php
View File

@@ -265,12 +265,14 @@ class FilterControllerOld extends Controller
DB::raw('COUNT(ticket_collaborator.ticket_id) as countcollaborator'),
'tickets.status',
'tickets.user_id',
'tickets.priority_id', 'tickets.assigned_to',
'tickets.priority_id',
'tickets.assigned_to',
'ticket_status.name as tickets_status',
'ticket_source.css_class as css',
DB::raw('substring_index(group_concat(ticket_thread.poster order by ticket_thread.id desc) , ",", 1) as last_replier'),
DB::raw('substring_index(group_concat(ticket_thread.title order by ticket_thread.id asc) , ",", 1) as ticket_title'),
'u.active as verified')
'u.active as verified'
)
->groupby('tickets.id');
return $tickets;

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

@@ -412,20 +412,20 @@ class TicketController extends Controller
$link = url('check_ticket/'.$encoded_ticketid);
$this->NotificationController->create($ticket_id, Auth::user()->id, '2');
$this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('0', $tickets->dept_id),
$to = ['name' => $user_name, 'email' => $email, 'cc' => $collaborators],
$message = [
'subject' => $ticket_subject.'[#'.$ticket_number.']',
'body' => $line.$request->input('reply_content'),
'scenario' => 'ticket-reply',
'attachments' => $attachment_files,
],
$template_variables = [
'ticket_number' => $ticket_number,
'user' => $username,
'agent_sign' => $agentsign,
'system_link' => $link,
]
$from = $this->PhpMailController->mailfrom('0', $tickets->dept_id),
$to = ['name' => $user_name, 'email' => $email, 'cc' => $collaborators],
$message = [
'subject' => $ticket_subject.'[#'.$ticket_number.']',
'body' => $line.$request->input('reply_content'),
'scenario' => 'ticket-reply',
'attachments' => $attachment_files,
],
$template_variables = [
'ticket_number' => $ticket_number,
'user' => $username,
'agent_sign' => $agentsign,
'system_link' => $link,
]
);
}
} catch (\Exception $e) {
@@ -733,12 +733,16 @@ class TicketController extends Controller
if ($auto_response == 0) {
$encoded_ticketid = Crypt::encrypt($ticketdata->id);
$link = url('check_ticket/'.$encoded_ticketid);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body],
$template_variables = [
'agent_sign' => Auth::user()->agent_sign,
'ticket_number' => $ticket_number2,
'system_link' => $link,
]);
$this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id),
$to = ['name' => $username, 'email' => $emailadd],
$message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body],
$template_variables = [
'agent_sign' => Auth::user()->agent_sign,
'ticket_number' => $ticket_number2,
'system_link' => $link,
]
);
}
} catch (\Exception $e) {
//dd($e);
@@ -748,12 +752,16 @@ class TicketController extends Controller
try {
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'],
$template_variables = ['user' => $username,
'ticket_number' => $ticket_number2,
'department_sign' => '',
'system_link' => $link,
]);
$this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id),
$to = ['name' => $username, 'email' => $emailadd],
$message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'],
$template_variables = ['user' => $username,
'ticket_number' => $ticket_number2,
'department_sign' => '',
'system_link' => $link,
]
);
}
} catch (\Exception $e) {
}
@@ -810,20 +818,23 @@ class TicketController extends Controller
foreach ($emails_to_be_sent as $email_data) {
try {
$this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = [
'user' => $email_data['to_user'],
'email' => $email_data['to_email'],
], $message = [
'subject' => $updated_subject,
'body' => $body, 'scenario' => $mail,
], $template_variables = [
'ticket_agent_name' => $email_data['to_user_name'],
'ticket_client_name' => $username,
'ticket_client_email' => $emailadd,
'user' => $email_data['to_user_name'],
'ticket_number' => $ticket_number2,
'email_address' => $emailadd,
'name' => $ticket_creator, ]
$from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id),
$to = [
'user' => $email_data['to_user'],
'email' => $email_data['to_email'],
],
$message = [
'subject' => $updated_subject,
'body' => $body, 'scenario' => $mail,
],
$template_variables = [
'ticket_agent_name' => $email_data['to_user_name'],
'ticket_client_name' => $username,
'ticket_client_email' => $emailadd,
'user' => $email_data['to_user_name'],
'ticket_number' => $ticket_number2,
'email_address' => $emailadd,
'name' => $ticket_creator, ]
);
} catch (\Exception $e) {
}
@@ -1153,11 +1164,11 @@ class TicketController extends Controller
return 0;
}
$data = [
'id' => $ticket_status->ticket_number,
'status' => 'Closed',
'first_name' => Auth::user()->first_name,
'last_name' => Auth::user()->last_name,
];
'id' => $ticket_status->ticket_number,
'status' => 'Closed',
'first_name' => Auth::user()->first_name,
'last_name' => Auth::user()->last_name,
];
\Event::fire('change-status', [$data]);
return 'your ticket'.$ticket_status->ticket_number.' has been closed';
@@ -1736,7 +1747,10 @@ class TicketController extends Controller
$notification = Notification::select('id')->where('model_id', '=', $ticket->id)->get();
foreach ($notification as $id) {
$user_notification = UserNotification::where(
'notification_id', '=', $id->id);
'notification_id',
'=',
$id->id
);
$user_notification->delete();
}
$notification = Notification::select('id')->where('model_id', '=', $ticket->id);
@@ -2106,9 +2120,10 @@ class TicketController extends Controller
$email = $email;
$ticket_id = $ticket_id;
$validator = \Validator::make(
['email' => $email,
'name' => $name, ], ['email' => 'required|email',
]
['email' => $email,
'name' => $name, ],
['email' => 'required|email',
]
);
$user = User::where('email', '=', $email)->first();
if ($user) {
@@ -2812,7 +2827,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.inbox', compact('table'));
@@ -2827,7 +2850,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.open', compact('table'));
@@ -2842,7 +2873,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.answered', compact('table'));
@@ -2857,7 +2896,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.myticket', compact('table'));
@@ -2872,7 +2919,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.overdue', compact('table'));
@@ -2887,7 +2942,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.duetodayticket', compact('table'));
@@ -2902,7 +2965,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.closed', compact('table'));
@@ -2917,7 +2988,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.assigned', compact('table'));
@@ -2952,7 +3031,15 @@ class TicketController extends Controller
}
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.dept-ticket.tickets', compact('dept', 'status', 'table'));
@@ -2967,7 +3054,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.trash', compact('table'));
@@ -2982,7 +3077,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.unassigned', compact('table'));
@@ -2997,7 +3100,15 @@ class TicketController extends Controller
{
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.ticket.myticket', compact('table'));
@@ -3011,7 +3122,15 @@ class TicketController extends Controller
try {
$table = \Datatable::table()
->addColumn(
'', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at'))
'',
Lang::get('lang.subject'),
Lang::get('lang.ticket_id'),
Lang::get('lang.priority'),
Lang::get('lang.from'),
Lang::get('lang.assigned_to'),
Lang::get('lang.last_activity'),
Lang::get('lang.created-at')
)
->noScript();
return view('themes.default1.agent.helpdesk.followup.followup', compact('table'));

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

@@ -82,13 +82,15 @@ class UserController extends Controller
/* get all values in Sys_user */
$table = \ Datatable::table()
->addColumn(Lang::get('lang.name'),
->addColumn(
Lang::get('lang.name'),
Lang::get('lang.email'),
Lang::get('lang.phone'),
Lang::get('lang.status'),
Lang::get('lang.last_login'),
Lang::get('lang.role'),
Lang::get('lang.action')) // these are the column headings to be shown
Lang::get('lang.action')
) // these are the column headings to be shown
->noScript();
return view('themes.default1.agent.helpdesk.user.index', compact('table'));

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

@@ -321,10 +321,10 @@ class AuthController extends Controller
return redirect()->back()
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.not-registered'),
'referer' => $referer, ]);
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.not-registered'),
'referer' => $referer, ]);
}
//if user exists
@@ -367,10 +367,10 @@ class AuthController extends Controller
return redirect()->back()
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'),
'referer' => $referer, ]);
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'),
'referer' => $referer, ]);
} else {
// try login
$loginAttempts = 1;
@@ -416,10 +416,10 @@ class AuthController extends Controller
return redirect()->back()
->withInput($request->only('email', 'remember'))
->withErrors([
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.invalid'),
'referer' => $referer, ]);
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.invalid'),
'referer' => $referer, ]);
// Increment login attempts
} catch (\Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());

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

@@ -69,10 +69,10 @@ class ForgotPasswordController extends Controller
$name = $user->user_name;
}
$value = [
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code, ];
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code, ];
\Event::fire('reset.password2', [$value]);
}

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

@@ -75,10 +75,10 @@ class PasswordController extends Controller
$name = $user->user_name;
}
$value = [
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code, ];
'url' => url('password/reset/'.$code),
'name' => $name,
'mobile' => $user->mobile,
'code' => $user->country_code, ];
\Event::fire('reset.password2', [$value]);
}

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

@@ -299,8 +299,8 @@ class GuestController extends Controller
public function PostCheckTicket(Request $request)
{
$validator = \Validator::make($request->all(), [
'email' => 'required|email',
'ticket_number' => 'required',
'email' => 'required|email',
'ticket_number' => 'required',
]);
if ($validator->fails()) {
return redirect()->back()
@@ -330,7 +330,10 @@ class GuestController extends Controller
$company = $this->company();
$this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $user->email], $message = ['subject' => 'Ticket link Request ['.$Ticket_number.']', 'scenario' => 'check-ticket'], $template_variables = ['user' => $username, 'ticket_link_with_number' => \URL::route('check_ticket', $code)]
$from = $this->PhpMailController->mailfrom('1', '0'),
$to = ['name' => $username, 'email' => $user->email],
$message = ['subject' => 'Ticket link Request ['.$Ticket_number.']', 'scenario' => 'check-ticket'],
$template_variables = ['user' => $username, 'ticket_link_with_number' => \URL::route('check_ticket', $code)]
);
return \Redirect::back()

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

@@ -53,8 +53,8 @@ class UnAuthController extends Controller
{
try {
$validator = \Validator::make($request->all(), [
'email_address' => 'required|email',
'ticket_number' => 'required',
'email_address' => 'required|email',
'ticket_number' => 'required',
]);
if ($validator->fails()) {
return redirect()->back()
@@ -98,7 +98,10 @@ class UnAuthController extends Controller
try {
$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)]
);
} catch (\Exception $e) {
}

16
app/Http/Controllers/Common/NotificationController.php
View File

@@ -13,7 +13,7 @@ class NotificationController extends Controller
{
/**
* ********************************************
* Class Notification Controller
* Class Notification Controller.
* ********************************************
* This controller is used to generate in app notification
* under the folling occurrence
@@ -157,13 +157,13 @@ class NotificationController extends Controller
public static function getNotifications()
{
$notifications = UserNotification::with([
'notification.type' => function ($query) {
$query->select('id', 'message', 'type');
}, 'users' => function ($query) {
$query->select('id', 'email', 'profile_pic');
}, 'notification.model' => function ($query) {
$query->select('id', 'ticket_number');
},
'notification.type' => function ($query) {
$query->select('id', 'message', 'type');
}, 'users' => function ($query) {
$query->select('id', 'email', 'profile_pic');
}, 'notification.model' => function ($query) {
$query->select('id', 'ticket_number');
},
])->where('user_id', '=', \Auth::user()->id);
return $notifications;

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

@@ -28,7 +28,8 @@ class PhpMailController extends Controller
{
$emails = Emails::where(
[['id', '=', $id],
['sending_status', '=', 1], ])
['sending_status', '=', 1], ]
)
->first();
return $emails;
@@ -182,11 +183,11 @@ class PhpMailController extends Controller
switch ($mail->sending_protocol) {
case 'smtp':
$config = ['host' => $mail->sending_host,
'port' => $mail->sending_port,
'security' => $mail->sending_encryption,
'username' => $mail->email_address,
'password' => $mail->password,
];
'port' => $mail->sending_port,
'security' => $mail->sending_encryption,
'username' => $mail->email_address,
'password' => $mail->password,
];
if (!$this->commonMailer->setSmtpDriver($config)) {
\Log::info('Invaid configuration :- '.$config);
@@ -195,12 +196,12 @@ class PhpMailController extends Controller
break;
case 'send_mail':
$config = [
'host' => \Config::get('mail.host'),
'port' => \Config::get('mail.port'),
'security' => \Config::get('mail.encryption'),
'username' => \Config::get('mail.username'),
'password' => \Config::get('mail.password'),
];
'host' => \Config::get('mail.host'),
'port' => \Config::get('mail.port'),
'security' => \Config::get('mail.encryption'),
'username' => \Config::get('mail.username'),
'password' => \Config::get('mail.password'),
];
$this->commonMailer->setSmtpDriver($config);
break;
case 'mailgun':

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

@@ -22,7 +22,7 @@ use Lang;
/**
* ***************************
* Settings Controllers
* Settings Controllers.
* ***************************
* Controller to keep smtp details and fetch where ever needed.
*/

5
app/Http/Controllers/Controller.php
View File

@@ -10,6 +10,7 @@ use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs,
ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
}

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

@@ -224,12 +224,12 @@ class InstallController extends Controller
public function accountcheck(Request $request)
{
$validator = \Validator::make($request->all(), [
'firstname' => 'required|max:20',
'Lastname' => 'required|max:20',
'email' => 'required|max:50|email',
'username' => 'required|max:50|min:3',
'password' => 'required|min:6',
'confirmpassword' => 'required|same:password',
'firstname' => 'required|max:20',
'Lastname' => 'required|max:20',
'email' => 'required|max:50|email',
'username' => 'required|max:50|min:3',
'password' => 'required|min:6',
'confirmpassword' => 'required|same:password',
]);
if ($validator->fails()) {
@@ -285,15 +285,15 @@ class InstallController extends Controller
$admin_tzone = $timezones->id;
// creating an user
$user = User::updateOrCreate(['id' => 1], [
'first_name' => $firstname,
'last_name' => $lastname,
'email' => $email,
'user_name' => $username,
'password' => Hash::make($password),
//'assign_group' => 1,
'primary_dpt' => 1,
'active' => 1,
'role' => 'admin',
'first_name' => $firstname,
'last_name' => $lastname,
'email' => $email,
'user_name' => $username,
'password' => Hash::make($password),
//'assign_group' => 1,
'primary_dpt' => 1,
'active' => 1,
'role' => 'admin',
]);
// checking if the user have been created

10
app/Http/Controllers/Update/UpgradeController.php
View File

@@ -82,11 +82,11 @@ class UpgradeController extends Controller
{
echo '<p>Downloading New Update</p>';
$context = stream_context_create(
[
'http' => [
'header' => 'User-Agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36',
],
]
[
'http' => [
'header' => 'User-Agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36',
],
]
);
$newUpdate = file_get_contents($download_url, false, $context);