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

Bug-fix-patch

Browse Source 
Fixed bugs for priority and email exception throw.
This commit is contained in:
Manish Verma
2016-11-03 18:01:39 +05:30
parent 964353bc1e
commit 8c6b314499
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/helpdesk/PriorityController.php
View File

@@ -156,10 +156,10 @@ class PriorityController extends Controller
$tk_priority->ispublic = $request->ispublic; $tk_priority->ispublic = $request->ispublic;
$tk_priority->save(); $tk_priority->save();
if ($request->input('default_priority') == 'on') { if ($request->input('default_priority') == 'on') {
Ticket_Priority::where('is_default', '>', '0') Ticket_Priority::where('is_default', '=', 1)
->update(['is_default' => '0']); ->update(['is_default' => 0]);
Ticket_Priority::where('priority_id', '=', $priority_id) Ticket_Priority::where('priority_id', '=', $priority_id)
->update(['is_default' => $priority_id]); ->update(['is_default' => 1]);
} }
return \Redirect::route('priority.index')->with('success', (Lang::get('lang.priority_successfully_updated'))); return \Redirect::route('priority.index')->with('success', (Lang::get('lang.priority_successfully_updated')));

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

@@ -383,7 +383,7 @@ class TicketController extends Controller
return Redirect('newticket')->with('fails', Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken'))->withInput($request->except('password')); return Redirect('newticket')->with('fails', Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken'))->withInput($request->except('password'));
} }
} catch (Exception $e) { } catch (Exception $e) {
dd($e); // dd($e);
if ($api != false) { if ($api != false) {
return $e->getMessage(); return $e->getMessage();
} }
@@ -960,7 +960,7 @@ class TicketController extends Controller
try { try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $email_data['to_user'], 'email' => $email_data['to_email']], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $email_data['to_user_name'], 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $email_data['to_user_name'], 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $email_data['to_user'], 'email' => $email_data['to_email']], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $email_data['to_user_name'], 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $email_data['to_user_name'], 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
} catch (\Exception $e) { } catch (\Exception $e) {
dd($e); // dd($e);
} }
} }
$data = [ $data = [

2
resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
View File

@@ -796,7 +796,7 @@ if ($thread->title != "") {
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>{!! Lang::get('lang.priority') !!} <span class="text-red"> *</span></label> <label>{!! Lang::get('lang.priority') !!} <span class="text-red"> *</span></label>
<?php $ticket_prioritys = App\Model\helpdesk\Ticket\Ticket_Priority::all() ?> <?php $ticket_prioritys = App\Model\helpdesk\Ticket\Ticket_Priority::where('status', '=', 1)->get(); ?>
<select class="form-control" name="ticket_priority"> <select class="form-control" name="ticket_priority">
@foreach($ticket_prioritys as $ticket_priority) @foreach($ticket_prioritys as $ticket_priority)
<option value="{!! $ticket_priority->priority_id !!}" <?php <option value="{!! $ticket_priority->priority_id !!}" <?php