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

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

11
app/models/Piggybank.php
View File

@@ -3,6 +3,7 @@ use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Database\Eloquent\SoftDeletingTrait;
use Watson\Validating\ValidatingTrait;
use Illuminate\Database\Eloquent\Builder;
/**
* Class PiggyBank
@@ -77,19 +78,19 @@ class PiggyBank extends Eloquent
return $rep;
} else {
$query = $this->piggyBankRepetitions()->where(
function ($q) {
function (Builder $q) {
$q->where(
function ($q) {
function (Builder $q) {
$q->where(
function ($q) {
function (Builder $q) {
$today = new Carbon;
$q->whereNull('startdate');
$q->orWhere('startdate', '<=', $today->format('Y-m-d 00:00:00'));
}
)->where(
function ($q) {
function (Builder $q) {
$today = new Carbon;
$q->whereNull('targetdate');
$q->orWhere('targetdate', '>=', $today->format('Y-m-d 00:00:00'));
@@ -97,7 +98,7 @@ class PiggyBank extends Eloquent
);
}
)->orWhere(
function ($q) {
function (Builder $q) {
$today = new Carbon;
$q->where('startdate', '>=', $today->format('Y-m-d 00:00:00'));
$q->where('targetdate', '>=', $today->format('Y-m-d 00:00:00'));

2
app/models/TransactionJournal.php
View File

@@ -192,7 +192,7 @@ class TransactionJournal extends Eloquent
public function scopeWithRelevantData(Builder $query)
{
$query->with(
['transactions' => function ($q) {
['transactions' => function (Builder $q) {
$q->orderBy('amount', 'ASC');
}, 'transactiontype', 'budgets','categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories']
);