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

Small bug fixes.

Browse Source
This commit is contained in:
James Cole
2014-12-20 07:33:59 +01:00
parent 8b901084fe
commit e86547645c
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ use Illuminate\Support\MessageBag;
/** /**
* Class Account * Class Account
* *
* @package FireflyIII\Database * @package FireflyIII\Database
* @implements FireflyIII\Database\Account\AccountInterface * @implements FireflyIII\Database\Account\AccountInterface
*/ */
class Account implements CUD, CommonDatabaseCalls, AccountInterface class Account implements CUD, CommonDatabaseCalls, AccountInterface
@@ -260,7 +260,9 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
$journal->delete(); $journal->delete();
} }
// also delete transactions. // also delete transactions.
\Transaction::whereIn('id', $transactions)->delete(); if (count($transactions) > 0) {
\Transaction::whereIn('id', $transactions)->delete();
}
/* /*

3
app/lib/FireflyIII/Shared/Toolkit/Steam.php
View File

@@ -63,8 +63,7 @@ class Steam
{ {
$user = \Auth::user(); $user = \Auth::user();
if ($user) { if ($user) {
\BudgetLimit::leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')->where('budgets.user_id', $user->id) \BudgetLimit::where('amount', 0)->delete();
->where('budget_limits.amount', 0)->delete();
} }
} }

2
app/models/BudgetLimit.php
View File

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

0
tests/_data/dump.sql
View File