IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

A test to see if transfers and transactions and what-not can be related somehow.

Browse Source
This commit is contained in:
James Cole 2014-11-26 21:07:14 +01:00
parent 6b39beecb4
commit c8038e0774
2 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/controllers/ReportController.php
View File

@ -157,15 +157,25 @@ class ReportController extends BaseController
/** @var \FireflyIII\Database\TransactionJournal $journalRepository */
$journalRepository = App::make('FireflyIII\Database\TransactionJournal');
$journals = $journalRepository->getInDateRange($start, $end);
$journals = $journals->filter(
$journals = $journalRepository->getInDateRange($start, $end);
$withdrawals = $journals->filter(
function (TransactionJournal $journal) {
if ($journal->transactionType->type == 'Withdrawal' && count($journal->budgets) == 0) {
return $journal;
}
}
);
$journals->each(
// filter again for transfers
$transfers = $journals->filter(
function (TransactionJournal $journal) {
if ($journal->transactionType->type == 'Transfer') {
return $journal;
}
}
);
$withdrawals->each(
function (TransactionJournal $journal) {
$collection = new Collection;
/** @var Transaction $transaction */
@ -178,7 +188,7 @@ class ReportController extends BaseController
->where('transaction_journals.description', 'LIKE', '%' . e($journal->description) . '%')
->get(['transactions.*']);
/** @var Transaction $ct */
foreach($counters as $ct) {
foreach ($counters as $ct) {
$collection->push($ct->transactionjournal);
}
}
@ -187,7 +197,32 @@ class ReportController extends BaseController
}
);
return View::make('reports.unbalanced', compact('start', 'end', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon', 'journals'));
// same for transfers but the other way around! Yay!
$transfers->each(
function (TransactionJournal $journal) {
$collection = new Collection;
/** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) {
if (floatval($transaction->amount) < 0) {
$account = $transaction->account;
// TODO this has to be the most lame way of filtering ever.
$descr = trim(str_replace('Geld voor','',$journal->description));
// find counter transfer:
$counters = $account->transactions()->where('amount', floatval($transaction->amount))
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('transaction_journals.description', 'LIKE', '%' . $descr . '%')
->get(['transactions.*']);
/** @var Transaction $ct */
foreach ($counters as $ct) {
$collection->push($ct->transactionjournal);
}
}
}
$journal->counters = $collection;
}
);
return View::make('reports.unbalanced', compact('start','transfers', 'end', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon', 'withdrawals'));
}
/**

37
app/views/reports/unbalanced.blade.php
View File

@ -1,7 +1,13 @@
@extends('layouts.default')
@section('content')
<div class="row">
@foreach($journals as $journal)
<div class="col-lg-4 col-md-4 col-sm-6">
<h3>Transactions</h3>
</div>
</div>
<div class="row">
@foreach($withdrawals as $journal)
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="panel
@if($journal->counters->count() > 0)
@ -35,6 +41,35 @@
</div>
@endforeach
</div>
<div class="row">
<div class="col-lg-4 col-md-4 col-sm-6">
<h3>Transfers</h3>
</div>
</div>
<div class="row">
@foreach($transfers as $journal)
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="panel
@if($journal->counters->count() > 0)
panel-default
@else
panel-danger
@endif
">
<div class="panel-heading">
{{{$journal->description}}}
</div>
<div class="panel-body">
Bla bla?
</div>
</div>
</div>
@endforeach
</div>
@stop