kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 11:19:16 +00:00
Code Issues Projects Releases Wiki Activity

File reformatting.

Browse Source
This commit is contained in:
James Cole
2015-12-18 16:38:50 +01:00
parent 813fb679a7
commit ac61dfae6b
24 changed files with 149 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Generator/Chart/Budget/BudgetChartGenerator.php
View File

@@ -18,13 +18,6 @@ interface BudgetChartGenerator
*/
public function budget(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
/**
* @param Collection $entries
*
@@ -39,6 +32,13 @@ interface BudgetChartGenerator
*/
public function frontpage(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
/**
* @param Collection $budgets
* @param Collection $entries

19
app/Generator/Chart/Category/CategoryChartGenerator.php
View File

@@ -20,11 +20,12 @@ interface CategoryChartGenerator
public function all(Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function multiYear(Collection $entries);
public function earnedInYear(Collection $categories, Collection $entries);
/**
* @param Collection $entries
@@ -38,8 +39,14 @@ interface CategoryChartGenerator
*
* @return array
*/
public function period(Collection $entries);
public function multiYear(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function period(Collection $entries);
/**
* @param Collection $categories
@@ -48,12 +55,4 @@ interface CategoryChartGenerator
* @return array
*/
public function spentInYear(Collection $categories, Collection $entries);
/**
* @param Collection $categories
* @param Collection $entries
*
* @return array
*/
public function earnedInYear(Collection $categories, Collection $entries);
}

8
app/Generator/Chart/Report/ChartJsReportChartGenerator.php
View File

@@ -107,9 +107,9 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
],
];
$data['datasets'][0]['data'][] = round($income, 2);
$data['datasets'][1]['data'][] = round( $expense, 2);
$data['datasets'][1]['data'][] = round($expense, 2);
$data['datasets'][0]['data'][] = round(($income / $count), 2);
$data['datasets'][1]['data'][] = round(( $expense / $count), 2);
$data['datasets'][1]['data'][] = round(($expense / $count), 2);
return $data;
}
@@ -138,9 +138,9 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
],
];
$data['datasets'][0]['data'][] = round($income, 2);
$data['datasets'][1]['data'][] = round( $expense, 2);
$data['datasets'][1]['data'][] = round($expense, 2);
$data['datasets'][0]['data'][] = round(($income / $count), 2);
$data['datasets'][1]['data'][] = round(( $expense / $count), 2);
$data['datasets'][1]['data'][] = round(($expense / $count), 2);
return $data;
}

32
app/Generator/Chart/Report/ReportChartGenerator.php
View File

@@ -16,25 +16,9 @@ interface ReportChartGenerator
* @param Collection $entries
*
* @return array
*/
public function yearInOut(Collection $entries);
/**
* @param Collection $entries
*
* @return array
*/
public function multiYearInOut(Collection $entries);
/**
* @param string $income
* @param string $expense
* @param int $count
*
* @return array
*/
public function yearInOutSummarized($income, $expense, $count);
/**
* @param string $income
* @param string $expense
@@ -44,4 +28,20 @@ interface ReportChartGenerator
*/
public function multiYearInOutSummarized($income, $expense, $count);
/**
* @param Collection $entries
*
* @return array
*/
public function yearInOut(Collection $entries);
/**
* @param string $income
* @param string $expense
* @param int $count
*
* @return array
*/
public function yearInOutSummarized($income, $expense, $count);
}

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

@@ -134,7 +134,7 @@ class ReportQuery implements ReportQueryInterface
$query->orWhere(
function (Builder $q) use ($ids) {
$q->where('transaction_types.type', TransactionType::TRANSFER);
$q->whereNotIn('ac_from.id',$ids);
$q->whereNotIn('ac_from.id', $ids);
$q->whereIn('ac_to.id', $ids);
}
);

9
app/Http/Controllers/Auth/AuthController.php
View File

