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

Refactor

Browse Source
This commit is contained in:
James Cole
2015-12-13 10:05:13 +01:00
parent 59f57c96e9
commit c4c4fbc34c
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/Budget/BudgetRepository.php
View File

@@ -52,7 +52,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
*
* @return float
*/
public function expensesOnDayCorrected(Budget $budget, Carbon $date)
public function expensesOnDay(Budget $budget, Carbon $date)
{
bcscale(2);
$sum = $budget->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->onDate($date)->get(['transaction_journals.*'])->sum('amount');

2
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@@ -35,7 +35,7 @@ interface BudgetRepositoryInterface
*
* @return float
*/
public function expensesOnDayCorrected(Budget $budget, Carbon $date);
public function expensesOnDay(Budget $budget, Carbon $date);
/**
* @return Collection

6
app/Repositories/Category/CategoryRepository.php
View File

@@ -67,7 +67,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
*
* @return array
*/
public function getCategoriesAndExpensesCorrected(Carbon $start, Carbon $end)
public function getCategoriesAndExpenses(Carbon $start, Carbon $end)
{
$set = Auth::user()->transactionjournals()
->leftJoin(
@@ -212,7 +212,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
*
* @return string
*/
public function spentOnDaySumCorrected(Category $category, Carbon $date)
public function spentOnDaySum(Category $category, Carbon $date)
{
return $category->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
}
@@ -381,7 +381,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
*
* @return float
*/
public function earnedOnDaySumCorrected(Category $category, Carbon $date)
public function earnedOnDaySum(Category $category, Carbon $date)
{
return $category->transactionjournals()->transactionTypes([TransactionType::DEPOSIT])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
}

6
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@@ -47,7 +47,7 @@ interface CategoryRepositoryInterface
*
* @return array
*/
public function getCategoriesAndExpensesCorrected(Carbon $start, Carbon $end);
public function getCategoriesAndExpenses(Carbon $start, Carbon $end);
/**
* @param Category $category
@@ -156,7 +156,7 @@ interface CategoryRepositoryInterface
*
* @return float
*/
public function spentOnDaySumCorrected(Category $category, Carbon $date);
public function spentOnDaySum(Category $category, Carbon $date);
/**
*
@@ -167,7 +167,7 @@ interface CategoryRepositoryInterface
*
* @return float
*/
public function earnedOnDaySumCorrected(Category $category, Carbon $date);
public function earnedOnDaySum(Category $category, Carbon $date);
/**
* @param array $data