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

Update v1.0.7.9

Browse Source
This commit is contained in:
Sujit Prasad
2016-08-04 19:54:26 +05:30
parent 4c96bc9765
commit f07afa8307
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/helpdesk/AgentController.php
View File

@@ -137,7 +137,7 @@ class AgentController extends Controller
// save user credentails // save user credentails
if ($user->save() == true) { if ($user->save() == true) {
// fetch user credentails to send mail // fetch user credentails to send mail
$name = $user->user_name; $name = $user->first_name;
$email = $user->email; $email = $user->email;
if($request->input('send_email')) { if($request->input('send_email')) {
try { try {

27
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -630,10 +630,8 @@ class TicketController extends Controller {
$password = $this->generateRandomString(); $password = $this->generateRandomString();
// create user // create user
$user = new User(); $user = new User();
if ($username == null) { $user->first_name = $username;
$username = $emailadd; $user->user_name = $emailadd;
}
$user->user_name = $username;
$user->email = $emailadd; $user->email = $emailadd;
$user->password = Hash::make($password); $user->password = Hash::make($password);
$user->phone_number = $phone; $user->phone_number = $phone;
@@ -649,14 +647,14 @@ class TicketController extends Controller {
\Event::fire(new \App\Events\ReadMailEvent($user_id, $password)); \Event::fire(new \App\Events\ReadMailEvent($user_id, $password));
try { try {
if ($auto_response == 0) { if ($auto_response == 0) {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $username, 'email_address' => $emailadd, 'user_password' => $password]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->first_name, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $user->first_name, 'email_address' => $emailadd, 'user_password' => $password]);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
} }
} }
} else { } else {
$username = $checkemail->user_name; $username = $checkemail->first_name;
$user_id = $checkemail->id; $user_id = $checkemail->id;
} }
$ticket_number = $this->check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $status); $ticket_number = $this->check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $status);
@@ -688,7 +686,7 @@ class TicketController extends Controller {
$body2 = null; $body2 = null;
try { try {
if ($auto_response == 0) { if ($auto_response == 0) {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $username, 'ticket_number' => $ticket_number2, 'department_sign' => '']); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $user->first_name, 'ticket_number' => $ticket_number2, 'department_sign' => '']);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -705,7 +703,7 @@ class TicketController extends Controller {
foreach ($admins as $admin) { foreach ($admins as $admin) {
$to_email = $admin->email; $to_email = $admin->email;
$to_user = $admin->first_name; $to_user = $admin->first_name;
$to_user_name = $admin->first_name . ' ' . $admin->last_name; $to_user_name = $admin->first_name;
$set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name]; $set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name];
} }
} }
@@ -720,7 +718,7 @@ class TicketController extends Controller {
if ($department_data->name == $agent->primary_dpt) { if ($department_data->name == $agent->primary_dpt) {
$to_email = $agent->email; $to_email = $agent->email;
$to_user = $agent->first_name; $to_user = $agent->first_name;
$to_user_name = $agent->first_name . ' ' . $agent->last_name; $to_user_name = $agent->first_name;
$set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name]; $set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name];
} }
} }
@@ -732,7 +730,7 @@ class TicketController extends Controller {
$assigned_to = User::where('id', '=', $ticketdata->assigned_to)->first(); $assigned_to = User::where('id', '=', $ticketdata->assigned_to)->first();
$to_email = $assigned_to->email; $to_email = $assigned_to->email;
$to_user = $assigned_to->first_name; $to_user = $assigned_to->first_name;
$to_user_name = $assigned_to->first_name . ' ' . $assigned_to->last_name; $to_user_name = $assigned_to->first_name;
$set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name]; $set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name];
} }
$emails_to_be_sent = array_unique($set_mails, SORT_REGULAR); $emails_to_be_sent = array_unique($set_mails, SORT_REGULAR);
@@ -1360,7 +1358,8 @@ class TicketController extends Controller {
$email = $email; $email = $email;
if ($this->checkEmail($email) == false) { if ($this->checkEmail($email) == false) {
$create_user = new User(); $create_user = new User();
$create_user->user_name = $name; $create_user->first_name = $name;
$create_user->user_name = $email;
$create_user->email = $email; $create_user->email = $email;
$create_user->active = 1; $create_user->active = 1;
$create_user->role = 'user'; $create_user->role = 'user';
@@ -1562,7 +1561,8 @@ class TicketController extends Controller {
} else { } else {
$company = $this->company(); $company = $this->company();
$user = new User(); $user = new User();
$user->user_name = $name; $user->first_name = $name;
$user->user_name = $email;
$user->email = $email; $user->email = $email;
$password = $this->generateRandomString(); $password = $this->generateRandomString();
$user->password = \Hash::make($password); $user->password = \Hash::make($password);
@@ -2025,7 +2025,8 @@ class TicketController extends Controller {
} else { } else {
$company = $this->company(); $company = $this->company();
$user = new User(); $user = new User();
$user->user_name = $name; $user->first_name = $name;
$user->user_name = $email;
$user->email = $email; $user->email = $email;
$password = $this->generateRandomString(); $password = $this->generateRandomString();
$user->password = \Hash::make($password); $user->password = \Hash::make($password);

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

@@ -205,7 +205,7 @@ class UserController extends Controller
// save user credentails // save user credentails
if ($user->save() == true) { if ($user->save() == true) {
// fetch user credentails to send mail // fetch user credentails to send mail
$name = $user->user_name; $name = $user->first_name;
$email = $user->email; $email = $user->email;
if($request->input('send_email')) { if($request->input('send_email')) {
try { try {

3
app/Http/Controllers/Auth/AuthController.php
View File

@@ -91,7 +91,8 @@ class AuthController extends Controller
$password = Hash::make($request->input('password')); $password = Hash::make($request->input('password'));
$user->password = $password; $user->password = $password;
$name = $request->input('full_name'); $name = $request->input('full_name');
$user->user_name = $name; $user->first_name = $name;
$user->user_name = $request->input('email');
$user->email = $request->input('email'); $user->email = $request->input('email');
$user->role = 'user'; $user->role = 'user';

2
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -67,7 +67,7 @@ class PasswordController extends Controller
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
} }
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]);
return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link')); return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link'));
} else { } else {

2
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -288,7 +288,7 @@ class GuestController extends Controller
$userId = $ticket->user_id; $userId = $ticket->user_id;
$user = User::where('id', '=', $userId)->first(); $user = User::where('id', '=', $userId)->first();
if ($user->role == 'user') { if ($user->role == 'user') {
$username = $user->user_name; $username = $user->first_name;
} else { } else {
$username = $user->first_name.' '.$user->last_name; $username = $user->first_name.' '.$user->last_name;
} }

2
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -75,7 +75,7 @@ class UnAuthController extends Controller
} }
if ($ticket->user_id == $user_details->id) { if ($ticket->user_id == $user_details->id) {
if ($user_details->role == 'user') { if ($user_details->role == 'user') {
$username = $user_details->user_name; $username = $user_details->first_name;
} else { } else {
$username = $user_details->first_name.' '.$user_details->last_name; $username = $user_details->first_name.' '.$user_details->last_name;
} }