IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some code cleanup.

Browse Source
This commit is contained in:
James Cole 2016-01-01 12:41:00 +01:00
parent 70c922cdc5
commit b415b6b043
14 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Report/ReportQuery.php
View File

@ -7,9 +7,7 @@ use Carbon\Carbon;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\Budget;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection;

8
app/Helpers/Report/ReportQueryInterface.php
View File

@ -65,8 +65,8 @@ interface ReportQueryInterface
* grouped by month like so: "2015-01" => '123.45'
*
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
* @param Carbon $start
* @param Carbon $end
*
* @return array
*/
@ -77,8 +77,8 @@ interface ReportQueryInterface
* grouped by month like so: "2015-01" => '123.45'
*
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
* @param Carbon $start
* @param Carbon $end
*
* @return array
*/

2
app/Http/Controllers/AccountController.php
View File

@ -195,7 +195,7 @@ class AccountController extends Controller
$subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $account->accountType->type);
$what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
$journals = $repository->getJournals($account, $page);
$subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]);
$subTitle = trans('firefly.details_for_' . $what, ['name' => $account->name]);
$journals->setPath('accounts/show/' . $account->id);

4
app/Http/Controllers/BudgetController.php
View File

@ -234,8 +234,8 @@ class BudgetController extends Controller
if (is_null($repetition->id)) {
$start = $repository->firstActivity($budget);
$end = new Carbon;
$set = $budget->limitrepetitions()->orderBy('startdate','DESC')->get();
$end = new Carbon;
$set = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
//$set = $repository->getBudgetLimits($budget);
//$subTitle = e($budget->name);
} else {

4
app/Http/Controllers/Chart/BudgetController.php
View File

@ -227,9 +227,9 @@ class BudgetController extends Controller
/**
* Shows a budget list with spent/left/overspent.
*
* @param BudgetRepositoryInterface $repository
* @param BudgetRepositoryInterface $repository
*
* @param ARI $accountRepository
* @param ARI $accountRepository
*
* @return \Symfony\Component\HttpFoundation\Response
*/

1
app/Http/Controllers/Chart/CategoryController.php
View File

@ -461,5 +461,4 @@ class CategoryController extends Controller
}
}

6
app/Http/Controllers/NewUserController.php
View File

@ -6,7 +6,7 @@ use Config;
use FireflyIII\Http\Requests\NewUserFormRequest;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Preferences ;
use Preferences;
use Session;
use View;
@ -42,8 +42,8 @@ class NewUserController extends Controller
}
/**
* @param NewUserFormRequest $request
* @param ARI $repository
* @param NewUserFormRequest $request
* @param ARI $repository
*
* @return \Illuminate\Http\RedirectResponse
*/

10
app/Http/Controllers/PiggyBankController.php
View File

@ -40,8 +40,8 @@ class PiggyBankController extends Controller
/**
* Add money to piggy bank
*
* @param ARI $repository
* @param PiggyBank $piggyBank
* @param ARI $repository
* @param PiggyBank $piggyBank
*
* @return $this
*/
@ -116,8 +116,8 @@ class PiggyBankController extends Controller
}
/**
* @param ARI $repository
* @param PiggyBank $piggyBank
* @param ARI $repository
* @param PiggyBank $piggyBank
*
* @return View
*/
@ -219,7 +219,7 @@ class PiggyBankController extends Controller
/**
* @param PiggyBankRepositoryInterface $repository
* @param ARI $accounts
* @param ARI $accounts
* @param PiggyBank $piggyBank
*
* @return \Illuminate\Http\RedirectResponse

8
app/Http/Controllers/TransactionController.php
View File

@ -43,8 +43,8 @@ class TransactionController extends Controller
}
/**
* @param ARI $repository
* @param string $what
* @param ARI $repository
* @param string $what
*
* @return \Illuminate\View\View
*/
@ -133,8 +133,8 @@ class TransactionController extends Controller
/**
* Shows the view to edit a transaction.
*
* @param ARI $repository
* @param TransactionJournal $journal
* @param ARI $repository
* @param TransactionJournal $journal
*
* @return $this
*/

2
app/Repositories/Account/AccountRepository.php
View File

@ -270,7 +270,7 @@ class AccountRepository implements AccountRepositoryInterface
$end = clone Session::get('end', new Carbon);
$collection = new Collection(DB::table('piggy_banks')->distinct()->get(['piggy_banks.account_id']));
$ids = $collection->pluck('account_id')->toArray();
$accounts = new Collection;
$accounts = new Collection;
$cache = new CacheProperties;
$cache->addProperty($ids);

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

@ -206,7 +206,8 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
*
* @return Collection
*/
public function getBudgetReps(Budget $budget) {
public function getBudgetReps(Budget $budget)
{
$set = $budget->limitrepetitions()->count();
var_dump($set);
}

25
app/Repositories/Category/SingleCategoryRepository.php
View File

@ -2,7 +2,6 @@
namespace FireflyIII\Repositories\Category;
use Auth;
use Carbon\Carbon;
use DB;
use FireflyIII\Models\Category;
@ -108,12 +107,12 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
{
/** @var Collection $query */
$query = $category->transactionJournals()
->transactionTypes([TransactionType::DEPOSIT])
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '>', 0)
->before($end)
->after($start)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
->transactionTypes([TransactionType::DEPOSIT])
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '>', 0)
->before($end)
->after($start)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
$return = [];
foreach ($query->toArray() as $entry) {
@ -244,12 +243,12 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
{
/** @var Collection $query */
$query = $category->transactionJournals()
->transactionTypes([TransactionType::WITHDRAWAL])
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '<', 0)
->before($end)
->after($start)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
->transactionTypes([TransactionType::WITHDRAWAL])
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '<', 0)
->before($end)
->after($start)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
$return = [];
foreach ($query->toArray() as $entry) {

1
app/Repositories/Shared/ComponentRepository.php
View File

@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\Shared;
use Carbon\Carbon;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionType;
use FireflyIII\Support\CacheProperties;
use Illuminate\Support\Collection;

2
app/Sql/Query.php
View File

@ -11,7 +11,7 @@ namespace FireflyIII\Sql;
*/
class Query
{
const SPENT = 1;
const SPENT = 1;
const EARNED = 2;
}