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

Code cleanup.

Browse Source
This commit is contained in:
James Cole 2015-05-20 19:55:53 +02:00
parent 7645005d5a
commit b1d3158db1
19 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Collection/Balance.php
View File

@ -1,6 +1,7 @@
<?php
namespace FireflyIII\Helpers\Collection;
use Illuminate\Support\Collection;
/**
@ -60,6 +61,4 @@ class Balance
}
}

37
app/Helpers/Collection/BalanceEntry.php
View File

@ -17,14 +17,11 @@ class BalanceEntry
/** @var AccountModel */
protected $account;
/** @var float */
protected $left = 0.0;
/** @var float */
protected $spent = 0.0;
/** @var float */
protected $left = 0.0;
/**
* @return AccountModel
*/
@ -41,22 +38,6 @@ class BalanceEntry
$this->account = $account;
}
/**
* @return float
*/
public function getSpent()
{
return $this->spent;
}
/**
* @param float $spent
*/
public function setSpent($spent)
{
$this->spent = $spent;
}
/**
* @return float
*/
@ -73,7 +54,21 @@ class BalanceEntry
$this->left = $left;
}
/**
* @return float
*/
public function getSpent()
{
return $this->spent;
}
/**
* @param float $spent
*/
public function setSpent($spent)
{
$this->spent = $spent;
}
}

1
app/Helpers/Collection/BalanceHeader.php
View File

@ -43,5 +43,4 @@ class BalanceHeader
}
}

5
app/Helpers/Collection/Bill.php
View File

@ -43,8 +43,9 @@ class Bill
$this->bills->sortBy(
function (BillLine $bill) {
$active = intval($bill->getBill()->active) == 0 ? 1 : 0;
$name = $bill->getBill()->name;
return $active.$name;
$name = $bill->getBill()->name;
return $active . $name;
}
);

19
app/Helpers/Collection/Budget.php
View File

@ -1,6 +1,7 @@
<?php
namespace FireflyIII\Helpers\Collection;
use Illuminate\Support\Collection;
/**
@ -71,6 +72,14 @@ class Budget
$this->spent += floatval($add);
}
/**
* @return \Illuminate\Support\Collection
*/
public function getBudgetLines()
{
return $this->budgetLines;
}
/**
* @return float
*/
@ -135,15 +144,5 @@ class Budget
$this->spent = $spent;
}
/**
* @return \Illuminate\Support\Collection
*/
public function getBudgetLines()
{
return $this->budgetLines;
}
}

10
app/Helpers/Collection/BudgetLine.php
View File

@ -22,13 +22,13 @@ class BudgetLine
protected $repetition;
/** @var float */
protected $budgeted = 0;
protected $budgeted = 0;
/** @var float */
protected $left = 0;
protected $left = 0;
/** @var float */
protected $overspent = 0;
/** @var float */
protected $spent = 0;
protected $spent = 0;
/**
* @return BudgetModel
@ -127,8 +127,4 @@ class BudgetLine
}
}

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

@ -113,7 +113,9 @@ class ReportQuery implements ReportQueryInterface
$query->orderBy('transaction_journals.date');
// get everything
$data = $query->get(['transaction_journals.*', 'transaction_types.type', 'ac_to.name as name','ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']);
$data = $query->get(
['transaction_journals.*', 'transaction_types.type', 'ac_to.name as name', 'ac_to.id as account_id', 'ac_to.encrypted as account_encrypted']
);
$data->each(
function (TransactionJournal $journal) {
@ -285,7 +287,9 @@ class ReportQuery implements ReportQueryInterface
$query->orderBy('transaction_journals.date');
// get everything
$data = $query->get(['transaction_journals.*', 'transaction_types.type', 'ac_from.name as name','ac_from.id as account_id', 'ac_from.encrypted as account_encrypted']);
$data = $query->get(
['transaction_journals.*', 'transaction_types.type', 'ac_from.name as name', 'ac_from.id as account_id', 'ac_from.encrypted as account_encrypted']
);
$data->each(
function (TransactionJournal $journal) {

1
app/Http/Controllers/BillController.php
View File

@ -7,7 +7,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Input;
use Redirect;

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

@ -28,7 +28,7 @@ class BudgetController extends Controller
*/
public function budget(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget)
{
$chart->addColumn(trans('firefly.period'),'date');
$chart->addColumn(trans('firefly.period'), 'date');
$chart->addColumn(trans('firefly.spent'), 'number');
@ -50,6 +50,7 @@ class BudgetController extends Controller
}
$chart->generate();
return Response::json($chart->getData());
}

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

