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

bank reconciliation

Browse Source
This commit is contained in:
denisdulici
2018-10-27 17:57:40 +03:00
parent 42f6b00485
commit 268a4aa9d5
29 changed files with 1209 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/expenses/bills/index.blade.php
View File

@ -61,14 +61,18 @@
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="{{ url('expenses/bills/' . $item->id) }}">{{ trans('general.show') }}</a></li>
@if ($item->paid && !$item->reconciled)
<li><a href="{{ url('expenses/bills/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
<li class="divider"></li>
@endif
@permission('create-expenses-bills')
<li><a href="{{ url('expenses/bills/' . $item->id . '/duplicate') }}">{{ trans('general.duplicate') }}</a></li>
<li class="divider"></li>
<li><a href="{{ url('expenses/bills/' . $item->id . '/duplicate') }}">{{ trans('general.duplicate') }}</a></li>
@endpermission
@permission('delete-expenses-bills')
@if (!$item->reconciled)
<li class="divider"></li>
<li>{!! Form::deleteLink($item, 'expenses/bills') !!}</li>
@endif
@endpermission
</ul>
</div>

14
resources/views/expenses/bills/show.blade.php
View File

@ -160,9 +160,11 @@
<div class="box-footer row no-print">
<div class="col-xs-12">
@if(!$bill->reconciled)
<a href="{{ url('expenses/bills/' . $bill->id . '/edit') }}" class="btn btn-default">
<i class="fa fa-pencil-square-o"></i>&nbsp; {{ trans('general.edit') }}
</a>
@endif
<a href="{{ url('expenses/bills/' . $bill->id . '/print') }}" target="_blank" class="btn btn-success">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a>
@ -170,7 +172,9 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-circle-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
<ul class="dropdown-menu" role="menu">
@if($bill->status->code != 'paid')
@if(empty($bill->paid) || ($bill->paid != $bill->amount))
<li><a href="#" id="button-payment">{{ trans('bills.add_payment') }}</a></li>
@endif
@permission('update-expenses-bills')
@if($bill->bill_status_code == 'draft')
<li><a href="{{ url('expenses/bills/' . $bill->id . '/received') }}">{{ trans('bills.mark_received') }}</a></li>
@ -181,9 +185,11 @@
<li class="divider"></li>
@endif
<li><a href="{{ url('expenses/bills/' . $bill->id . '/pdf') }}">{{ trans('bills.download_pdf') }}</a></li>
<li class="divider"></li>
@permission('delete-expenses-bills')
@if(!$bill->reconciled)
<li class="divider"></li>
<li>{!! Form::deleteLink($bill, 'expenses/bills') !!}</li>
@endif
@endpermission
</ul>
</div>
@ -276,6 +282,11 @@
<td>@money($payment->amount, $payment->currency_code, true)</td>
<td>{{ $payment->account->name }}</td>
<td>
@if ($payment->reconciled)
<button type="button" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" title="{{ trans('reconciliations.reconciled') }}">
<i class="fa fa-check"></i>
</button>
@else
<a href="{{ url('expenses/bills/' . $payment->id) }}" class="btn btn-info btn-xs hidden"><i class="fa fa-eye" aria-hidden="true"></i> {{ trans('general.show') }}</a>
<a href="{{ url('expenses/bills/' . $payment->id . '/edit') }}" class="btn btn-primary btn-xs hidden"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ trans('general.edit') }}</a>
{!! Form::open([
@ -291,6 +302,7 @@
'onclick' => 'confirmDelete("' . '#bill-payment-' . $payment->id . '", "' . trans_choice('general.payments', 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . Date::parse($payment->paid_at)->format($date_format) . ' - ' . money($payment->amount, $payment->currency_code, true) . ' - ' . $payment->account->name . '</strong>', 'type' => strtolower(trans_choice('general.revenues', 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
)) !!}
{!! Form::close() !!}
@endif
</td>
</tr>
@endforeach

10
resources/views/expenses/payments/index.blade.php
View File

@ -47,7 +47,11 @@
<tbody>
@foreach($payments as $item)
<tr>
@if ($item->reconciled)
<td>{{ Date::parse($item->paid_at)->format($date_format) }}</td>
@else
<td><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
@endif
<td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td class="hidden-xs">{{ !empty($item->vendor->name) ? $item->vendor->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->category->name }}</td>
@ -59,14 +63,18 @@
<i class="fa fa-ellipsis-h"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
@if (!$item->reconciled)
<li><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
@permission('create-expenses-payments')
<li class="divider"></li>
@endif
@permission('create-expenses-payments')
<li><a href="{{ url('expenses/payments/' . $item->id . '/duplicate') }}">{{ trans('general.duplicate') }}</a></li>
@endpermission
@permission('delete-expenses-payments')
@if (!$item->reconciled)
<li class="divider"></li>
<li>{!! Form::deleteLink($item, 'expenses/payments') !!}</li>
@endif
@endpermission
</ul>
</div>