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

master branch merge

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-05-29 14:04:34 +03:00
parent aad139d40b ad51d61baa
commit a13a826056
224 changed files with 3473 additions and 1549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/modules/item/pre_sale.blade.php
View File

@ -87,10 +87,9 @@
@endif
@endpermission
@if ($module->purchase_faq)
<br>
<div class="text-center">
<a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{!! $module->purchase_desc !!}
</div>
@endif
</div>
@ -138,7 +137,7 @@
</div>
@if ($module->purchase_faq)
<akaunting-modal :show="faq.show">
<akaunting-modal :show="faq" modal-dialog-class="modal-md">
<template #modal-content>
{!! $module->purchase_faq !!}
</template>

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

@ -109,17 +109,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))
@ -189,10 +244,10 @@
@endpermission
@endif
@if ($module->purchase_faq)
<div class="text-center mt-3">
<a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
</div>
@if (!empty($module->purchase_desc))
<div class="text-center mt-3">
{!! $module->purchase_desc !!}
</div>
@endif
</div>
</div>
@ -249,7 +304,7 @@
</div>
@if ($module->purchase_faq)
<akaunting-modal :show="faq">
<akaunting-modal :show="faq" modal-dialog-class="modal-md">
<template #modal-content>
{!! $module->purchase_faq !!}
</template>
@ -264,7 +319,7 @@
<div class="modal-body">
<el-progress :text-inside="true" :stroke-width="24" :percentage="installation.total" :status="installation.status"></el-progress>
<div id="progress-text" v-html="installation.html"></div>
<div id="progress-text" class="mt-3" v-html="installation.html"></div>
</div>
</template>
<template #card-footer>