@ -4,7 +4,6 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use Crypt;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Models\LimitRepetition;
@ -82,8 +81,8 @@ class CategoryController extends Controller
foreach ($set as $entry) {
$sum = floatval($entry['sum']);
if($sum != 0) {
$chart->addRow($entry['name'], $sum);
if ($sum != 0) {
$chart->addRow($entry['name'], $sum);
}
}

6
app/Http/routes.php
View File

@ -188,7 +188,7 @@ Route::get('/register', ['uses' => 'Auth\AuthController@getRegister', 'as' => 'r
Route::controllers(
[
'auth' => 'Auth\AuthController',
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]
);
@ -276,7 +276,9 @@ Route::group(
*/
// accounts:
Route::get('/chart/account/frontpage', ['uses' => 'Chart\AccountController@frontpage']);
Route::get('/chart/account/month/{year}/{month}/{shared?}', ['uses' => 'Chart\AccountController@all'])->where(['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']);
Route::get('/chart/account/month/{year}/{month}/{shared?}', ['uses' => 'Chart\AccountController@all'])->where(
['year' => '[0-9]{4}', 'month' => '[0-9]{1,2}', 'shared' => 'shared']
);
Route::get('/chart/account/{account}', ['uses' => 'Chart\AccountController@single']);

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

@ -306,7 +306,7 @@ class AccountRepository implements AccountRepositoryInterface
/**
* @param Account $account
* @param Carbon $date
* @param Carbon $date
*
* @return float
*/

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

@ -115,7 +115,7 @@ interface AccountRepositoryInterface
/**
* @param Account $account
* @param Carbon $date
* @param Carbon $date
*
* @return float
*/

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

@ -417,6 +417,7 @@ class BudgetRepository implements BudgetRepositoryInterface
public function expensesOnDayCorrected(Budget $budget, Carbon $date)
{
$sum = floatval($budget->transactionjournals()->transactionTypes(['Withdrawal'])->onDate($date)->get(['transaction_journals.*'])->sum('amount'));
return $sum * -1;
}
}

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

@ -115,6 +115,7 @@ interface CategoryRepositoryInterface
/**
*
* Corrected for tags.
*
* @param Category $category
* @param Carbon $date
*

1
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@ -9,7 +9,6 @@ use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\PiggyBankRepetition;
use Illuminate\Support\Collection;
use Navigation;
/**
* Class PiggyBankRepository

3
app/Support/ExpandedForm.php
View File

@ -51,7 +51,8 @@ class ExpandedForm
if (isset($options['label'])) {
return $options['label'];
}
return trans('form.'.$name);
return trans('form.' . $name);
}

19
app/Support/Twig/Budget.php
View File

@ -41,15 +41,16 @@ class Budget extends Twig_Extension
$functions[] = new Twig_SimpleFunction(
'spentInRepetitionCorrected', function (LimitRepetition $repetition) {
$sum =
Auth::user()->transactionjournals()
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
->before($repetition->enddate)
->after($repetition->startdate)
->where('limit_repetitions.id', '=', $repetition->id)
->get(['transaction_journals.*'])->sum('amount');
$sum
= Auth::user()->transactionjournals()
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
->before($repetition->enddate)
->after($repetition->startdate)
->where('limit_repetitions.id', '=', $repetition->id)
->get(['transaction_journals.*'])->sum('amount');
return floatval($sum);
}
);

3
app/Support/Twig/Journal.php
View File

@ -85,6 +85,7 @@ class Journal extends Twig_Extension
// return tag formatted for a "balancing act", even if other
// tags are present.
$amount = App::make('amount')->formatJournal($journal, false);
return '<a href="' . route('tags.show', $tag->id) . '" class="label label-success" title="' . $amount
. '"><i class="fa fa-fw fa-refresh"></i> ' . $tag->tag . '</a>';
}
@ -94,6 +95,7 @@ class Journal extends Twig_Extension
*/
if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Deposit') {
$amount = App::make('amount')->formatJournal($journal, false);
return '<a href="' . route('tags.show', $tag->id) . '" class="label label-success" title="' . $amount
. '"><i class="fa fa-fw fa-sort-numeric-desc"></i> ' . $tag->tag . '</a>';
}
@ -103,6 +105,7 @@ class Journal extends Twig_Extension
*/
if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Withdrawal') {
$amount = App::make('amount')->formatJournal($journal);
return '<a href="' . route('tags.show', $tag->id) . '">' . $amount . '</a>';
}