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

Fix some reported issues.

Browse Source
This commit is contained in:
James Cole 2016-10-22 09:44:47 +02:00
parent 5d9b68c3e7
commit 091f6e918b
5 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Admin/UserController.php
View File

@ -92,16 +92,16 @@ class UserController extends Controller
$subTitleIcon = 'fa-user'; $subTitleIcon = 'fa-user';
// get IP info: // get IP info:
$defaultIp = '0.0.0.0'; $defaultIp = '0.0.0.0';
$registrationPreference = Preferences::getForUser($user, 'registration_ip_address'); $regPref = Preferences::getForUser($user, 'registration_ip_address');
$registration = $defaultIp; $registration = $defaultIp;
$confirmationPreference = Preferences::getForUser($user, 'confirmation_ip_address'); $conPref = Preferences::getForUser($user, 'confirmation_ip_address');
$confirmation = $defaultIp; $confirmation = $defaultIp;
if (!is_null($registrationPreference)) { if (!is_null($regPref)) {
$registration = $registrationPreference->data; $registration = $regPref->data;
} }
if (!is_null($confirmationPreference)) { if (!is_null($conPref)) {
$confirmation = $confirmationPreference->data; $confirmation = $conPref->data;
} }
$registrationHost = ''; $registrationHost = '';

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

@ -153,8 +153,6 @@ class ReportController extends Controller
*/ */
private function auditReport(Carbon $start, Carbon $end, Collection $accounts) private function auditReport(Carbon $start, Carbon $end, Collection $accounts)
{ {
/** @var ARI $repos */
$repos = app(ARI::class);
/** @var AccountTaskerInterface $tasker */ /** @var AccountTaskerInterface $tasker */
$tasker = app(AccountTaskerInterface::class); $tasker = app(AccountTaskerInterface::class);
$auditData = []; $auditData = [];

15
app/Http/Controllers/Transaction/SplitController.php
View File

@ -43,18 +43,18 @@ class SplitController extends Controller
/** @var AccountRepositoryInterface */ /** @var AccountRepositoryInterface */
private $accounts; private $accounts;
/** @var AttachmentHelperInterface */ /** @var AttachmentHelperInterface */
private $attachments; private $attachments;
/** @var BudgetRepositoryInterface */ /** @var BudgetRepositoryInterface */
private $budgets; private $budgets;
/** @var CurrencyRepositoryInterface */ /** @var CurrencyRepositoryInterface */
private $currencies; private $currencies;
/** @var JournalTaskerInterface */ /** @var JournalTaskerInterface */
private $tasker; private $tasker;
//
// /** @var PiggyBankRepositoryInterface */
// private $piggyBanks;
/** /**
* *
@ -68,10 +68,9 @@ class SplitController extends Controller
// some useful repositories: // some useful repositories:
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
$this->accounts = app(AccountRepositoryInterface::class); $this->accounts = app(AccountRepositoryInterface::class);
$this->budgets = app(BudgetRepositoryInterface::class); $this->budgets = app(BudgetRepositoryInterface::class);
$this->tasker = app(JournalTaskerInterface::class); $this->tasker = app(JournalTaskerInterface::class);
// $this->piggyBanks = app(PiggyBankRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class); $this->attachments = app(AttachmentHelperInterface::class);
$this->currencies = app(CurrencyRepositoryInterface::class); $this->currencies = app(CurrencyRepositoryInterface::class);
@ -157,7 +156,7 @@ class SplitController extends Controller
} }
/** /**
* @param Request $request * @param Request $request
* *
* @return array * @return array
*/ */

2
app/Http/breadcrumbs.php
View File

@ -119,7 +119,7 @@ Breadcrumbs::register(
Breadcrumbs::register( Breadcrumbs::register(
'admin.users.show', function (BreadCrumbGenerator $breadcrumbs, User $user) { 'admin.users.show', function (BreadCrumbGenerator $breadcrumbs, User $user) {
$breadcrumbs->parent('admin.users'); $breadcrumbs->parent('admin.users');
$breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', $user->id)); $breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id]));
} }
); );

6
app/Repositories/Bill/BillRepository.php
View File

@ -372,7 +372,7 @@ class BillRepository implements BillRepositoryInterface
$nextExpectedMatch = $this->nextDateMatch($bill, $currentStart); $nextExpectedMatch = $this->nextDateMatch($bill, $currentStart);
Log::debug(sprintf('Next Date match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d'))); Log::debug(sprintf('Next Date match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
/* /*
* If $nextExpectedMatch is after $end, we continue: * If nextExpectedMatch is after end, we continue:
*/ */
if ($nextExpectedMatch > $end) { if ($nextExpectedMatch > $end) {
Log::debug( Log::debug(
@ -482,7 +482,7 @@ class BillRepository implements BillRepositoryInterface
$cache->addProperty('nextDateMatch'); $cache->addProperty('nextDateMatch');
$cache->addProperty($date); $cache->addProperty($date);
if ($cache->has()) { if ($cache->has()) {
//return $cache->get(); return $cache->get();
} }
// find the most recent date for this bill NOT in the future. Cache this date: // find the most recent date for this bill NOT in the future. Cache this date:
$start = clone $bill->date; $start = clone $bill->date;
@ -519,7 +519,7 @@ class BillRepository implements BillRepositoryInterface
$cache->addProperty('nextExpectedMatch'); $cache->addProperty('nextExpectedMatch');
$cache->addProperty($date); $cache->addProperty($date);
if ($cache->has()) { if ($cache->has()) {
//return $cache->get(); return $cache->get();
} }
// find the most recent date for this bill NOT in the future. Cache this date: // find the most recent date for this bill NOT in the future. Cache this date:
$start = clone $bill->date; $start = clone $bill->date;