diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 2774cdf45..755014d57 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -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()); } diff --git a/app/Http/Controllers/Common/ExcelController.php b/app/Http/Controllers/Common/ExcelController.php index 20cc9190c..53dfd213f 100644 --- a/app/Http/Controllers/Common/ExcelController.php +++ b/app/Http/Controllers/Common/ExcelController.php @@ -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'); } } diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index c2cfa6f57..dcf770834 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -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; } } } diff --git a/resources/views/notifications-all.blade.php b/resources/views/notifications-all.blade.php index 48845fadd..b9ddb1d41 100644 --- a/resources/views/notifications-all.blade.php +++ b/resources/views/notifications-all.blade.php @@ -117,7 +117,7 @@ class="active" diff --git a/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php b/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php index 372025f2d..4508b1d6f 100644 --- a/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/agent/agents/index.blade.php @@ -72,7 +72,7 @@ class="nav-link active"
orderBy('id', 'ASC')->paginate(10); + $user = App\User::where('role', '!=', 'user')->orderBy('id', 'ASC')->simplePaginate(10); ?> diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index 907ed7523..add16f6cb 100755 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -501,7 +501,7 @@ if ($thread->title != "") { 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(); ?> diff --git a/resources/views/themes/default1/client/helpdesk/form.blade.php b/resources/views/themes/default1/client/helpdesk/form.blade.php index 28dc4a744..10e2a243e 100755 --- a/resources/views/themes/default1/client/helpdesk/form.blade.php +++ b/resources/views/themes/default1/client/helpdesk/form.blade.php @@ -92,7 +92,7 @@ class = "nav-item active" $encrypted_token = $encrypter->encrypt(csrf_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']) !!}
diff --git a/resources/views/themes/default1/client/helpdesk/guest-user/form.blade.php b/resources/views/themes/default1/client/helpdesk/guest-user/form.blade.php index 82d224623..d6bc03b1e 100644 --- a/resources/views/themes/default1/client/helpdesk/guest-user/form.blade.php +++ b/resources/views/themes/default1/client/helpdesk/guest-user/form.blade.php @@ -56,7 +56,7 @@ $encrypted_token = $encrypter->encrypt(csrf_token()); ?> -{!! Form::open(['action'=>'Client\helpdesk\FormController@postedForm','method'=>'post']) !!} +{!! Form::open(['route'=>'client.form.post','method'=>'post']) !!}

Ticket {!! Form::submit(Lang::get('lang.send'),['class'=>'form-group btn btn-info pull-right'])!!}