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

Some small fixes.

Browse Source
This commit is contained in:
James Cole 2015-06-28 08:42:06 +02:00
parent cbe52b5089
commit c15c45f765
5 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Generator/Chart/Category/GoogleCategoryChartGenerator.php
View File

@ -81,6 +81,7 @@ class GoogleCategoryChartGenerator implements CategoryChartGenerator
} }
/** /**
* @param Collection $categories
* @param Collection $entries * @param Collection $entries
* *
* @return array * @return array

3
app/Providers/FireflyServiceProvider.php
View File

@ -104,7 +104,8 @@ class FireflyServiceProvider extends ServiceProvider
//$this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\GoogleCategoryChartGenerator'); //$this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\GoogleCategoryChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator'); $this->app->bind('FireflyIII\Generator\Chart\Category\CategoryChartGenerator', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator');
//$this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\GooglePiggyBankChartGenerator'); //$this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator',
// 'FireflyIII\Generator\Chart\PiggyBank\GooglePiggyBankChartGenerator');
$this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator'); $this->app->bind('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGenerator', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator');
//$this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\GoogleReportChartGenerator'); //$this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGenerator', 'FireflyIII\Generator\Chart\Report\GoogleReportChartGenerator');

3
database/seeds/TestDataSeeder.php
View File

@ -528,9 +528,10 @@ class TestDataSeeder extends Seeder
} }
/** /**
* @param $tag * @param $tagName
* *
* @return Tag|null * @return Tag|null
* @internal param $tag
*/ */
protected function findTag($tagName) protected function findTag($tagName)
{ {

27
tests/helpers/ReportQueryTest.php
View File

@ -3,7 +3,6 @@
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Helpers\Report\ReportQuery; use FireflyIII\Helpers\Report\ReportQuery;
use FireflyIII\Models\AccountMeta; use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\Transaction;
use League\FactoryMuffin\Facade as FactoryMuffin; use League\FactoryMuffin\Facade as FactoryMuffin;
/** /**
@ -81,22 +80,20 @@ class ReportQueryTest extends TestCase
); );
$amount = 100; $amount = 100;
if($i == 8) { if ($i == 8) {
$amount = 0; // at least one "empty" journal. $amount = 0; // at least one "empty" journal.
} }
// update both transactions // update both transactions
$journal->transactions[0]->account_id = $account1->id; $journal->transactions[0]->account_id = $account1->id;
$journal->transactions[0]->amount = $amount * -1; $journal->transactions[0]->amount = $amount * -1;
$journal->transactions[0]->save(); $journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id; $journal->transactions[1]->account_id = $account2->id;
$journal->transactions[1]->amount = $amount; $journal->transactions[1]->amount = $amount;
$journal->transactions[1]->save(); $journal->transactions[1]->save();
} }
$this->be($user); $this->be($user);
@ -151,17 +148,17 @@ class ReportQueryTest extends TestCase
); );
$amount = 100; $amount = 100;
if($i == 8) { if ($i == 8) {
$amount = 0; // at least one "empty" journal. $amount = 0; // at least one "empty" journal.
} }
// update both transactions // update both transactions
$journal->transactions[0]->account_id = $account1->id; $journal->transactions[0]->account_id = $account1->id;
$journal->transactions[0]->amount = $amount * -1; $journal->transactions[0]->amount = $amount * -1;
$journal->transactions[0]->save(); $journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id; $journal->transactions[1]->account_id = $account2->id;
$journal->transactions[1]->amount = $amount; $journal->transactions[1]->amount = $amount;
$journal->transactions[1]->save(); $journal->transactions[1]->save();
} }
@ -271,17 +268,17 @@ class ReportQueryTest extends TestCase
); );
$amount = 100; $amount = 100;
if($i == 8) { if ($i == 8) {
$amount = 0; // at least one "empty" journal. $amount = 0; // at least one "empty" journal.
} }
// update both transactions // update both transactions
$journal->transactions[0]->account_id = $account1->id; $journal->transactions[0]->account_id = $account1->id;
$journal->transactions[0]->amount = $amount; $journal->transactions[0]->amount = $amount;
$journal->transactions[0]->save(); $journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id; $journal->transactions[1]->account_id = $account2->id;
$journal->transactions[1]->amount = $amount * -1; $journal->transactions[1]->amount = $amount * -1;
$journal->transactions[1]->save(); $journal->transactions[1]->save();
} }
@ -337,17 +334,17 @@ class ReportQueryTest extends TestCase
); );
$amount = 100; $amount = 100;
if($i == 8) { if ($i == 8) {
$amount = 0; // at least one "empty" journal. $amount = 0; // at least one "empty" journal.
} }
// update both transactions // update both transactions
$journal->transactions[0]->account_id = $account1->id; $journal->transactions[0]->account_id = $account1->id;
$journal->transactions[0]->amount = $amount * -1; $journal->transactions[0]->amount = $amount * -1;
$journal->transactions[0]->save(); $journal->transactions[0]->save();
$journal->transactions[1]->account_id = $account2->id; $journal->transactions[1]->account_id = $account2->id;
$journal->transactions[1]->amount = $amount; $journal->transactions[1]->amount = $amount;
$journal->transactions[1]->save(); $journal->transactions[1]->save();
} }

15
tests/repositories/JournalRepositoryTest.php
View File

@ -80,20 +80,21 @@ class JournalRepositoryTest extends TestCase
$withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionType'); // withdrawal
// create five journals with incrementing dates: // create five journals with incrementing dates:
$today = new Carbon('2015-01-01'); $today = new Carbon('2015-01-01');
for($i=0;$i<5;$i++) { $journal = null;
for ($i = 0; $i < 5; $i++) {
// create journal: // create journal:
$journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal');
$journal->transaction_type_id = $withdrawal; $journal->transaction_type_id = $withdrawal;
$journal->date = $today; $journal->date = $today;
$journal->save(); $journal->save();
// update transactions: // update transactions:
$journal->transactions[0]->amount = -100; $journal->transactions[0]->amount = -100;
$journal->transactions[0]->account_id = $asset->id; $journal->transactions[0]->account_id = $asset->id;
$journal->transactions[0]->save(); $journal->transactions[0]->save();
$journal->transactions[1]->amount = 100; $journal->transactions[1]->amount = 100;
$journal->transactions[1]->account_id = $expense->id; $journal->transactions[1]->account_id = $expense->id;
$journal->transactions[1]->save(); $journal->transactions[1]->save();
@ -102,7 +103,7 @@ class JournalRepositoryTest extends TestCase
} }
$before = $this->object->getAmountBefore($journal, $journal->transactions[1]); $before = $this->object->getAmountBefore($journal, $journal->transactions[1]);
// five transactions, we check the last one, so amount should be 400. // five transactions, we check the last one, so amount should be 400.
$this->assertEquals(400, $before); $this->assertEquals(400, $before);
} }