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

close #349 Fixed: Transfer added edit and delete feature

Browse Source
This commit is contained in:
cuneytsenturk 2018-05-21 16:47:35 +03:00
parent 3fe1429313
commit c57f3936ca
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/Banking/Transfers.php
View File

@ -34,10 +34,20 @@ class Transfers extends Controller
$transfers = array(); $transfers = array();
foreach ($items as $item) { foreach ($items as $item) {
$payment = $item->payment;
$revenue = $item->revenue; $revenue = $item->revenue;
$payment = $item->payment;
$data_name = [
'from' => $payment->account->name,
'to' => $revenue->account->name,
'amount' => money($payment->amount, $payment->currency_code, true)
];
$name = trans('transfers.delete_transfer', $data_name);
$transfers[] = (object)[ $transfers[] = (object)[
'id' => $item->id,
'name' => $name,
'from_account' => $payment->account->name, 'from_account' => $payment->account->name,
'to_account' => $revenue->account->name, 'to_account' => $revenue->account->name,
'amount' => $payment->amount, 'amount' => $payment->amount,
@ -162,10 +172,10 @@ class Transfers extends Controller
* *
* @return Response * @return Response
*/ */
public function edit(Request $request) public function edit(Transfer $transfer)
{ {
$payment = Payment::findOrFail($request['payment_id']); $payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($request['revenue_id']); $revenue = Revenue::findOrFail($transfer->revenue_id);
$transfer['from_account_id'] = $payment->account_id; $transfer['from_account_id'] = $payment->account_id;
$transfer['to_account_id'] = $revenue->account_id; $transfer['to_account_id'] = $revenue->account_id;
@ -175,7 +185,7 @@ class Transfers extends Controller
$transfer['payment_method'] = $revenue->payment_method; $transfer['payment_method'] = $revenue->payment_method;
$transfer['reference'] = $revenue->reference; $transfer['reference'] = $revenue->reference;
$accounts = Account::listArray(); $accounts = Account::enabled()->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();
@ -198,6 +208,7 @@ class Transfers extends Controller
$revenue_currency_code = Account::where('id', $request['to_account_id'])->pluck('currency_code')->first(); $revenue_currency_code = Account::where('id', $request['to_account_id'])->pluck('currency_code')->first();
$payment = Payment::findOrFail($transfer->payment_id); $payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer->revenue_id);
$request['account_id'] = $request['from_account_id']; $request['account_id'] = $request['from_account_id'];
$request['paid_at'] = $request['transferred_at']; $request['paid_at'] = $request['transferred_at'];
@ -209,8 +220,6 @@ class Transfers extends Controller
$payment->update($request->all()); $payment->update($request->all());
$revenue = Revenue::findOrFail($transfer->income_id);
$transfer = new Transfer(); $transfer = new Transfer();
$transfer->default_currency_code = $payment_currency_code; $transfer->default_currency_code = $payment_currency_code;
@ -255,8 +264,8 @@ class Transfers extends Controller
*/ */
public function destroy(Transfer $transfer) public function destroy(Transfer $transfer)
{ {
$payment = Payment::findOrFail($transfer['payment_id']); $payment = Payment::findOrFail($transfer->payment_id);
$revenue = Revenue::findOrFail($transfer['revenue_id']); $revenue = Revenue::findOrFail($transfer->revenue_id);
$transfer->delete(); $transfer->delete();
$payment->delete(); $payment->delete();

2
resources/lang/en-GB/transfers.php
View File

@ -4,5 +4,5 @@ return [
'from_account' => 'From Account', 'from_account' => 'From Account',
'to_account' => 'To Account', 'to_account' => 'To Account',
'delete_transfer' => 'Transfer : :from to :to :amount',
]; ];

18
resources/views/banking/transfers/index.blade.php
View File

@ -32,19 +32,33 @@
<table class="table table-striped table-hover" id="tbl-transfers"> <table class="table table-striped table-hover" id="tbl-transfers">
<thead> <thead>
<tr> <tr>
<th class="col-md-3">@sortablelink('payment.paid_at', trans('general.date'))</th> <th class="col-md-2">@sortablelink('payment.paid_at', trans('general.date'))</th>
<th class="col-md-3">@sortablelink('payment.name', trans('transfers.from_account'))</th> <th class="col-md-3">@sortablelink('payment.name', trans('transfers.from_account'))</th>
<th class="col-md-3">@sortablelink('revenue.name', trans('transfers.to_account'))</th> <th class="col-md-3">@sortablelink('revenue.name', trans('transfers.to_account'))</th>
<th class="col-md-3 text-right amount-space">@sortablelink('payment.amount', trans('general.amount'))</th> <th class="col-md-3 text-right amount-space">@sortablelink('payment.amount', trans('general.amount'))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($transfers as $item) @foreach($transfers as $item)
<tr> <tr>
<td>{{ Date::parse($item->paid_at)->format($date_format) }}</td> <td><a href="{{ url('banking/transfers/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>{{ $item->from_account }}</td> <td>{{ $item->from_account }}</td>
<td>{{ $item->to_account }}</td> <td>{{ $item->to_account }}</td>
<td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td> <td class="text-right amount-space">@money($item->amount, $item->currency_code, true)</td>
<td class="text-center">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">
<i class="fa fa-ellipsis-h"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="{{ url('banking/transfers/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
@permission('delete-banking-transfers')
<li>{!! Form::deleteLink($item, 'banking/transfers') !!}</li>
@endpermission
</ul>
</div>
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>