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

Merge remote-tracking branch 'refs/remotes/origin/master' into hot-fix-patch

Browse Source
This commit is contained in:
Manish Verma
2017-05-12 11:50:54 +05:30
parent 03cdb3976b 187f25e474
commit 7cc81512e0
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ use Lang;
use Mail; use Mail;
use PDF; use PDF;
use UTC; use UTC;
use Crypt;
/** /**
* TicketController. * TicketController.
@@ -526,8 +527,8 @@ class TicketController extends Controller
} }
if ($mail == true) { if ($mail == true) {
//dd($thread->purify()); $encoded_ticketid = Crypt::encrypt($ticket_id);
//dd($this->replyContent($request->input('reply_content'))); $link = url('check_ticket/'.$encoded_ticketid);
$this->NotificationController->create($ticket_id, Auth::user()->id, '2'); $this->NotificationController->create($ticket_id, Auth::user()->id, '2');
$this->PhpMailController->sendmail( $this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $from = $this->PhpMailController->mailfrom('0', $tickets->dept_id),
@@ -540,7 +541,9 @@ class TicketController extends Controller
], ],
$template_variables = [ $template_variables = [
'ticket_number' => $ticket_number, 'ticket_number' => $ticket_number,
'user' => $username, 'agent_sign' => $agentsign, 'user' => $username,
'agent_sign' => $agentsign,
'system_link'=>$link
] ]
); );
} }
@@ -840,11 +843,19 @@ class TicketController extends Controller
} else { } else {
$sign = $company; $sign = $company;
} }
$encoded_ticketid = Crypt::encrypt($ticketdata->id);
$link = url('check_ticket/'.$encoded_ticketid);
if ($source == 3) { if ($source == 3) {
try { try {
if ($auto_response == 0) { if ($auto_response == 0) {
//dd($source); $encoded_ticketid = Crypt::encrypt($ticketdata->id);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $ticket_number2]); $link = url('check_ticket/'.$encoded_ticketid);
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket-by-agent', 'body' => $body],
$template_variables = [
'agent_sign' => Auth::user()->agent_sign,
'ticket_number' => $ticket_number2,
'system_link'=>$link,
]);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
//dd($e); //dd($e);
@@ -853,7 +864,12 @@ 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' => $username,
'ticket_number' => $ticket_number2,
'department_sign' => '',
'system_link'=>$link,
]);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
} }

2
config/app.php
View File

@@ -12,7 +12,7 @@ return [
| application. If disabled, a simple generic error page is shown. | application. If disabled, a simple generic error page is shown.
| |
*/ */
'debug' => env('APP_DEBUG', false), 'debug' => env('APP_DEBUG', true),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Error Log | Error Log