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

2
resources/views/partials/admin/head.blade.php
View File

@ -33,7 +33,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

104
resources/views/partials/admin/navbar.blade.php
View File

@ -2,6 +2,8 @@
<nav class="navbar navbar-top navbar-expand navbar-dark border-bottom">
<div class="container-fluid">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
@stack('navbar_search')
@permission('read-common-search')
<form class="navbar-search navbar-search-light form-inline mb-0" id="navbar-search-main" autocomplete="off">
<div id="global-search" class="form-group mb-0 mr-sm-3">
@ -37,21 +39,7 @@
@endpermission
<ul class="navbar-nav align-items-center ml-md-auto">
<li class="nav-item d-xl-none">
<div class="pr-3 sidenav-toggler sidenav-toggler-dark" data-action="sidenav-pin" data-target="#sidenav-main">
<div class="sidenav-toggler-inner">
<i class="sidenav-toggler-line"></i>
<i class="sidenav-toggler-line"></i>
<i class="sidenav-toggler-line"></i>
</div>
</div>
</li>
<li class="nav-item d-sm-none">
<a class="nav-link" href="#" data-action="search-show" data-target="#navbar-search-main">
<i class="fa fa-search"></i>
</a>
</li>
@stack('navbar_create')
@permission(['create-sales-invoices', 'create-sales-revenues', 'create-sales-invoices', 'create-purchases-bills', 'create-purchases-payments', 'create-purchases-vendors'])
<li class="nav-item dropdown">
@ -60,6 +48,8 @@
</a>
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-dark dropdown-menu-right">
<div class="row shortcuts px-4">
@stack('navbar_create_invoice')
@permission('create-sales-invoices')
<a href="{{ route('invoices.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
@ -69,6 +59,8 @@
</a>
@endpermission
@stack('navbar_create_revenue')
@permission('create-sales-revenues')
<a href="{{ route('revenues.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
@ -78,6 +70,8 @@
</a>
@endpermission
@stack('navbar_create_customer')
@permission('create-sales-customers')
<a href="{{ route('customers.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-info">
@ -87,6 +81,8 @@
</a>
@endpermission
@stack('navbar_create_bill')
@permission('create-purchases-bills')
<a href="{{ route('bills.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@ -96,6 +92,8 @@
</a>
@endpermission
@stack('navbar_create_payment')
@permission('create-purchases-payments')
<a href="{{ route('payments.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@ -105,6 +103,8 @@
</a>
@endpermission
@stack('navbar_create_vendor_start')
@permission('create-purchases-vendors')
<a href="{{ route('vendors.create') }}" class="col-4 shortcut-item">
<span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@ -113,10 +113,14 @@
<small class="text-danger">{{ trans_choice('general.vendors', 1) }}</small>
</a>
@endpermission
@stack('navbar_create_vendor_end')
</div>
</div>
</li>
@endif
@endpermission
@stack('navbar_notifications')
<li class="nav-item dropdown">
<a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -175,6 +179,8 @@
</div>
</li>
@stack('navbar_updates')
@permission('read-install-updates')
<li class="nav-item">
<a class="nav-link" href="{{ route('updates.index') }}" title="{{ $updates }} Updates Available" role="button" aria-haspopup="true" aria-expanded="false">
@ -188,13 +194,19 @@
</li>
@endpermission
@stack('navbar_help_start')
<li class="nav-item d-none d-md-block">
<a class="nav-link" href="{{ url(trans('header.support_link')) }}" target="_blank" title="{{ trans('general.help') }}" role="button" aria-haspopup="true" aria-expanded="false">
<i class="far fa-life-ring"></i>
</a>
</li>
@stack('navbar_help_end')
</ul>
@stack('navbar_profile')
<ul class="navbar-nav align-items-center ml-auto ml-md-0">
<li class="nav-item dropdown">
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@ -209,40 +221,66 @@
</div>
</div>
</a>
<div class="dropdown-menu dropdown-menu-right">
@stack('navbar_profile_welcome')
<div class="dropdown-header noti-title">
<h6 class="text-overflow m-0">{{ trans('general.welcome') }}</h6>
</div>
@stack('navbar_profile_edit')
@permission('update-auth-users')
<a href="{{ route('users.edit', $user->id) }}" class="dropdown-item">
<i class="fas fa-user"></i>
<span>{{ trans('auth.profile') }}</span>
</a>
@endpermission
@permission('read-auth-users')
@permission(['read-auth-users', 'read-auth-roles', 'read-auth-permissions'])
<div class="dropdown-divider"></div>
<a href="{{ route('users.index') }}" class="dropdown-item">
<i class="fas fa-users"></i>
<span>{{ trans_choice('general.users', 2) }}</span>
</a>
@endpermission
@permission('read-auth-roles')
<a href="{{ route('roles.index') }}" class="dropdown-item">
<i class="fas fa-list"></i>
<span>{{ trans_choice('general.roles', 2) }}</span>
</a>
@endpermission
@permission('read-auth-permissions')
<a href="{{ route('permissions.index') }}" class="dropdown-item">
<i class="fas fa-key"></i>
<span>{{ trans_choice('general.permissions', 2) }}</span>
</a>
@stack('navbar_profile_users')
@permission('read-auth-users')
<a href="{{ route('users.index') }}" class="dropdown-item">
<i class="fas fa-users"></i>
<span>{{ trans_choice('general.users', 2) }}</span>
</a>
@endpermission
@stack('navbar_profile_roles')
@permission('read-auth-roles')
<a href="{{ route('roles.index') }}" class="dropdown-item">
<i class="fas fa-list"></i>
<span>{{ trans_choice('general.roles', 2) }}</span>
</a>
@endpermission
@stack('navbar_profile_permissions_start')
@permission('read-auth-permissions')
<a href="{{ route('permissions.index') }}" class="dropdown-item">
<i class="fas fa-key"></i>
<span>{{ trans_choice('general.permissions', 2) }}</span>
</a>
@endpermission
@stack('navbar_profile_permissions_end')
@endpermission
<div class="dropdown-divider"></div>
@stack('navbar_profile_logout_start')
<a href="{{ route('logout') }}" class="dropdown-item">
<i class="fas fa-power-off"></i>
<span>{{ trans('auth.logout') }}</span>
</a>
@stack('navbar_profile_logout_end')
</div>
</li>
</ul>

