diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php index 12586f820..b5f3e4ed5 100644 --- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php +++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php @@ -89,9 +89,9 @@ class LanguageController extends Controller return \Datatable::collection(new Collection($values)) ->addColumn('language', function ($model) { if ($model == Config::get('app.fallback_locale')) { - return Config::get('languages.'.$model).' ('.Lang::get('lang.default').')'; + return Config::get('languages.'.$model)[1].' ('.Lang::get('lang.default').')'; } else { - return Config::get('languages.'.$model); + return Config::get('languages.'.$model)[1]; } }) ->addColumn('id', function ($model) { diff --git a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php index 5e610b606..44eab8b0d 100644 --- a/app/Http/Controllers/Admin/helpdesk/WorkflowController.php +++ b/app/Http/Controllers/Admin/helpdesk/WorkflowController.php @@ -144,7 +144,7 @@ class WorkflowController extends Controller */ public function create(Emails $emails) { - $email_data = ''; + $email_data = []; foreach ($emails->pluck('email_address', 'id') as $key => $email) { $email_data["E-$key"] = $email; } diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php index 46419ceff..e126e518d 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/create.blade.php @@ -100,21 +100,21 @@ class="active"
{!! Form::label('parent_topic',Lang::get('lang.parent_topic')) !!} - {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->lists('topic','topic')->toArray()],1,['class' => 'form-control']) !!} + {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->pluck('topic','topic')->toArray()],1,['class' => 'form-control']) !!}
{!! Form::label('custom_form',Lang::get('lang.Custom_form')) !!} - {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->lists('formname','id')->toArray()],1,['class' => 'form-control']) !!} + {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->pluck('formname','id')->toArray()],1,['class' => 'form-control']) !!}
{!! Form::label('department',Lang::get('lang.department')) !!} - {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->lists('name','id')->toArray()],1,['class' => 'form-control']) !!} + {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],1,['class' => 'form-control']) !!}
@@ -123,21 +123,21 @@ class="active"
{!! Form::label('priority',Lang::get('lang.priority')) !!} * - {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->lists('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!}
{!! Form::label('sla_plan',Lang::get('lang.SLA_plan')) !!} - {!!Form::select('sla_plan', [''=>Lang::get('lang.select_a_sla_plan'),Lang::get('lang.sla_plans')=>$slas->lists('name','id')->toArray()],1,['class' => 'form-control']) !!} + {!!Form::select('sla_plan', [''=>Lang::get('lang.select_a_sla_plan'),Lang::get('lang.sla_plans')=>$slas->pluck('name','id')->toArray()],1,['class' => 'form-control']) !!}
{!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!} - {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->pluck('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php index 36f8707de..3c0a6c4ee 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/helptopic/edit.blade.php @@ -98,21 +98,21 @@ class="active"
{!! Form::label('parent_topic',Lang::get('lang.parent_topic')) !!} - {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->lists('topic','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('parent_topic', [''=>Lang::get('lang.select_a_parent_topic'),Lang::get('lang.help_topic')=>$topics->pluck('topic','id')->toArray()],null,['class' => 'form-control']) !!}
{!! Form::label('custom_form',Lang::get('lang.Custom_form')) !!} - {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->lists('formname','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('custom_form', [''=>Lang::get('lang.select_a_form'),Lang::get('lang.custom_form')=>$forms->pluck('formname','id')->toArray()],null,['class' => 'form-control']) !!}
{!! Form::label('department',Lang::get('lang.department')) !!} - {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->lists('name','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('department', [''=>Lang::get('lang.select_a_department'),Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],null,['class' => 'form-control']) !!}
@@ -121,21 +121,21 @@ class="active"
{!! Form::label('priority',Lang::get('lang.priority')) !!} * - {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->lists('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('priority', [''=>Lang::get('lang.select_a_priority'),Lang::get('lang.priorities')=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!}
{!! Form::label('sla_plan',Lang::get('lang.SLA_plan')) !!} - {!!Form::select('sla_plan', [''=>Lang::get('lang.select_a_sla_plan'),Lang::get('lang.sla_plans')=>$slas->lists('name','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('sla_plan', [''=>Lang::get('lang.select_a_sla_plan'),Lang::get('lang.sla_plans')=>$slas->pluck('name','id')->toArray()],null,['class' => 'form-control']) !!}
{!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!} - {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->lists('full_name','id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('auto_assign', [''=>Lang::get('lang.select_an_agent'),Lang::get('lang.agents')=>$agents->pluck('full_name','id')->toArray()],null,['class' => 'form-control']) !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/close-workflow/index.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/close-workflow/index.blade.php index fe8d627fd..abd2e9fad 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/close-workflow/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/close-workflow/index.blade.php @@ -113,7 +113,7 @@ class="active"
{!! Lang::get('lang.close-msg3') !!}
get(); ?> - {!! Form::select('status',[ Lang::get('lang.status')=>$user->lists('name','id')->toArray()],null,['class' => 'form-control']) !!} + {!! Form::select('status',[ Lang::get('lang.status')=>$user->pluck('name','id')->toArray()],null,['class' => 'form-control']) !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php index 721ff7458..2157cc3c4 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/system.blade.php @@ -95,7 +95,7 @@ class="active"
{!! Form::label('time_zone',Lang::get('lang.timezone')) !!} {!! $errors->first('time_zone', ':message') !!} - {!!Form::select('time_zone',['Time Zones'=>$timezones->lists('name','id')->toArray()],null,['class'=>'form-control']) !!} + {!!Form::select('time_zone',['Time Zones'=>$timezones->pluck('name','id')->toArray()],null,['class'=>'form-control']) !!}
@@ -105,7 +105,7 @@ class="active"
{!! Form::label('date_time_format',Lang::get('lang.date_time')) !!} {!! $errors->first('date_time_format', ':message') !!} - {!! Form::select('date_time_format',['Date Time Formats'=>$date_time->lists('format','id')->toArray()],null,['class' => 'form-control']) !!} + {!! Form::select('date_time_format',['Date Time Formats'=>$date_time->pluck('format','id')->toArray()],null,['class' => 'form-control']) !!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/ticket.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/ticket.blade.php index ffcd62f8f..679911456 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/ticket.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/ticket.blade.php @@ -89,7 +89,7 @@ class="active"
{!! Form::label('priority',Lang::get('lang.default_priority')) !!} - {!!Form::select('priority', [''=>'select a priority','Priorities'=>$priority->lists('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!} + {!!Form::select('priority', [''=>'select a priority','Priorities'=>$priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control']) !!}
@@ -98,14 +98,14 @@ class="active"