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

fixed #126

Browse Source
This commit is contained in:
denisdulici
2017-12-05 18:31:18 +03:00
parent a2bf5cc5a2
commit 3a6f51cd87
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Expenses/Payments.php
View File

@ -35,7 +35,9 @@ class Payments extends Controller
$accounts = collect(Account::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts'));
$transfer_cat_id = Category::transfer();
return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
}
/**
@ -197,6 +199,11 @@ class Payments extends Controller
*/
public function destroy(Payment $payment)
{
// Can't delete transfer payment
if ($payment->category->id == Category::transfer()) {
return redirect('expenses/payments');
}
$payment->delete();
$message = trans('messages.success.deleted', ['type' => trans_choice('general.payments', 1)]);

9
app/Http/Controllers/Incomes/Revenues.php
View File

@ -37,7 +37,9 @@ class Revenues extends Controller
$accounts = collect(Account::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts'));
$transfer_cat_id = Category::transfer();
return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
}
/**
@ -199,6 +201,11 @@ class Revenues extends Controller
*/
public function destroy(Revenue $revenue)
{
// Can't delete transfer revenue
if ($revenue->category->id == Category::transfer()) {
return redirect('incomes/revenues');
}
$revenue->delete();
$message = trans('messages.success.deleted', ['type' => trans_choice('general.revenues', 1)]);