kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 18:54:58 +00:00
Code Issues Projects Releases Wiki Activity

Some code cleanup and fixes.

Browse Source
This commit is contained in:
James Cole
2014-08-10 11:30:14 +02:00
parent c50a9b4b04
commit fbd056104a
27 changed files with 145 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/Firefly/Helper/Controllers/Category.php
View File

@@ -10,8 +10,8 @@ class Category implements CategoryInterface
public function journalsInRange(\Category $category, Carbon $start, Carbon $end)
{
return $category->transactionjournals()->with(
['transactions', 'transactions.account', 'transactiontype', 'components']
)->orderBy('date', 'DESC')->orderBy('id', 'DESC')->before($end)->after($start)->get();
['transactions', 'transactions.account', 'transactiontype', 'components']
)->orderBy('date', 'DESC')->orderBy('id', 'DESC')->before($end)->after($start)->get();
}
}

4
app/lib/Firefly/Storage/Account/EloquentAccountRepository.php
View File

@@ -96,7 +96,9 @@ class EloquentAccountRepository implements AccountRepositoryInterface
public function findByName($name, \AccountType $type = null)
{
$type = is_null($type) ? \AccountType::where('description', 'Default account')->first() : $type;
return \Auth::user()->accounts()->where('account_type_id',$type->id)->where('name', 'like', '%' . $name . '%')->first();
return \Auth::user()->accounts()->where('account_type_id', $type->id)->where('name', 'like', '%' . $name . '%')
->first();
}
/**

12
app/lib/Firefly/Storage/RecurringTransaction/EloquentRecurringTransactionRepository.php
View File

@@ -7,8 +7,10 @@ use Carbon\Carbon;
class EloquentRecurringTransactionRepository implements RecurringTransactionRepositoryInterface
{
public function destroy(\RecurringTransaction $recurringTransaction) {
public function destroy(\RecurringTransaction $recurringTransaction)
{
$recurringTransaction->delete();
return true;
}
@@ -27,8 +29,9 @@ class EloquentRecurringTransactionRepository implements RecurringTransactionRepo
$recurringTransaction->amount_min = floatval($data['amount_min']);
// both amounts zero:
if($recurringTransaction->amount_max == 0 && $recurringTransaction->amount_min == 0) {
$recurringTransaction->errors()->add('amount_max','Amount max and min cannot both be zero.');
if ($recurringTransaction->amount_max == 0 && $recurringTransaction->amount_min == 0) {
$recurringTransaction->errors()->add('amount_max', 'Amount max and min cannot both be zero.');
return $recurringTransaction;
}
@@ -38,9 +41,10 @@ class EloquentRecurringTransactionRepository implements RecurringTransactionRepo
$recurringTransaction->skip = isset($data['skip']) ? intval($data['skip']) : 0;
$recurringTransaction->repeat_freq = $data['repeat_freq'];
if($recurringTransaction->validate()) {
if ($recurringTransaction->validate()) {
$recurringTransaction->save();
}
return $recurringTransaction;
}

2
app/lib/Firefly/Storage/TransactionJournal/EloquentTransactionJournalRepository.php
View File

@@ -392,7 +392,7 @@ class EloquentTransactionJournalRepository implements TransactionJournalReposito
// do budget:
$budget = $budRepository->find($data['budget_id']);
if(!is_null($budget)) {
if (!is_null($budget)) {
$journal->budgets()->attach($budget);
}

1
app/lib/Firefly/Storage/User/EloquentUserRepository.php
View File

@@ -69,6 +69,7 @@ class EloquentUserRepository implements UserRepositoryInterface
if (!$user->save()) {
\Log::error('Invalid user');
\Session::flash('error', 'Input invalid, please try again: ' . $user->errors()->first());
return false;
}
$user->save();