#bug-fix-patch-5

# showing correct count of closed tickets in user profile view
This commit is contained in:
Manish Verma
2016-11-28 18:54:19 +05:30
parent 07319587ae
commit 435bc29edc

View File

@@ -246,7 +246,7 @@ class="active"
<?php $user = App\User::where('id', $users->id)->first(); ?> <?php $user = App\User::where('id', $users->id)->first(); ?>
<?php <?php
$open = count(App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', $users->id)->where('status', '=', '1')->get()); $open = count(App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', $users->id)->where('status', '=', '1')->get());
$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '2')->get()); $counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '3')->get());
$deleted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '5')->get()); $deleted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '5')->get());
?> ?>
@if($open>0) @if($open>0)
@@ -488,7 +488,7 @@ class="active"
if ($users->role == 'user') { if ($users->role == 'user') {
$open = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '1')->get()); $open = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '1')->get());
$tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '2')->orderBy('id', 'DESC')->paginate(20); $tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '2')->orderBy('id', 'DESC')->paginate(20);
$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '2')->get()); $counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '3')->get());
$deleted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '5')->get()); $deleted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '5')->get());
// dd($deleted); // dd($deleted);
} }
@@ -654,7 +654,7 @@ class="active"
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->
<div class="tab-pane" id="tab_2"> <div class="tab-pane" id="tab_2">
{{-- open tab --}} {{-- open tab --}}
<?php $closed = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', 2)->get()); ?> <?php $closed = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', 3)->get());?>
@if(Session::has('success')) @if(Session::has('success'))
<div id="success-alert" class="alert alert-success alert-dismissable"> <div id="success-alert" class="alert alert-success alert-dismissable">
<i class="fa fa-check-circle"> </i> <i class="fa fa-check-circle"> </i>
@@ -679,7 +679,7 @@ class="active"
<input type="submit" class="btn btn-default text-yellow btn-sm" name="submit" value="{!! Lang::get('lang.close') !!}"> <input type="submit" class="btn btn-default text-yellow btn-sm" name="submit" value="{!! Lang::get('lang.close') !!}">
<div class="pull-right"> <div class="pull-right">
<?php <?php
$counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '2')->get()); $counted = count(App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '3')->get());
if ($counted < 20) { if ($counted < 20) {
echo $counted . "/" . $counted; echo $counted . "/" . $counted;
} else { } else {
@@ -704,9 +704,9 @@ class="active"
</thead> </thead>
<tbody id="hello"> <tbody id="hello">
@if($users->role != 'user') @if($users->role != 'user')
<?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', $users->id)->where('status', '=', '2')->orderBy('id', 'DESC')->paginate(20); ?> <?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('assigned_to', '=', $users->id)->where('status', '=', '3')->orderBy('id', 'DESC')->paginate(20); ?>
@elseif($users->role ='user') @elseif($users->role ='user')
<?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '2')->orderBy('id', 'DESC')->paginate(20); ?> <?php $tickets = App\Model\helpdesk\Ticket\Tickets::where('user_id', '=', $users->id)->where('status', '=', '3')->orderBy('id', 'DESC')->paginate(20); ?>
@endif @endif
@foreach ($tickets as $ticket) @foreach ($tickets as $ticket)
<tr <?php if ($ticket->seen_by == null) { ?> style="color:green;" <?php } ?> > <tr <?php if ($ticket->seen_by == null) { ?> style="color:green;" <?php } ?> >