shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #1448 Fixed: Missing pagination for app reviews

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-05-19 20:06:20 +03:00
parent a69ea5b3c5
commit 771df1047a
6 changed files with 112 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
resources/views/modules/item/show.blade.php
View File

@@ -108,17 +108,72 @@
@endif
<div class="tab-pane fade" id="review">
<div id="reviews" class="clearfix" v-html="reviews">
@if(!$module->reviews)
<div class="text-center">
<strong>
{{ trans('modules.reviews.na') }}
</strong>
</div>
@endif
@php
$reviews = $module->app_reviews;
@endphp
<div id="reviews" class="clearfix" v-if="reviews.status" v-html="reviews.html"></div>
<div id="reviews" class="clearfix" v-else>
@include('partials.modules.reviews')
</div>
<div class="card-footer mx--4 mt-4 mb--4">
@php
$review_first_item = count($reviews->data) > 0 ? ($reviews->current_page - 1) * $reviews->per_page + 1 : null;
$review_last_item = count($reviews->data) > 0 ? $review_first_item + count($reviews->data) - 1 : null;
@endphp
@if (!empty($review_first_item))
@stack('pagination_start')
<div class="row mt-4">
<div class="col-md-6">
<span class="table-text d-lg-block">
{{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}
</span>
</div>
<div class="col-md-6">
<ul class="pagination float-right">
{{-- Previous Page Link --}}
<li class="page-item disabled" v-if="reviews.pagination.current_page == 1">
<span class="page-link">&laquo;</span>
</li>
<li class="page-item" v-else>
<button type="button" class="page-link" @click="onReviews(reviews.pagination.current_page - 1)" rel="prev">&laquo;</button>
</li>
{{-- Pagination Elements --}}
@for ($page = 1; $page <= $reviews->last_page; $page++)
<li class="page-item" :class="[{'active': reviews.pagination.current_page == {{ $page }}}]" v-if="reviews.pagination.current_page == {{ $page }}">
<span class="page-link">{{ $page }}</span>
</li>
<li class="page-item" v-else>
<button type="button" class="page-link" @click="onReviews({{ $page }})" data-page="{{ $page }}">{{ $page }}</button>
</li>
@endfor
{{-- Next Page Link --}}
<li class="page-item" v-if="reviews.pagination.last_page != reviews.pagination.current_page">
<button type="button" class="page-link" @click="onReviews(reviews.pagination.current_page + 1)" rel="next">&raquo;</button>
</li>
<li class="page-item disabled" v-else>
<span class="page-link">&raquo;</span>
</li>
</ul>
</div>
</div>
@stack('pagination_end')
@else
<div class="row">
<div class="col-md-12">
<small>{{ trans('general.no_records') }}</small>
</div>
</div>
@endif
<div class="card-footer mx--4 mb--4">
<div class="row">
<div class="col-md-12 text-right">
@if (!empty($module->review_action))

87
resources/views/partials/modules/reviews.blade.php
View File

@@ -5,77 +5,38 @@
<div class="media-body">
<div class="media-comment-text">
<div class="d-flex">
<h5 class="mt-0">{{ $review->author }}</h5>
<h5 class="text-right ml-auto">@date($review->created_at)</h5>
<h5 class="mb-0">{{ $review->author }}</h5>
</div>
<p class="text-sm lh-160">{!! nl2br($review->text) !!}</p>
<div class="icon-actions">
<a href="#" class="like active">
<span class="text-yellow">
<div class="d-flex">
<p class="h6 text-muted mb-0">@date($review->created_at)</p>
</div>
<div class="d-flex">
<span class="text-yellow position-absolute top-3 right-3">
@if ($review->rating)
@for($i = 1; $i <= $review->rating; $i++)
<i class="fa fa-star"></i>
@endfor
@for($i = $review->rating; $i < 5; $i++)
<i class="fa fa-star-o"></i>
@if ($review->rating < 5)
@for($i = $review->rating; $i > 1; $i--)
<i class="far fa-star"></i>
@endfor
@endif
@else
@for($i = 1; $i <= 5; $i++)
<i class="far fa-star"></i>
@endfor
</span>
</a>
@endif
</span>
</div>
<div class="d-flex">
<p class="mt-2 mb-0 text-sm lh-160">{!! nl2br($review->text) !!}</p>
</div>
</div>
</div>
</div>
@endforeach
@php
$review_first_item = count($reviews->data) > 0 ? ($reviews->current_page - 1) * $reviews->per_page + 1 : null;
$review_last_item = count($reviews->data) > 0 ? $review_first_item + count($reviews->data) - 1 : null;
@endphp
@endif
@if (!empty($review_first_item))
@stack('pagination_start')
<div class="row d-none">
<div class="col-md-6">
<span class="table-text d-none d-lg-block">
{{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}
</span>
</div>
<div class="col-md-6">
<ul class="pagination float-right">
{{-- Previous Page Link --}}
@if ($reviews->current_page <= 1)
<li class="page-item disabled"><span class="page-link">&laquo;</span></li>
@else
<li><a class="page-link" href="{{ url(request()->path()) }}?page={{ $reviews->current_page - 1 }}" rel="prev">&laquo;</a></li>
@endif
{{-- Pagination Elements --}}
@for ($page = 1; $page <= $reviews->last_page; $page++)
@if ($page == $reviews->current_page)
<li class="page-item active"><span class="page-link">{{ $page }}</span></li>
@else
<li class="page-item"><a class="page-link" href="{{ url(request()->path()) }}?page={{ $page }}" data-page="{{ $page }}">{{ $page }}</a></li>
@endif
@endfor
{{-- Next Page Link --}}
@if ($reviews->current_page != 1)
<li class="page-item"><a class="page-link" href="{{ url(request()->path()) }}?page={{ $reviews->current_page + 1 }}" rel="next">&raquo;</a></li>
@else
<li class="page-item disabled"><span class="page-link">&raquo;</span></li>
@endif
</ul>
</div>
</div>
@stack('pagination_end')
@else
<div class="row">
<div class="col-md-12">
<small>{{ trans('general.no_records') }}</small>
</div>
</div>
@endif
</div>
</div>