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

apply not recurring and split scopes by default

Browse Source
This commit is contained in:
Denis Duliçi
2022-06-05 03:33:26 +03:00
parent 3ac8186d4a
commit 2cdeaad00d
10 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Banking/Accounts.php
View File

@ -36,7 +36,7 @@ class Accounts extends Controller
public function show(Account $account)
{
// Handle transactions
$transactions = Transaction::with('account', 'category')->where('account_id', $account->id)->isNotRecurring()->collect('paid_at');
$transactions = Transaction::with('account', 'category')->where('account_id', $account->id)->collect('paid_at');
$transfers = Transfer::with('expense_transaction', 'income_transaction')->get()->filter(function ($transfer) use($account) {
if ($transfer->expense_account->id == $account->id || $transfer->income_account->id == $account->id) {

2
app/Http/Controllers/Banking/Transactions.php
View File

@ -35,7 +35,7 @@ class Transactions extends Controller
*/
public function index()
{
$transactions = Transaction::with('account', 'category', 'contact')->isNotRecurring()->isNotSplit()->collect(['paid_at'=> 'desc']);
$transactions = Transaction::with('account', 'category', 'contact')->collect(['paid_at'=> 'desc']);
$totals = [
'income' => 0,