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

Fix php7.2 issues

Browse Source
This commit is contained in:
Manish Verma
2018-08-13 14:30:31 +05:30
parent 7d38727e7a
commit 9787b36d0b
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,12 +614,13 @@ class UserController extends Controller
{ {
try { try {
$users = User::where('id', '=', $id)->first(); $users = User::where('id', '=', $id)->first();
if (count($users) > 0) { if ($users && $users->count() > 0) {
return view('themes.default1.agent.helpdesk.user.show', compact('users')); return view('themes.default1.agent.helpdesk.user.show', compact('users'));
} else { } else {
return redirect()->back()->with('fails', Lang::get('lang.user-not-found')); return redirect()->back()->with('fails', Lang::get('lang.user-not-found'));
} }
} catch (Exception $e) { } catch (Exception $e) {
dd($e);
return redirect()->back()->with('fails', $e->getMessage()); return redirect()->back()->with('fails', $e->getMessage());
} }
} }

5
resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
View File

@@ -125,7 +125,7 @@ class="active"
</div> </div>
<?php <?php
$user_orga_relation_id = ""; $user_orga_relation_id = [];
$user_orga_relations = App\Model\helpdesk\Agent_panel\User_org::where('org_id', '=', $orgs->id)->get(); $user_orga_relations = App\Model\helpdesk\Agent_panel\User_org::where('org_id', '=', $orgs->id)->get();
foreach ($user_orga_relations as $user_orga_relation) { foreach ($user_orga_relations as $user_orga_relation) {
$user_orga_relation_id[] = $user_orga_relation->user_id; $user_orga_relation_id[] = $user_orga_relation->user_id;
@@ -327,7 +327,8 @@ class="active"
$string = strip_tags($title->title); $string = strip_tags($title->title);
// check atatchments // check atatchments
$attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->first(); $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->first();
$attach = count($attachments); // dd($attachments);
$attach = ($attachments) ? count($attachments->toArray()): 0;
if (strlen($string) > 40) { if (strlen($string) > 40) {
$stringCut = substr($string, 0, 40); $stringCut = substr($string, 0, 40);

8
resources/views/themes/default1/agent/helpdesk/user/show.blade.php
View File

@@ -354,12 +354,12 @@ class="active"
<!-- <div class="col-xs-4 form-group {{ $errors->has('group') ? 'has-error' : '' }}"> --> <!-- <div class="col-xs-4 form-group {{ $errors->has('group') ? 'has-error' : '' }}"> -->
{!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!} <span class="text-red"> *</span> {!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!} <span class="text-red"> *</span>
{!!Form::select('group',[Lang::get('lang.groups')=>$groups->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} {!!Form::select('group',[Lang::get('lang.groups')=>$groups->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!}
<!-- </div> --> <!-- </div> -->
<!-- primary dept --> <!-- primary dept -->
<!-- <div class="col-xs-4 form-group {{ $errors->has('primary_department') ? 'has-error' : '' }}"> --> <!-- <div class="col-xs-4 form-group {{ $errors->has('primary_department') ? 'has-error' : '' }}"> -->
{!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!} <span class="text-red"> *</span> {!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!} <span class="text-red"> *</span>
{!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} {!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!}
<!-- </div> --> <!-- </div> -->
</div> </div>
@@ -423,12 +423,12 @@ class="active"
<!-- <div class="col-xs-4 form-group {{ $errors->has('group') ? 'has-error' : '' }}"> --> <!-- <div class="col-xs-4 form-group {{ $errors->has('group') ? 'has-error' : '' }}"> -->
{!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!} <span class="text-red"> *</span> {!! Form::label('assign_group',Lang::get('lang.assigned_group')) !!} <span class="text-red"> *</span>
{!!Form::select('group',[Lang::get('lang.groups')=>$groups->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} {!!Form::select('group',[Lang::get('lang.groups')=>$groups->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!}
<!-- </div> --> <!-- </div> -->
<!-- primary dept --> <!-- primary dept -->
<!-- <div class="col-xs-4 form-group {{ $errors->has('primary_department') ? 'has-error' : '' }}"> --> <!-- <div class="col-xs-4 form-group {{ $errors->has('primary_department') ? 'has-error' : '' }}"> -->
{!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!} <span class="text-red"> *</span> {!! Form::label('primary_dpt',Lang::get('lang.primary_department')) !!} <span class="text-red"> *</span>
{!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->lists('name','id')->toArray()],null,['class' => 'form-control select']) !!} {!! Form::select('primary_department', [Lang::get('lang.departments')=>$departments->pluck('name','id')->toArray()],null,['class' => 'form-control select']) !!}
<!-- </div> --> <!-- </div> -->
</div> </div>