From e6ed19c2e5753dbcac674a352ff808f68e79749d Mon Sep 17 00:00:00 2001 From: sujitprasad Date: Fri, 1 Apr 2016 11:45:18 +0530 Subject: [PATCH] Update v1.0.6.10 --- .../Agent/helpdesk/NotificationController.php | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/app/Http/Controllers/Agent/helpdesk/NotificationController.php index 3c2462152..ce4a3aab6 100644 --- a/app/Http/Controllers/Agent/helpdesk/NotificationController.php +++ b/app/Http/Controllers/Agent/helpdesk/NotificationController.php @@ -3,17 +3,16 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use App\Http\Controllers\Common\PhpMailController; -// Model use App\Http\Controllers\Controller; +// Model use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Settings\Company; -use App\Model\helpdesk\settings\Email; +use App\Model\helpdesk\Settings\Email; use App\Model\helpdesk\Utility\Log_notification; use App\User; use View; - +use App\Http\Controllers\Common\PhpMailController; // classes /** @@ -24,11 +23,10 @@ use View; */ class NotificationController extends Controller { - public function __construct(PhpMailController $PhpMailController) - { - $this->PhpMailController = $PhpMailController; + public function __construct(PhpMailController $PhpMailController) { + $this->PhpMailController = $PhpMailController; } - + /** * This function is for sending daily report/notification about the system. * */ @@ -75,8 +73,8 @@ class NotificationController extends Controller $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.admin', ['company' => $company, 'name' => $user_name]); $contents = $view->render(); - $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null, 'body' => $contents]); - + $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null,'body' => $contents]); + // \Mail::send('emails.notifications.admin', ['company' => $company, 'name' => $user_name], function ($message) use ($email, $user_name, $company) { // $message->to($email, $user_name)->subject($company.' Daily Report '); // }); @@ -101,9 +99,9 @@ class NotificationController extends Controller $email = $user->email; $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.manager', ['company' => $company, 'name' => $user_name]); - $contents = $view->render(); - $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null, 'body' => $contents]); - + $contents = $view->render(); + $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null,'body' => $contents]); + // \Mail::send('emails.notifications.manager', ['company' => $company, 'name' => $user_name, 'dept_id' => $dept->id, 'dept_name' => $dept->name], function ($message) use ($email, $user_name, $company, $dept_name) { // $message->to($email, $user_name)->subject($company.' Daily Report for department manager of '.$dept_name.' department.'); // }); @@ -131,8 +129,8 @@ class NotificationController extends Controller $user_name = $user->first_name.' '.$user->last_name; $view = View::make('emails.notifications.lead', ['company' => $company, 'name' => $user_name]); $contents = $view->render(); - $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null, 'body' => $contents]); - + $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null,'body' => $contents]); + // \Mail::send('emails.notifications.lead', ['company' => $company, 'name' => $user_name, 'team_id' => $team->id], function ($message) use ($email, $user_name, $company, $team_name) { // $message->to($email, $user_name)->subject($company.' Daily Report for Team Lead of team '.$team_name); // }); @@ -154,10 +152,10 @@ class NotificationController extends Controller // Send notification details to all the agents $email = $user->email; $user_name = $user->first_name.' '.$user->last_name; - $view = View::make('emails.notifications.agent', ['company' => $company, 'name' => $user_name]); + $view = View::make('emails.notifications.agent', ['company' => $company, 'name' => $user_name, 'user_id' => $user->id]); $contents = $view->render(); - $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null, 'body' => $contents]); - + $this->PhpMailController->sendEmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => 'Dily Report', 'scenario' => null,'body' => $contents]); + // \Mail::send('emails.notifications.agent', ['company' => $company, 'name' => $user_name, 'user_id' => 1], function ($message) use ($email, $user_name, $company) { // $message->to($email, $user_name)->subject($company.' Daily Report for Agents'); // });