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

Fixed various bugs that made tests fail.

Browse Source
This commit is contained in:
James Cole
2014-12-26 22:59:13 +01:00
parent 3ba0cf1454
commit 7a885bfc3c
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,6 +366,9 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
*/ */
public function limitOnStartingOnDate(\Budget $budget, Carbon $date) public function limitOnStartingOnDate(\Budget $budget, Carbon $date)
{ {
return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d'))->first(); return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d 00:00:00'))->first();
} }
} }

2
app/models/Budget.php
View File

@@ -28,7 +28,7 @@ class Budget extends Eloquent
*/ */
public function budgetlimits() public function budgetlimits()
{ {
return $this->hasMany('BudgetLimit', 'budget_id'); return $this->hasMany('BudgetLimit');
} }
/** /**

5
app/models/BudgetLimit.php
View File

@@ -1,9 +1,10 @@
<?php <?php
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
use \Illuminate\Database\Eloquent\Model as Eloquent;
/** /**
* Class Limit * Class Limit
*/ */
@@ -27,7 +28,7 @@ class BudgetLimit extends Eloquent
*/ */
public function budget() public function budget()
{ {
return $this->belongsTo('Budget','budget_id'); return $this->belongsTo('Budget');
} }
/** /**

2
app/models/Category.php
View File

@@ -36,7 +36,7 @@ class Category extends Eloquent
*/ */
public function transactionjournals() public function transactionjournals()
{ {
return $this->belongsToMany('TransactionJournal', 'budget_transaction_journal', 'budget_id'); return $this->belongsToMany('TransactionJournal', 'category_transaction_journal', 'category_id');
} }
/** /**