2
resources/views/partials/auth/head.blade.php
View File

@ -28,7 +28,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

22
resources/views/partials/documents/item/print.blade.php Normal file
View File

@ -0,0 +1,22 @@
<tr>
@stack('name_td_start')
<td class="item">
{{ $item->name }}
@if (!empty($item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}</small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="quantity">{{ $item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="price">@money($item->price, $document->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="total">@money($item->total, $document->currency_code, true)</td>
@stack('total_td_end')
</tr>

28
resources/views/partials/documents/item/show.blade.php Normal file
View File

@ -0,0 +1,28 @@
<tr class="d-flex flex-nowrap">
@stack('name_td_start')
<td class="col-xs-4 col-sm-5 pl-5">
{{ $item->name }}
@if (!empty($item->item->description))
<br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}<small>
@endif
</td>
@stack('name_td_end')
@stack('quantity_td_start')
<td class="col-xs-4 col-sm-1 text-center">{{ $item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="col-sm-3 text-right d-none d-sm-block">@money($item->price, $document->currency_code, true)</td>
@stack('price_td_end')
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_td_start')
<td class="col-sm-1 text-center d-none d-sm-block">{{ $item->discount }}</td>
@stack('discount_td_end')
@endif
@stack('total_td_start')
<td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $document->currency_code, true)</td>
@stack('total_td_end')
</tr>

2
resources/views/partials/modules/bar.blade.php
View File

@ -21,7 +21,7 @@
</div>
<div class="col-xs-12 col-sm-3 text-right">
{!! Form::open(['route' => 'apps.search', 'role' => 'form', 'method' => 'GET', 'class' => 'm-0']) !!}
<input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="Search Apps">
<input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="{{ trans('general.search_placeholder') }}">
<span class="glyphicon glyphicon-search form-control-feedback"></span>
{!! Form::close() !!}
</div>

4
resources/views/partials/modules/head.blade.php
View File

@ -30,8 +30,8 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_home = '{{ url("apps/categories") }}';
var app_url = '{{ env("APP_URL") }}';
var app_home = '{{ route("apps.home.index") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/modules/item.blade.php
View File

@ -9,7 +9,7 @@
@php $color = 'bg-green'; @endphp
@if (!$installed[$module->slug])
@php $color = 'bg-yellow'; @endphp
@php $color = 'bg-warning'; @endphp
@endif
<span class="mr--3 float-right">

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

@ -5,78 +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 = 1; $i <= 5 - $review->rating; $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>

2
resources/views/partials/portal/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/signed/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')

2
resources/views/partials/wizard/head.blade.php
View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!--
var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}';
var app_url = '{{ config("app.url") }}';
//--></script>
@stack('js')