From 8f91ff23db5c9eb1ca91f97ed4fa17e331f146c7 Mon Sep 17 00:00:00 2001 From: sujitprasad Date: Fri, 1 Apr 2016 13:11:01 +0530 Subject: [PATCH] Update v1.0.6.10 --- .../Agent/helpdesk/NotificationController.php | 30 ++++++++++--------- .../emails/notifications/admin.blade.php | 8 ++--- .../emails/notifications/agent.blade.php | 7 ++--- .../views/emails/notifications/lead.blade.php | 8 ++--- .../emails/notifications/manager.blade.php | 7 ++--- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/app/Http/Controllers/Agent/helpdesk/NotificationController.php index ce4a3aab6..3b6a4969b 100644 --- a/app/Http/Controllers/Agent/helpdesk/NotificationController.php +++ b/app/Http/Controllers/Agent/helpdesk/NotificationController.php @@ -3,8 +3,9 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use App\Http\Controllers\Controller; +use App\Http\Controllers\Common\PhpMailController; // Model +use App\Http\Controllers\Controller; use App\Model\helpdesk\Agent\Department; use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Settings\Company; @@ -12,7 +13,7 @@ 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 /** @@ -23,10 +24,11 @@ use App\Http\Controllers\Common\PhpMailController; */ 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. * */ @@ -73,8 +75,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' => 'Daily 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 '); // }); @@ -99,9 +101,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' => 'Daily 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.'); // }); @@ -129,8 +131,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' => 'Daily 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,8 +156,8 @@ class NotificationController extends Controller $user_name = $user->first_name.' '.$user->last_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' => 'Daily 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'); // }); diff --git a/resources/views/emails/notifications/admin.blade.php b/resources/views/emails/notifications/admin.blade.php index e6831f01a..2aeb7beed 100644 --- a/resources/views/emails/notifications/admin.blade.php +++ b/resources/views/emails/notifications/admin.blade.php @@ -52,7 +52,7 @@ foreach ($depts as $dept) { Daily Report

- Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. + Hi {!! $name !!},
Below mentioned is daily report for {!! $company !!}.

@@ -129,9 +129,7 @@ foreach ($depts as $dept) {

- We should all work hard to guarantee that all tickets are being addressed in a timely manner.  - -

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.

Thank You,
Kind Regards,
{!! $company !!} @@ -139,7 +137,7 @@ foreach ($depts as $dept) {

- Powered by Faveo + Powered by Faveo

diff --git a/resources/views/emails/notifications/agent.blade.php b/resources/views/emails/notifications/agent.blade.php index b30b6edf8..76aa07273 100644 --- a/resources/views/emails/notifications/agent.blade.php +++ b/resources/views/emails/notifications/agent.blade.php @@ -52,7 +52,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)- Daily Report

- Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. + Hi {!! $name !!},
Below mentioned is daily report for {!! $company !!}.

@@ -107,8 +107,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)-

- We should all work hard to guarantee that all tickets are being addressed in a timely manner.  - + We should all work hard to guarantee that all tickets are being addressed in a timely manner.

@@ -117,7 +116,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)-

- Powered by Faveo + Powered by Faveo

diff --git a/resources/views/emails/notifications/lead.blade.php b/resources/views/emails/notifications/lead.blade.php index becab73fd..00ae6d245 100644 --- a/resources/views/emails/notifications/lead.blade.php +++ b/resources/views/emails/notifications/lead.blade.php @@ -193,7 +193,7 @@ foreach ($depts as $dept) { - Below mentioned are your daily reportfor your {!! $company !!}. + Below mentioned is daily report for {!! $company !!}. @@ -562,9 +562,7 @@ foreach ($depts as $dept) {

- We should all work hard to guarantee that all tickets are being addressed in a timely manner.  - -

+ We should all work hard to guarantee that all tickets are being addressed in a timely manner.

Thank You,
Kind Regards,
{!! $company !!} @@ -572,7 +570,7 @@ foreach ($depts as $dept) {

- Powered by Faveo + Powered by Faveo

diff --git a/resources/views/emails/notifications/manager.blade.php b/resources/views/emails/notifications/manager.blade.php index ed610e1bb..0d5ec6783 100644 --- a/resources/views/emails/notifications/manager.blade.php +++ b/resources/views/emails/notifications/manager.blade.php @@ -52,7 +52,7 @@ $i = 0; Daily Report

- Hi {!! $name !!},
Below mentioned are your daily report for your {!! $company !!}. + Hi {!! $name !!},
Below mentioned is daily report for {!! $company !!}.

@@ -105,8 +105,7 @@ $i = 0;

- We should all work hard to guarantee that all tickets are being addressed in a timely manner.  - + We should all work hard to guarantee that all tickets are being addressed in a timely manner.

@@ -115,7 +114,7 @@ $i = 0;

- Powered by Faveo + Powered by Faveo