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

removed extra transfer check

Browse Source
This commit is contained in:
denisdulici 2020-01-18 17:24:13 +03:00
parent 3eee5f63ed
commit c2719dcbca
4 changed files with 37 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Purchases/Payments.php
View File

@ -39,9 +39,7 @@ class Payments extends Controller
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$transfer_cat_id = Category::transfer(); return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
} }
/** /**

4
app/Http/Controllers/Sales/Revenues.php
View File

@ -39,9 +39,7 @@ class Revenues extends Controller
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$transfer_cat_id = Category::transfer(); return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
} }
/** /**

9
resources/views/purchases/payments/index.blade.php
View File

@ -47,7 +47,6 @@
<tbody> <tbody>
@foreach($payments as $item) @foreach($payments as $item)
@php $is_transfer = ($item->category && ($item->category->id == $transfer_cat_id)); @endphp
<tr class="row align-items-center border-top-1"> <tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td> <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
@if ($item->reconciled) @if ($item->reconciled)
@ -60,7 +59,6 @@
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td> <td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
<td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td> <td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center"> <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
@if (!$is_transfer)
<div class="dropdown"> <div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-h text-muted"></i> <i class="fa fa-ellipsis-h text-muted"></i>
@ -81,13 +79,6 @@
@endpermission @endpermission
</div> </div>
</div> </div>
@else
<div class="dropdown">
<button class="btn btn-white btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="tooltip" aria-haspopup="true" aria-expanded="false" title="This Transfer, If you want to action redirect">
<i class="fa fa-exchange-alt text-muted"></i>
</button>
</div>
@endif
</td> </td>
</tr> </tr>
@endforeach @endforeach

9
resources/views/sales/revenues/index.blade.php
View File

@ -47,7 +47,6 @@
<tbody> <tbody>
@foreach($revenues as $item) @foreach($revenues as $item)
@php $is_transfer = ($item->category && ($item->category->id == $transfer_cat_id)); @endphp
<tr class="row align-items-center border-top-1"> <tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td> <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
@if ($item->reconciled) @if ($item->reconciled)
@ -60,7 +59,6 @@
<td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td> <td class="col-lg-2 col-xl-2 d-none d-lg-block text-left">{{ $item->category->name }}</td>
<td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td> <td class="col-lg-2 col-xl-1 d-none d-lg-block text-left">{{ $item->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center"> <td class="col-xs-4 col-sm-2 col-md-2 col-lg-1 col-xl-1 text-center">
@if (!$is_transfer)
<div class="dropdown"> <div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-ellipsis-h text-muted"></i> <i class="fa fa-ellipsis-h text-muted"></i>
@ -82,13 +80,6 @@
@endpermission @endpermission
</div> </div>
</div> </div>
@else
<div class="dropdown">
<button class="btn btn-secondary btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="tooltip" aria-haspopup="true" aria-expanded="false" title="This Transfer, If you want to action redirect">
<i class="fa fa-exchange-alt text-muted"></i>
</button>
</div>
@endif
</td> </td>
</tr> </tr>
@endforeach @endforeach