mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-18 10:16:49 +00:00
Various code cleanup [skip ci]
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace FireflyIII\Helpers\Attachments;
|
namespace FireflyIII\Helpers\Attachments;
|
||||||
|
|
||||||
use FireflyIII\Models\Attachment;
|
use FireflyIII\Models\Attachment;
|
||||||
|
@@ -10,6 +10,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace FireflyIII\Helpers\Help;
|
namespace FireflyIII\Helpers\Help;
|
||||||
|
|
||||||
use Cache;
|
use Cache;
|
||||||
@@ -123,6 +124,7 @@ class Help implements HelpInterface
|
|||||||
if (strlen($content) > 0) {
|
if (strlen($content) > 0) {
|
||||||
Log::debug(sprintf('Will store entry in cache: %s', $key));
|
Log::debug(sprintf('Will store entry in cache: %s', $key));
|
||||||
Cache::put($key, $content, 10080); // a week.
|
Cache::put($key, $content, 10080); // a week.
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log::info(sprintf('Will not cache %s because content is empty.', $key));
|
Log::info(sprintf('Will not cache %s because content is empty.', $key));
|
||||||
|
@@ -410,6 +410,7 @@ class ImportController extends Controller
|
|||||||
}
|
}
|
||||||
// @codeCoverageIgnoreEnd
|
// @codeCoverageIgnoreEnd
|
||||||
}
|
}
|
||||||
|
|
||||||
return redirect(route('import.configure', [$job->key]));
|
return redirect(route('import.configure', [$job->key]));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -429,6 +430,7 @@ class ImportController extends Controller
|
|||||||
case 'settings':
|
case 'settings':
|
||||||
case 'store-settings':
|
case 'store-settings':
|
||||||
Log::debug(sprintf('Job %d with key %s has status %s', $job->id, $job->key, $job->status));
|
Log::debug(sprintf('Job %d with key %s has status %s', $job->id, $job->key, $job->status));
|
||||||
|
|
||||||
return $job->status === 'import_configuration_saved';
|
return $job->status === 'import_configuration_saved';
|
||||||
case 'finished':
|
case 'finished':
|
||||||
return $job->status === 'import_complete';
|
return $job->status === 'import_complete';
|
||||||
|
@@ -18,7 +18,6 @@ use FireflyIII\Models\AccountType;
|
|||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use FireflyIII\Repositories\User\UserRepositoryInterface;
|
use FireflyIII\Repositories\User\UserRepositoryInterface;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Log;
|
|
||||||
use PragmaRX\Google2FA\Contracts\Google2FA;
|
use PragmaRX\Google2FA\Contracts\Google2FA;
|
||||||
use Preferences;
|
use Preferences;
|
||||||
use Session;
|
use Session;
|
||||||
|
@@ -14,7 +14,6 @@ declare(strict_types = 1);
|
|||||||
namespace FireflyIII\Http\Controllers;
|
namespace FireflyIII\Http\Controllers;
|
||||||
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
|
||||||
use FireflyIII\Generator\Report\ReportGeneratorFactory;
|
use FireflyIII\Generator\Report\ReportGeneratorFactory;
|
||||||
use FireflyIII\Helpers\Report\ReportHelperInterface;
|
use FireflyIII\Helpers\Report\ReportHelperInterface;
|
||||||
use FireflyIII\Http\Requests\ReportFormRequest;
|
use FireflyIII\Http\Requests\ReportFormRequest;
|
||||||
|
@@ -79,7 +79,8 @@ Breadcrumbs::register(
|
|||||||
}
|
}
|
||||||
// when is specific period:
|
// when is specific period:
|
||||||
if (strlen($moment) > 0 && $moment !== 'all') {
|
if (strlen($moment) > 0 && $moment !== 'all') {
|
||||||
$title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
|
$title = trans(
|
||||||
|
'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
|
||||||
'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]
|
'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]
|
||||||
);
|
);
|
||||||
$breadcrumbs->push($title, route('accounts.show', [$account->id, $moment]));
|
$breadcrumbs->push($title, route('accounts.show', [$account->id, $moment]));
|
||||||
@@ -333,7 +334,8 @@ Breadcrumbs::register(
|
|||||||
}
|
}
|
||||||
// when is specific period:
|
// when is specific period:
|
||||||
if (strlen($moment) > 0 && $moment !== 'all') {
|
if (strlen($moment) > 0 && $moment !== 'all') {
|
||||||
$title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
|
$title = trans(
|
||||||
|
'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
|
||||||
'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]
|
'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]
|
||||||
);
|
);
|
||||||
$breadcrumbs->push($title, route('categories.show', [$category->id, $moment]));
|
$breadcrumbs->push($title, route('categories.show', [$category->id, $moment]));
|
||||||
@@ -742,7 +744,8 @@ Breadcrumbs::register(
|
|||||||
|
|
||||||
// when is specific period:
|
// when is specific period:
|
||||||
if (strlen($moment) > 0 && $moment !== 'all') {
|
if (strlen($moment) > 0 && $moment !== 'all') {
|
||||||
$title = trans('firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
|
$title = trans(
|
||||||
|
'firefly.between_dates_breadcrumb', ['start' => $start->formatLocalized(strval(trans('config.month_and_day'))),
|
||||||
'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]
|
'end' => $end->formatLocalized(strval(trans('config.month_and_day')))]
|
||||||
);
|
);
|
||||||
$breadcrumbs->push($title, route('transactions.index', [$what, $moment]));
|
$breadcrumbs->push($title, route('transactions.index', [$what, $moment]));
|
||||||
|
@@ -48,6 +48,7 @@ class AccountType extends Model
|
|||||||
protected $dates = ['created_at', 'updated_at'];
|
protected $dates = ['created_at', 'updated_at'];
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return HasMany
|
* @return HasMany
|
||||||
*/
|
*/
|
||||||
|
@@ -13,10 +13,10 @@ declare(strict_types = 1);
|
|||||||
|
|
||||||
namespace FireflyIII\Models;
|
namespace FireflyIII\Models;
|
||||||
|
|
||||||
|
use Crypt;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use Illuminate\Contracts\Encryption\DecryptException;
|
use Illuminate\Contracts\Encryption\DecryptException;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Crypt;
|
|
||||||
use Log;
|
use Log;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -39,11 +39,13 @@ class JournalList implements BinderInterface
|
|||||||
$object = TransactionJournal::whereIn('transaction_journals.id', $ids)
|
$object = TransactionJournal::whereIn('transaction_journals.id', $ids)
|
||||||
->expanded()
|
->expanded()
|
||||||
->where('transaction_journals.user_id', auth()->user()->id)
|
->where('transaction_journals.user_id', auth()->user()->id)
|
||||||
->get([
|
->get(
|
||||||
|
[
|
||||||
'transaction_journals.*',
|
'transaction_journals.*',
|
||||||
'transaction_types.type AS transaction_type_type',
|
'transaction_types.type AS transaction_type_type',
|
||||||
'transaction_currencies.code AS transaction_currency_code',
|
'transaction_currencies.code AS transaction_currency_code',
|
||||||
]);
|
]
|
||||||
|
);
|
||||||
|
|
||||||
if ($object->count() > 0) {
|
if ($object->count() > 0) {
|
||||||
return $object;
|
return $object;
|
||||||
|
@@ -15,10 +15,8 @@ namespace FireflyIII\Support\Models;
|
|||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use FireflyIII\Models\Transaction;
|
use FireflyIII\Models\Transaction;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
|
||||||
use FireflyIII\Support\CacheProperties;
|
use FireflyIII\Support\CacheProperties;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -29,7 +29,6 @@ use Google2FA;
|
|||||||
use Illuminate\Contracts\Encryption\DecryptException;
|
use Illuminate\Contracts\Encryption\DecryptException;
|
||||||
use Illuminate\Contracts\Translation\Translator;
|
use Illuminate\Contracts\Translation\Translator;
|
||||||
use Illuminate\Validation\Validator;
|
use Illuminate\Validation\Validator;
|
||||||
use Log;
|
|
||||||
use Session;
|
use Session;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user