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

Some cleaning up. About to release 3.2.1

Browse Source
This commit is contained in:
James Cole 2014-12-15 19:39:01 +01:00
parent 16678aa5e1
commit b999a8f0fb
10 changed files with 74 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/HomeController.php
View File

@ -48,7 +48,7 @@ class HomeController extends BaseController
$transactions = [];
foreach ($accounts as $account) {
$set = $jrnls->getInDateRangeAccount($account, 10, $start, $end);
$set = $jrnls->getInDateRangeAccount($account, $start, $end, 10);
if (count($set) > 0) {
$transactions[] = [$set, $account];
}

5
app/database/seeds/TestContentSeeder.php
View File

@ -138,8 +138,7 @@ class TestContentSeeder extends Seeder
*/
public function createTransaction(
Account $from, Account $to, $amount, TransactionType $type, $description, $date, Budget $budget = null, Category $category = null
)
{
) {
$user = User::whereEmail('thegrumpydictator@gmail.com')->first();
$euro = TransactionCurrency::whereCode('EUR')->first();
@ -161,7 +160,6 @@ class TestContentSeeder extends Seeder
'transaction_journal_id' => $journal->id,
'amount' => $amount * -1
]
);
Transaction::create(
[
@ -169,7 +167,6 @@ class TestContentSeeder extends Seeder
'transaction_journal_id' => $journal->id,
'amount' => $amount
]
);
if (!is_null($budget)) {
$journal->budgets()->save($budget);

40
app/lib/FireflyIII/Collection/PiggybankPart.php
View File

@ -14,13 +14,10 @@ class PiggybankPart
{
/** @var float */
public $amountPerBar;
/** @var float */
public $currentamount;
/** @var float */
public $cumulativeAmount;
/** @var float */
public $currentamount;
/** @var \Reminder */
public $reminder;
@ -38,11 +35,12 @@ class PiggybankPart
*/
public function getReminder()
{
if(is_null($this->reminder)) {
if (is_null($this->reminder)) {
$this->reminder = $this->repetition->piggybank->reminders()->where('startdate', $bar->getStartdate()->format('Y-m-d'))->where(
'enddate', $bar->getTargetdate()->format('Y-m-d')
)->first();
}
return $this->reminder;
}
@ -145,22 +143,6 @@ class PiggybankPart
$this->currentamount = $currentamount;
}
/**
* @return float
*/
public function getAmountPerBar()
{
return $this->amountPerBar;
}
/**
* @param float $amountPerBar
*/
public function setAmountPerBar($amountPerBar)
{
$this->amountPerBar = $amountPerBar;
}
/**
* @return float
*/
@ -177,7 +159,21 @@ class PiggybankPart
$this->cumulativeAmount = $cumulativeAmount;
}
/**
* @return float
*/
public function getAmountPerBar()
{
return $this->amountPerBar;
}
/**
* @param float $amountPerBar
*/
public function setAmountPerBar($amountPerBar)
{
$this->amountPerBar = $amountPerBar;
}
}

40
app/lib/FireflyIII/Database/Account/Account.php
View File

@ -223,28 +223,28 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
// delete journals:
\TransactionJournal::whereIn(
'id', function ($query) use ($model) {
$query->select('transaction_journal_id')
->from('transactions')->whereIn(
'account_id', function ($query) use ($model) {
$query
->select('id')
->from('accounts')
->where(
$query->select('transaction_journal_id')
->from('transactions')->whereIn(
'account_id', function ($query) use ($model) {
$query
->select('id')
->from('accounts')
->where(
function ($q) use ($model) {
$q->where('id', $model->id);
$q->orWhere(
function ($q) use ($model) {
$q->where('id', $model->id);
$q->orWhere(
function ($q) use ($model) {
$q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
// TODO magic number!
$q->where('accounts.account_type_id', 3);
$q->where('accounts.active', 0);
}
);
$q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
// TODO magic number!
$q->where('accounts.account_type_id', 3);
$q->where('accounts.active', 0);
}
)->where('accounts.user_id', $this->getUser()->id);
}
)->get();
}
);
}
)->where('accounts.user_id', $this->getUser()->id);
}
)->get();
}
)->delete();
/*

6
app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
View File

@ -87,6 +87,12 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
* Validates an array. Returns an array containing MessageBags
* errors/warnings/successes.
*
* Ignore PHPMD rules because Laravel 5.0 will make this method superfluous anyway.
*
* @SuppressWarnings("Cyclomatic")
* @SuppressWarnings("NPath")
* @SuppressWarnings("MethodLength")
*
* @param array $model
*
* @return array

6
app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php
View File

@ -158,6 +158,12 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggyBankInterface
* Validates an array. Returns an array containing MessageBags
* errors/warnings/successes.
*
*
* ignored because this method will be gone soon.
* @SuppressWarnings("Cyclomatic")
* @SuppressWarnings("NPath")
* @SuppressWarnings("MethodLength")
*
* @param array $model
*
* @return array

5
app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php
View File

@ -102,6 +102,11 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac
* Validates an array. Returns an array containing MessageBags
* errors/warnings/successes.
*
* ignored because this method will be gone soon.
* @SuppressWarnings("Cyclomatic")
* @SuppressWarnings("NPath")
* @SuppressWarnings("MethodLength")
*
* @param array $model
*
* @return array

9
app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
View File

@ -194,6 +194,11 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
* Validates an array. Returns an array containing MessageBags
* errors/warnings/successes.
*
* ignored because this method will be gone soon.
* @SuppressWarnings("Cyclomatic")
* @SuppressWarnings("NPath")
* @SuppressWarnings("MethodLength")
*
* @param array $model
*
* @return array
@ -614,13 +619,13 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
/**
* @param \Account $account
* @param int $count
* @param Carbon $start
* @param Carbon $end
* @param int $count
*
* @return Collection
*/
public function getInDateRangeAccount(\Account $account, $count = 20, Carbon $start, Carbon $end)
public function getInDateRangeAccount(\Account $account, Carbon $start, Carbon $end, $count = 20)
{
$accountID = $account->id;

1
app/lib/FireflyIII/Shared/Toolkit/Form.php
View File

@ -15,7 +15,6 @@ class Form
* Takes any collection and tries to make a sensible select list compatible array of it.
*
* @param Collection $set
* @param null $titleField
* @param bool $addEmpty
* @SuppressWarnings("CyclomaticComplexity")
*

18
bootstrap/start.php
View File

@ -14,14 +14,16 @@ if (!function_exists('mf')) {
$amount = round($amount, 2);
$string = number_format($amount, 2, ',', '.');
if ($coloured === true && $amount === 0.0) {
return '<span style="color:#999">&#8364; ' . $string . '</span>';
}
if ($coloured === true && $amount > 0) {
return '<span class="text-success">&#8364; ' . $string . '</span>';
}
if ($coloured === true && $amount < 0) {
return '<span class="text-danger">&#8364; ' . $string . '</span>';
if ($coloured === true) {
if ($amount === 0.0) {
return '<span style="color:#999">&#8364; ' . $string . '</span>';
}
if ($amount > 0) {
return '<span class="text-success">&#8364; ' . $string . '</span>';
}
if ($amount < 0) {
return '<span class="text-danger">&#8364; ' . $string . '</span>';
}
}
return '&#8364; ' . $string;