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

83
app/Api/v1/ApiController.php
View File

@@ -1123,7 +1123,24 @@ class ApiController extends Controller
->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id')
->where('users.id', $id)
->select(
'ticket_priority.priority_color as priority_color', \DB::raw('substring_index(group_concat(ticket_thread.title order by ticket_thread.id asc) , ",", 1) as title'), 'tickets.duedate as overdue_date', \DB::raw('count(ticket_attachment.id) as attachment'), \DB::raw('max(ticket_thread.updated_at) as updated_at'), 'client.user_name', 'client.first_name', 'client.last_name', 'client.email', 'client.profile_pic', 'ticket_number', 'tickets.id', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name'
'ticket_priority.priority_color as priority_color',
\DB::raw('substring_index(group_concat(ticket_thread.title order by ticket_thread.id asc) , ",", 1) as title'),
'tickets.duedate as overdue_date',
\DB::raw('count(ticket_attachment.id) as attachment'),
\DB::raw('max(ticket_thread.updated_at) as updated_at'),
'client.user_name',
'client.first_name',
'client.last_name',
'client.email',
'client.profile_pic',
'ticket_number',
'tickets.id',
'tickets.created_at',
'department.name as department_name',
'ticket_priority.priority as priotity_name',
'sla_plan.name as sla_plan_name',
'help_topic.topic as help_topic_name',
'ticket_status.name as ticket_status_name'
)
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
@@ -1166,7 +1183,20 @@ class ApiController extends Controller
->leftJoin('user_assign_organization', 'users.id', '=', 'user_assign_organization.user_id')
->leftJoin('organization', 'user_assign_organization.org_id', '=', 'organization.id')
->select(
'users.first_name', 'users.last_name', 'users.user_name', 'users.email', 'users.id', 'users.profile_pic', 'users.ban', 'users.active', 'users.is_delete', 'users.phone_number', 'users.ext', 'users.country_code', 'users.mobile', 'organization.name as company'
'users.first_name',
'users.last_name',
'users.user_name',
'users.email',
'users.id',
'users.profile_pic',
'users.ban',
'users.active',
'users.is_delete',
'users.phone_number',
'users.ext',
'users.country_code',
'users.mobile',
'organization.name as company'
)->first()->toArray();
$result = $this->user->join('tickets', function ($join) use ($id) {
$join->on('users.id', '=', 'tickets.user_id')
@@ -1234,7 +1264,39 @@ class ApiController extends Controller
//$select = 'users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','num_sequence','user_id','priority_id','sla','max_open_ticket','captcha','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','is_transfer','transfer_at','reopened_at','duedate','closed_at','last_message_at';
$result = $response->addSelect(
'users.email', 'users.user_name', 'users.first_name', 'users.last_name', 'tickets.id', 'ticket_number', 'user_id', 'ticket_priority.priority_id', 'ticket_priority.priority as priority_name', 'department.name as dept_name', 'ticket_status.name as status_name', 'sla_plan.name as sla_name', 'ticket_source.name as source_name', 'sla_plan.id as sla', 'ticket_status.id as status', 'lock_by', 'lock_at', 'ticket_source.id as source', 'isoverdue', 'reopened', 'isanswered', 'is_deleted', 'closed', 'reopened_at', 'duedate', 'closed_at', 'tickets.created_at', 'tickets.updated_at', 'ticket_priority.priority_color as priority_color', 'help_topic.id as helptopic_id', 'help_topic.topic as helptopic_name', 'sla_plan.grace_period as grace_period')->first();
'users.email',
'users.user_name',
'users.first_name',
'users.last_name',
'tickets.id',
'ticket_number',
'user_id',
'ticket_priority.priority_id',
'ticket_priority.priority as priority_name',
'department.name as dept_name',
'ticket_status.name as status_name',
'sla_plan.name as sla_name',
'ticket_source.name as source_name',
'sla_plan.id as sla',
'ticket_status.id as status',
'lock_by',
'lock_at',
'ticket_source.id as source',
'isoverdue',
'reopened',
'isanswered',
'is_deleted',
'closed',
'reopened_at',
'duedate',
'closed_at',
'tickets.created_at',
'tickets.updated_at',
'ticket_priority.priority_color as priority_color',
'help_topic.id as helptopic_id',
'help_topic.topic as helptopic_name',
'sla_plan.grace_period as grace_period'
)->first();
// $resultticket_source
$result2 = $result;
$result = $result->toArray();
@@ -1344,7 +1406,9 @@ class ApiController extends Controller
public function addCollaboratorForTicket()
{
try {
$v = \Validator::make(\Input::get(), [
$v = \Validator::make(
\Input::get(),
[
'email' => 'required|email|unique:users',
'ticket_id' => 'required',
]
@@ -1375,7 +1439,9 @@ class ApiController extends Controller
public function getCollaboratorForTicket()
{
try {
$v = \Validator::make(\Input::get(), [
$v = \Validator::make(
\Input::get(),
[
'ticket_id' => 'required',
]
);
@@ -1405,7 +1471,9 @@ class ApiController extends Controller
public function deleteCollaborator()
{
try {
$v = \Validator::make(\Input::get(), [
$v = \Validator::make(
\Input::get(),
[
'ticketid' => 'required',
'email' => 'required',
]
@@ -1573,7 +1641,8 @@ class ApiController extends Controller
{
try {
$v = \Validator::make(
$this->request->all(), [
$this->request->all(),
[
'username' => 'required|unique:users,user_name',
'first_name' => 'required',
]

3
app/Api/v1/InstallerApiController.php
View File

@@ -52,7 +52,8 @@ class InstallerApiController extends Controller
'databasename' => $request->databasename,
'dbusername' => $request->dbusername,
'port' => $request->port,
], $rules
],
$rules
);
if ($validator->fails()) {
$jsons = $validator->messages();

3
app/Console/Commands/Install.php
View File

@@ -54,7 +54,8 @@ class Install extends Command
$this->appEnv();
if ($this->confirm('Do you want to intall faveo?')) {
$default = $this->choice(
'Which sql engine would you like to use?', ['mysql']
'Which sql engine would you like to use?',
['mysql']
);
$host = $this->ask('Enter your sql host');
$database = $this->ask('Enter your database name');

2
app/Exceptions/Handler.php
View File

@@ -25,7 +25,7 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
// 'Symfony\Component\HttpKernel\Exception\HttpException',
// 'Symfony\Component\HttpKernel\Exception\HttpException',
\Illuminate\Http\Exception\HttpResponseException::class,
foundation::class,
AuthorizationException::class,

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

@@ -96,7 +96,9 @@ class SettingsController extends Controller
}
$iter = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($root, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST, RecursiveIteratorIterator::CATCH_GET_CHILD // Ignore "Permission denied"
new RecursiveDirectoryIterator($root, RecursiveDirectoryIterator::SKIP_DOTS),
RecursiveIteratorIterator::SELF_FIRST,
RecursiveIteratorIterator::CATCH_GET_CHILD // Ignore "Permission denied"
);
$paths = [$root];

24
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,
$datacontent = str_replace(
'APP_DEBUG='.$debug,
'APP_DEBUG='.\Input::get('debug'),
$datacontent);
$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,
$datacontent2 = str_replace(
'APP_BUGSNAG='.$bugsnag_debug,
'APP_BUGSNAG='.\Input::get('bugsnag'),
$datacontent2);
$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 */

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

@@ -1099,7 +1099,12 @@ class SettingsController extends Controller
{
try {
$user = \App\User::select(
'user_name', 'first_name', 'last_name', 'email', 'password', 'agent_tzone'
'user_name',
'first_name',
'last_name',
'email',
'password',
'agent_tzone'
)->where('id', '=', 1)->first();
$system = System::where('id', '=', 1)->first();
\Schema::disableForeignKeyConstraints();

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;

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

@@ -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],
$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'],
$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,13 +818,16 @@ 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 = [
$from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id),
$to = [
'user' => $email_data['to_user'],
'email' => $email_data['to_email'],
], $message = [
],
$message = [
'subject' => $updated_subject,
'body' => $body, 'scenario' => $mail,
], $template_variables = [
],
$template_variables = [
'ticket_agent_name' => $email_data['to_user_name'],
'ticket_client_name' => $username,
'ticket_client_email' => $emailadd,
@@ -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);
@@ -2107,7 +2121,8 @@ class TicketController extends Controller
$ticket_id = $ticket_id;
$validator = \Validator::make(
['email' => $email,
'name' => $name, ], ['email' => 'required|email',
'name' => $name, ],
['email' => 'required|email',
]
);
$user = User::where('email', '=', $email)->first();
@@ -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'));

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

@@ -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()

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

@@ -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) {
}

2
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

3
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;

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;
}

6
app/Http/Requests/helpdesk/EmailsEditRequest.php
View File

@@ -40,9 +40,9 @@ class EmailsEditRequest extends Request
// 'sending_host' => 'required',
// 'sending_port' => 'required',
//'mailbox_protocol' => 'required'
// 'fetching_host' => 'required',
// 'fetching_port' => 'required',
// 'mailbox_protocol' => 'required',
// 'fetching_host' => 'required',
// 'fetching_port' => 'required',
// 'mailbox_protocol' => 'required',
];
}
}

6
app/Http/Requests/helpdesk/EmailsRequest.php
View File

@@ -39,9 +39,9 @@ class EmailsRequest extends Request
// 'user_name' => 'required',
// 'sending_host' => 'required',
// 'sending_port' => 'required',
// 'fetching_host' => 'required',
// 'fetching_port' => 'required',
// 'mailbox_protocol' => 'required',
// 'fetching_host' => 'required',
// 'fetching_port' => 'required',
// 'mailbox_protocol' => 'required',
];
}
}

2
app/Http/Requests/helpdesk/PriorityRequest.php
View File

@@ -36,7 +36,7 @@ class PriorityRequest extends Request
'priority_color' => 'required',
'ispublic' => 'required',
'priority_successfully_updated' => 'priority successfully updated',
'priority_successfully_created!!!'=> 'priority successfully created',
'priority_successfully_created!!!' => 'priority successfully created',
];
}

4
app/Http/Requests/helpdesk/TemplateRequest.php
View File

@@ -29,8 +29,8 @@ class TemplateRequest extends Request
public function rules()
{
return [
// 'name' => 'required|unique:template',
// 'subject' => 'required',
// 'name' => 'required|unique:template',
// 'subject' => 'required',
'type' => 'required',
'message' => 'required',
];

4
app/Http/Requests/helpdesk/TemplateUdate.php
View File

@@ -29,8 +29,8 @@ class TemplateUdate extends Request
public function rules()
{
return [
// 'name' => 'required|max:60',
// 'subject' => 'required',
// 'name' => 'required|max:60',
// 'subject' => 'required',
'type' => 'required',
'message' => 'required',
];

3
app/Jobs/SendEmail.php
View File

@@ -9,7 +9,8 @@ use Illuminate\Queue\SerializesModels;
class SendEmail extends Job implements ShouldQueue
{
use InteractsWithQueue,SerializesModels;
use InteractsWithQueue;
use SerializesModels;
protected $from;
protected $to;

12
app/Providers/ComposerServiceProvider.php
View File

@@ -26,25 +26,29 @@ class ComposerServiceProvider extends ServiceProvider
'themes.default1.admin.layout.admin',
'themes.default1.admin.helpdesk.setting',
$service_desk,
], 'App\Http\ViewComposers\AgentLayout'
],
'App\Http\ViewComposers\AgentLayout'
);
view()->composer(
[
'themes.default1.update.notification',
], 'App\Http\ViewComposers\UpdateNotification'
],
'App\Http\ViewComposers\UpdateNotification'
);
view()->composer(
[
'themes.default1.agent.layout.agent',
'themes.default1.admin.layout.admin',
], 'App\Http\ViewComposers\AuthUser'
],
'App\Http\ViewComposers\AuthUser'
);
view()->composer(
[
'themes.default1.admin.layout.admin',
'themes.default1.agent.layout.agent',
'themes.default1.client.layout.client',
], 'App\Http\ViewComposers\UserLanguage'
],
'App\Http\ViewComposers\UserLanguage'
);
}

4
app/User.php
View File

@@ -11,8 +11,8 @@ use Tymon\JWTAuth\Contracts\JWTSubject as AuthenticatableUserContract;
class User extends Model implements AuthenticatableContract, CanResetPasswordContract, AuthenticatableUserContract
{
use Authenticatable,
CanResetPassword;
use Authenticatable;
use CanResetPassword;
/**
* The database table used by the model.

2
config/mail.php
View File

@@ -93,7 +93,7 @@ return [
|
*/
'sendmail' => '',
/*
/*
|--------------------------------------------------------------------------
| Mail "Pretend"
|--------------------------------------------------------------------------

5
database/migrations/2016_06_28_141613_version1079table.php
View File

@@ -19,7 +19,10 @@ class Version1079table extends Migration
DB::table('settings_system')->insert(['version' => $current_version]);
DB::table('common_settings')
->insert(
['option_name' => 'enable_rtl', 'option_value' => ''], ['option_name' => 'user_set_ticket_status', 'status' => 1], ['option_name' => 'send_otp', 'status' => 0], ['option_name' => 'email_mandatory', 'status' => 1]
['option_name' => 'enable_rtl', 'option_value' => ''],
['option_name' => 'user_set_ticket_status', 'status' => 1],
['option_name' => 'send_otp', 'status' => 0],
['option_name' => 'email_mandatory', 'status' => 1]
);
}

2
resources/lang/es/lang.php
View File

@@ -1621,7 +1621,7 @@ Puede ingresar el número de días de registros de base de datos que se eliminar
'days' => 'Days',
'months'=> 'Months',
'year' => 'Year',
// department change
// department change
'change_department' => 'Change Department',
'ticket_department_successfully_changed'=> 'Ticket Department Successfully Changed',
'select_another_department' => 'Select another department',

40
resources/lang/nl/lang.php
View File

@@ -82,26 +82,26 @@ return [
| Register Page
|--------------------------------------
*/
'registration' => 'Registratie',
'full_name' => 'Volledige naam',
'firstname' => 'Voornaam',
'lastname' => 'Achternaam',
'profilepicture' => 'Profielfoto',
'oldpassword' => 'Oude wachtwoord',
'newpassword' => 'Nieuwe wachtwoord',
'retype_password' => 'Herhaal wachtwoord',
'i_agree_to_the' => 'Ik ga akkoord met de',
'terms' => 'algemene voorwaarden',
'register' => 'Registreren',
'i_already_have_a_membership' => 'Ik heb al een profiel',
'see-profile1' => 'Klik hier om dit te bekijken ',
'see-profile2' => 's profiel',
'activate_your_account_click_on_Link_that_send_to_your_mail' => 'Activeer je account ! Klik op de link welke we naar je e-mailadres hebben gestuurd',
'activate_your_account_click_on_Link_that_send_to_your_mail_and_moble' => 'Activeer je account ! Klik op de link welke we naar je e-mailadres hebben gestuur of login op je account en voer de OTP code in welke we naar je mobiele nummer hebben gestuurd.',
'activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup' => 'Account aangemaakt. Neem contact op met de systeembeheer want we konden geen OTP code naar je mobiele nummer verzenden, ook konden we geen e-mail versturen naar je e-mailadres.',
'this_field_do_not_match_our_records' => 'Dit veld komt niet overeen met onze gegevens.',
'we_have_e-mailed_your_password_reset_link' => 'We hebben een link verstuurd om je wachtwoord te resetten!',
"we_can't_find_a_user_with_that_e-mail_address" => 'We kunnen geen gebruiker met dat e-mailadres vinden.',
'registration' => 'Registratie',
'full_name' => 'Volledige naam',
'firstname' => 'Voornaam',
'lastname' => 'Achternaam',
'profilepicture' => 'Profielfoto',
'oldpassword' => 'Oude wachtwoord',
'newpassword' => 'Nieuwe wachtwoord',
'retype_password' => 'Herhaal wachtwoord',
'i_agree_to_the' => 'Ik ga akkoord met de',
'terms' => 'algemene voorwaarden',
'register' => 'Registreren',
'i_already_have_a_membership' => 'Ik heb al een profiel',
'see-profile1' => 'Klik hier om dit te bekijken ',
'see-profile2' => 's profiel',
'activate_your_account_click_on_Link_that_send_to_your_mail' => 'Activeer je account ! Klik op de link welke we naar je e-mailadres hebben gestuurd',
'activate_your_account_click_on_Link_that_send_to_your_mail_and_moble' => 'Activeer je account ! Klik op de link welke we naar je e-mailadres hebben gestuur of login op je account en voer de OTP code in welke we naar je mobiele nummer hebben gestuurd.',
'activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup' => 'Account aangemaakt. Neem contact op met de systeembeheer want we konden geen OTP code naar je mobiele nummer verzenden, ook konden we geen e-mail versturen naar je e-mailadres.',
'this_field_do_not_match_our_records' => 'Dit veld komt niet overeen met onze gegevens.',
'we_have_e-mailed_your_password_reset_link' => 'We hebben een link verstuurd om je wachtwoord te resetten!',
"we_can't_find_a_user_with_that_e-mail_address" => 'We kunnen geen gebruiker met dat e-mailadres vinden.',
/*
|--------------------------------------
| Reset Password Page

2
resources/lang/zh-hans/lang.php
View File

@@ -1589,7 +1589,7 @@ return [
'days' => '天',
'months' => '月',
'year' => '年',
// department change
// department change
'change_department' => '改变部门',
'ticket_department_successfully_changed' => '成功改变工单部门',
'select_another_department' => '选择另一个部门',

3
tests/DuskTestCase.php
View File

@@ -30,7 +30,8 @@ abstract class DuskTestCase extends BaseTestCase
protected function driver()
{
return RemoteWebDriver::create(
'http://localhost:9515', DesiredCapabilities::chrome()
'http://localhost:9515',
DesiredCapabilities::chrome()
);
}
}