update v1.0.5.3

This commit is contained in:
sujitprasad
2016-02-01 17:20:45 +05:30
parent 38c814c543
commit d25f7d63ed
212 changed files with 60 additions and 27221 deletions

View File

@@ -41,7 +41,7 @@
<body class="skin-yellow fixed">
<div class="wrapper">
<header class="main-header">
<a href="http://www.faveohelpdesk.com" class="logo"><img src="{{ asset('lb-faveo/media/images/logo.png') }}"></a>
<a href="http://www.faveohelpdesk.com" class="logo"><img src="{{ asset('lb-faveo/media/images/logo.png') }}" width="100px"></a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
@@ -142,10 +142,17 @@
<li class="header">{!! Lang::get('lang.Tickets') !!}</li>
<?php
$inbox = App\Model\helpdesk\Ticket\Tickets::get();
if(Auth::user()->role == 'admin') {
$inbox = App\Model\helpdesk\Ticket\Tickets::all();
$myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status','1')->get();
$unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '0')->where('status','1')->get();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->get();
} elseif(Auth::user()->role == 'agent') {
$inbox = App\Model\helpdesk\Ticket\Tickets::where('dept_id','',Auth::user()->primary_dpt)->get();
$myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status','1')->get();
$unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '0')->where('status','1')->where('dept_id','',Auth::user()->primary_dpt)->get();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->get();
}
$i = count($tickets);
?>
<li>

View File

@@ -43,7 +43,7 @@
<body class="skin-yellow skin-green fixed">
<div class="wrapper">
<header class="main-header">
<a href="http://www.faveohelpdesk.com" class="logo"><img src="{{ asset('lb-faveo/media/images/logo.png') }}"></a>
<a href="http://www.faveohelpdesk.com" class="logo"><img src="{{ asset('lb-faveo/media/images/logo.png') }}" width="100px;"></a>
<?php
$company = App\Model\helpdesk\Settings\Company::where('id', '=', '1')->first();
if ($company != null) {
@@ -154,10 +154,17 @@ if ($company != null) {
@yield('sidebar')
<li class="header">{!! Lang::get('lang.Tickets') !!}</li>
<?php
if(Auth::user()->role == 'admin') {
$inbox = App\Model\helpdesk\Ticket\Tickets::all();
$myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status','1')->get();
$unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '0')->where('status','1')->get();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->get();
} elseif(Auth::user()->role == 'agent') {
$inbox = App\Model\helpdesk\Ticket\Tickets::where('dept_id','',Auth::user()->primary_dpt)->get();
$myticket = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', Auth::user()->id)->where('status','1')->get();
$unassigned = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '0')->where('status','1')->where('dept_id','',Auth::user()->primary_dpt)->get();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status','1')->get();
}
$i = count($tickets);
?>
<li @yield('inbox')>

View File

@@ -157,7 +157,7 @@ if (DB_HOST && DB_USER && DB_NAME) {
<div class="col-md-2">
</div>
<div class="col-md-9">
<img src="{{asset("lb-faveo/dist/img/gifloader.gif")}}"><br/><br/><br/>
<img src="{{asset("lb-faveo/media/images/gifloader.gif")}}"><br/><br/><br/>
</div>
</div>
</div>

View File

@@ -56,6 +56,6 @@ active
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
<script src="{{asset(" js/index.js ")}}"></script>
<script src="{{asset("lb-faveo/js/index.js")}}"></script>
@stop

View File

@@ -4,13 +4,18 @@
<meta name="viewport" content="width=device-width">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Faveo HELPDESK</title>
<link rel="stylesheet" href="{{asset("lb-faveo/installer/css/load-styles.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/installer/css/css.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/installer/css/admin.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/installer/css/wc-setup.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/installer/css/activation.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/installer/css/style.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{{asset("lb-faveo/css/load-styles.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/css/css.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/css/admin.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/css/wc-setup.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/css/activation.css")}}" type="text/css" media="all">
<link rel="stylesheet" href="{{asset("lb-faveo/css/style.css")}}" type="text/css" media="all">
{{-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"> --}}
<link href="{{asset("lb-faveo/css/font-awesome.min.css")}}" rel="stylesheet" type="text/css" />
<!-- Ionicons -->
{{-- <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> --}}
<link href="{{asset("lb-faveo/css/ionicons.min.css")}}" rel="stylesheet">
<style type="text/css">
@@ -81,7 +86,8 @@
</head>
<body class="wc-setup wp-core-ui">
<h1 id="wc-logo"><a href="#">
<img src="{{asset("lb-faveo/installer/images/faveo.png")}}" alt="faveo"></a></h1>
<img src="{{asset("lb-faveo/media/installer/faveo.png")}}" alt="faveo" width="
250px"></a></h1>
<ol class="wc-setup-steps">
<li class="@yield('licence')">Licence Agreement</li>
<li class="@yield('environment')">Environment Test</li>
@@ -92,7 +98,8 @@
<div class="wc-setup-content">
@yield('content')
</div>
<center>&copy;<?php echo date('Y')?>. Powered by <a href="http://www.faveohelpdesk.com">Faveo </a></center>
<br/>
<center>&copy;<?php echo date('Y')?>. Powered by <a target="_blank" href="http://www.faveohelpdesk.com">Faveo </a></center>
{{-- // <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script> --}}
{{-- // <script src="{{asset("lb-faveo/installer/js/index.js ")}}"></script> --}}
</body>