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

Clean up some code.

Browse Source
This commit is contained in:
James Cole 2021-04-08 10:13:35 +02:00
parent a0c98c7d9f
commit 115639a004
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Helpers/Attachments/AttachmentHelper.php
View File

@ -42,16 +42,11 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
*/ */
class AttachmentHelper implements AttachmentHelperInterface class AttachmentHelper implements AttachmentHelperInterface
{ {
/** @var Collection All attachments */ public Collection $attachments;
public $attachments; public MessageBag $errors;
/** @var MessageBag All errors */ public MessageBag $messages;
public $errors; protected array $allowedMimes = [];
/** @var MessageBag All messages */ protected int $maxUploadSize = 0;
public $messages;
/** @var array Allowed mimes */
protected $allowedMimes = [];
/** @var int Max upload size. */
protected $maxUploadSize = 0;
/** @var Filesystem The disk where attachments are stored. */ /** @var Filesystem The disk where attachments are stored. */
protected $uploadDisk; protected $uploadDisk;

3
app/Http/Middleware/InterestingMessage.php
View File

@ -103,6 +103,9 @@ class InterestingMessage
if ('deleted' === $message) { if ('deleted' === $message) {
session()->flash('success', (string)trans('firefly.account_deleted', ['name' => $account->name])); session()->flash('success', (string)trans('firefly.account_deleted', ['name' => $account->name]));
} }
if('created' === $message) {
session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name]));
}
} }
/** /**
* @param Request $request * @param Request $request

13
config/firefly.php
View File

@ -123,14 +123,13 @@ return [
'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), 'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'), 'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
'custom_logout_uri' => envNonEmpty('CUSTOM_LOGOUT_URI', ''), 'custom_logout_uri' => envNonEmpty('CUSTOM_LOGOUT_URI', ''),
'cer_provider' => envNonEmpty('CER_PROVIDER', 'fixer'),
'ipinfo_token' => env('IPINFO_TOKEN', ''), 'ipinfo_token' => env('IPINFO_TOKEN', ''),
'update_endpoint' => 'https://version.firefly-iii.org/index.json', 'update_endpoint' => 'https://version.firefly-iii.org/index.json',
'send_telemetry' => env('SEND_TELEMETRY', false), 'send_telemetry' => env('SEND_TELEMETRY', false),
'allow_webhooks' => env('ALLOW_WEBHOOKS', false), 'allow_webhooks' => env('ALLOW_WEBHOOKS', false),
'telemetry_endpoint' => 'https://telemetry.firefly-iii.org', 'telemetry_endpoint' => 'https://telemetry.firefly-iii.org',
'layout' => envNonEmpty('FIREFLY_III_LAYOUT', 'v1'), 'layout' => envNonEmpty('FIREFLY_III_LAYOUT', 'v1'),
'update_minimum_age' => 6, 'update_minimum_age' => 7,
'default_location' => [ 'default_location' => [
'longitude' => env('MAP_DEFAULT_LONG', '5.916667'), 'longitude' => env('MAP_DEFAULT_LONG', '5.916667'),
'latitude' => env('MAP_DEFAULT_LAT', '51.983333'), 'latitude' => env('MAP_DEFAULT_LAT', '51.983333'),
@ -208,7 +207,7 @@ return [
'application/vnd.oasis.opendocument.database', 'application/vnd.oasis.opendocument.database',
'application/vnd.oasis.opendocument.image', 'application/vnd.oasis.opendocument.image',
], ],
'list_length' => 10, 'list_length' => 10, // to be removed if v1 is cancelled.
'bill_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'bill_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'interest_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'interest_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'accountRoles' => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset', 'cashWalletAsset'], 'accountRoles' => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset', 'cashWalletAsset'],
@ -333,14 +332,6 @@ return [
'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'], 'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'],
'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'], 'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'],
], ],
'transactionTypesByWhat' => [
'expenses' => ['Withdrawal'],
'withdrawal' => ['Withdrawal'],
'revenue' => ['Deposit'],
'deposit' => ['Deposit'],
'transfer' => ['Transfer'],
'transfers' => ['Transfer'],
],
'transactionTypesByType' => [ 'transactionTypesByType' => [
'expenses' => ['Withdrawal'], 'expenses' => ['Withdrawal'],
'withdrawal' => ['Withdrawal'], 'withdrawal' => ['Withdrawal'],