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

bugfixes

Browse Source
This commit is contained in:
RafficMohammed
2023-02-28 19:25:06 +05:30
parent 555b881753
commit 40809202df
8 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -996,7 +996,7 @@ class UserController extends Controller
$users = $this->getUsers($first_date, $second_date);
$excel_controller = new \App\Http\Controllers\Common\ExcelController();
$filename = 'users'.$date;
$excel_controller->export($filename, $users);
return $excel_controller->export($filename, $users);
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}

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

@@ -16,6 +16,6 @@ class ExcelController extends Controller
throw new Exception('No data');
}
//dd(Excel::download(new UserExport($data), $filename.'.'.'xls'));
return Excel::download(new UserExport(), $filename.'.'.'xls');
return Excel::download(new UserExport($data), $filename.'.'.'xlsx');
}
}

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

@@ -237,6 +237,7 @@ class PhpMailController extends Controller
//dd($to, $toname, $subject, $data, $cc, $attach);
//dd(\Config::get('mail'));
//dd($attach);
$mail = Mail::send('emails.mail', ['data' => $data], function ($m) use ($to, $subject, $toname, $cc, $attach, $from_address) {
$m->to($to, $toname)->subject($subject);
$m->from($from_address->email_address, $from_address->email_name);
@@ -263,6 +264,7 @@ class PhpMailController extends Controller
$name = $attach[$i]['file_name'];
$mime = $attach[$i]['mime'];
$this->attachmentMode($m, $file, $name, $mime, $mode);
break;
}
}
}

4
resources/views/notifications-all.blade.php
View File

@@ -117,7 +117,7 @@ class="active"
<ul class="todo-list">
@if($notifications)
@foreach($notifications->orderBy('created_at', 'desc')->paginate(10) as $notification)
@foreach($notifications->orderBy('created_at', 'desc')->simplePaginate() as $notification)
@if($notification->notification && $notification->notification->type && $notification->notification->type->type == 'registration')
@if($notification->is_read == 1)
<li class="task">
@@ -189,7 +189,7 @@ class="active"
</li>
@endif
{!!$notifications->paginate(10)->render()!!}
{!!$notifications->Simplepaginate(10)!!}
</ul>
</div>

2
resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php
View File

@@ -72,7 +72,7 @@ class="nav-link active"
</div>
<div class="card-body">
<?php
$user = App\User::where('role', '!=', 'user')->orderBy('id', 'ASC')->paginate(10);
$user = App\User::where('role', '!=', 'user')->orderBy('id', 'ASC')->simplePaginate(10);
?>
<!-- Agent table -->
<table class="table table-bordered dataTable" style="overflow:hidden;">

2
resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
View File

@@ -501,7 +501,7 @@ if ($thread->title != "") {
<!-- ticket conversations -->
<?php
$conversations = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $tickets->id)->orderBy('id', 'DESC')->paginate(10);
$conversations = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $tickets->id)->orderBy('id', 'DESC')->simplePaginate(10);
$ij = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $tickets->id)->first();
?>

2
resources/views/themes/default1/client/helpdesk/form.blade.php
View File

@@ -92,7 +92,7 @@ class = "nav-item active"
$encrypted_token = $encrypter->encrypt(csrf_token());
?>
<input id="token" type="hidden" value="{{$encrypted_token}}">
{!! Form::open(['action'=>'Client\helpdesk\FormController@postedForm','method'=>'post', 'enctype'=>'multipart/form-data']) !!}
{!! Form::open(['route'=>'client.form.post','method'=>'post', 'enctype'=>'multipart/form-data']) !!}
<article class="hentry">

2
resources/views/themes/default1/client/helpdesk/guest-user/form.blade.php
View File

@@ -56,7 +56,7 @@
$encrypted_token = $encrypter->encrypt(csrf_token());
?>
<input id="token" type="hidden" value="{{$encrypted_token}}">
{!! Form::open(['action'=>'Client\helpdesk\FormController@postedForm','method'=>'post']) !!}
{!! Form::open(['route'=>'client.form.post','method'=>'post']) !!}
<div>
<div class="content-header">
<h4>Ticket {!! Form::submit(Lang::get('lang.send'),['class'=>'form-group btn btn-info pull-right'])!!}</h4>