@@ -214,15 +214,17 @@ class AuthController extends Controller
/**
* @return array
*/
protected function getBlockedDomains() {
protected function getBlockedDomains()
{
$set = Config::get('mail.blocked_domains');
$domains = [];
foreach($set as $entry) {
foreach ($set as $entry) {
$domain = trim($entry);
if(strlen($domain) > 0) {
if (strlen($domain) > 0) {
$domains[] = $domain;
}
}
return $domains;
}
@@ -234,6 +236,7 @@ class AuthController extends Controller
if (isset($parts[1]) && in_array($parts[1], $blocked)) {
return true;
}
return false;
}

12
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -1,13 +1,12 @@
<?php namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
use FireflyIII\User;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Mail\Message;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class PasswordController
*
@@ -50,6 +49,7 @@ class PasswordController extends Controller
* Send a reset link to the given user.
*
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function postEmail(Request $request)
@@ -61,9 +61,11 @@ class PasswordController extends Controller
if (!is_null($user) && intval($user->blocked) === 1) {
$response = 'passwords.blocked';
} else {
$response = Password::sendResetLink($request->only('email'), function (Message $message) {
$response = Password::sendResetLink(
$request->only('email'), function (Message $message) {
$message->subject($this->getEmailSubject());
});
}
);
}
switch ($response) {

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

@@ -147,7 +147,7 @@ class CurrencyController extends Controller
public function index(CurrencyRepositoryInterface $repository)
{
$currencies = $repository->get();
$defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', env('DEFAULT_CURRENCY','EUR')));
$defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR')));
if (!Auth::user()->hasRole('owner')) {

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

@@ -50,13 +50,13 @@ class ReportController extends Controller
// get id's for quick links:
$accountIds = [];
/** @var Account $account */
foreach($accounts as $account) {
foreach ($accounts as $account) {
$accountIds [] = $account->id;
}
$accountList = join(',',$accountIds);
$accountList = join(',', $accountIds);
return view('reports.index', compact('months', 'accounts', 'start','accountList'));
return view('reports.index', compact('months', 'accounts', 'start', 'accountList'));
}
/**

4
app/Http/Middleware/Authenticate.php
View File

@@ -1,13 +1,14 @@
<?php namespace FireflyIII\Http\Middleware;
use App;
use Auth;
use Carbon\Carbon;
use Closure;
use Config;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Preferences;
use Auth;
/**
* Class Authenticate
*
@@ -55,6 +56,7 @@ class Authenticate
if (intval($this->auth->user()->blocked) == 1) {
Auth::logout();
return redirect()->route('index');
}

36
app/Models/TransactionType.php
View File

@@ -36,22 +36,6 @@ class TransactionType extends Model
return ['created_at', 'updated_at', 'deleted_at'];
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function transactionJournals()
{
return $this->hasMany('FireflyIII\Models\TransactionJournal');
}
/**
* @return bool
*/
public function isWithdrawal()
{
return $this->type === TransactionType::WITHDRAWAL;
}
/**
* @return bool
*/
@@ -60,6 +44,14 @@ class TransactionType extends Model
return $this->type === TransactionType::DEPOSIT;
}
/**
* @return bool
*/
public function isOpeningBalance()
{
return $this->type === TransactionType::OPENING_BALANCE;
}
/**
* @return bool
*/
@@ -71,8 +63,16 @@ class TransactionType extends Model
/**
* @return bool
*/
public function isOpeningBalance()
public function isWithdrawal()
{
return $this->type === TransactionType::OPENING_BALANCE;
return $this->type === TransactionType::WITHDRAWAL;
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function transactionJournals()
{
return $this->hasMany('FireflyIII\Models\TransactionJournal');
}
}

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

@@ -14,7 +14,6 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Input;
use Log;
/**
* Class BudgetRepository

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

@@ -478,6 +478,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
->transactionTypes([TransactionType::WITHDRAWAL])
->get(['transaction_journals.*'])
->sum('amount');
return $sum;
}
@@ -508,6 +509,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
->after($start)
->get(['transaction_journals.*'])
->sum('amount');
return $sum;
}

4
app/Repositories/Tag/TagRepository.php
View File

@@ -77,7 +77,9 @@ class TagRepository implements TagRepositoryInterface
/** @var Tag $tag */
foreach ($tags as $tag) {
$journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(['transaction_journals.*']);
$journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(
['transaction_journals.*']
);
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {

8
app/Support/Amount.php
View File

@@ -40,7 +40,7 @@ class Amount
if ($cache->has()) {
return $cache->get();
} else {
$currencyPreference = Prefs::get('currencyPreference', env('DEFAULT_CURRENCY','EUR'));
$currencyPreference = Prefs::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR'));
$currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
$cache->store($currency->symbol);
@@ -152,7 +152,7 @@ class Amount
if ($cache->has()) {
return $cache->get();
} else {
$currencyPreference = Prefs::get('currencyPreference', env('DEFAULT_CURRENCY','EUR'));
$currencyPreference = Prefs::get('currencyPreference', env('DEFAULT_CURRENCY', 'EUR'));
$currency = TransactionCurrency::whereCode($currencyPreference->data)->first();
if ($currency) {
@@ -161,9 +161,9 @@ class Amount
return $currency->code;
}
$cache->store(env('DEFAULT_CURRENCY','EUR'));
$cache->store(env('DEFAULT_CURRENCY', 'EUR'));
return env('DEFAULT_CURRENCY','EUR'); // @codeCoverageIgnore
return env('DEFAULT_CURRENCY', 'EUR'); // @codeCoverageIgnore
}
}