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

Update v1.0.6.10

Browse Source
This commit is contained in:
sujitprasad
2016-04-01 13:11:01 +05:30
parent 6a4bff0510
commit 8f91ff23db
5 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Http/Controllers/Agent/helpdesk/NotificationController.php
View File

@@ -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');
// });

8
resources/views/emails/notifications/admin.blade.php
View File

@@ -52,7 +52,7 @@ foreach ($depts as $dept) {
<strong> Daily Report</strong>
</p>
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 12px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
<strong>Hi {!! $name !!},</strong> <br> Below mentioned are your daily report for your {!! $company !!}.
<strong>Hi {!! $name !!},</strong> <br> Below mentioned is daily report for {!! $company !!}.
</p>
<!-- End Main Text (introduction) -->
</td>
@@ -129,9 +129,7 @@ foreach ($depts as $dept) {
<tr>
<td style="padding: " colspan="2" bgcolor="#FFFFFF">
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 11px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
We should all work hard to guarantee that all tickets are being addressed in a timely manner. 
</p>
We should all work hard to guarantee that all tickets are being addressed in a timely manner.</p>
<p style="padding: 15px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: bold; font-family: Arial, Helvetica, sans-serif; text-align: left;">
Thank You,<br/> Kind Regards,<br/>{!! $company !!}
@@ -139,7 +137,7 @@ foreach ($depts as $dept) {
<!-- Main Text -->
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px; text-align: center; color: #3AB4FF;">
<strong> Powered by Faveo</strong>
<strong>Powered by <a href="http://www.faveohelpdesk.com" target="_blank">Faveo</a></strong>
</p>
</td>

7
resources/views/emails/notifications/agent.blade.php
View File

@@ -52,7 +52,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)-
<strong> Daily Report</strong>
</p>
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 12px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
<strong>Hi {!! $name !!},</strong> <br> Below mentioned are your daily report for your {!! $company !!}.
<strong>Hi {!! $name !!},</strong> <br> Below mentioned is daily report for {!! $company !!}.
</p>
<!-- End Main Text (introduction) -->
</td>
@@ -107,8 +107,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)-
<tr>
<td style="padding: " colspan="2" bgcolor="#FFFFFF">
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 11px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
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.
</p>
<p style="padding: 15px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: bold; font-family: Arial, Helvetica, sans-serif; text-align: left;">
@@ -117,7 +116,7 @@ $dept = App\Model\helpdesk\Agent\Department::where('id','=',$user->primary_dpt)-
<!-- Main Text -->
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px; text-align: center; color: #3AB4FF;">
<strong> Powered by Faveo</strong>
<strong>Powered by <a href="http://www.faveohelpdesk.com" target="_blank">Faveo</a></strong>
</p>
</td>

8
resources/views/emails/notifications/lead.blade.php
View File

@@ -193,7 +193,7 @@ foreach ($depts as $dept) {
</tr>
<tr>
<td style="font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height:24px; color: #666666;" st-conteent="2colcontent1">
Below mentioned are your daily reportfor your {!! $company !!}.
Below mentioned is daily report for {!! $company !!}.
</td>
</tr>
</tbody>
@@ -562,9 +562,7 @@ foreach ($depts as $dept) {
<tr>
<td style="padding: " colspan="2" bgcolor="#FFFFFF">
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 11px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
We should all work hard to guarantee that all tickets are being addressed in a timely manner. 
</p>
We should all work hard to guarantee that all tickets are being addressed in a timely manner.</p>
<p style="padding: 15px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: bold; font-family: Arial, Helvetica, sans-serif; text-align: left;">
Thank You,<br/> Kind Regards,<br/>{!! $company !!}
@@ -572,7 +570,7 @@ foreach ($depts as $dept) {
<!-- Main Text -->
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px; text-align: center; color: #3AB4FF;">
<strong> Powered by Faveo</strong>
<strong>Powered by <a href="http://www.faveohelpdesk.com" target="_blank">Faveo</a></strong>
</p>
</td>

7
resources/views/emails/notifications/manager.blade.php
View File

@@ -52,7 +52,7 @@ $i = 0;
<strong> Daily Report</strong>
</p>
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 12px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
<strong>Hi {!! $name !!},</strong> <br> Below mentioned are your daily report for your {!! $company !!}.
<strong>Hi {!! $name !!},</strong> <br> Below mentioned is daily report for {!! $company !!}.
</p>
<!-- End Main Text (introduction) -->
</td>
@@ -105,8 +105,7 @@ $i = 0;
<tr>
<td style="padding: " colspan="2" bgcolor="#FFFFFF">
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 11px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px;">
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.
</p>
<p style="padding: 15px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: bold; font-family: Arial, Helvetica, sans-serif; text-align: left;">
@@ -115,7 +114,7 @@ $i = 0;
<!-- Main Text -->
<p style="padding: 0px 30px 20px 50px; margin: 0; font-size: 16px; color: #333; font-weight: normal; font-family: Arial, Helvetica, sans-serif; line-height: 22px; text-align: center; color: #3AB4FF;">
<strong> Powered by Faveo</strong>
<strong>Powered by <a href="http://www.faveohelpdesk.com" target="_blank">Faveo</a></strong>
</p>
</td>