diff --git a/app/Api/v1/ApiController.php b/app/Api/v1/ApiController.php index 5750b7808..4fdba2cf5 100644 --- a/app/Api/v1/ApiController.php +++ b/app/Api/v1/ApiController.php @@ -187,8 +187,8 @@ class ApiController extends Controller //dd($this->request->all()); try { $v = \Validator::make($this->request->all(), [ - 'ticket_id' => 'required|exists:tickets,id', - 'reply_content' => 'required', + 'ticket_id' => 'required|exists:tickets,id', + 'reply_content' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -225,12 +225,12 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'ticket_id' => 'required|exists:tickets,id', - 'subject' => 'required', - 'sla_plan' => 'required|exists:sla_plan,id', - 'help_topic' => 'required|exists:help_topic,id', - 'ticket_source' => 'required|exists:ticket_source,id', - 'ticket_priority' => 'required|exists:ticket_priority,priority_id', + 'ticket_id' => 'required|exists:tickets,id', + 'subject' => 'required', + 'sla_plan' => 'required|exists:sla_plan,id', + 'help_topic' => 'required|exists:help_topic,id', + 'ticket_source' => 'required|exists:ticket_source,id', + 'ticket_priority' => 'required|exists:ticket_priority,priority_id', ]); if ($v->fails()) { $error = $v->errors(); @@ -262,7 +262,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'ticket_id' => 'required|exists:tickets,id', + 'ticket_id' => 'required|exists:tickets,id', ]); if ($v->fails()) { $error = $v->errors(); @@ -496,8 +496,8 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'ticket_id' => 'required', - 'user' => 'required', + 'ticket_id' => 'required', + 'user' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -535,7 +535,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'search' => 'required', + 'search' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -602,7 +602,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'user_id' => 'required', + 'user_id' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -635,7 +635,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'search' => 'required', + 'search' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -668,7 +668,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'id' => 'required', + 'id' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -708,7 +708,7 @@ class ApiController extends Controller //dd($this->request); try { $v = \Validator::make($this->request->all(), [ - 'url' => 'required|url', + 'url' => 'required|url', ]); if ($v->fails()) { $error = $v->errors(); @@ -1013,9 +1013,9 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'user_id' => 'required|exists:users,id', - 'ticket_id' => 'required|exists:tickets,id', - 'body' => 'required', + 'user_id' => 'required|exists:users,id', + 'ticket_id' => 'required|exists:tickets,id', + 'body' => 'required', ]); if ($v->fails()) { $error = $v->errors(); @@ -1092,7 +1092,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'user_id' => 'required|exists:users,id', + 'user_id' => 'required|exists:users,id', ]); if ($v->fails()) { $error = $v->errors(); @@ -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') @@ -1149,7 +1166,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'user_id' => 'required|exists:users,id', + 'user_id' => 'required|exists:users,id', ]); if ($v->fails()) { $error = $v->errors(); @@ -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') @@ -1206,7 +1236,7 @@ class ApiController extends Controller { try { $v = \Validator::make($this->request->all(), [ - 'ticket_id' => 'required|exists:tickets,id', + 'ticket_id' => 'required|exists:tickets,id', ]); if ($v->fails()) { $error = $v->errors(); @@ -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,10 +1406,12 @@ class ApiController extends Controller public function addCollaboratorForTicket() { try { - $v = \Validator::make(\Input::get(), [ - 'email' => 'required|email|unique:users', - 'ticket_id' => 'required', - ] + $v = \Validator::make( + \Input::get(), + [ + 'email' => 'required|email|unique:users', + 'ticket_id' => 'required', + ] ); if ($v->fails()) { $error = $v->messages(); @@ -1375,9 +1439,11 @@ class ApiController extends Controller public function getCollaboratorForTicket() { try { - $v = \Validator::make(\Input::get(), [ - 'ticket_id' => 'required', - ] + $v = \Validator::make( + \Input::get(), + [ + 'ticket_id' => 'required', + ] ); if ($v->fails()) { $error = $v->messages(); @@ -1405,10 +1471,12 @@ class ApiController extends Controller public function deleteCollaborator() { try { - $v = \Validator::make(\Input::get(), [ - 'ticketid' => 'required', - 'email' => 'required', - ] + $v = \Validator::make( + \Input::get(), + [ + 'ticketid' => 'required', + 'email' => 'required', + ] ); if ($v->fails()) { $result = $v->messages(); @@ -1538,8 +1606,8 @@ class ApiController extends Controller { try { $v = \Validator::make($request->all(), [ - 'email' => 'required|email|unique:users', - 'password' => 'required|min:6', + 'email' => 'required|email|unique:users', + 'password' => 'required|min:6', ]); if ($v->fails()) { $error = $v->errors(); @@ -1573,10 +1641,11 @@ class ApiController extends Controller { try { $v = \Validator::make( - $this->request->all(), [ - 'username' => 'required|unique:users,user_name', - 'first_name' => 'required', - ] + $this->request->all(), + [ + 'username' => 'required|unique:users,user_name', + 'first_name' => 'required', + ] ); if ($v->fails()) { $error = $v->messages(); diff --git a/app/Api/v1/ApiExceptAuthController.php b/app/Api/v1/ApiExceptAuthController.php index b9bd7b704..55b842091 100644 --- a/app/Api/v1/ApiExceptAuthController.php +++ b/app/Api/v1/ApiExceptAuthController.php @@ -25,7 +25,7 @@ class ApiExceptAuthController extends Controller //dd($this->request); try { $v = \Validator::make($this->request->all(), [ - 'url' => 'required|url', + 'url' => 'required|url', ]); if ($v->fails()) { $error = $v->errors(); diff --git a/app/Api/v1/InstallerApiController.php b/app/Api/v1/InstallerApiController.php index b64214b3b..cf7d3fe21 100644 --- a/app/Api/v1/InstallerApiController.php +++ b/app/Api/v1/InstallerApiController.php @@ -37,11 +37,11 @@ class InstallerApiController extends Controller public function config_database(Request $request) { $rules = [ - 'database' => 'required|min:1', - 'host' => 'required', - 'databasename' => 'required|min:1', - 'dbusername' => 'required|min:1', - ]; + 'database' => 'required|min:1', + 'host' => 'required', + 'databasename' => 'required|min:1', + 'dbusername' => 'required|min:1', + ]; if ($request->port) { $rules['port'] = 'integer|min:0'; } @@ -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(); @@ -200,15 +201,15 @@ class InstallerApiController extends Controller // Creating user $user = User::create([ - 'first_name' => $firstname, - 'last_name' => $lastname, - 'email' => $email, - 'user_name' => $username, - 'password' => Hash::make($password), - 'active' => 1, - 'role' => 'admin', - 'assign_group' => 1, - 'primary_dpt' => 1, + 'first_name' => $firstname, + 'last_name' => $lastname, + 'email' => $email, + 'user_name' => $username, + 'password' => Hash::make($password), + 'active' => 1, + 'role' => 'admin', + 'assign_group' => 1, + 'primary_dpt' => 1, ]); // Setting database installed status diff --git a/app/Api/v1/TokenAuthController.php b/app/Api/v1/TokenAuthController.php index 8d141f122..c1a1f1de5 100644 --- a/app/Api/v1/TokenAuthController.php +++ b/app/Api/v1/TokenAuthController.php @@ -134,7 +134,7 @@ class TokenAuthController extends Controller { try { $v = \Validator::make($request->all(), [ - 'url' => 'required|url', + 'url' => 'required|url', ]); if ($v->fails()) { $error = $v->errors(); @@ -155,7 +155,7 @@ class TokenAuthController extends Controller { try { $v = \Validator::make($request->all(), [ - 'email' => 'required|email|exists:users,email', + 'email' => 'required|email|exists:users,email', ]); if ($v->fails()) { $error = $v->errors(); diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php index 0f4e2014e..a0919d472 100644 --- a/app/Console/Commands/Install.php +++ b/app/Console/Commands/Install.php @@ -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'); diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 25987693e..1713688c0 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -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, diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php index a1fd6f5e4..31d057b2e 100644 --- a/app/FaveoStorage/Controllers/SettingsController.php +++ b/app/FaveoStorage/Controllers/SettingsController.php @@ -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]; diff --git a/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php b/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php index 9a4855b21..cf937c55e 100644 --- a/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php +++ b/app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php @@ -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 */ diff --git a/app/Http/Controllers/Admin/helpdesk/FormController.php b/app/Http/Controllers/Admin/helpdesk/FormController.php index 363fd524f..1e994276a 100644 --- a/app/Http/Controllers/Admin/helpdesk/FormController.php +++ b/app/Http/Controllers/Admin/helpdesk/FormController.php @@ -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); diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 37ef7d771..3332de56c 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -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; diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 6da51ca25..9a56cc220 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -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()); } diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index f0120a0fa..7162fbe55 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -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 */ diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php index 171ed0a8e..603fecb50 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php @@ -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; diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 636532d17..f4e198633 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -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')); diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index fbd71cb6d..b2760e758 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -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')); diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index bf414088e..a5f95ff5f 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -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()); diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 2a7d29662..42525ec68 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -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]); } diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 84130a4cb..a5b09ac01 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -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]); } diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index cdd03f0e6..323d5ca15 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -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() diff --git a/app/Http/Controllers/Client/helpdesk/UnAuthController.php b/app/Http/Controllers/Client/helpdesk/UnAuthController.php index f530c28d4..138cc5768 100644 --- a/app/Http/Controllers/Client/helpdesk/UnAuthController.php +++ b/app/Http/Controllers/Client/helpdesk/UnAuthController.php @@ -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) { } diff --git a/app/Http/Controllers/Common/NotificationController.php b/app/Http/Controllers/Common/NotificationController.php index 40a2ee4f7..e1ac4659b 100644 --- a/app/Http/Controllers/Common/NotificationController.php +++ b/app/Http/Controllers/Common/NotificationController.php @@ -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; diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 3daa13984..e27c4fed9 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -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': diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php index 9a905c2e6..1690410dc 100644 --- a/app/Http/Controllers/Common/SettingsController.php +++ b/app/Http/Controllers/Common/SettingsController.php @@ -22,7 +22,7 @@ use Lang; /** * *************************** - * Settings Controllers + * Settings Controllers. * *************************** * Controller to keep smtp details and fetch where ever needed. */ diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b49a22a37..97a1edbb0 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -10,6 +10,7 @@ use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { - use AuthorizesRequests, DispatchesJobs, - ValidatesRequests; + use AuthorizesRequests; + use DispatchesJobs; + use ValidatesRequests; } diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index 6f5d03835..3d19e03b1 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -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 diff --git a/app/Http/Controllers/Update/UpgradeController.php b/app/Http/Controllers/Update/UpgradeController.php index 3eeab9f84..2b4eb0778 100644 --- a/app/Http/Controllers/Update/UpgradeController.php +++ b/app/Http/Controllers/Update/UpgradeController.php @@ -82,11 +82,11 @@ class UpgradeController extends Controller { echo '

Downloading New Update

