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

Code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-01-02 05:52:38 +01:00
parent d9bf4d1c0d
commit 550f301ba2
27 changed files with 52 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ use FireflyIII\Database\CommonDatabaseCalls;
use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -224,18 +225,18 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
// delete journals:
$journals = \TransactionJournal::whereIn(
'id', function ($query) use ($model) {
'id', function (Builder $query) use ($model) {
$query->select('transaction_journal_id')
->from('transactions')->whereIn(
'account_id', function ($query) use ($model) {
'account_id', function (Builder $query) use ($model) {
$query
->select('id')
->from('accounts')
->where(
function ($q) use ($model) {
function (Builder $q) use ($model) {
$q->where('id', $model->id);
$q->orWhere(
function ($q) use ($model) {
function (Builder $q) use ($model) {
$q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
// TODO magic number!
$q->where('accounts.account_type_id', 3);
@@ -273,10 +274,10 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
// delete accounts:
\Account::where(
function ($q) use ($model) {
function (Builder $q) use ($model) {
$q->where('id', $model->id);
$q->orWhere(
function ($q) use ($model) {
function (Builder $q) use ($model) {
$q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
// TODO magic number!
$q->where('accounts.account_type_id', 3);

3
app/lib/FireflyIII/Database/Budget/Budget.php
View File

@@ -10,6 +10,7 @@ use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
use Illuminate\Database\Eloquent\Builder;
/**
* Class Budget
@@ -265,7 +266,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
return $this->getUser()
->transactionjournals()
->whereNotIn(
'transaction_journals.id', function ($query) use ($start, $end) {
'transaction_journals.id', function (Builder $query) use ($start, $end) {
$query
->select('transaction_journals.id')
->from('transaction_journals')

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

@@ -158,7 +158,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
$errors->add('description', 'Internal error: need to know type of transaction!');
}
/*
* Amount:
* Amount
*/
if (isset($model['amount']) && floatval($model['amount']) < 0.01) {
$errors->add('amount', 'Amount must be > 0.01');
@@ -171,7 +171,7 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
}
/*
* Budget:
* Budget
*/
if (isset($model['budget_id']) && !ctype_digit($model['budget_id'])) {
$errors->add('budget_id', 'Invalid budget');