kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 10:39:28 +00:00
Code Issues Projects Releases Wiki Activity

Accidentally commented out date limits in query.

Browse Source
This commit is contained in:
James Cole
2015-04-09 21:01:08 +02:00
parent 587b94153d
commit 0224d1d59b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/JsonController.php
View File

@@ -50,8 +50,8 @@ class JsonController extends Controller
$box = Input::get('box'); $box = Input::get('box');
$in = Auth::user()->transactionjournals() $in = Auth::user()->transactionjournals()
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
//->before($end) ->before($end)
// ->after($start) ->after($start)
->transactionTypes(['Withdrawal']) ->transactionTypes(['Withdrawal'])
->where('transactions.amount', '>', 0) ->where('transactions.amount', '>', 0)
->first([DB::Raw('SUM(transactions.amount) as `totalAmount`')]); ->first([DB::Raw('SUM(transactions.amount) as `totalAmount`')]);

2
app/Repositories/Bill/BillRepository.php
View File

@@ -4,6 +4,8 @@ namespace FireflyIII\Repositories\Bill;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;