Email config alert
Added alert box to convey that email has not been setup
This commit is contained in:
@@ -316,9 +316,9 @@ class ApiController extends Controller
|
||||
->groupby('tickets.id')
|
||||
->distinct()
|
||||
->paginate(10)
|
||||
->toJson();
|
||||
->toArray();
|
||||
|
||||
return $result;
|
||||
return response($result);
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
@@ -370,9 +370,9 @@ class ApiController extends Controller
|
||||
->groupby('tickets.id')
|
||||
->distinct()
|
||||
->paginate(10)
|
||||
->toJson();
|
||||
->toArray();
|
||||
|
||||
return $unassigned;
|
||||
return response($unassigned);
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
@@ -423,9 +423,9 @@ class ApiController extends Controller
|
||||
->groupby('tickets.id')
|
||||
->distinct()
|
||||
->paginate(10)
|
||||
->toJson();
|
||||
->toArray();
|
||||
|
||||
return $result;
|
||||
return response($result);
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
@@ -988,9 +988,8 @@ class ApiController extends Controller
|
||||
->groupby('tickets.id')
|
||||
->distinct()
|
||||
->paginate(10)
|
||||
->toJson();
|
||||
|
||||
return $inbox;
|
||||
->toArray();
|
||||
return response($inbox);
|
||||
} catch (\Exception $ex) {
|
||||
$error = $ex->getMessage();
|
||||
$line = $ex->getLine();
|
||||
@@ -1072,9 +1071,9 @@ class ApiController extends Controller
|
||||
->groupby('tickets.id')
|
||||
->distinct()
|
||||
->paginate(10)
|
||||
->toJson();
|
||||
->toArray();
|
||||
|
||||
return $trash;
|
||||
return response($trash);
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
@@ -1129,9 +1128,9 @@ class ApiController extends Controller
|
||||
->groupby('tickets.id')
|
||||
->distinct()
|
||||
->paginate(10)
|
||||
->toJson();
|
||||
->toArray();
|
||||
|
||||
return $result;
|
||||
return response($result);
|
||||
} catch (\Exception $e) {
|
||||
$error = $e->getMessage();
|
||||
$line = $e->getLine();
|
||||
|
@@ -3,6 +3,7 @@
|
||||
namespace App\Http\ViewComposers;
|
||||
|
||||
use App\Model\helpdesk\Agent\Department;
|
||||
use App\Model\helpdesk\Email\Emails;
|
||||
use App\Model\helpdesk\Settings\Company;
|
||||
use App\Model\helpdesk\Ticket\Tickets;
|
||||
use App\User;
|
||||
@@ -28,13 +29,14 @@ class AgentLayout
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(Company $company, User $users, Tickets $tickets, Department $department)
|
||||
public function __construct(Company $company, User $users, Tickets $tickets, Department $department, Emails $emails)
|
||||
{
|
||||
$this->company = $company;
|
||||
$this->auth = Auth::user();
|
||||
$this->users = $users;
|
||||
$this->tickets = $tickets;
|
||||
$this->department = $department;
|
||||
$this->emails = $emails;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,6 +60,7 @@ class AgentLayout
|
||||
'department' => $this->departments(),
|
||||
'overdues' => $this->overdues(),
|
||||
'due_today' => $this->getDueToday(),
|
||||
'is_mail_conigured' => $this->getEmailConfig(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -194,4 +197,21 @@ class AgentLayout
|
||||
->whereRaw('date(duedate) = ?', [date('Y-m-d')]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @category function to check configured mails
|
||||
*
|
||||
* @var $emails
|
||||
*
|
||||
* @return bool true/false
|
||||
*/
|
||||
public function getEmailConfig()
|
||||
{
|
||||
$emails = $this->emails->where('sending_status', '=', 1)->where('fetching_status', '=', 1)->count();
|
||||
if ($emails >= 1) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -374,7 +374,22 @@
|
||||
|
||||
<!-- Main content -->
|
||||
<section class="content">
|
||||
|
||||
@if (!$is_mail_conigured)
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="callout callout-warning lead">
|
||||
<h4><i class="fa fa-exclamation-triangle"></i> {{Lang::get('Alert')}}</h4>
|
||||
<p style="font-size:0.8em">
|
||||
@if (\Auth::user()->role == 'admin')
|
||||
{{Lang::get('lang.system-outgoing-incoming-mail-not-configured')}} <a href="{{URL::route('emails.create')}}">{{Lang::get('lang.confihure-the-mail-now')}}</a>
|
||||
@else
|
||||
{{Lang::get('lang.system-mail-not-configured-agent-message')}}
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@yield('content')
|
||||
</section><!-- /.content -->
|
||||
<!-- /.content-wrapper -->
|
||||
|
@@ -400,6 +400,22 @@ $group = App\Model\helpdesk\Agent\Groups::where('id', '=', $agent_group)->first(
|
||||
</section>
|
||||
<!-- Main content -->
|
||||
<section class="content">
|
||||
@if (!$is_mail_conigured)
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="callout callout-warning lead">
|
||||
<h4><i class="fa fa-exclamation-triangle"></i> {{Lang::get('Alert')}}</h4>
|
||||
<p style="font-size:0.8em">
|
||||
@if (\Auth::user()->role == 'admin')
|
||||
{{Lang::get('lang.system-outgoing-incoming-mail-not-configured')}} <a href="{{URL::route('emails.create')}}">{{Lang::get('lang.confihure-the-mail-now')}}</a>
|
||||
@else
|
||||
{{Lang::get('lang.system-mail-not-configured-agent-message')}}
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@yield('content')
|
||||
</section><!-- /.content -->
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user