'; $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); diff --git a/app/Http/Requests/helpdesk/AgentRequest.php b/app/Http/Requests/helpdesk/AgentRequest.php index d31d9f0ea..f656ef4c5 100644 --- a/app/Http/Requests/helpdesk/AgentRequest.php +++ b/app/Http/Requests/helpdesk/AgentRequest.php @@ -69,7 +69,7 @@ class AgentRequest extends Request // 'last_name' => 'required|max:30', 'email' => 'required|unique:users', 'active' => 'required', - // 'account_status' => 'required', + // 'account_status' => 'required', 'group' => 'required', 'primary_department' => 'required', 'agent_time_zone' => 'required', diff --git a/app/Http/Requests/helpdesk/ClientRequest.php b/app/Http/Requests/helpdesk/ClientRequest.php index 8dc900750..284d06b20 100644 --- a/app/Http/Requests/helpdesk/ClientRequest.php +++ b/app/Http/Requests/helpdesk/ClientRequest.php @@ -129,16 +129,16 @@ class ClientRequest extends Request if (($email_mandatory->status == 0 || $email_mandatory->status == '0')) { if (!\Auth::check()) { return [ - 'Name' => 'required', - 'Email' => 'email', - 'Subject' => 'required', - 'Details' => 'required', - 'mobile' => 'required', + 'Name' => 'required', + 'Email' => 'email', + 'Subject' => 'required', + 'Details' => 'required', + 'mobile' => 'required', ]; } else { return [ - 'Subject' => 'required', - 'Details' => 'required', + 'Subject' => 'required', + 'Details' => 'required', ]; } } else { diff --git a/app/Http/Requests/helpdesk/CreateTicketRequest.php b/app/Http/Requests/helpdesk/CreateTicketRequest.php index 849fd7c0b..3bf22979f 100644 --- a/app/Http/Requests/helpdesk/CreateTicketRequest.php +++ b/app/Http/Requests/helpdesk/CreateTicketRequest.php @@ -107,16 +107,16 @@ class CreateTicketRequest extends Request public function onlyMobleRequired() { return [ - 'email' => 'email|max:60', - 'first_name' => 'required|min:3|max:40', - 'helptopic' => 'required', - // 'dept' => 'required', - 'sla' => 'required', - 'subject' => 'required|min:5', - 'body' => 'required|min:10', - 'priority' => 'required', - 'code' => 'required', - 'mobile' => 'required', - ]; + 'email' => 'email|max:60', + 'first_name' => 'required|min:3|max:40', + 'helptopic' => 'required', + // 'dept' => 'required', + 'sla' => 'required', + 'subject' => 'required|min:5', + 'body' => 'required|min:10', + 'priority' => 'required', + 'code' => 'required', + 'mobile' => 'required', + ]; } } diff --git a/app/Http/Requests/helpdesk/EmailsEditRequest.php b/app/Http/Requests/helpdesk/EmailsEditRequest.php index cc520207b..6547dbc99 100644 --- a/app/Http/Requests/helpdesk/EmailsEditRequest.php +++ b/app/Http/Requests/helpdesk/EmailsEditRequest.php @@ -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', ]; } } diff --git a/app/Http/Requests/helpdesk/EmailsRequest.php b/app/Http/Requests/helpdesk/EmailsRequest.php index 2502cb8d0..989ab96b4 100644 --- a/app/Http/Requests/helpdesk/EmailsRequest.php +++ b/app/Http/Requests/helpdesk/EmailsRequest.php @@ -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', ]; } } diff --git a/app/Http/Requests/helpdesk/HelptopicRequest.php b/app/Http/Requests/helpdesk/HelptopicRequest.php index 956e025ba..d54129e83 100644 --- a/app/Http/Requests/helpdesk/HelptopicRequest.php +++ b/app/Http/Requests/helpdesk/HelptopicRequest.php @@ -35,7 +35,7 @@ class HelptopicRequest extends Request 'department' => 'required', 'priority' => 'required', 'sla_plan' => 'required', - // 'auto_assign' => 'required', + // 'auto_assign' => 'required', ]; } } diff --git a/app/Http/Requests/helpdesk/Mail/MailRequest.php b/app/Http/Requests/helpdesk/Mail/MailRequest.php index e0d76ffe3..1f3465094 100644 --- a/app/Http/Requests/helpdesk/Mail/MailRequest.php +++ b/app/Http/Requests/helpdesk/Mail/MailRequest.php @@ -68,7 +68,7 @@ class MailRequest extends Request return $rules; case 'mandrill': $rules = [ - 'secret'=> 'required', + 'secret'=> 'required', ]; return $rules; diff --git a/app/Http/Requests/helpdesk/OrganizationRequest.php b/app/Http/Requests/helpdesk/OrganizationRequest.php index ee74044ad..85713191c 100644 --- a/app/Http/Requests/helpdesk/OrganizationRequest.php +++ b/app/Http/Requests/helpdesk/OrganizationRequest.php @@ -32,7 +32,7 @@ class OrganizationRequest extends Request 'name' => 'required|unique:organization', 'website' => 'url', - // 'phone' => 'size:10', + // 'phone' => 'size:10', ]; } } diff --git a/app/Http/Requests/helpdesk/OrganizationUpdate.php b/app/Http/Requests/helpdesk/OrganizationUpdate.php index 6d4ea4f12..9d951f1d1 100644 --- a/app/Http/Requests/helpdesk/OrganizationUpdate.php +++ b/app/Http/Requests/helpdesk/OrganizationUpdate.php @@ -31,7 +31,7 @@ class OrganizationUpdate extends Request return [ 'website' => 'url', - // 'phone' => 'size:10', + // 'phone' => 'size:10', ]; } } diff --git a/app/Http/Requests/helpdesk/PriorityRequest.php b/app/Http/Requests/helpdesk/PriorityRequest.php index c4b0cdb64..7f8c92356 100644 --- a/app/Http/Requests/helpdesk/PriorityRequest.php +++ b/app/Http/Requests/helpdesk/PriorityRequest.php @@ -30,13 +30,13 @@ class PriorityRequest extends Request { return [ - 'priority' => 'required|max:10', + 'priority' => 'required|max:10', 'status' => 'required', 'priority_desc' => 'required|max:255', 'priority_color' => 'required', - 'ispublic' => 'required', - 'priority_successfully_updated' => 'priority successfully updated', - 'priority_successfully_created!!!'=> 'priority successfully created', + 'ispublic' => 'required', + 'priority_successfully_updated' => 'priority successfully updated', + 'priority_successfully_created!!!' => 'priority successfully created', ]; } diff --git a/app/Http/Requests/helpdesk/Sys_userRequest.php b/app/Http/Requests/helpdesk/Sys_userRequest.php index c01359728..e6edf987c 100644 --- a/app/Http/Requests/helpdesk/Sys_userRequest.php +++ b/app/Http/Requests/helpdesk/Sys_userRequest.php @@ -88,11 +88,11 @@ class Sys_userRequest extends Request public function onlyMobleRequired() { return [ - 'first_name' => 'required', - 'user_name' => 'required|min:3|unique:users,user_name', - 'email' => 'unique:users,email', - 'country_code' => 'required', - 'mobile' => 'required|unique:users', - ]; + 'first_name' => 'required', + 'user_name' => 'required|min:3|unique:users,user_name', + 'email' => 'unique:users,email', + 'country_code' => 'required', + 'mobile' => 'required|unique:users', + ]; } } diff --git a/app/Http/Requests/helpdesk/TemplateRequest.php b/app/Http/Requests/helpdesk/TemplateRequest.php index 8f229bc31..46a830b73 100644 --- a/app/Http/Requests/helpdesk/TemplateRequest.php +++ b/app/Http/Requests/helpdesk/TemplateRequest.php @@ -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', ]; diff --git a/app/Http/Requests/helpdesk/TemplateUdate.php b/app/Http/Requests/helpdesk/TemplateUdate.php index e921669d1..478ca0d79 100644 --- a/app/Http/Requests/helpdesk/TemplateUdate.php +++ b/app/Http/Requests/helpdesk/TemplateUdate.php @@ -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', ]; diff --git a/app/Http/Requests/helpdesk/TicketEditRequest.php b/app/Http/Requests/helpdesk/TicketEditRequest.php index c9a38806e..ff1395a04 100644 --- a/app/Http/Requests/helpdesk/TicketEditRequest.php +++ b/app/Http/Requests/helpdesk/TicketEditRequest.php @@ -29,11 +29,11 @@ class TicketEditRequest extends Request public function rules() { return [ - // 'subject' => 'required', - // 'sla_paln' => 'required', - // 'help_topic' => 'required', - // 'ticket_source' => 'required', - // 'ticket_priority' => 'required', + // 'subject' => 'required', + // 'sla_paln' => 'required', + // 'help_topic' => 'required', + // 'ticket_source' => 'required', + // 'ticket_priority' => 'required', ]; } } diff --git a/app/Http/Requests/kb/FooterRequest.php b/app/Http/Requests/kb/FooterRequest.php index ff29c1e7b..13f617e32 100644 --- a/app/Http/Requests/kb/FooterRequest.php +++ b/app/Http/Requests/kb/FooterRequest.php @@ -25,7 +25,7 @@ class FooterRequest extends Request { return [ 'title' => 'required', - //'description' => 'required', + //'description' => 'required', ]; } } diff --git a/app/Http/Requests/kb/SettingsRequests.php b/app/Http/Requests/kb/SettingsRequests.php index 864411076..5ee9eaf63 100644 --- a/app/Http/Requests/kb/SettingsRequests.php +++ b/app/Http/Requests/kb/SettingsRequests.php @@ -24,8 +24,8 @@ class SettingsRequests extends Request public function rules() { return [ - // 'company_name' => 'required', - // 'website' => 'required|url', + // 'company_name' => 'required', + // 'website' => 'required|url', ]; } } diff --git a/app/Http/helpers.php b/app/Http/helpers.php index 0e21ecf27..f46cd41b4 100644 --- a/app/Http/helpers.php +++ b/app/Http/helpers.php @@ -266,10 +266,10 @@ function successResponse($successMsg = '', $data = '', $responseCode = 200) function exceptionResponse(\Exception $exception) { return errorResponse([ - 'file' => $exception->getFile(), - 'line_number'=> $exception->getLine(), - 'exception' => $exception->getMessage(), - ], 500); + 'file' => $exception->getFile(), + 'line_number'=> $exception->getLine(), + 'exception' => $exception->getMessage(), + ], 500); } /** diff --git a/app/Jobs/SendEmail.php b/app/Jobs/SendEmail.php index c09289c0e..83bbf4112 100644 --- a/app/Jobs/SendEmail.php +++ b/app/Jobs/SendEmail.php @@ -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; diff --git a/app/Model/helpdesk/Notification/Notification.php b/app/Model/helpdesk/Notification/Notification.php index 3345ef092..2161d4baa 100644 --- a/app/Model/helpdesk/Notification/Notification.php +++ b/app/Model/helpdesk/Notification/Notification.php @@ -9,8 +9,8 @@ class Notification extends BaseModel protected $table = 'notifications'; protected $fillable = [ - 'model_id', 'userid_created', 'type_id', - ]; + 'model_id', 'userid_created', 'type_id', + ]; public function type() { diff --git a/app/Model/helpdesk/Notification/NotificationType.php b/app/Model/helpdesk/Notification/NotificationType.php index a86721650..9078ff7d1 100644 --- a/app/Model/helpdesk/Notification/NotificationType.php +++ b/app/Model/helpdesk/Notification/NotificationType.php @@ -9,6 +9,6 @@ class NotificationType extends BaseModel protected $table = 'notification_types'; protected $fillable = [ - 'message', 'type', 'icon_class', - ]; + 'message', 'type', 'icon_class', + ]; } diff --git a/app/Model/helpdesk/Notification/UserNotification.php b/app/Model/helpdesk/Notification/UserNotification.php index b6243588b..63cc329c0 100644 --- a/app/Model/helpdesk/Notification/UserNotification.php +++ b/app/Model/helpdesk/Notification/UserNotification.php @@ -9,8 +9,8 @@ class UserNotification extends BaseModel protected $table = 'user_notification'; protected $fillable = [ - 'notification_id', 'user_id', 'is_read', - ]; + 'notification_id', 'user_id', 'is_read', + ]; public function notification() { diff --git a/app/Model/helpdesk/NotificationOld/Notification.php b/app/Model/helpdesk/NotificationOld/Notification.php index 0c92ede94..12ec0bc7f 100644 --- a/app/Model/helpdesk/NotificationOld/Notification.php +++ b/app/Model/helpdesk/NotificationOld/Notification.php @@ -9,6 +9,6 @@ class Notification extends BaseModel protected $table = 'notifications'; protected $fillable = [ - 'model_id', 'userid_created', 'type_id', - ]; + 'model_id', 'userid_created', 'type_id', + ]; } diff --git a/app/Model/helpdesk/NotificationOld/NotificationType.php b/app/Model/helpdesk/NotificationOld/NotificationType.php index a86721650..9078ff7d1 100644 --- a/app/Model/helpdesk/NotificationOld/NotificationType.php +++ b/app/Model/helpdesk/NotificationOld/NotificationType.php @@ -9,6 +9,6 @@ class NotificationType extends BaseModel protected $table = 'notification_types'; protected $fillable = [ - 'message', 'type', 'icon_class', - ]; + 'message', 'type', 'icon_class', + ]; } diff --git a/app/Model/helpdesk/NotificationOld/UserNotification.php b/app/Model/helpdesk/NotificationOld/UserNotification.php index e5a279348..b1efbaf7a 100644 --- a/app/Model/helpdesk/NotificationOld/UserNotification.php +++ b/app/Model/helpdesk/NotificationOld/UserNotification.php @@ -9,6 +9,6 @@ class UserNotification extends BaseModel protected $table = 'user_notification'; protected $fillable = [ - 'notification_id', 'user_id', 'is_read', - ]; + 'notification_id', 'user_id', 'is_read', + ]; } diff --git a/app/Model/helpdesk/Ratings/Rating.php b/app/Model/helpdesk/Ratings/Rating.php index dd78f1bb8..13f3f5c24 100644 --- a/app/Model/helpdesk/Ratings/Rating.php +++ b/app/Model/helpdesk/Ratings/Rating.php @@ -9,6 +9,6 @@ class Rating extends BaseModel protected $table = 'ratings'; protected $fillable = [ - 'name', 'display_order', 'allow_modification', 'rating_scale', 'rating_area', 'restrict', - ]; + 'name', 'display_order', 'allow_modification', 'rating_scale', 'rating_area', 'restrict', + ]; } diff --git a/app/Model/helpdesk/Ratings/RatingRef.php b/app/Model/helpdesk/Ratings/RatingRef.php index 67bd80e75..5374e3978 100644 --- a/app/Model/helpdesk/Ratings/RatingRef.php +++ b/app/Model/helpdesk/Ratings/RatingRef.php @@ -9,6 +9,6 @@ class RatingRef extends BaseModel protected $table = 'rating_ref'; protected $fillable = [ - 'rating_id', 'ticket_id', 'thread_id', 'rating_value', - ]; + 'rating_id', 'ticket_id', 'thread_id', 'rating_value', + ]; } diff --git a/app/Model/helpdesk/Ticket/Ticket_Collaborator.php b/app/Model/helpdesk/Ticket/Ticket_Collaborator.php index d307d7143..e6ae8011a 100644 --- a/app/Model/helpdesk/Ticket/Ticket_Collaborator.php +++ b/app/Model/helpdesk/Ticket/Ticket_Collaborator.php @@ -8,6 +8,6 @@ class Ticket_Collaborator extends BaseModel { protected $table = 'ticket_collaborator'; protected $fillable = [ - 'id', 'isactive', 'ticket_id', 'user_id', 'role', 'updated_at', 'created_at', - ]; + 'id', 'isactive', 'ticket_id', 'user_id', 'role', 'updated_at', 'created_at', + ]; } diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 9e7817bd4..51c79dc24 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -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' + 'themes.default1.update.notification', + ], + 'App\Http\ViewComposers\UpdateNotification' ); view()->composer( [ - 'themes.default1.agent.layout.agent', + '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' ); } diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php index 1dd7e32a0..28f83d337 100644 --- a/app/Providers/ConfigServiceProvider.php +++ b/app/Providers/ConfigServiceProvider.php @@ -18,10 +18,10 @@ class ConfigServiceProvider extends ServiceProvider public function register() { config([ - 'lfm.images_url' => url('uploads').'/', - 'lfm.images_dir' => '/public/uploads/', - 'lfm.files_url' => url('uploads').'/', - 'lfm.files_dir' => '/public/uploads/', + 'lfm.images_url' => url('uploads').'/', + 'lfm.images_dir' => '/public/uploads/', + 'lfm.files_url' => url('uploads').'/', + 'lfm.files_dir' => '/public/uploads/', ]); } } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index ad9bf8f85..a1d64d8fd 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -88,7 +88,7 @@ class RouteServiceProvider extends ServiceProvider Route::group([ 'middleware' => ['web', 'installer'], 'namespace' => $this->namespace, - ], function ($router) { + ], function ($router) { require base_path('routes/installer.php'); }); } @@ -106,7 +106,7 @@ class RouteServiceProvider extends ServiceProvider 'middleware' => ['web', 'redirect', 'install'], 'namespace' => $this->namespace, 'prefix' => 'app/update', - ], function ($router) { + ], function ($router) { require base_path('routes/update.php'); }); } diff --git a/app/User.php b/app/User.php index 8aabed4c1..9d06d5816 100644 --- a/app/User.php +++ b/app/User.php @@ -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. diff --git a/config/app.php b/config/app.php index c8c328abb..f35f4e538 100644 --- a/config/app.php +++ b/config/app.php @@ -175,7 +175,7 @@ return [ 'Chumper\Datatable\DatatableServiceProvider', 'Chumper\Zipper\ZipperServiceProvider', Tymon\JWTAuth\Providers\LaravelServiceProvider::class, - \Torann\GeoIP\GeoIPServiceProvider::class, + \Torann\GeoIP\GeoIPServiceProvider::class, Unisharp\Laravelfilemanager\LaravelFilemanagerServiceProvider::class, Intervention\Image\ImageServiceProvider::class, Unisharp\Ckeditor\ServiceProvider::class, diff --git a/config/compile.php b/config/compile.php index 249f27da9..869aa64fe 100644 --- a/config/compile.php +++ b/config/compile.php @@ -30,6 +30,6 @@ return [ | */ 'providers' => [ - // + // ], ]; diff --git a/config/mail.php b/config/mail.php index 1497deff1..a3cb22951 100644 --- a/config/mail.php +++ b/config/mail.php @@ -93,7 +93,7 @@ return [ | */ 'sendmail' => '', - /* +/* |-------------------------------------------------------------------------- | Mail "Pretend" |-------------------------------------------------------------------------- diff --git a/database/migrations/2016_06_28_141613_version1079table.php b/database/migrations/2016_06_28_141613_version1079table.php index 70d13aa36..1d404b736 100644 --- a/database/migrations/2016_06_28_141613_version1079table.php +++ b/database/migrations/2016_06_28_141613_version1079table.php @@ -19,8 +19,11 @@ 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] + ); } if (Schema::hasTable('common_settings')) { diff --git a/database/seeds/UserSeeder.php b/database/seeds/UserSeeder.php index 5d63f508e..0f6fb35e6 100644 --- a/database/seeds/UserSeeder.php +++ b/database/seeds/UserSeeder.php @@ -16,15 +16,15 @@ class UserSeeder extends Seeder $str = 'demopass'; $password = \Hash::make($str); $user = User::create([ - 'first_name' => 'Demo', - 'last_name' => 'Admin', - 'email' => null, - 'user_name' => 'demo_admin', - 'password' => $password, - 'assign_group' => 1, - 'primary_dpt' => 1, - 'active' => 1, - 'role' => 'admin', + 'first_name' => 'Demo', + 'last_name' => 'Admin', + 'email' => null, + 'user_name' => 'demo_admin', + 'password' => $password, + 'assign_group' => 1, + 'primary_dpt' => 1, + 'active' => 1, + 'role' => 'admin', ]); // checking if the user have been created } diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 8a29231c7..b96662905 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -493,7 +493,7 @@ return [ 'footer2' => 'Footer2', 'footer3' => 'Footer3', 'footer4' => 'Footer4', - /* + /* |-------------------------------------- | Custom alert box |-------------------------------------- @@ -776,7 +776,7 @@ return [ 'user-exists' => 'Benutzer existiert bereits. Versuchen Sie, den vorhandenen Benutzer zu suchen.', 'valid-email' => 'Geben sie eine gültige E-Mail-Adresse an.', 'search_user' => 'Benutzer suchen', - 'merge-ticket' => 'Ticket zusammenlegen', + 'merge-ticket' => 'Ticket zusammenlegen', 'title' => 'Title', 'merge' => 'Zusammenlegen', 'select_tickets' => 'Wählen Sie Tickets zum Zusammenführen aus', @@ -1080,80 +1080,80 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Nachverfolgen', - 'followup_tickets' => 'Followup tickets', - 'followup_Notification' => 'Follow-up-Benachrichtigung', + 'followup' => 'Nachverfolgen', + 'followup_tickets' => 'Followup tickets', + 'followup_Notification' => 'Follow-up-Benachrichtigung', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Nicht verfügbar', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Nicht verfügbar', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Agentenbericht', - 'assign_tickets' => 'Tickets zuweisen', - 'delete_agent' => 'Löschen Sie den Agenten', - 'delete_user' => 'Benutzer löschen', - 'confirm_deletion' => 'Löschung bestätigen', - 'delete_all_content' => 'Lösche den gesamten Inhalt', - 'agent_profile' => 'Agentenprofil', - 'change_role_to_admin' => 'Ändern Sie die Rolle in Admin', - 'change_role_to_user' => 'Ändern Sie die Rolle in Benutzer', - 'change_role_to_agent' => 'Ändern Sie die Rolle in Agent', - 'change_password' => 'Passwort ändern', - 'role_change' => 'Rollenwechsel', - 'password_generator' => 'Passwortgenerator', - 'depertment' => 'Abteilung', - 'duetoday' => 'Heute fällig', - 'today-due_tickets' => 'Heutige Tickets', - 'password_change_successfully' => 'Passwort erfolgreich geändert', - 'role_change_successfully' => 'Die Rolle wurde erfolgreich geändert', - 'user_delete_successfully' => 'Benutzer wurde erfolgreich gelöscht', - 'agent_delete_successfully' => 'Agent wurde erfolgreich gelöscht', - 'select_another_agent' => 'Wählen Sie einen anderen Agenten aus', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Der Agent wurde erfolgreich gelöscht und das Ticket wurde einem anderen Agenten zugewiesen', - 'deleted_user' => 'Gelöschter Benutzer', - 'deleted_user_directory' => 'Gelöschtes Benutzerverzeichnis', - 'restore' => 'Wiederherstellen', - 'user_restore_successfully' => 'Benutzerwiederherstellung erfolgreich', + 'agent_report' => 'Agentenbericht', + 'assign_tickets' => 'Tickets zuweisen', + 'delete_agent' => 'Löschen Sie den Agenten', + 'delete_user' => 'Benutzer löschen', + 'confirm_deletion' => 'Löschung bestätigen', + 'delete_all_content' => 'Lösche den gesamten Inhalt', + 'agent_profile' => 'Agentenprofil', + 'change_role_to_admin' => 'Ändern Sie die Rolle in Admin', + 'change_role_to_user' => 'Ändern Sie die Rolle in Benutzer', + 'change_role_to_agent' => 'Ändern Sie die Rolle in Agent', + 'change_password' => 'Passwort ändern', + 'role_change' => 'Rollenwechsel', + 'password_generator' => 'Passwortgenerator', + 'depertment' => 'Abteilung', + 'duetoday' => 'Heute fällig', + 'today-due_tickets' => 'Heutige Tickets', + 'password_change_successfully' => 'Passwort erfolgreich geändert', + 'role_change_successfully' => 'Die Rolle wurde erfolgreich geändert', + 'user_delete_successfully' => 'Benutzer wurde erfolgreich gelöscht', + 'agent_delete_successfully' => 'Agent wurde erfolgreich gelöscht', + 'select_another_agent' => 'Wählen Sie einen anderen Agenten aus', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Der Agent wurde erfolgreich gelöscht und das Ticket wurde einem anderen Agenten zugewiesen', + 'deleted_user' => 'Gelöschter Benutzer', + 'deleted_user_directory' => 'Gelöschtes Benutzerverzeichnis', + 'restore' => 'Wiederherstellen', + 'user_restore_successfully' => 'Benutzerwiederherstellung erfolgreich', - /*** updates 28-11-2016***/ - 'apply' => 'anwenden', + /*** updates 28-11-2016***/ + 'apply' => 'anwenden', - /* updates 2-12-2016 **/ - 'sort-by' => 'Sortiere nach', - 'created-at' => 'Erstellt am', - 'or' => 'oder', - 'activate' => 'Aktivieren', - 'system-email-not-configured' => 'Wir können die E-Mail-Anfrage nicht verarbeiten, da das System keine konfigurierte E-Mail zum Senden von E-Mails hat. Bitte kontaktieren Sie den Systemadministrator und benachrichtigen Sie ihn.', - 'assign-ticket' => 'Tickets zuweisen', - 'can-not-inactive-group' => 'Die Gruppe kann nicht inaktiviert werden, da ihr Agenten zugewiesen sind. Weisen Sie diese Agenten einer anderen Gruppe zu und versuchen Sie es erneut.', - 'internal-note-has-been-added' => 'Interne Notiz wurde dem Ticket hinzugefügt', - 'active-users' => 'Aktive Benutzer', - 'deleted-users' => 'Gelöschte Benutzer', - 'view-option' => 'Optionen anzeigen', - 'accoutn-not-verified' => 'Benutzerkonto wurde nicht überprüft', - 'enabled' => 'Aktiviert', - 'disabled' => 'Deaktiviert', - 'user-account-is-deleted' => 'Dieses Benutzerkonto wurde gelöscht.', - 'restore-user' => 'Benutzerkonto wiederherstellen', - 'delete-account-caution-info' => 'Bitte beachten Sie, dass dieses Konto möglicherweise noch offene Tickets im System hat.', - 'reply-can-not-be-empty' => 'Antwort kann nicht leer sein. Bitte geben Sie Ihre Antwort ein.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Sortiere nach', + 'created-at' => 'Erstellt am', + 'or' => 'oder', + 'activate' => 'Aktivieren', + 'system-email-not-configured' => 'Wir können die E-Mail-Anfrage nicht verarbeiten, da das System keine konfigurierte E-Mail zum Senden von E-Mails hat. Bitte kontaktieren Sie den Systemadministrator und benachrichtigen Sie ihn.', + 'assign-ticket' => 'Tickets zuweisen', + 'can-not-inactive-group' => 'Die Gruppe kann nicht inaktiviert werden, da ihr Agenten zugewiesen sind. Weisen Sie diese Agenten einer anderen Gruppe zu und versuchen Sie es erneut.', + 'internal-note-has-been-added' => 'Interne Notiz wurde dem Ticket hinzugefügt', + 'active-users' => 'Aktive Benutzer', + 'deleted-users' => 'Gelöschte Benutzer', + 'view-option' => 'Optionen anzeigen', + 'accoutn-not-verified' => 'Benutzerkonto wurde nicht überprüft', + 'enabled' => 'Aktiviert', + 'disabled' => 'Deaktiviert', + 'user-account-is-deleted' => 'Dieses Benutzerkonto wurde gelöscht.', + 'restore-user' => 'Benutzerkonto wiederherstellen', + 'delete-account-caution-info' => 'Bitte beachten Sie, dass dieses Konto möglicherweise noch offene Tickets im System hat.', + 'reply-can-not-be-empty' => 'Antwort kann nicht leer sein. Bitte geben Sie Ihre Antwort ein.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Ihr Konto wurde erfolgreich erstellt. Bitte kontaktieren Sie den Administrator für die Kontoaktivierung, da wir Ihnen keinen OPT-Code senden konnten.', - //update 19-12-2016 - 'only-agents' => 'Agentenbenutzer', - 'only-users' => 'Kunden Benutzer', - 'banned-users' => 'Gesperrte Benutzer', - 'inactive-users' => 'Inaktiver Benutzer', - 'all-users' => 'Alle Nutzer', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'Der ausgewählte Benutzer ist bereits Inhaber dieses Tickets.', - //updated 15-5-2017 - 'session-expired' => 'Die Sitzung ist abgelaufen oder ungültig. Bitte versuchen Sie es erneut.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Ihr Konto wurde erfolgreich erstellt. Bitte kontaktieren Sie den Administrator für die Kontoaktivierung, da wir Ihnen keinen OPT-Code senden konnten.', + //update 19-12-2016 + 'only-agents' => 'Agentenbenutzer', + 'only-users' => 'Kunden Benutzer', + 'banned-users' => 'Gesperrte Benutzer', + 'inactive-users' => 'Inaktiver Benutzer', + 'all-users' => 'Alle Nutzer', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Der ausgewählte Benutzer ist bereits Inhaber dieses Tickets.', + //updated 15-5-2017 + 'session-expired' => 'Die Sitzung ist abgelaufen oder ungültig. Bitte versuchen Sie es erneut.', ]; diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 1919147b0..38f068a95 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -48,7 +48,7 @@ return [ 'iforgot' => 'I forgot my password', 'email_address' => 'Email address', 'password' => 'Password', - 'password_confirmation' => 'Password confirmation', + 'password_confirmation' => 'Password confirmation', 'woops' => 'Whoops!', 'theirisproblem' => 'There were some problems with your input.', 'e-mail' => 'Email', @@ -64,7 +64,7 @@ return [ 'verify-number' => 'Verify number', 'get-verify-message' => 'Enter the OTP code we\'ve sent to your new number.', 'number-verification-sussessfull' => 'Your number has been verified successfully, please wait we are updating your profile.', - 'enter_your_email_here' => 'Enter Your Email Here', + 'enter_your_email_here' => 'Enter Your Email Here', /* |-------------------------------------- | Register Page @@ -462,7 +462,7 @@ return [ |Social login |-------------------------------------------------- */ - 'social-login' => 'Social login', + 'social-login' => 'Social login', /* |------------------------------------------------ @@ -1120,7 +1120,7 @@ return [ 'user-exists' => 'User already exists. Try search existing user.', 'valid-email' => 'Enter a valid email address.', 'search_user' => 'Search user', - 'merge-ticket' => 'Merge ticket', + 'merge-ticket' => 'Merge ticket', 'title' => 'Title', 'merge' => 'Merge', 'select_tickets' => 'Select tickets to merge', @@ -1516,82 +1516,82 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Followup', - 'followup_tickets' => 'Followup tickets', - 'followup_Notification' => 'Followup notification', + 'followup' => 'Followup', + 'followup_tickets' => 'Followup tickets', + 'followup_Notification' => 'Followup notification', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Not available', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Not available', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Agent report', - 'assign_tickets' => 'Assign tickets', - 'delete_agent' => 'Delete agent', - 'delete_user' => 'Delete user', - 'confirm_deletion' => 'Confirm deletion', - 'delete_all_content' => 'Delete all content', - 'agent_profile' => 'Agent profile', - 'change_role_to_admin' => 'Change role to admin', - 'change_role_to_user' => 'Change role to user', - 'change_role_to_agent' => 'Change role to agent', - 'change_password' => 'Change password', - 'role_change' => 'Role change', - 'password_generator' => 'Password generator', - 'depertment' => 'Department', - 'duetoday' => 'Due today', - 'today-due_tickets' => 'Today\'s due tickets', - 'password_change_successfully' => 'Password changed successfully', - 'role_change_successfully' => 'Role changed successfully', - 'user_delete_successfully' => 'User deleted successfully', - 'agent_delete_successfully' => 'Agent deleted successfully', - 'select_another_agent' => 'Select another agent', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', - 'deleted_user' => 'Deleted User', - 'deleted_user_directory' => 'Deleted User Directory', - 'restore' => 'Restore', - 'user_restore_successfully' => 'User restore successfully', + 'agent_report' => 'Agent report', + 'assign_tickets' => 'Assign tickets', + 'delete_agent' => 'Delete agent', + 'delete_user' => 'Delete user', + 'confirm_deletion' => 'Confirm deletion', + 'delete_all_content' => 'Delete all content', + 'agent_profile' => 'Agent profile', + 'change_role_to_admin' => 'Change role to admin', + 'change_role_to_user' => 'Change role to user', + 'change_role_to_agent' => 'Change role to agent', + 'change_password' => 'Change password', + 'role_change' => 'Role change', + 'password_generator' => 'Password generator', + 'depertment' => 'Department', + 'duetoday' => 'Due today', + 'today-due_tickets' => 'Today\'s due tickets', + 'password_change_successfully' => 'Password changed successfully', + 'role_change_successfully' => 'Role changed successfully', + 'user_delete_successfully' => 'User deleted successfully', + 'agent_delete_successfully' => 'Agent deleted successfully', + 'select_another_agent' => 'Select another agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', + 'deleted_user' => 'Deleted User', + 'deleted_user_directory' => 'Deleted User Directory', + 'restore' => 'Restore', + 'user_restore_successfully' => 'User restore successfully', - /*** updates 28-11-2016***/ - 'apply' => 'Apply', + /*** updates 28-11-2016***/ + 'apply' => 'Apply', - /* updates 2-12-2016 **/ - 'sort-by' => 'Sort by', - 'created-at' => 'Created at', - 'or' => 'OR', - 'activate' => 'Activate', - 'system-email-not-configured' => 'System could not send emails to users as it does not have the email configured to send outgoing mails. Please contact and report system admin.', - 'assign-ticket' => 'Assign tickets', - 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', - 'internal-note-has-been-added' => 'Internal note added to the ticket', - 'active-users' => 'Active users', - 'deleted-users' => 'Deleted users', - 'view-option' => 'View options', - 'accoutn-not-verified' => 'User account is not verified', - 'enabled' => 'Enabled', - 'disabled' => 'Disabled', - 'user-account-is-deleted' => 'This user account has been deleted.', - 'restore-user' => 'Restore user account', - 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', - 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Sort by', + 'created-at' => 'Created at', + 'or' => 'OR', + 'activate' => 'Activate', + 'system-email-not-configured' => 'System could not send emails to users as it does not have the email configured to send outgoing mails. Please contact and report system admin.', + 'assign-ticket' => 'Assign tickets', + 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', + 'internal-note-has-been-added' => 'Internal note added to the ticket', + 'active-users' => 'Active users', + 'deleted-users' => 'Deleted users', + 'view-option' => 'View options', + 'accoutn-not-verified' => 'User account is not verified', + 'enabled' => 'Enabled', + 'disabled' => 'Disabled', + 'user-account-is-deleted' => 'This user account has been deleted.', + 'restore-user' => 'Restore user account', + 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', + 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OTP code.', - //update 19-12-2016 - 'only-agents' => 'Agent users', - 'only-users' => 'Clients users', - 'banned-users' => 'Banned users', - 'inactive-users' => 'Inactive users', - 'all-users' => 'All users', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', - //updated 15-5-2017 - 'session-expired' => 'Session expired or invalid, please try again.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OTP code.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', + //updated 15-5-2017 + 'session-expired' => 'Session expired or invalid, please try again.', //update since v1.10 'your_helpdesk_is_ready' => 'Your Helpdesk is Ready!', diff --git a/resources/lang/es/lang.php b/resources/lang/es/lang.php index bee393698..1ea8fa8eb 100644 --- a/resources/lang/es/lang.php +++ b/resources/lang/es/lang.php @@ -62,7 +62,7 @@ return [ 'iforgot' => 'Olvidé mi contraseña', 'email_address' => 'Dirección de correo electrónico', 'password' => 'Contraseña', - 'password_confirmation' => 'confirmación de contraseña', + 'password_confirmation' => 'confirmación de contraseña', 'woops' => 'Whoops!', 'theirisproblem' => 'Hubo algunos problemas con su entrada.', 'login' => 'Iniciar sesión', @@ -79,7 +79,7 @@ return [ 'verify-number' => 'Verificar el número', 'get-verify-message' => 'Ingrese el código de OTP que enviamos a su nuevo número.', 'number-verification-sussessfull' => 'Su número se ha verificado correctamente, por favor espere que estamos actualizando su perfil.', - 'enter_your_email_here' => 'Ingrese su dirección de correo electrónico aquí', + 'enter_your_email_here' => 'Ingrese su dirección de correo electrónico aquí', /* |-------------------------------------- | Página de Registro @@ -478,7 +478,7 @@ return [ |Social login |-------------------------------------------------- */ - 'social-login' => 'Ingreso social', + 'social-login' => 'Ingreso social', /* |------------------------------------------------ @@ -1137,7 +1137,7 @@ return [ 'user-exists' => 'El usuario ya existe. Intente buscar el usuario existente.', 'valid-email' => 'Introduzca una dirección de correo electrónico válida.', 'search_user' => 'Buscar usuario', - 'merge-ticket' => 'Fusionar ticket', + 'merge-ticket' => 'Fusionar ticket', 'title' => 'Título', 'merge' => 'Fusionar', 'select_tickets' => 'Seleccionar tickets para fusionar', @@ -1534,95 +1534,95 @@ Puede ingresar el número de días de registros de base de datos que se eliminar * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Seguir', - 'followup_tickets' => 'Seguir tickets', - 'followup_Notification' => 'Notificación de Seguimiento', + 'followup' => 'Seguir', + 'followup_tickets' => 'Seguir tickets', + 'followup_Notification' => 'Notificación de Seguimiento', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'No disponible', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'No disponible', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Informe del agente', - 'assign_tickets' => 'Asignar tickets', - 'delete_agent' => 'Borrar agente', - 'delete_user' => 'Borrar usuario', - 'confirm_deletion' => 'Confirmar la eliminación', - 'delete_all_content' => 'Borrar todo el contenido', - 'agent_profile' => 'Perfil del agente', - 'change_role_to_admin' => 'Cambiar el rol a admin', - 'change_role_to_user' => 'Cambiar función a usuario', - 'change_role_to_agent' => 'Cambiar el rol a agente', - 'change_password' => 'Cambia la contraseña', - 'role_change' => 'Cambio de rol', - 'password_generator' => 'Generador de contraseñas', - 'depertment' => 'Departmento', - 'duetoday' => 'Para hoy', - 'today-due_tickets' => 'Tickets para hoy', - 'password_change_successfully' => 'Contraseña cambiada con éxito', - 'role_change_successfully' => 'Función cambiada con éxito', - 'user_delete_successfully' => 'Usuario eliminado correctamente', - 'agent_delete_successfully' => 'Agente eliminado correctamente', - 'select_another_agent' => 'Seleccione otro agente', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agente eliminado con éxito y el ticket asignado a otro agente', - 'deleted_user' => 'Eliminar usuario', - 'deleted_user_directory' => 'Eliminar directorio del usuario', - 'restore' => 'Restaurar', - 'user_restore_successfully' => 'Usuario restaurado con éxito', + 'agent_report' => 'Informe del agente', + 'assign_tickets' => 'Asignar tickets', + 'delete_agent' => 'Borrar agente', + 'delete_user' => 'Borrar usuario', + 'confirm_deletion' => 'Confirmar la eliminación', + 'delete_all_content' => 'Borrar todo el contenido', + 'agent_profile' => 'Perfil del agente', + 'change_role_to_admin' => 'Cambiar el rol a admin', + 'change_role_to_user' => 'Cambiar función a usuario', + 'change_role_to_agent' => 'Cambiar el rol a agente', + 'change_password' => 'Cambia la contraseña', + 'role_change' => 'Cambio de rol', + 'password_generator' => 'Generador de contraseñas', + 'depertment' => 'Departmento', + 'duetoday' => 'Para hoy', + 'today-due_tickets' => 'Tickets para hoy', + 'password_change_successfully' => 'Contraseña cambiada con éxito', + 'role_change_successfully' => 'Función cambiada con éxito', + 'user_delete_successfully' => 'Usuario eliminado correctamente', + 'agent_delete_successfully' => 'Agente eliminado correctamente', + 'select_another_agent' => 'Seleccione otro agente', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agente eliminado con éxito y el ticket asignado a otro agente', + 'deleted_user' => 'Eliminar usuario', + 'deleted_user_directory' => 'Eliminar directorio del usuario', + 'restore' => 'Restaurar', + 'user_restore_successfully' => 'Usuario restaurado con éxito', - /*** updates 28-11-2016***/ - 'apply' => 'Apply', + /*** updates 28-11-2016***/ + 'apply' => 'Apply', - /* updates 2-12-2016 **/ - 'sort-by' => 'Ordenar por', - 'created-at' => 'Creado en', - 'or' => 'OR', - 'activate' => 'Activar', - 'system-email-not-configured' => 'No podemos procesar la solicitud de correo electrónico porque el sistema no tiene correo configurado para enviar correos. Comuníquese con el administrador del sistema.', - 'assign-ticket' => 'Asignar tickets', - 'can-not-inactive-group' => 'No se puede hacer que el grupo inactivo, ya que tiene agentes asignados en él. Asigne estos agentes a otro grupo e inténtelo de nuevo.', - 'internal-note-has-been-added' => 'Nota interna añadida al ticket', - 'active-users' => 'Usuarios Activos', - 'deleted-users' => 'Borrar usuarios', - 'view-option' => 'Ver opciones', - 'accoutn-not-verified' => 'La cuenta de usuario no se ha verificado', - 'enabled' => 'Habilitado', - 'disabled' => 'Desabilitado', - 'user-account-is-deleted' => 'Se ha eliminado esta cuenta de usuario.', - 'restore-user' => 'Restaurar cuenta de usuario', - 'delete-account-caution-info' => 'Tenga en cuenta que esta cuenta todavía puede tener entradas abiertas en el sistema.', - 'reply-can-not-be-empty' => 'La respuesta no puede estar en blanco. Ingrese su respuesta.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Ordenar por', + 'created-at' => 'Creado en', + 'or' => 'OR', + 'activate' => 'Activar', + 'system-email-not-configured' => 'No podemos procesar la solicitud de correo electrónico porque el sistema no tiene correo configurado para enviar correos. Comuníquese con el administrador del sistema.', + 'assign-ticket' => 'Asignar tickets', + 'can-not-inactive-group' => 'No se puede hacer que el grupo inactivo, ya que tiene agentes asignados en él. Asigne estos agentes a otro grupo e inténtelo de nuevo.', + 'internal-note-has-been-added' => 'Nota interna añadida al ticket', + 'active-users' => 'Usuarios Activos', + 'deleted-users' => 'Borrar usuarios', + 'view-option' => 'Ver opciones', + 'accoutn-not-verified' => 'La cuenta de usuario no se ha verificado', + 'enabled' => 'Habilitado', + 'disabled' => 'Desabilitado', + 'user-account-is-deleted' => 'Se ha eliminado esta cuenta de usuario.', + 'restore-user' => 'Restaurar cuenta de usuario', + 'delete-account-caution-info' => 'Tenga en cuenta que esta cuenta todavía puede tener entradas abiertas en el sistema.', + 'reply-can-not-be-empty' => 'La respuesta no puede estar en blanco. Ingrese su respuesta.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Su cuenta se ha creado correctamente. Póngase en contacto con admin para activar la cuenta, ya que no hemos podido enviarle un código de OTP.', - //update 19-12-2016 - 'only-agents' => 'Usuarios de agentes', - 'only-users' => 'Clientes usuarios', - 'banned-users' => 'Usuarios baneados', - 'inactive-users' => 'Usuarios inactivos', - 'all-users' => 'Todos los usuarios', - 'search' => 'Buscar...', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'El usuario seleccionado ya es el propietario de este ticket.', - //update 1-2-2017 - 'system-outgoing-incoming-mail-not-configured' => 'You have not configured system mail. Faveo can\'t fetch tickets from mail or send mail to users without it.', - 'confihure-the-mail-now' => 'Click here to configure the mail.', - 'system-mail-not-configured-agent-message' => 'System incoming and outgoing email settings are not configured. Please contct the admin.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Su cuenta se ha creado correctamente. Póngase en contacto con admin para activar la cuenta, ya que no hemos podido enviarle un código de OTP.', + //update 19-12-2016 + 'only-agents' => 'Usuarios de agentes', + 'only-users' => 'Clientes usuarios', + 'banned-users' => 'Usuarios baneados', + 'inactive-users' => 'Usuarios inactivos', + 'all-users' => 'Todos los usuarios', + 'search' => 'Buscar...', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'El usuario seleccionado ya es el propietario de este ticket.', + //update 1-2-2017 + 'system-outgoing-incoming-mail-not-configured' => 'You have not configured system mail. Faveo can\'t fetch tickets from mail or send mail to users without it.', + 'confihure-the-mail-now' => 'Click here to configure the mail.', + 'system-mail-not-configured-agent-message' => 'System incoming and outgoing email settings are not configured. Please contct the admin.', - // arindam-14.2.2017 - // sla - 'min' => 'Min', - 'hours' => 'Hours', - 'days' => 'Days', - 'months'=> 'Months', - 'year' => 'Year', -// department change - 'change_department' => 'Change Department', + // arindam-14.2.2017 + // sla + 'min' => 'Min', + 'hours' => 'Hours', + 'days' => 'Days', + 'months'=> 'Months', + 'year' => 'Year', + // department change + 'change_department' => 'Change Department', 'ticket_department_successfully_changed'=> 'Ticket Department Successfully Changed', 'select_another_department' => 'Select another department', diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 888002e03..611524a00 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -678,7 +678,7 @@ return [ 'footer2' => 'Footer2', 'footer3' => 'Footer3', 'footer4' => 'Footer4', - /* + /* |-------------------------------------- | Custom alert box |-------------------------------------- @@ -1082,7 +1082,7 @@ return [ 'user-exists' => 'L\'utilisateur existe déjà. Essayez de rechercher un utilisateur existant.', 'valid-email' => 'Entrer une adreese email valide.', 'search_user' => 'Rechercher utilisateur', - 'merge-ticket' => 'Fusionner ticket', + 'merge-ticket' => 'Fusionner ticket', 'title' => 'Titre', 'merge' => 'Fusionner', 'select_tickets' => 'Sélectionner les tickets à fusionner', @@ -1361,30 +1361,30 @@ return [ 'api_configurations' => 'Configurations API', 'generate_key' => 'Générer Clé', 'api_settings' => 'Paramètres API', - /* + /* *----------------------------------------------------------------------------- * Error log and debugging settings *-------------------------------------------------------------------------- * */ - 'error-debug' => 'Logs d\'erreurs et débug', - 'debug-options' => 'Options de débug', - 'view-logs' => 'Voir logs d\'erreurs', - 'not-authorised-error-debug' => 'Vous n\'êtes pas autorisé à accéder à cette URL', - 'error-debug-settings' => 'Paramètres erreurs et débug', - 'debugging' => 'Mode de débug', - 'bugsnag-debugging' => 'Envoyer les rapports de crash de l\'app pour aider à améliorer Faveo', - 'error-debug-settings-saved-message' => 'Vos paramètres erreurs et débugging ont été enregistrés avec succès', - 'error-debug-settings-error-message' => 'Vous n\'avez effectué aucun changement dans les paramètres.', - 'error-logs' => 'Logs d\'erreurs', - /*--------------------------------------------------------------------------------------- + 'error-debug' => 'Logs d\'erreurs et débug', + 'debug-options' => 'Options de débug', + 'view-logs' => 'Voir logs d\'erreurs', + 'not-authorised-error-debug' => 'Vous n\'êtes pas autorisé à accéder à cette URL', + 'error-debug-settings' => 'Paramètres erreurs et débug', + 'debugging' => 'Mode de débug', + 'bugsnag-debugging' => 'Envoyer les rapports de crash de l\'app pour aider à améliorer Faveo', + 'error-debug-settings-saved-message' => 'Vos paramètres erreurs et débugging ont été enregistrés avec succès', + 'error-debug-settings-error-message' => 'Vous n\'avez effectué aucun changement dans les paramètres.', + 'error-logs' => 'Logs d\'erreurs', + /*--------------------------------------------------------------------------------------- *Latest update 16-06-2016 *----------------------------------------------------------------------------------- */ - 'that_email_is not_available_in_this_system' => 'Cet email n\'est pas disponible dans le système', - 'use_subject' => 'Utiliser sujet', - 'reopen' => 'Réouvrir', - 'invalid_attempt' => 'Tentative invalide', + 'that_email_is not_available_in_this_system' => 'Cet email n\'est pas disponible dans le système', + 'use_subject' => 'Utiliser sujet', + 'reopen' => 'Réouvrir', + 'invalid_attempt' => 'Tentative invalide', /**-------------------------------------------------------------------------------------------- * Attachment Updated @@ -1487,81 +1487,81 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Suivre', - 'followup_tickets' => 'Tickets suivi', - 'followup_Notification' => 'Notification de suivi', + 'followup' => 'Suivre', + 'followup_tickets' => 'Tickets suivi', + 'followup_Notification' => 'Notification de suivi', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Non disponible', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Non disponible', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Rapport d\'agent', - 'assign_tickets' => 'Attribuer des tickets', - 'delete_agent' => 'Supprimer un agent', - 'delete_user' => 'Supprimer un user', - 'confirm_deletion' => 'Confirmer la suppression', - 'delete_all_content' => 'Supprimer tous les contenus', - 'agent_profile' => 'Profil d\'agent', - 'change_role_to_admin' => 'Changer le rôle en admin', - 'change_role_to_user' => 'Changer le rôle en utilisateur', - 'change_role_to_agent' => 'Changer le rôle en agent', - 'change_password' => 'Changer le mot de passe', - 'role_change' => 'Changer le rôle', - 'password_generator' => 'Génerateur de mot de passe', - 'depertment' => 'Département', - 'duetoday' => 'A faire aujourd\'hui', - 'today-due_tickets' => 'Tickets a faire aujourd\'hui', - 'password_change_successfully' => 'Mot de passe modifié avec succès', - 'role_change_successfully' => 'Rôle modifié avec succès', - 'user_delete_successfully' => 'Utilisation supprimé avec succès', - 'agent_delete_successfully' => 'Agent supprimé avec succès', - 'select_another_agent' => 'Sélectionner un autre agent', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent supprimé avec succès et les tickets ont été assignés a un autre agent', - 'deleted_user' => 'Utilisateurs supprimés', - 'deleted_user_directory' => 'Dossier d\'utilisateurs supprimés', - 'restore' => 'Restaurer', - 'user_restore_successfully' => 'Utilisateur restauré avec succès', + 'agent_report' => 'Rapport d\'agent', + 'assign_tickets' => 'Attribuer des tickets', + 'delete_agent' => 'Supprimer un agent', + 'delete_user' => 'Supprimer un user', + 'confirm_deletion' => 'Confirmer la suppression', + 'delete_all_content' => 'Supprimer tous les contenus', + 'agent_profile' => 'Profil d\'agent', + 'change_role_to_admin' => 'Changer le rôle en admin', + 'change_role_to_user' => 'Changer le rôle en utilisateur', + 'change_role_to_agent' => 'Changer le rôle en agent', + 'change_password' => 'Changer le mot de passe', + 'role_change' => 'Changer le rôle', + 'password_generator' => 'Génerateur de mot de passe', + 'depertment' => 'Département', + 'duetoday' => 'A faire aujourd\'hui', + 'today-due_tickets' => 'Tickets a faire aujourd\'hui', + 'password_change_successfully' => 'Mot de passe modifié avec succès', + 'role_change_successfully' => 'Rôle modifié avec succès', + 'user_delete_successfully' => 'Utilisation supprimé avec succès', + 'agent_delete_successfully' => 'Agent supprimé avec succès', + 'select_another_agent' => 'Sélectionner un autre agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent supprimé avec succès et les tickets ont été assignés a un autre agent', + 'deleted_user' => 'Utilisateurs supprimés', + 'deleted_user_directory' => 'Dossier d\'utilisateurs supprimés', + 'restore' => 'Restaurer', + 'user_restore_successfully' => 'Utilisateur restauré avec succès', - /*** updates 28-11-2016***/ - 'apply' => 'Appliquer', + /*** updates 28-11-2016***/ + 'apply' => 'Appliquer', - /* updates 2-12-2016 **/ - 'sort-by' => 'Trier par', - 'created-at' => 'Créé a', - 'or' => 'ou', - 'activate' => 'Activer', - 'system-email-not-configured' => 'Nous ne pouvons pas traiter la demande d\'email car le système n\'a pas de email configuré pour l\'envoi de courrier. Veuillez contacter et signaler a l\'administrateur système.', - 'assign-ticket' => 'Tickets assignés', - 'can-not-inactive-group' => 'Impossible de rendre le groupe inactif car il contient des agents. Veuillez attribuer ces agents à un autre groupe et réessayer.', - 'internal-note-has-been-added' => 'Note interne ajoutée au ticket', - 'active-users' => 'Utilisateurs actifs', - 'deleted-users' => 'Utilisateurs supprimés', - 'view-option' => 'Voir les options', - 'accoutn-not-verified' => 'Le compote utilisateur n\'est pas vérifié', - 'enabled' => 'Activé', - 'disabled' => 'Désactivé', - 'user-account-is-deleted' => 'Ce compte utilisateur a été supprimé.', - 'restore-user' => 'Restaurer le compte utilisateur', - 'delete-account-caution-info' => 'Veuillez noter que ce compte peut toujours contenir des billets ouverts dans le système.', - 'reply-can-not-be-empty' => 'La réponse ne peut pas être vide. Veuillez entrer votre réponse.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Trier par', + 'created-at' => 'Créé a', + 'or' => 'ou', + 'activate' => 'Activer', + 'system-email-not-configured' => 'Nous ne pouvons pas traiter la demande d\'email car le système n\'a pas de email configuré pour l\'envoi de courrier. Veuillez contacter et signaler a l\'administrateur système.', + 'assign-ticket' => 'Tickets assignés', + 'can-not-inactive-group' => 'Impossible de rendre le groupe inactif car il contient des agents. Veuillez attribuer ces agents à un autre groupe et réessayer.', + 'internal-note-has-been-added' => 'Note interne ajoutée au ticket', + 'active-users' => 'Utilisateurs actifs', + 'deleted-users' => 'Utilisateurs supprimés', + 'view-option' => 'Voir les options', + 'accoutn-not-verified' => 'Le compote utilisateur n\'est pas vérifié', + 'enabled' => 'Activé', + 'disabled' => 'Désactivé', + 'user-account-is-deleted' => 'Ce compte utilisateur a été supprimé.', + 'restore-user' => 'Restaurer le compte utilisateur', + 'delete-account-caution-info' => 'Veuillez noter que ce compte peut toujours contenir des billets ouverts dans le système.', + 'reply-can-not-be-empty' => 'La réponse ne peut pas être vide. Veuillez entrer votre réponse.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Votre compte a été créé avec succès. Veuillez contacter admin pour l\'activation du compte car nous n\'avons pas pu vous envoyer un code OPT.', - //update 19-12-2016 - 'only-agents' => 'Agent users', - 'only-users' => 'Clients users', - 'banned-users' => 'Utilisateurs bannis', - 'inactive-users' => 'Utilisateurs inactifs', - 'all-users' => 'Tous les utilisateurs', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'L\'utilisateur sélectionné est déjà le propriétaire du ticket.', - //updated 15-5-2017 - 'session-expired' => 'Session expired or invalid, please try again.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Votre compte a été créé avec succès. Veuillez contacter admin pour l\'activation du compte car nous n\'avons pas pu vous envoyer un code OPT.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Utilisateurs bannis', + 'inactive-users' => 'Utilisateurs inactifs', + 'all-users' => 'Tous les utilisateurs', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'L\'utilisateur sélectionné est déjà le propriétaire du ticket.', + //updated 15-5-2017 + 'session-expired' => 'Session expired or invalid, please try again.', ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 8580ceddf..2bd7ce4a9 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -470,7 +470,7 @@ return [ |Social login |-------------------------------------------------- */ - 'social-login' => 'Accesso con i Social', + 'social-login' => 'Accesso con i Social', /* |------------------------------------------------ @@ -1128,7 +1128,7 @@ return [ 'user-exists' => 'Utente già esistente, prova a cercare questo stesso utente.', 'valid-email' => 'Inserisci un indirizzo email valido.', 'search_user' => 'Cerca utente', - 'merge-ticket' => 'Unisci ticket', + 'merge-ticket' => 'Unisci ticket', 'title' => 'Titolo', 'merge' => 'Unisci', 'select_tickets' => 'Seleziona ticket da unire', @@ -1520,78 +1520,78 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Followup', - 'followup_tickets' => 'Ticket di followup', - 'followup_Notification' => 'Notifiche followup', + 'followup' => 'Followup', + 'followup_tickets' => 'Ticket di followup', + 'followup_Notification' => 'Notifiche followup', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Non disponibile', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Non disponibile', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Resoconto agente', - 'assign_tickets' => 'Ticket assegnati', - 'delete_agent' => 'Cancella agente', - 'delete_user' => 'Cancella utente', - 'confirm_deletion' => 'Conferma cancellazione', - 'delete_all_content' => 'Cancella tutti i contenuti', - 'agent_profile' => 'Profilo agente', - 'change_role_to_admin' => 'Cambia ruolo in admin', - 'change_role_to_user' => 'Cambia ruolo in utente', - 'change_role_to_agent' => 'Cambia ruolo in agente', - 'change_password' => 'Cambia password', - 'role_change' => 'Cambio ruolo', - 'password_generator' => 'Genera password', - 'depertment' => 'Dipartimento', - 'duetoday' => 'In ritardo oggi', - 'today-due_tickets' => 'In scadenza oggi', - 'password_change_successfully' => 'Password cambiata con successo', - 'role_change_successfully' => 'Ruolo modificato con successo', - 'user_delete_successfully' => 'Utente cancellato correttamente', - 'agent_delete_successfully' => 'Agente cancellato correttamente', - 'select_another_agent' => 'Seleziona un altro agente', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agente cancellato e ticket assegnato ad altro agente', - 'deleted_user' => 'Utente cancellato', - 'deleted_user_directory' => 'Cartella utente cancellata', - 'restore' => 'Ripristina', - 'user_restore_successfully' => 'Utente ripristinato correttamente', + 'agent_report' => 'Resoconto agente', + 'assign_tickets' => 'Ticket assegnati', + 'delete_agent' => 'Cancella agente', + 'delete_user' => 'Cancella utente', + 'confirm_deletion' => 'Conferma cancellazione', + 'delete_all_content' => 'Cancella tutti i contenuti', + 'agent_profile' => 'Profilo agente', + 'change_role_to_admin' => 'Cambia ruolo in admin', + 'change_role_to_user' => 'Cambia ruolo in utente', + 'change_role_to_agent' => 'Cambia ruolo in agente', + 'change_password' => 'Cambia password', + 'role_change' => 'Cambio ruolo', + 'password_generator' => 'Genera password', + 'depertment' => 'Dipartimento', + 'duetoday' => 'In ritardo oggi', + 'today-due_tickets' => 'In scadenza oggi', + 'password_change_successfully' => 'Password cambiata con successo', + 'role_change_successfully' => 'Ruolo modificato con successo', + 'user_delete_successfully' => 'Utente cancellato correttamente', + 'agent_delete_successfully' => 'Agente cancellato correttamente', + 'select_another_agent' => 'Seleziona un altro agente', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agente cancellato e ticket assegnato ad altro agente', + 'deleted_user' => 'Utente cancellato', + 'deleted_user_directory' => 'Cartella utente cancellata', + 'restore' => 'Ripristina', + 'user_restore_successfully' => 'Utente ripristinato correttamente', - /*** updates 28-11-2016***/ - 'apply' => 'Applica', + /*** updates 28-11-2016***/ + 'apply' => 'Applica', - /* updates 2-12-2016 **/ - 'sort-by' => 'Ordina per', - 'created-at' => 'Creato a', - 'or' => 'o', - 'activate' => 'Attiva', - 'system-email-not-configured' => 'Non possiamo processare la richiesta in quanto il sistema non ha configurato alcuna mail per le notifiche. Per favore contatta l\'amministratore.', - 'assign-ticket' => 'Assegna ticket', - 'can-not-inactive-group' => 'Impossibile disattivare il gruppo con agenti assegnati. Per favore riassegna gli agenti ad un altro gruppo e riprova.', - 'internal-note-has-been-added' => 'Note interne aggiunte al ticket', - 'active-users' => 'Utenti attivi', - 'deleted-users' => 'Utenti cancellati', - 'view-option' => 'Visualizza opzioni', - 'accoutn-not-verified' => 'Account non verificato', - 'enabled' => 'Abilitato', - 'disabled' => 'Disabilitato', - 'user-account-is-deleted' => 'Questo account è stato cancellato.', - 'restore-user' => 'Ripristina account utente', - 'delete-account-caution-info' => 'Questo account potrebbe avere ancora ticket aperti nel sistema.', - 'reply-can-not-be-empty' => 'La risposta non può essere vuota.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Ordina per', + 'created-at' => 'Creato a', + 'or' => 'o', + 'activate' => 'Attiva', + 'system-email-not-configured' => 'Non possiamo processare la richiesta in quanto il sistema non ha configurato alcuna mail per le notifiche. Per favore contatta l\'amministratore.', + 'assign-ticket' => 'Assegna ticket', + 'can-not-inactive-group' => 'Impossibile disattivare il gruppo con agenti assegnati. Per favore riassegna gli agenti ad un altro gruppo e riprova.', + 'internal-note-has-been-added' => 'Note interne aggiunte al ticket', + 'active-users' => 'Utenti attivi', + 'deleted-users' => 'Utenti cancellati', + 'view-option' => 'Visualizza opzioni', + 'accoutn-not-verified' => 'Account non verificato', + 'enabled' => 'Abilitato', + 'disabled' => 'Disabilitato', + 'user-account-is-deleted' => 'Questo account è stato cancellato.', + 'restore-user' => 'Ripristina account utente', + 'delete-account-caution-info' => 'Questo account potrebbe avere ancora ticket aperti nel sistema.', + 'reply-can-not-be-empty' => 'La risposta non può essere vuota.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Il tuo account è stato creato correttamente. Per favore contatta l\'amministratore in quanto non siamo stati in grado di spedire un codice OTP.', - //update 19-12-2016 - 'only-agents' => 'Utenti agenti', - 'only-users' => 'Utenti clienti', - 'banned-users' => 'Utenti bannati', - 'inactive-users' => 'Utenti inattivi', - 'all-users' => 'Tutti gli utenti', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'L\'utente selezionato è già il proprietario del ticket.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Il tuo account è stato creato correttamente. Per favore contatta l\'amministratore in quanto non siamo stati in grado di spedire un codice OTP.', + //update 19-12-2016 + 'only-agents' => 'Utenti agenti', + 'only-users' => 'Utenti clienti', + 'banned-users' => 'Utenti bannati', + 'inactive-users' => 'Utenti inattivi', + 'all-users' => 'Tutti gli utenti', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'L\'utente selezionato è già il proprietario del ticket.', ]; diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php index caf305df1..af5572135 100644 --- a/resources/lang/it/validation.php +++ b/resources/lang/it/validation.php @@ -2,7 +2,7 @@ return [ - /* + /* |-------------------------------------------------------------------------- | Validation Language Lines |-------------------------------------------------------------------------- diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 298a4cfba..8de220b34 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -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 @@ -1532,81 +1532,81 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Opvolging', - 'followup_tickets' => 'Opvolg tickets', - 'followup_Notification' => 'Opvolging melding', + 'followup' => 'Opvolging', + 'followup_tickets' => 'Opvolg tickets', + 'followup_Notification' => 'Opvolging melding', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Niet beschikbaar', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Niet beschikbaar', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'confirm_deletion' => 'Verwijderen bevestigen', - 'delete_all_content' => 'Verwijder alle inhoud', - 'agent_profile' => 'Medewerker profiel', - 'change_role_to_admin' => 'Verander naar beheerder', - 'change_role_to_user' => 'Verander naar gebruiker', - 'change_role_to_agent' => 'Verander naar medewerker', - 'change_password' => 'Verander wachtwoord', - 'role_change' => 'Rol aanpassen', - 'password_generator' => 'Wachtwoord generator', - 'depertment' => 'Afdeling', - 'duetoday' => 'Einddatum vandaag', - 'today-due_tickets' => 'Ticket met een einddatum vandaag', - 'password_change_successfully' => 'Wachtwoord succesvol veranderd', - 'role_change_successfully' => 'Rol succesvol veranderd', - 'user_delete_successfully' => 'Gebruiker succesvol verwijderd', - 'agent_delete_successfully' => 'Medewerker succesvol verwijderd', - 'select_another_user' => 'Selecteer een andere gebruiker', + 'confirm_deletion' => 'Verwijderen bevestigen', + 'delete_all_content' => 'Verwijder alle inhoud', + 'agent_profile' => 'Medewerker profiel', + 'change_role_to_admin' => 'Verander naar beheerder', + 'change_role_to_user' => 'Verander naar gebruiker', + 'change_role_to_agent' => 'Verander naar medewerker', + 'change_password' => 'Verander wachtwoord', + 'role_change' => 'Rol aanpassen', + 'password_generator' => 'Wachtwoord generator', + 'depertment' => 'Afdeling', + 'duetoday' => 'Einddatum vandaag', + 'today-due_tickets' => 'Ticket met een einddatum vandaag', + 'password_change_successfully' => 'Wachtwoord succesvol veranderd', + 'role_change_successfully' => 'Rol succesvol veranderd', + 'user_delete_successfully' => 'Gebruiker succesvol verwijderd', + 'agent_delete_successfully' => 'Medewerker succesvol verwijderd', + 'select_another_user' => 'Selecteer een andere gebruiker', 'agent_delete_successfully_and_ticket_assign_to_another_user' => 'Medewerker succesvol verwijderd, het ticket is aan een andere gebruiker toegewezen', /************************************New updates*************************************/ /* Translation Required */ /************************************************************************************/ 'deleted_user' => 'Deleted User', - 'deleted_user_directory' => 'Deleted User Directory', - 'restore' => 'Restore', - 'user_restore_successfully' => 'User restore successfully', + 'deleted_user_directory' => 'Deleted User Directory', + 'restore' => 'Restore', + 'user_restore_successfully' => 'User restore successfully', - /*** updates 28-11-2016***/ - 'apply' => 'Apply', + /*** updates 28-11-2016***/ + 'apply' => 'Apply', - /* updates 2-12-2016 **/ - 'sort-by' => 'Sort by', - 'created-at' => 'Created at', - 'or' => 'OR', - 'activate' => 'Activate', - 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', - 'assign-ticket' => 'Assign tickets', - 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', - 'internal-note-has-been-added' => 'Internal note added to the ticket', - 'active-users' => 'Active users', - 'deleted-users' => 'Deleted users', - 'view-option' => 'View options', - 'accoutn-not-verified' => 'User account is not verified', - 'enabled' => 'Enabled', - 'disabled' => 'Disabled', - 'user-account-is-deleted' => 'This user account has been deleted.', - 'restore-user' => 'Restore user account', - 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', - 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Sort by', + 'created-at' => 'Created at', + 'or' => 'OR', + 'activate' => 'Activate', + 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', + 'assign-ticket' => 'Assign tickets', + 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', + 'internal-note-has-been-added' => 'Internal note added to the ticket', + 'active-users' => 'Active users', + 'deleted-users' => 'Deleted users', + 'view-option' => 'View options', + 'accoutn-not-verified' => 'User account is not verified', + 'enabled' => 'Enabled', + 'disabled' => 'Disabled', + 'user-account-is-deleted' => 'This user account has been deleted.', + 'restore-user' => 'Restore user account', + 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', + 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', - //update 19-12-2016 - 'only-agents' => 'Agent users', - 'only-users' => 'Clients users', - 'banned-users' => 'Banned users', - 'inactive-users' => 'Inactive users', - 'all-users' => 'All users', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', - //updated 15-5-2017 - 'session-expired' => 'Session expired or invalid, please try again.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', + //updated 15-5-2017 + 'session-expired' => 'Session expired or invalid, please try again.', ]; diff --git a/resources/lang/pt-br/lang.php b/resources/lang/pt-br/lang.php index 8f9356ab6..71e9a99ce 100644 --- a/resources/lang/pt-br/lang.php +++ b/resources/lang/pt-br/lang.php @@ -676,7 +676,7 @@ return [ 'footer2' => 'Rodapé2', 'footer3' => 'Rodapé3', 'footer4' => 'Rodapé4', - /* + /* |-------------------------------------- | Custom alert box |-------------------------------------- @@ -1353,34 +1353,34 @@ return [ 'api_configurations' => 'Configurações Api', 'generate_key' => 'Gerar chave', 'api_settings' => 'Configurações API', - /* + /* *----------------------------------------------------------------------------- * Error log and debugging settings *-------------------------------------------------------------------------- * */ - 'error-debug' => 'Logs de erros e depuração', - 'debug-options' => 'Opções de depuração', - 'view-logs' => 'Exibir logs de erro', - 'not-authorised-error-debug' => 'Você não está autorizado a acessar a URL', - 'error-debug-settings' => 'Configurações de erro e depuração', - 'debugging' => 'Modo de depuração', - 'bugsnag-debugging' => 'Enviar relatórios de falha de aplicativos para ajudar Ladybird melhorar Faveo', - 'error-debug-settings-saved-message' => 'Suas configurações de erro e depuração foram salvas com sucesso', - 'error-debug-settings-error-message' => 'Você ainda não fez qualquer mudança nas configurações.', - 'error-logs' => 'Logs de erros', - /*--------------------------------------------------------------------------------------- + 'error-debug' => 'Logs de erros e depuração', + 'debug-options' => 'Opções de depuração', + 'view-logs' => 'Exibir logs de erro', + 'not-authorised-error-debug' => 'Você não está autorizado a acessar a URL', + 'error-debug-settings' => 'Configurações de erro e depuração', + 'debugging' => 'Modo de depuração', + 'bugsnag-debugging' => 'Enviar relatórios de falha de aplicativos para ajudar Ladybird melhorar Faveo', + 'error-debug-settings-saved-message' => 'Suas configurações de erro e depuração foram salvas com sucesso', + 'error-debug-settings-error-message' => 'Você ainda não fez qualquer mudança nas configurações.', + 'error-logs' => 'Logs de erros', + /*--------------------------------------------------------------------------------------- *Latest update 16-06-2016 *----------------------------------------------------------------------------------- */ - 'that_email_is not_available_in_this_system' => 'Esse e-mail não está disponível neste sistema', - 'use_subject' => 'Use Assunto', - 'reopen' => 'Reabrir', + 'that_email_is not_available_in_this_system' => 'Esse e-mail não está disponível neste sistema', + 'use_subject' => 'Use Assunto', + 'reopen' => 'Reabrir', - /*******************************New updated ********************************************/ - /* Translation Required */ - /***************************************************************************************/ - 'invalid_attempt' => 'Tentativa inválida', + /*******************************New updated ********************************************/ + /* Translation Required */ + /***************************************************************************************/ + 'invalid_attempt' => 'Tentativa inválida', /* --------------------------------------------------------------------------------------- * Latest update 27-07-2016 * ----------------------------------------------------------------------------------- @@ -1475,82 +1475,82 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Acompanhamento', - 'followup_tickets' => 'Tickets em acompanhamento', - 'followup_Notification' => 'Notificação de acompanhamento', + 'followup' => 'Acompanhamento', + 'followup_tickets' => 'Tickets em acompanhamento', + 'followup_Notification' => 'Notificação de acompanhamento', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *-------------------------------------------------------------------------------------------- */ - 'not-available' => 'Não disponível', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Não disponível', + /* -------------------------------------------------------------------------------------------- * User Module * --------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Relatório do agente', - 'assign_tickets' => 'Atribuir ticket', - 'delete_agent' => 'Deletar agente', - 'delete_user' => 'Deletar usuário', - 'confirm_deletion' => 'Confirmar exclusão', - 'delete_all_content' => 'Deletar todo conteúdo', - 'agent_profile' => 'Perfil do agente', - 'change_role_to_admin' => 'Alterar função para admin', - 'change_role_to_user' => 'Alterar função para usuário', - 'change_role_to_agent' => 'Alterar função para agente', - 'change_password' => 'Alterar senha', - 'role_change' => 'Alterar função', - 'password_generator' => 'Gerador de senha', - 'depertment' => 'Depertamento', - 'duetoday' => 'Vencendo hoje', - 'today-due_tickets' => 'Tickets vencendo hoje', - 'password_change_successfully' => 'Senha alterada com sucesso', - 'role_change_successfully' => 'Função alterada com sucesso', - 'user_delete_successfully' => 'Usuário excluído com sucesso', - 'agent_delete_successfully' => 'Agente excluído com sucesso', - 'select_another_agent' => 'Escolher outro agente', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agente excluído com sucesso e ticket associado a outro agente', - 'deleted_user' => 'Usuário excluído', - 'deleted_user_directory' => 'Diretório de usuário excluído', - 'restore' => 'Restaurar', - 'user_restore_successfully' => 'Usuário restaurado com sucesso', + 'agent_report' => 'Relatório do agente', + 'assign_tickets' => 'Atribuir ticket', + 'delete_agent' => 'Deletar agente', + 'delete_user' => 'Deletar usuário', + 'confirm_deletion' => 'Confirmar exclusão', + 'delete_all_content' => 'Deletar todo conteúdo', + 'agent_profile' => 'Perfil do agente', + 'change_role_to_admin' => 'Alterar função para admin', + 'change_role_to_user' => 'Alterar função para usuário', + 'change_role_to_agent' => 'Alterar função para agente', + 'change_password' => 'Alterar senha', + 'role_change' => 'Alterar função', + 'password_generator' => 'Gerador de senha', + 'depertment' => 'Depertamento', + 'duetoday' => 'Vencendo hoje', + 'today-due_tickets' => 'Tickets vencendo hoje', + 'password_change_successfully' => 'Senha alterada com sucesso', + 'role_change_successfully' => 'Função alterada com sucesso', + 'user_delete_successfully' => 'Usuário excluído com sucesso', + 'agent_delete_successfully' => 'Agente excluído com sucesso', + 'select_another_agent' => 'Escolher outro agente', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agente excluído com sucesso e ticket associado a outro agente', + 'deleted_user' => 'Usuário excluído', + 'deleted_user_directory' => 'Diretório de usuário excluído', + 'restore' => 'Restaurar', + 'user_restore_successfully' => 'Usuário restaurado com sucesso', - /*** updates 28-11-2016***/ - 'apply' => 'Aplicar', + /*** updates 28-11-2016***/ + 'apply' => 'Aplicar', - /* updates 2-12-2016 **/ - 'sort-by' => 'Ordenar por', - 'created-at' => 'Criado em', - 'or' => 'OU', - 'activate' => 'Ativar', - 'system-email-not-configured' => 'Não podemos processar a solicitação de email, pois o sistema não possui email configurado para o envio de emails. Entre em contato e relate ao administrador do sistema.', - 'assign-ticket' => 'Atribuir tickets', - 'can-not-inactive-group' => 'Não é possível tornar o grupo inativo, pois possui agentes atribuídos. Atribua esses agentes a outro grupo e tente novamente.', - 'internal-note-has-been-added' => 'Nota interna adicionada ao ticket', - 'active-users' => 'Usuários ativos', - 'deleted-users' => 'Usuários excluídos', - 'view-option' => 'Ver opções', - 'accoutn-not-verified' => 'Conta de usuário não está verificada', - 'enabled' => 'Habilitado', - 'disabled' => 'Desabilitado', - 'user-account-is-deleted' => 'Esta conta de usuário foi excluída.', - 'restore-user' => 'Restaurar conta de usuário', - 'delete-account-caution-info' => 'Observe que esta conta ainda pode ter tickets abertos no sistema.', - 'reply-can-not-be-empty' => 'A resposta não pode ficar em branco. Digite sua resposta.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Ordenar por', + 'created-at' => 'Criado em', + 'or' => 'OU', + 'activate' => 'Ativar', + 'system-email-not-configured' => 'Não podemos processar a solicitação de email, pois o sistema não possui email configurado para o envio de emails. Entre em contato e relate ao administrador do sistema.', + 'assign-ticket' => 'Atribuir tickets', + 'can-not-inactive-group' => 'Não é possível tornar o grupo inativo, pois possui agentes atribuídos. Atribua esses agentes a outro grupo e tente novamente.', + 'internal-note-has-been-added' => 'Nota interna adicionada ao ticket', + 'active-users' => 'Usuários ativos', + 'deleted-users' => 'Usuários excluídos', + 'view-option' => 'Ver opções', + 'accoutn-not-verified' => 'Conta de usuário não está verificada', + 'enabled' => 'Habilitado', + 'disabled' => 'Desabilitado', + 'user-account-is-deleted' => 'Esta conta de usuário foi excluída.', + 'restore-user' => 'Restaurar conta de usuário', + 'delete-account-caution-info' => 'Observe que esta conta ainda pode ter tickets abertos no sistema.', + 'reply-can-not-be-empty' => 'A resposta não pode ficar em branco. Digite sua resposta.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Sua conta foi criada com sucesso. Entre em contato com o administrador para ativar a conta, pois não foi possível enviar um código OPT.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Sua conta foi criada com sucesso. Entre em contato com o administrador para ativar a conta, pois não foi possível enviar um código OPT.', - //update 19-12-2016 - 'only-agents' => 'Usuários agentes', - 'only-users' => 'Usuários clientes', - 'banned-users' => 'Usuários banidos', - 'inactive-users' => 'Usuários inativos', - 'all-users' => 'Todos os usuários', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'O usuário selecionado já é o proprietário deste ticket.', - //updated 15-5-2017 - 'session-expired' => 'Sessão expirada ou inválida, tente novamente.', + //update 19-12-2016 + 'only-agents' => 'Usuários agentes', + 'only-users' => 'Usuários clientes', + 'banned-users' => 'Usuários banidos', + 'inactive-users' => 'Usuários inativos', + 'all-users' => 'Todos os usuários', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'O usuário selecionado já é o proprietário deste ticket.', + //updated 15-5-2017 + 'session-expired' => 'Sessão expirada ou inválida, tente novamente.', ]; diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index de1ece67f..b22a48eb5 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -677,7 +677,7 @@ return [ 'footer2' => 'Rodapé2', 'footer3' => 'Rodapé3', 'footer4' => 'Rodapé4', - /* + /* |-------------------------------------- | Custom alert box |-------------------------------------- @@ -1077,7 +1077,7 @@ return [ 'user-exists' => 'Usuário já existe. Tente procurar usuários existentes.', 'valid-email' => 'Informe um endereço de e-mail válido.', 'search_user' => 'Procurar usuário', - 'merge-ticket' => 'Vincular ticket', + 'merge-ticket' => 'Vincular ticket', 'title' => 'Título', 'merge' => 'Vincular', 'select_tickets' => 'Selecione tickets para vincular', @@ -1355,34 +1355,34 @@ return [ 'api_configurations' => 'Configurações Api', 'generate_key' => 'Gerar chave', 'api_settings' => 'Configurações API', - /* + /* *----------------------------------------------------------------------------- * Error log and debugging settings *-------------------------------------------------------------------------- * */ - 'error-debug' => 'Logs de erros e depuração', - 'debug-options' => 'Opções de depuração', - 'view-logs' => 'Exibir logs de erro', - 'not-authorised-error-debug' => 'Você não está autorizado a acessar a URL', - 'error-debug-settings' => 'Configurações de erro e depuração', - 'debugging' => 'Modo de depuração', - 'bugsnag-debugging' => 'Enviar relatórios de falha de aplicativos para ajudar Ladybird melhorar Faveo', - 'error-debug-settings-saved-message' => 'Suas configurações de erro e depuração foram salvas com sucesso', - 'error-debug-settings-error-message' => 'Você ainda não fez qualquer mudança nas configurações.', - 'error-logs' => 'Logs de erros', - /*--------------------------------------------------------------------------------------- + 'error-debug' => 'Logs de erros e depuração', + 'debug-options' => 'Opções de depuração', + 'view-logs' => 'Exibir logs de erro', + 'not-authorised-error-debug' => 'Você não está autorizado a acessar a URL', + 'error-debug-settings' => 'Configurações de erro e depuração', + 'debugging' => 'Modo de depuração', + 'bugsnag-debugging' => 'Enviar relatórios de falha de aplicativos para ajudar Ladybird melhorar Faveo', + 'error-debug-settings-saved-message' => 'Suas configurações de erro e depuração foram salvas com sucesso', + 'error-debug-settings-error-message' => 'Você ainda não fez qualquer mudança nas configurações.', + 'error-logs' => 'Logs de erros', + /*--------------------------------------------------------------------------------------- *Latest update 16-06-2016 *----------------------------------------------------------------------------------- */ - 'that_email_is not_available_in_this_system' => 'Esse e-mail não está disponível neste sistema', - 'use_subject' => 'Use Assunto', - 'reopen' => 'Reabrir', + 'that_email_is not_available_in_this_system' => 'Esse e-mail não está disponível neste sistema', + 'use_subject' => 'Use Assunto', + 'reopen' => 'Reabrir', - /*******************************New updated ********************************************/ - /* Translation Required */ - /***************************************************************************************/ - 'invalid_attempt' => 'Invalid Attempt', + /*******************************New updated ********************************************/ + /* Translation Required */ + /***************************************************************************************/ + 'invalid_attempt' => 'Invalid Attempt', /* --------------------------------------------------------------------------------------- * Latest update 27-07-2016 * ----------------------------------------------------------------------------------- @@ -1477,82 +1477,82 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Followup', - 'followup_tickets' => 'Followup tickets', - 'followup_Notification' => 'Followup notification', + 'followup' => 'Followup', + 'followup_tickets' => 'Followup tickets', + 'followup_Notification' => 'Followup notification', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Not available', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Not available', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Agent report', - 'assign_tickets' => 'Assign tickets', - 'delete_agent' => 'Delete agent', - 'delete_user' => 'Delete user', - 'confirm_deletion' => 'Confirm deletion', - 'delete_all_content' => 'Delete all content', - 'agent_profile' => 'Agent profile', - 'change_role_to_admin' => 'Change role to admin', - 'change_role_to_user' => 'Change role to user', - 'change_role_to_agent' => 'Change role to agent', - 'change_password' => 'Change password', - 'role_change' => 'Role change', - 'password_generator' => 'Password generator', - 'depertment' => 'Depertment', - 'duetoday' => 'Due today', - 'today-due_tickets' => 'Today\'s due ticekts', - 'password_change_successfully' => 'Password changed successfully', - 'role_change_successfully' => 'Role changed successfully', - 'user_delete_successfully' => 'User deleted successfully', - 'agent_delete_successfully' => 'Agent deleted successfully', - 'select_another_agent' => 'Select another agent', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', - 'deleted_user' => 'Deleted User', - 'deleted_user_directory' => 'Deleted User Directory', - 'restore' => 'Restore', - 'user_restore_successfully' => 'User restore successfully', + 'agent_report' => 'Agent report', + 'assign_tickets' => 'Assign tickets', + 'delete_agent' => 'Delete agent', + 'delete_user' => 'Delete user', + 'confirm_deletion' => 'Confirm deletion', + 'delete_all_content' => 'Delete all content', + 'agent_profile' => 'Agent profile', + 'change_role_to_admin' => 'Change role to admin', + 'change_role_to_user' => 'Change role to user', + 'change_role_to_agent' => 'Change role to agent', + 'change_password' => 'Change password', + 'role_change' => 'Role change', + 'password_generator' => 'Password generator', + 'depertment' => 'Depertment', + 'duetoday' => 'Due today', + 'today-due_tickets' => 'Today\'s due ticekts', + 'password_change_successfully' => 'Password changed successfully', + 'role_change_successfully' => 'Role changed successfully', + 'user_delete_successfully' => 'User deleted successfully', + 'agent_delete_successfully' => 'Agent deleted successfully', + 'select_another_agent' => 'Select another agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', + 'deleted_user' => 'Deleted User', + 'deleted_user_directory' => 'Deleted User Directory', + 'restore' => 'Restore', + 'user_restore_successfully' => 'User restore successfully', - /*** updates 28-11-2016***/ - 'apply' => 'Apply', + /*** updates 28-11-2016***/ + 'apply' => 'Apply', - /* updates 2-12-2016 **/ - 'sort-by' => 'Sort by', - 'created-at' => 'Created at', - 'or' => 'OR', - 'activate' => 'Activate', - 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', - 'assign-ticket' => 'Assign tickets', - 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', - 'internal-note-has-been-added' => 'Internal note added to the ticket', - 'active-users' => 'Active users', - 'deleted-users' => 'Deleted users', - 'view-option' => 'View options', - 'accoutn-not-verified' => 'User account is not verified', - 'enabled' => 'Enabled', - 'disabled' => 'Disabled', - 'user-account-is-deleted' => 'This user account has been deleted.', - 'restore-user' => 'Restore user account', - 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', - 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Sort by', + 'created-at' => 'Created at', + 'or' => 'OR', + 'activate' => 'Activate', + 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', + 'assign-ticket' => 'Assign tickets', + 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', + 'internal-note-has-been-added' => 'Internal note added to the ticket', + 'active-users' => 'Active users', + 'deleted-users' => 'Deleted users', + 'view-option' => 'View options', + 'accoutn-not-verified' => 'User account is not verified', + 'enabled' => 'Enabled', + 'disabled' => 'Disabled', + 'user-account-is-deleted' => 'This user account has been deleted.', + 'restore-user' => 'Restore user account', + 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', + 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', - //update 19-12-2016 - 'only-agents' => 'Agent users', - 'only-users' => 'Clients users', - 'banned-users' => 'Banned users', - 'inactive-users' => 'Inactive users', - 'all-users' => 'All users', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', - //updated 15-5-2017 - 'session-expired' => 'Session expired or invalid, please try again.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', + //updated 15-5-2017 + 'session-expired' => 'Session expired or invalid, please try again.', ]; diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index cc63ccbcb..9a204cf7d 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -987,81 +987,81 @@ return [ * Followup Updated * -------------------------------------------------------------------------------------------- */ - 'followup' => 'Followup', - 'followup_tickets' => 'Followup tickets', - 'followup_Notification' => 'Followup notification', + 'followup' => 'Followup', + 'followup_tickets' => 'Followup tickets', + 'followup_Notification' => 'Followup notification', - /* + /* *-------------------------------------------------------------------------------------------- *Updated 6-9-2016 *--------------------------------------------------------------------------------------- */ - 'not-available' => 'Not available', - /* -------------------------------------------------------------------------------------------- + 'not-available' => 'Not available', + /* -------------------------------------------------------------------------------------------- * User Module * -------------------------------------------------------------------------------------------- */ - 'agent_report' => 'Agent report', - 'assign_tickets' => 'Assign tickets', - 'delete_agent' => 'Delete agent', - 'delete_user' => 'Delete user', - 'confirm_deletion' => 'Confirm deletion', - 'delete_all_content' => 'Delete all content', - 'agent_profile' => 'Agent profile', - 'change_role_to_admin' => 'Change role to admin', - 'change_role_to_user' => 'Change role to user', - 'change_role_to_agent' => 'Change role to agent', - 'change_password' => 'Change password', - 'role_change' => 'Role change', - 'password_generator' => 'Password generator', - 'depertment' => 'Depertment', - 'duetoday' => 'Due today', - 'today-due_tickets' => 'Today\'s due ticekts', - 'password_change_successfully' => 'Password changed successfully', - 'role_change_successfully' => 'Role changed successfully', - 'user_delete_successfully' => 'User deleted successfully', - 'agent_delete_successfully' => 'Agent deleted successfully', - 'select_another_agent' => 'Select another agent', - 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', - 'deleted_user' => 'Deleted User', - 'deleted_user_directory' => 'Deleted User Directory', - 'restore' => 'Restore', - 'user_restore_successfully' => 'User restore successfully', + 'agent_report' => 'Agent report', + 'assign_tickets' => 'Assign tickets', + 'delete_agent' => 'Delete agent', + 'delete_user' => 'Delete user', + 'confirm_deletion' => 'Confirm deletion', + 'delete_all_content' => 'Delete all content', + 'agent_profile' => 'Agent profile', + 'change_role_to_admin' => 'Change role to admin', + 'change_role_to_user' => 'Change role to user', + 'change_role_to_agent' => 'Change role to agent', + 'change_password' => 'Change password', + 'role_change' => 'Role change', + 'password_generator' => 'Password generator', + 'depertment' => 'Depertment', + 'duetoday' => 'Due today', + 'today-due_tickets' => 'Today\'s due ticekts', + 'password_change_successfully' => 'Password changed successfully', + 'role_change_successfully' => 'Role changed successfully', + 'user_delete_successfully' => 'User deleted successfully', + 'agent_delete_successfully' => 'Agent deleted successfully', + 'select_another_agent' => 'Select another agent', + 'agent_delete_successfully_and_ticket_assign_to_another_agent' => 'Agent deleted successfully and ticket assigned to another agent', + 'deleted_user' => 'Deleted User', + 'deleted_user_directory' => 'Deleted User Directory', + 'restore' => 'Restore', + 'user_restore_successfully' => 'User restore successfully', - /*** updates 28-11-2016***/ - 'apply' => 'Apply', + /*** updates 28-11-2016***/ + 'apply' => 'Apply', - /* updates 2-12-2016 **/ - 'sort-by' => 'Sort by', - 'created-at' => 'Created at', - 'or' => 'OR', - 'activate' => 'Activate', - 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', - 'assign-ticket' => 'Assign tickets', - 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', - 'internal-note-has-been-added' => 'Internal note added to the ticket', - 'active-users' => 'Active users', - 'deleted-users' => 'Deleted users', - 'view-option' => 'View options', - 'accoutn-not-verified' => 'User account is not verified', - 'enabled' => 'Enabled', - 'disabled' => 'Disabled', - 'user-account-is-deleted' => 'This user account has been deleted.', - 'restore-user' => 'Restore user account', - 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', - 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', + /* updates 2-12-2016 **/ + 'sort-by' => 'Sort by', + 'created-at' => 'Created at', + 'or' => 'OR', + 'activate' => 'Activate', + 'system-email-not-configured' => 'We are unable to process email request as the system has no configured email for sending mails. Please contact and report system admin.', + 'assign-ticket' => 'Assign tickets', + 'can-not-inactive-group' => 'Can not make the group inactive as it has agents assigned in it. Please assign those agents to another group and try again.', + 'internal-note-has-been-added' => 'Internal note added to the ticket', + 'active-users' => 'Active users', + 'deleted-users' => 'Deleted users', + 'view-option' => 'View options', + 'accoutn-not-verified' => 'User account is not verified', + 'enabled' => 'Enabled', + 'disabled' => 'Disabled', + 'user-account-is-deleted' => 'This user account has been deleted.', + 'restore-user' => 'Restore user account', + 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', + 'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.', - //update 18-12-2016 - 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', + //update 18-12-2016 + 'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.', - //update 19-12-2016 - 'only-agents' => 'Agent users', - 'only-users' => 'Clients users', - 'banned-users' => 'Banned users', - 'inactive-users' => 'Inactive users', - 'all-users' => 'All users', - //update 21-12-2016 - 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', - //updated 15-5-2017 - 'session-expired' => 'Session expired or invalid, please try again.', + //update 19-12-2016 + 'only-agents' => 'Agent users', + 'only-users' => 'Clients users', + 'banned-users' => 'Banned users', + 'inactive-users' => 'Inactive users', + 'all-users' => 'All users', + //update 21-12-2016 + 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', + //updated 15-5-2017 + 'session-expired' => 'Session expired or invalid, please try again.', ]; diff --git a/resources/lang/zh-hans/lang.php b/resources/lang/zh-hans/lang.php index cab1b54a4..8eee19e13 100644 --- a/resources/lang/zh-hans/lang.php +++ b/resources/lang/zh-hans/lang.php @@ -1589,7 +1589,7 @@ return [ 'days' => '天', 'months' => '月', 'year' => '年', -// department change + // department change 'change_department' => '改变部门', 'ticket_department_successfully_changed' => '成功改变工单部门', 'select_another_department' => '选择另一个部门', diff --git a/resources/views/themes/default1/agent/kb/article/image.php b/resources/views/themes/default1/agent/kb/article/image.php index 16c18fd3d..7c9d5471b 100644 --- a/resources/views/themes/default1/agent/kb/article/image.php +++ b/resources/views/themes/default1/agent/kb/article/image.php @@ -14,10 +14,10 @@ if (isset($_FILES['image'])) { $link = "http://$_SERVER[HTTP_HOST]".'/codex/'.$path; //Here we are constructing the JSON Object $res = ['upload' => [ - 'links' => ['original' => $link], - 'image' => ['width' => $data[0], - 'height' => $data[1], - ], + 'links' => ['original' => $link], + 'image' => ['width' => $data[0], + 'height' => $data[1], + ], ]]; //echo out the response :) echo json_encode($res); diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php index 0035c804d..5da0a41bf 100644 --- a/tests/DuskTestCase.php +++ b/tests/DuskTestCase.php @@ -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() ); } }