Code cleanup

This commit is contained in:
James Cole
2016-01-15 13:13:33 +01:00
parent 651dff0750
commit 01792f91e2
6 changed files with 36 additions and 23 deletions

View File

@@ -80,6 +80,7 @@ class AccountRepository implements AccountRepositoryInterface
return strtolower($account->name);
}
);
return $result;
}
@@ -113,6 +114,7 @@ class AccountRepository implements AccountRepositoryInterface
DB::Raw('SUM(`transactions`.`amount`) AS `balance`')
]
);
return $set;
}
@@ -143,6 +145,7 @@ class AccountRepository implements AccountRepositoryInterface
}
$result = $query->get(['accounts.*']);
return $result;
}
@@ -173,6 +176,7 @@ class AccountRepository implements AccountRepositoryInterface
->orderBy('transaction_journals.id', 'DESC')
->take(10)
->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']);
return $set;
}

View File

@@ -146,6 +146,7 @@ class BillRepository implements BillRepositoryInterface
->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC')
->get(['transaction_journals.*', 'transactions.amount as journalAmount']);
return $set;
}
@@ -460,6 +461,7 @@ class BillRepository implements BillRepositoryInterface
$amount = bcadd($amount, $paid->sum_amount);
}
}
return $amount;
}
@@ -515,6 +517,7 @@ class BillRepository implements BillRepositoryInterface
$amount = bcadd($amount, $bill->expectedAmount);
}
}
return $amount;
}

View File

@@ -14,7 +14,6 @@ use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger;
use Illuminate\Support\Collection;
/**
* Class RuleRepository
@@ -48,6 +47,7 @@ class RuleRepository implements RuleRepositoryInterface
/**
* @param RuleGroup $ruleGroup
*
* @return bool
*/
public function resetRulesInGroupOrder(RuleGroup $ruleGroup)
@@ -98,7 +98,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return bool
*/
public function moveRuleUp(Rule $rule)
public function moveUp(Rule $rule)
{
$order = $rule->order;
@@ -119,7 +119,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return bool
*/
public function moveRuleDown(Rule $rule)
public function moveDown(Rule $rule)
{
$order = $rule->order;
@@ -142,7 +142,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return Rule
*/
public function storeRule(array $data)
public function store(array $data)
{
/** @var RuleGroup $ruleGroup */
$ruleGroup = Auth::user()->ruleGroups()->find($data['rule_group_id']);
@@ -213,7 +213,7 @@ class RuleRepository implements RuleRepositoryInterface
*
* @return bool
*/
public function destroyRule(Rule $rule)
public function destroy(Rule $rule)
{
foreach ($rule->ruleTriggers as $trigger) {
$trigger->delete();
@@ -264,9 +264,10 @@ class RuleRepository implements RuleRepositoryInterface
/**
* @param Rule $rule
* @param array $data
*
* @return Rule
*/
public function updateRule(Rule $rule, array $data)
public function update(Rule $rule, array $data)
{
// update rule:
$rule->active = $data['active'];

View File

@@ -13,7 +13,6 @@ use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger;
use Illuminate\Support\Collection;
/**
* Interface RuleRepositoryInterface
@@ -27,7 +26,7 @@ interface RuleRepositoryInterface
*
* @return bool
*/
public function destroyRule(Rule $rule);
public function destroy(Rule $rule);
/**
* @param RuleGroup $ruleGroup
@@ -39,6 +38,7 @@ interface RuleRepositoryInterface
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleTriggers(Rule $rule, array $ids);
@@ -46,41 +46,46 @@ interface RuleRepositoryInterface
/**
* @param Rule $rule
* @param array $ids
*
* @return bool
*/
public function reorderRuleActions(Rule $rule, array $ids);
/**
* @param RuleGroup $ruleGroup
*
* @return bool
*/
public function resetRulesInGroupOrder(RuleGroup $ruleGroup);
/**
* @param Rule $rule
*
* @return bool
*/
public function moveRuleUp(Rule $rule);
public function moveUp(Rule $rule);
/**
* @param Rule $rule
* @param array $data
*
* @return Rule
*/
public function updateRule(Rule $rule, array $data);
public function update(Rule $rule, array $data);
/**
* @param Rule $rule
*
* @return bool
*/
public function moveRuleDown(Rule $rule);
public function moveDown(Rule $rule);
/**
* @param array $data
*
* @return Rule
*/
public function storeRule(array $data);
public function store(array $data);
/**
* @param Rule $rule