diff --git a/.gitignore b/.gitignore index fecabceb8..4b202b43f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ # Please try and keep this file organized by alphabetical order. Single files first, then directories. .env -example.env Homestead.yaml Homestead.json /app/Plugins/Reseller/ diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index f14b144cc..7794cd99d 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -484,10 +484,10 @@ class TicketController extends Controller $user_id = $tickets->user_id; $user = User::where('id', '=', $user_id)->first(); $email = $user->email; - $user_name = $user->user_name; + $user_name = $user->first_name; $ticket_number = $tickets->ticket_number; $company = $this->company(); - $username = $ticket_user->user_name; + $username = $ticket_user->first_name; if (!empty(Auth::user()->agent_sign)) { $agentsign = Auth::user()->agent_sign; } else { diff --git a/example.env b/example.env new file mode 100644 index 000000000..18dbf2e92 --- /dev/null +++ b/example.env @@ -0,0 +1,18 @@ +APP_ENV=production +APP_DEBUG=false +APP_KEY=SomeRandomString +DB_TYPE= +DB_HOST= +DB_PORT= +DB_DATABASE= +DB_USERNAME= +DB_PASSWORD= +DB_INSTALL=%0% +MAIL_DRIVER=smtp +MAIL_HOST=mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync