kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 00:20:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.4.7' into develop

Browse Source
This commit is contained in:
James Cole
2015-07-07 11:12:30 +02:00
parent 3172bc90da 43669648ce
commit 3de57c668f
3 changed files with 150 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@@ -61,19 +61,19 @@ Everything is organised:
_Please note that everything in these screenshots is fictional and may not be realistic._ _Please note that everything in these screenshots is fictional and may not be realistic._
![Index](https://i.nder.be/gdryw73q) ![Index](https://i.nder.be/c6hz06d3)
![Accounts](https://i.nder.be/hmpkq8q0) ![Accounts](https://i.nder.be/gzxxyz6n)
![Budgets](https://i.nder.be/cbq2n5g9) ![Budgets](https://i.nder.be/hhu3krqk)
![Reports 1](https://i.nder.be/cmwvqrds) ![Reports 1](https://i.nder.be/cc3yspf6)
![Reports 2](https://i.nder.be/cv4dqbp4) ![Reports 2](https://i.nder.be/h6fp7xkb)
![Bills](https://i.nder.be/gmkxqdw7) ![Bills](https://i.nder.be/c30zkcpv)
![Piggy banks](https://i.nder.be/cc5u6h3b) ![Piggy banks](https://i.nder.be/g20k0mdq)
## Running and installing ## Running and installing

4
config/firefly.php
View File

@@ -1,8 +1,8 @@
<?php <?php
return [ return [
'chart' => 'chartjs', // or 'chartjs' 'chart' => 'chartjs',
'version' => '3.4.6', 'version' => '3.4.7',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true, 'csv_import_enabled' => true,

160
database/seeds/TestDataSeeder.php
View File

@@ -7,6 +7,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Role; use FireflyIII\Models\Role;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
@@ -45,6 +46,7 @@ class TestDataSeeder extends Seeder
$this->createExpenseAccounts(); $this->createExpenseAccounts();
$this->createRevenueAccounts(); $this->createRevenueAccounts();
$this->createBills(); $this->createBills();
$this->createPiggybanks();
// dates: // dates:
$start = Carbon::now()->subyear()->startOfMonth(); $start = Carbon::now()->subyear()->startOfMonth();
@@ -213,6 +215,144 @@ class TestDataSeeder extends Seeder
); );
} }
protected function createPiggybanks()
{
$account = $this->findAccount('Savings');
$camera = PiggyBank::create(
[
'account_id' => $account->id,
'name' => 'New camera',
'targetamount' => 1000,
'startdate' => '2015-04-01',
'reminder_skip' => 0,
'remind_me' => 0,
'order' => 1,
]
);
$repetition = $camera->piggyBankRepetitions()->first();
$repetition->currentamount = 735;
$repetition->save();
// events:
PiggyBankEvent::create(
[
'piggy_bank_id' => $camera->id,
'date' => '2015-05-01',
'amount' => '245'
]
);
PiggyBankEvent::create(
[
'piggy_bank_id' => $camera->id,
'date' => '2015-06-01',
'amount' => '245'
]
);
PiggyBankEvent::create(
[
'piggy_bank_id' => $camera->id,
'date' => '2015-07-01',
'amount' => '245'
]
);
$phone = PiggyBank::create(
[
'account_id' => $account->id,
'name' => 'New phone',
'targetamount' => 600,
'startdate' => '2015-04-01',
'reminder_skip' => 0,
'remind_me' => 0,
'order' => 1,
]
);
$repetition = $phone->piggyBankRepetitions()->first();
$repetition->currentamount = 333;
$repetition->save();
// events:
PiggyBankEvent::create(
[
'piggy_bank_id' => $phone->id,
'date' => '2015-05-01',
'amount' => '111'
]
);
PiggyBankEvent::create(
[
'piggy_bank_id' => $phone->id,
'date' => '2015-06-01',
'amount' => '111'
]
);
PiggyBankEvent::create(
[
'piggy_bank_id' => $phone->id,
'date' => '2015-07-01',
'amount' => '111'
]
);
$couch = PiggyBank::create(
[
'account_id' => $account->id,
'name' => 'New couch',
'targetamount' => 500,
'startdate' => '2015-04-01',
'reminder_skip' => 0,
'remind_me' => 0,
'order' => 1,
]
);
$repetition = $couch->piggyBankRepetitions()->first();
$repetition->currentamount = 120;
$repetition->save();
// events:
PiggyBankEvent::create(
[
'piggy_bank_id' => $couch->id,
'date' => '2015-05-01',
'amount' => '40'
]
);
PiggyBankEvent::create(
[
'piggy_bank_id' => $couch->id,
'date' => '2015-06-01',
'amount' => '40'
]
);
PiggyBankEvent::create(
[
'piggy_bank_id' => $couch->id,
'date' => '2015-07-01',
'amount' => '40'
]
);
}
/**
* @param $name
*
* @return Account|null
*/
protected function findAccount($name)
{
/** @var Account $account */
foreach (Account::get() as $account) {
if ($account->name == $name && $this->user->id == $account->user_id) {
return $account;
break;
}
}
return null;
}
/** /**
* @param $description * @param $description
* @param Carbon $date * @param Carbon $date
@@ -260,24 +400,6 @@ class TestDataSeeder extends Seeder
} }
/**
* @param $name
*
* @return Account|null
*/
protected function findAccount($name)
{
/** @var Account $account */
foreach (Account::get() as $account) {
if ($account->name == $name && $this->user->id == $account->user_id) {
return $account;
break;
}
}
return null;
}
/** /**
* @param $description * @param $description
* @param Carbon $date * @param Carbon $date
@@ -593,7 +715,7 @@ class TestDataSeeder extends Seeder
$journal = TransactionJournal::create( $journal = TransactionJournal::create(
[ [
'user_id' => $this->user->id, 'user_id' => $this->user->id,
'transaction_type_id' => 2, 'transaction_type_id' => 3,
'transaction_currency_id' => 1, 'transaction_currency_id' => 1,
'description' => 'Save money', 'description' => 'Save money',
'completed' => 1, 'completed' => 1,