diff --git a/.github/lock.yml b/.github/lock.yml index 2c57deaab5..8935e94dc8 100644 --- a/.github/lock.yml +++ b/.github/lock.yml @@ -32,4 +32,4 @@ setLockReason: true # daysUntilLock: 30 # Repository to extend settings from -# _extends: repo \ No newline at end of file +# _extends: repo diff --git a/app/Helpers/Collector/Extensions/AccountCollection.php b/app/Helpers/Collector/Extensions/AccountCollection.php index 28906281bb..819a87c3a8 100644 --- a/app/Helpers/Collector/Extensions/AccountCollection.php +++ b/app/Helpers/Collector/Extensions/AccountCollection.php @@ -230,4 +230,4 @@ trait AccountCollection return $this; } -} \ No newline at end of file +} diff --git a/app/Helpers/Collector/Extensions/AmountCollection.php b/app/Helpers/Collector/Extensions/AmountCollection.php index 9eb4560c5e..719426bfcc 100644 --- a/app/Helpers/Collector/Extensions/AmountCollection.php +++ b/app/Helpers/Collector/Extensions/AmountCollection.php @@ -84,4 +84,4 @@ trait AmountCollection return $this; } -} \ No newline at end of file +} diff --git a/app/Helpers/Collector/Extensions/CollectorProperties.php b/app/Helpers/Collector/Extensions/CollectorProperties.php index cfb23f656e..ae05ce6338 100644 --- a/app/Helpers/Collector/Extensions/CollectorProperties.php +++ b/app/Helpers/Collector/Extensions/CollectorProperties.php @@ -56,4 +56,4 @@ trait CollectorProperties private $total; /** @var User The user object. */ private $user; -} \ No newline at end of file +} diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php index ef3df3b6ac..0f92abbbaf 100644 --- a/app/Helpers/Collector/Extensions/MetaCollection.php +++ b/app/Helpers/Collector/Extensions/MetaCollection.php @@ -288,4 +288,4 @@ trait MetaCollection } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php index bcdf5e9376..48abeb9f79 100644 --- a/app/Http/Controllers/Json/BudgetController.php +++ b/app/Http/Controllers/Json/BudgetController.php @@ -108,4 +108,4 @@ class BudgetController extends Controller ); } -} \ No newline at end of file +} diff --git a/app/Models/Telemetry.php b/app/Models/Telemetry.php index 521f4e18c1..b45593cd94 100644 --- a/app/Models/Telemetry.php +++ b/app/Models/Telemetry.php @@ -72,4 +72,4 @@ class Telemetry extends Model 'value' => 'array', ]; -} \ No newline at end of file +} diff --git a/app/Repositories/Account/OperationsRepository.php b/app/Repositories/Account/OperationsRepository.php index 7bedce6638..b7458808fa 100644 --- a/app/Repositories/Account/OperationsRepository.php +++ b/app/Repositories/Account/OperationsRepository.php @@ -198,4 +198,4 @@ class OperationsRepository implements OperationsRepositoryInterface { throw new FireflyException(sprintf('%s is not yet implemented', __METHOD__)); } -} \ No newline at end of file +} diff --git a/app/Repositories/Account/OperationsRepositoryInterface.php b/app/Repositories/Account/OperationsRepositoryInterface.php index 001151b4c2..04a5c214f9 100644 --- a/app/Repositories/Account/OperationsRepositoryInterface.php +++ b/app/Repositories/Account/OperationsRepositoryInterface.php @@ -84,4 +84,4 @@ interface OperationsRepositoryInterface * @return array */ public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index c8602e290d..127df8f18b 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -302,4 +302,4 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface ->where('start_date', $start->format('Y-m-d 00:00:00')) ->where('end_date', $end->format('Y-m-d 00:00:00'))->first(); } -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 4d930241a6..d631233669 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -154,4 +154,4 @@ interface AvailableBudgetRepositoryInterface */ public function updateAvailableBudget(AvailableBudget $availableBudget, array $data): AvailableBudget; -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index 127f1a6a5f..b725c943b8 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/app/Repositories/Budget/BudgetLimitRepository.php @@ -463,4 +463,4 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface $budget->budgetlimits()->delete(); } } -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php index c7c5c2ee33..c9813fe39a 100644 --- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php @@ -146,4 +146,4 @@ interface BudgetLimitRepositoryInterface */ public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit; -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/NoBudgetRepository.php b/app/Repositories/Budget/NoBudgetRepository.php index 70e871170b..8e22217ff2 100644 --- a/app/Repositories/Budget/NoBudgetRepository.php +++ b/app/Repositories/Budget/NoBudgetRepository.php @@ -200,4 +200,4 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface return $array; } -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.php index c23124caaa..ca58eebfef 100644 --- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php @@ -70,4 +70,4 @@ interface NoBudgetRepositoryInterface */ public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array; -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index 8e6c65b25f..c41cc732be 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/app/Repositories/Budget/OperationsRepository.php @@ -433,4 +433,4 @@ class OperationsRepository implements OperationsRepositoryInterface return $repos->getActiveBudgets(); } -} \ No newline at end of file +} diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index 8786c29f66..458a640d48 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -123,4 +123,4 @@ interface OperationsRepositoryInterface */ public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array; -} \ No newline at end of file +} diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index 9243e01f30..b8581a2df8 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/app/Repositories/Category/NoCategoryRepository.php @@ -240,4 +240,4 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface return $array; } -} \ No newline at end of file +} diff --git a/app/Repositories/Category/NoCategoryRepositoryInterface.php b/app/Repositories/Category/NoCategoryRepositoryInterface.php index d5cff14f6d..dd82a6aa2c 100644 --- a/app/Repositories/Category/NoCategoryRepositoryInterface.php +++ b/app/Repositories/Category/NoCategoryRepositoryInterface.php @@ -88,4 +88,4 @@ interface NoCategoryRepositoryInterface public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; -} \ No newline at end of file +} diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index 8c76d46c18..4bef77b518 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/app/Repositories/Category/OperationsRepository.php @@ -317,4 +317,4 @@ class OperationsRepository implements OperationsRepositoryInterface return $set; } -} \ No newline at end of file +} diff --git a/app/Repositories/Category/OperationsRepositoryInterface.php b/app/Repositories/Category/OperationsRepositoryInterface.php index e03697319b..f2fa4b4e5d 100644 --- a/app/Repositories/Category/OperationsRepositoryInterface.php +++ b/app/Repositories/Category/OperationsRepositoryInterface.php @@ -89,4 +89,4 @@ interface OperationsRepositoryInterface * @return array */ public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $categories = null): array; -} \ No newline at end of file +} diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index d9d26bca89..f0ac3bab99 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -251,4 +251,4 @@ class OperationsRepository implements OperationsRepositoryInterface return $repository->get(); } -} \ No newline at end of file +} diff --git a/app/Repositories/Tag/OperationsRepositoryInterface.php b/app/Repositories/Tag/OperationsRepositoryInterface.php index 496f985453..bb254c841b 100644 --- a/app/Repositories/Tag/OperationsRepositoryInterface.php +++ b/app/Repositories/Tag/OperationsRepositoryInterface.php @@ -90,4 +90,4 @@ interface OperationsRepositoryInterface * @return array */ public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array; -} \ No newline at end of file +} diff --git a/app/Repositories/Telemetry/TelemetryRepository.php b/app/Repositories/Telemetry/TelemetryRepository.php index bae61595d5..fc7f84bece 100644 --- a/app/Repositories/Telemetry/TelemetryRepository.php +++ b/app/Repositories/Telemetry/TelemetryRepository.php @@ -64,4 +64,4 @@ class TelemetryRepository implements TelemetryRepositoryInterface // created_at is never NULL. Telemetry::whereNotNull('submitted')->delete(); } -} \ No newline at end of file +} diff --git a/app/Repositories/Telemetry/TelemetryRepositoryInterface.php b/app/Repositories/Telemetry/TelemetryRepositoryInterface.php index 16f5dc749b..e4dc3d3dfd 100644 --- a/app/Repositories/Telemetry/TelemetryRepositoryInterface.php +++ b/app/Repositories/Telemetry/TelemetryRepositoryInterface.php @@ -56,4 +56,4 @@ interface TelemetryRepositoryInterface */ public function deleteSubmitted(): void; -} \ No newline at end of file +} diff --git a/app/Rules/IsTransferAccount.php b/app/Rules/IsTransferAccount.php index 851d04e234..d6d0620629 100644 --- a/app/Rules/IsTransferAccount.php +++ b/app/Rules/IsTransferAccount.php @@ -71,4 +71,4 @@ class IsTransferAccount implements Rule return !(false === $validAccount); } -} \ No newline at end of file +} diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php index 2242f9a36a..a428007d2c 100644 --- a/app/Services/FireflyIIIOrg/Update/UpdateRequest.php +++ b/app/Services/FireflyIIIOrg/Update/UpdateRequest.php @@ -217,4 +217,4 @@ class UpdateRequest implements UpdateRequestInterface return $return; } -} \ No newline at end of file +} diff --git a/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php b/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php index 6f7f7eb095..410dee0225 100644 --- a/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php +++ b/app/Services/FireflyIIIOrg/Update/UpdateRequestInterface.php @@ -36,4 +36,4 @@ interface UpdateRequestInterface */ public function getUpdateInformation(string $channel): array; -} \ No newline at end of file +} diff --git a/app/Services/Internal/Support/LocationServiceTrait.php b/app/Services/Internal/Support/LocationServiceTrait.php index 5d8ffb21be..0cdaa0a21f 100644 --- a/app/Services/Internal/Support/LocationServiceTrait.php +++ b/app/Services/Internal/Support/LocationServiceTrait.php @@ -53,4 +53,4 @@ trait LocationServiceTrait return null; } -} \ No newline at end of file +} diff --git a/app/Support/Chart/Category/FrontpageChartGenerator.php b/app/Support/Chart/Category/FrontpageChartGenerator.php index 0e0a25631a..7a20ece942 100644 --- a/app/Support/Chart/Category/FrontpageChartGenerator.php +++ b/app/Support/Chart/Category/FrontpageChartGenerator.php @@ -264,4 +264,4 @@ class FrontpageChartGenerator return $currencyData; } -} \ No newline at end of file +} diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.php index c4c72827b5..60cce35976 100644 --- a/app/Support/Cronjobs/AutoBudgetCronjob.php +++ b/app/Support/Cronjobs/AutoBudgetCronjob.php @@ -86,4 +86,4 @@ class AutoBudgetCronjob extends AbstractCronjob app('fireflyconfig')->set('last_ab_job', (int)$this->date->format('U')); Log::info('Done with auto budget cron job task.'); } -} \ No newline at end of file +} diff --git a/app/Support/Search/AccountSearch.php b/app/Support/Search/AccountSearch.php index 9eb9aeef64..6badb4291c 100644 --- a/app/Support/Search/AccountSearch.php +++ b/app/Support/Search/AccountSearch.php @@ -143,4 +143,4 @@ class AccountSearch implements GenericSearchInterface $this->user = $user; } -} \ No newline at end of file +} diff --git a/app/Support/Search/GenericSearchInterface.php b/app/Support/Search/GenericSearchInterface.php index 1ca809d1ca..016b1f6820 100644 --- a/app/Support/Search/GenericSearchInterface.php +++ b/app/Support/Search/GenericSearchInterface.php @@ -35,4 +35,4 @@ interface GenericSearchInterface */ public function search(): Collection; -} \ No newline at end of file +} diff --git a/app/Support/Search/TransactionSearch.php b/app/Support/Search/TransactionSearch.php index 45080812d5..7f7aedf8c8 100644 --- a/app/Support/Search/TransactionSearch.php +++ b/app/Support/Search/TransactionSearch.php @@ -37,4 +37,4 @@ class TransactionSearch implements GenericSearchInterface { // TODO: Implement search() method. } -} \ No newline at end of file +} diff --git a/app/Support/Search/TransferSearch.php b/app/Support/Search/TransferSearch.php index aff435b65a..722da14ab6 100644 --- a/app/Support/Search/TransferSearch.php +++ b/app/Support/Search/TransferSearch.php @@ -145,4 +145,4 @@ class TransferSearch implements GenericSearchInterface $this->source = $this->accountRepository->findByName($source, $this->types); } } -} \ No newline at end of file +} diff --git a/app/Support/System/OAuthKeys.php b/app/Support/System/OAuthKeys.php index fc6df6b40c..ee46cf8569 100644 --- a/app/Support/System/OAuthKeys.php +++ b/app/Support/System/OAuthKeys.php @@ -109,4 +109,4 @@ class OAuthKeys } } -} \ No newline at end of file +} diff --git a/app/Validation/Account/AccountValidatorProperties.php b/app/Validation/Account/AccountValidatorProperties.php index 1bb98af1f0..12f10bc209 100644 --- a/app/Validation/Account/AccountValidatorProperties.php +++ b/app/Validation/Account/AccountValidatorProperties.php @@ -49,4 +49,4 @@ trait AccountValidatorProperties private $transactionType; /** @var User */ private $user; -} \ No newline at end of file +} diff --git a/app/Validation/Account/DepositValidation.php b/app/Validation/Account/DepositValidation.php index b7ae9f397b..1894775386 100644 --- a/app/Validation/Account/DepositValidation.php +++ b/app/Validation/Account/DepositValidation.php @@ -139,4 +139,4 @@ trait DepositValidation // don't expect to end up here: return $result; } -} \ No newline at end of file +} diff --git a/app/Validation/Account/OBValidation.php b/app/Validation/Account/OBValidation.php index 0399592c6d..b3fa427e6d 100644 --- a/app/Validation/Account/OBValidation.php +++ b/app/Validation/Account/OBValidation.php @@ -145,4 +145,4 @@ trait OBValidation return $result; } -} \ No newline at end of file +} diff --git a/app/Validation/Account/ReconciliationValidation.php b/app/Validation/Account/ReconciliationValidation.php index 8bbf48e4b2..cd002e2a6d 100644 --- a/app/Validation/Account/ReconciliationValidation.php +++ b/app/Validation/Account/ReconciliationValidation.php @@ -104,4 +104,4 @@ trait ReconciliationValidation return false; } -} \ No newline at end of file +} diff --git a/app/Validation/Account/TransferValidation.php b/app/Validation/Account/TransferValidation.php index 6f7382132a..c0570e65b1 100644 --- a/app/Validation/Account/TransferValidation.php +++ b/app/Validation/Account/TransferValidation.php @@ -120,4 +120,4 @@ trait TransferValidation return true; } -} \ No newline at end of file +} diff --git a/app/Validation/Account/WithdrawalValidation.php b/app/Validation/Account/WithdrawalValidation.php index 74229c7525..07c2e09f5b 100644 --- a/app/Validation/Account/WithdrawalValidation.php +++ b/app/Validation/Account/WithdrawalValidation.php @@ -117,4 +117,4 @@ trait WithdrawalValidation return true; } -} \ No newline at end of file +} diff --git a/app/Validation/CurrencyValidation.php b/app/Validation/CurrencyValidation.php index b4fa475fdf..1cff24e8b9 100644 --- a/app/Validation/CurrencyValidation.php +++ b/app/Validation/CurrencyValidation.php @@ -69,4 +69,4 @@ trait CurrencyValidation } } } -} \ No newline at end of file +} diff --git a/app/Validation/GroupValidation.php b/app/Validation/GroupValidation.php index a5f1a939cc..4361a757e3 100644 --- a/app/Validation/GroupValidation.php +++ b/app/Validation/GroupValidation.php @@ -129,4 +129,4 @@ trait GroupValidation } -} \ No newline at end of file +} diff --git a/resources/assets/js/components/bills/Index.vue b/resources/assets/js/components/bills/Index.vue deleted file mode 100644 index 1ff1c90048..0000000000 --- a/resources/assets/js/components/bills/Index.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - diff --git a/resources/assets/js/create_transaction.js b/resources/assets/js/create_transaction.js index a4ca887921..522059d033 100644 --- a/resources/assets/js/create_transaction.js +++ b/resources/assets/js/create_transaction.js @@ -73,4 +73,4 @@ new Vue({ render: (createElement) => { return createElement(CreateTransaction, { props: props }); }, - }); \ No newline at end of file + }); diff --git a/resources/assets/js/edit_transaction.js b/resources/assets/js/edit_transaction.js index 374389abb2..3c18569d40 100644 --- a/resources/assets/js/edit_transaction.js +++ b/resources/assets/js/edit_transaction.js @@ -73,4 +73,4 @@ new Vue({ render: (createElement) => { return createElement(EditTransaction, { props: props }) }, - }); \ No newline at end of file + }); diff --git a/resources/assets/js/i18n.js b/resources/assets/js/i18n.js index b22129a813..4d397a06a1 100644 --- a/resources/assets/js/i18n.js +++ b/resources/assets/js/i18n.js @@ -25,4 +25,4 @@ module.exports = new vuei18n({ 'sv': require('./locales/sv.json'), 'vi': require('./locales/vi.json'), } -}); \ No newline at end of file +}); diff --git a/resources/assets/js/profile.js b/resources/assets/js/profile.js index ed00fabfd0..eb5022e918 100644 --- a/resources/assets/js/profile.js +++ b/resources/assets/js/profile.js @@ -46,4 +46,4 @@ new Vue({ render: (createElement) => { return createElement(ProfileOptions, { props: props }) }, - }); \ No newline at end of file + }); diff --git a/resources/lang/.gitignore b/resources/lang/.gitignore index 3b0e399bcf..dfe53e29e6 100644 --- a/resources/lang/.gitignore +++ b/resources/lang/.gitignore @@ -8,4 +8,4 @@ uk_UA sr_CS et_EE bg_BG -tlh_AA \ No newline at end of file +tlh_AA diff --git a/resources/lang/en_US/api.php b/resources/lang/en_US/api.php index 6d7ccef9fc..cf82af250e 100644 --- a/resources/lang/en_US/api.php +++ b/resources/lang/en_US/api.php @@ -23,4 +23,4 @@ declare(strict_types=1); return [ -]; \ No newline at end of file +]; diff --git a/resources/lang/en_US/components.php b/resources/lang/en_US/components.php index 0145ed8345..c547bbcadc 100644 --- a/resources/lang/en_US/components.php +++ b/resources/lang/en_US/components.php @@ -24,9 +24,6 @@ declare(strict_types=1); return [ // profile - 'personal_access_tokens' => 'Personal access tokens', // bills: - 'not_expected_period' => 'Not expected this period', - 'not_or_not_yet' => 'Not (yet)', ]; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 90fa39c1fd..a11d9005e7 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -32,7 +32,6 @@ return [ 'clone' => 'Clone', 'last_seven_days' => 'Last seven days', 'last_thirty_days' => 'Last thirty days', - 'welcomeBack' => 'What\'s playing?', 'welcome_back' => 'What\'s playing?', 'everything' => 'Everything', 'today' => 'today', @@ -1319,9 +1318,7 @@ return [ 'summary' => 'Summary', 'average' => 'Average', 'balanceFor' => 'Balance for :name', - 'no_tags_for_cloud' => 'No tags to generate cloud', 'no_tags' => '(no tags)', - 'tag_cloud' => 'Tag cloud', // piggy banks: 'add_money_to_piggy' => 'Add money to piggy bank ":name"', @@ -1419,7 +1416,6 @@ return [ 'split_transaction_title' => 'Description of the split transaction', 'split_transaction_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.', 'split_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.', - 'transaction_information' => 'Transaction information', 'you_create_transfer' => 'You\'re creating a transfer.', 'you_create_withdrawal' => 'You\'re creating a withdrawal.', 'you_create_deposit' => 'You\'re creating a deposit.', @@ -1490,11 +1486,6 @@ return [ // split a transaction: 'splits' => 'Splits', 'add_another_split' => 'Add another split', - 'split-transactions' => 'Split transactions', - 'do_split' => 'Do a split', - 'split_this_withdrawal' => 'Split this withdrawal', - 'split_this_deposit' => 'Split this deposit', - 'split_this_transfer' => 'Split this transfer', 'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.', 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.', 'breadcrumb_convert_group' => 'Convert transaction', @@ -1508,7 +1499,6 @@ return [ // Import page (general strings only) 'import_index_title' => 'Import transactions into Firefly III', - 'import_data' => 'Import data', 'import_transactions' => 'Import transactions', 'import_tools_title' => 'Import tools', 'tools_index_intro' => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out this page.', @@ -1599,10 +1589,6 @@ return [ 'recurring_never_cron' => 'It seems the cron job that is necessary to support recurring transactions has never run. This is of course normal when you have just installed Firefly III, but this should be something to set up as soon as possible. Please check out the help-pages using the (?)-icon in the top right corner of the page.', 'recurring_cron_long_ago' => 'It looks like it has been more than 36 hours since the cron job to support recurring transactions has fired for the last time. Are you sure it has been set up correctly? Please check out the help-pages using the (?)-icon in the top right corner of the page.', - 'recurring_meta_field_tags' => 'Tags', - 'recurring_meta_field_notes' => 'Notes', - 'recurring_meta_field_bill_id' => 'Bill', - 'recurring_meta_field_piggy_bank_id' => 'Piggy bank', 'create_new_recurrence' => 'Create new recurring transaction', 'help_first_date' => 'Indicate the first expected recurrence. This must be in the future.', 'help_first_date_no_past' => 'Indicate the first expected recurrence. Firefly III will not create transactions in the past.', @@ -1645,7 +1631,6 @@ return [ 'box_spent_in_currency' => 'Spent (:currency)', 'box_earned_in_currency' => 'Earned (:currency)', 'box_budgeted_in_currency' => 'Budgeted (:currency)', - 'box_sum_in_currency' => 'Sum (:currency)', 'box_bill_paid_in_currency' => 'Bills paid (:currency)', 'box_bill_unpaid_in_currency' => 'Bills unpaid (:currency)', 'box_left_to_spend_in_currency' => 'Left to spend (:currency)', diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php index 27feaec360..15b70b0c23 100644 --- a/resources/lang/en_US/form.php +++ b/resources/lang/en_US/form.php @@ -40,35 +40,25 @@ return [ 'repeat_freq' => 'Repeats', 'location' => 'Location', 'update_channel' => 'Update channel', - 'journal_currency_id' => 'Currency', 'currency_id' => 'Currency', 'transaction_currency_id' => 'Currency', 'auto_budget_currency_id' => 'Currency', 'external_ip' => 'Your server\'s external IP', 'attachments' => 'Attachments', - 'journal_amount' => 'Amount', - 'journal_source_name' => 'Revenue account (source)', - 'keep_bill_id' => 'Bill', - 'journal_source_id' => 'Asset account (source)', 'BIC' => 'BIC', 'verify_password' => 'Verify password security', 'source_account' => 'Source account', 'destination_account' => 'Destination account', - 'journal_destination_id' => 'Asset account (destination)', 'asset_destination_account' => 'Destination account', 'include_net_worth' => 'Include in net worth', 'asset_source_account' => 'Source account', 'journal_description' => 'Description', 'note' => 'Notes', - 'store_new_transaction' => 'Store new transaction', - 'split_journal' => 'Split this transaction', - 'split_journal_explanation' => 'Split this transaction in multiple parts', 'currency' => 'Currency', 'account_id' => 'Asset account', 'budget_id' => 'Budget', 'opening_balance' => 'Opening balance', 'tagMode' => 'Tag mode', - 'tag_position' => 'Tag location', 'virtual_balance' => 'Virtual balance', 'targetamount' => 'Target amount', 'account_role' => 'Account role', @@ -83,10 +73,7 @@ return [ 'expense_account' => 'Expense account', 'revenue_account' => 'Revenue account', 'decimal_places' => 'Decimal places', - 'exchange_rate_instruction' => 'Foreign currencies', - 'source_amount' => 'Amount (source)', 'destination_amount' => 'Amount (destination)', - 'native_amount' => 'Native amount', 'new_email_address' => 'New email address', 'verification' => 'Verification', 'api_key' => 'API key', @@ -95,10 +82,6 @@ return [ 'interest' => 'Interest', 'interest_period' => 'Interest period', - 'source_account_asset' => 'Source account (asset account)', - 'destination_account_expense' => 'Destination account (expense account)', - 'destination_account_asset' => 'Destination account (asset account)', - 'source_account_revenue' => 'Source account (revenue account)', 'type' => 'Type', 'convert_Withdrawal' => 'Convert withdrawal', 'convert_Deposit' => 'Convert deposit', @@ -106,7 +89,6 @@ return [ 'amount' => 'Amount', 'foreign_amount' => 'Foreign amount', - 'existing_attachments' => 'Existing attachments', 'date' => 'Date', 'interest_date' => 'Interest date', 'book_date' => 'Book date', @@ -128,12 +110,6 @@ return [ 'date_format' => 'Date format', 'specifix' => 'Bank- or file specific fixes', 'attachments[]' => 'Attachments', - 'store_new_withdrawal' => 'Store new withdrawal', - 'store_new_deposit' => 'Store new deposit', - 'store_new_transfer' => 'Store new transfer', - 'add_new_withdrawal' => 'Add a new withdrawal', - 'add_new_deposit' => 'Add a new deposit', - 'add_new_transfer' => 'Add a new transfer', 'title' => 'Title', 'notes' => 'Notes', 'filename' => 'File name', @@ -143,8 +119,6 @@ return [ 'stop_processing' => 'Stop processing', 'start_date' => 'Start of range', 'end_date' => 'End of range', - 'include_attachments' => 'Include uploaded attachments', - 'include_old_uploads' => 'Include imported data', 'delete_account' => 'Delete account ":name"', 'delete_bill' => 'Delete bill ":name"', 'delete_budget' => 'Delete budget ":name"', @@ -217,10 +191,7 @@ return [ 'csv_tab' => 'A tab (invisible)', 'csv_delimiter' => 'CSV field delimiter', 'csv_import_account' => 'Default import account', - 'csv_config' => 'CSV import configuration', 'client_id' => 'Client ID', - 'service_secret' => 'Service secret', - 'app_secret' => 'App secret', 'app_id' => 'App ID', 'secret' => 'Secret', 'public_key' => 'Public key', diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php index 71506af1bc..5afc66e78c 100644 --- a/resources/lang/en_US/import.php +++ b/resources/lang/en_US/import.php @@ -27,8 +27,6 @@ return [ 'index_breadcrumb' => 'Import data into Firefly III', 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', - 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', - 'prerequisites_breadcrumb_ynab' => 'Prerequisites for YNAB', 'job_configuration_breadcrumb' => 'Configuration for ":key"', 'job_status_breadcrumb' => 'Import status for ":key"', 'disabled_for_demo_user' => 'disabled in demo', @@ -43,26 +41,14 @@ return [ // import provider strings (index): 'button_fake' => 'Fake an import', 'button_file' => 'Import a file', - 'button_bunq' => 'Import from bunq', 'button_spectre' => 'Import using Spectre', - 'button_plaid' => 'Import using Plaid', - 'button_yodlee' => 'Import using Yodlee', - 'button_quovo' => 'Import using Quovo', - 'button_ynab' => 'Import from You Need A Budget', - 'button_fints' => 'Import using FinTS', - // prerequisites box (index) 'need_prereq_title' => 'Import prerequisites', 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', 'do_prereq_fake' => 'Prerequisites for the fake provider', 'do_prereq_file' => 'Prerequisites for file imports', - 'do_prereq_bunq' => 'Prerequisites for imports from bunq', 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', - 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', - 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', - 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', - 'do_prereq_ynab' => 'Prerequisites for imports from YNAB', // prerequisites: 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', @@ -70,18 +56,10 @@ return [ 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', - 'prereq_bunq_title' => 'Prerequisites for an import from bunq', - 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', - 'prereq_ynab_title' => 'Prerequisites for an import from YNAB', - 'prereq_ynab_text' => 'In order to be able to download transactions from YNAB, please create a new application on your Developer Settings Page and enter the client ID and secret on this page.', - 'prereq_ynab_redirect' => 'To complete the configuration, enter the following URL at the Developer Settings Page under the "Redirect URI(s)".', 'callback_not_tls' => 'Firefly III has detected the following callback URI. It seems your server is not set up to accept TLS-connections (https). YNAB will not accept this URI. You may continue with the import (because Firefly III could be wrong) but please keep this in mind.', // prerequisites success messages: 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', - 'prerequisites_saved_for_bunq' => 'API key and IP stored!', - 'prerequisites_saved_for_ynab' => 'YNAB client ID and secret stored!', // job configuration: 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', @@ -134,42 +112,8 @@ return [ 'job_config_spectre_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.', // job configuration for bunq: - 'job_config_bunq_accounts_title' => 'bunq accounts', - 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - 'bunq_no_mapping' => 'It seems you have not selected any accounts.', 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', - 'job_config_bunq_apply_rules' => 'Apply rules', - 'job_config_bunq_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.', - 'bunq_savings_goal' => 'Savings goal: :amount (:percentage%)', - 'bunq_account_status_CANCELLED' => 'Closed bunq account', - - 'ynab_account_closed' => 'Account is closed!', - 'ynab_account_deleted' => 'Account is deleted!', - 'ynab_account_type_savings' => 'savings account', - 'ynab_account_type_checking' => 'checking account', - 'ynab_account_type_cash' => 'cash account', - 'ynab_account_type_creditCard' => 'credit card', - 'ynab_account_type_lineOfCredit' => 'line of credit', - 'ynab_account_type_otherAsset' => 'other asset account', - 'ynab_account_type_otherLiability' => 'other liabilities', - 'ynab_account_type_payPal' => 'Paypal', - 'ynab_account_type_merchantAccount' => 'merchant account', - 'ynab_account_type_investmentAccount' => 'investment account', - 'ynab_account_type_mortgage' => 'mortgage', - 'ynab_do_not_import' => '(do not import)', - 'job_config_ynab_apply_rules' => 'Apply rules', - 'job_config_ynab_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.', - - // job configuration for YNAB: - 'job_config_ynab_select_budgets' => 'Select your budget', - 'job_config_ynab_select_budgets_text' => 'You have :count budgets stored at YNAB. Please select the one from which Firefly III will import the transactions.', - 'job_config_ynab_no_budgets' => 'There are no budgets available to be imported from.', - 'ynab_no_mapping' => 'It seems you have not selected any accounts to import from.', - 'job_config_ynab_bad_currency' => 'You cannot import from the following budget(s), because you do not have accounts with the same currency as these budgets.', - 'job_config_ynab_accounts_title' => 'Select accounts', - 'job_config_ynab_accounts_text' => 'You have the following accounts available in this budget. Please select from which accounts you want to import, and where the transactions should be stored.', - // keys from "extra" array: 'spectre_extra_key_iban' => 'IBAN', @@ -192,41 +136,6 @@ return [ 'spectre_extra_key_unit_price' => 'Unit price', 'spectre_extra_key_transactions_count' => 'Transaction count', - //job configuration for finTS - 'fints_connection_failed' => 'An error occurred while trying to connecting to your bank. Please make sure that all the data you entered is correct. Original error message: :originalError', - - 'job_config_fints_url_help' => 'E.g. https://banking-dkb.s-fints-pt-dkb.de/fints30', - 'job_config_fints_username_help' => 'For many banks this is your account number.', - 'job_config_fints_port_help' => 'The default port is 443.', - 'job_config_fints_account_help' => 'Choose the bank account for which you want to import transactions.', - 'job_config_local_account_help' => 'Choose the Firefly III account corresponding to your bank account chosen above.', - // specifics: - 'specific_ing_name' => 'ING NL', - 'specific_ing_descr' => 'Create better descriptions in ING exports', - 'specific_sns_name' => 'SNS / Volksbank NL', - 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', - 'specific_abn_name' => 'ABN AMRO NL', - 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', - 'specific_rabo_name' => 'Rabobank NL', - 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', - 'specific_pres_name' => 'President\'s Choice Financial CA', - 'specific_pres_descr' => 'Fixes potential problems with PC files', - 'specific_belfius_name' => 'Belfius BE', - 'specific_belfius_descr' => 'Fixes potential problems with Belfius files', - 'specific_ingbelgium_name' => 'ING BE', - 'specific_ingbelgium_descr' => 'Fixes potential problems with ING Belgium files', - // job configuration for file provider (stage: roles) - 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', - 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', - 'job_config_roles_submit' => 'Continue', - 'job_config_roles_column_name' => 'Name of column', - 'job_config_roles_column_example' => 'Column example data', - 'job_config_roles_column_role' => 'Column data meaning', - 'job_config_roles_do_map_value' => 'Map these values', - 'job_config_roles_no_example' => 'No example data available', - 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', - 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', - 'job_config_roles_colum_count' => 'Column', // job config for the file provider (stage: mapping): 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', @@ -256,64 +165,9 @@ return [ 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // general errors and warnings: 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // column roles for CSV import: - 'column__ignore' => '(ignore this column)', - 'column_account-iban' => 'Asset account (IBAN)', - 'column_account-id' => 'Asset account ID (matching FF3)', - 'column_account-name' => 'Asset account (name)', - 'column_account-bic' => 'Asset account (BIC)', - 'column_amount' => 'Amount', - 'column_amount_foreign' => 'Amount (in foreign currency)', - 'column_amount_debit' => 'Amount (debit column)', - 'column_amount_credit' => 'Amount (credit column)', - 'column_amount_negated' => 'Amount (negated column)', - 'column_amount-comma-separated' => 'Amount (comma as decimal separator)', - 'column_bill-id' => 'Bill ID (matching FF3)', - 'column_bill-name' => 'Bill name', - 'column_budget-id' => 'Budget ID (matching FF3)', - 'column_budget-name' => 'Budget name', - 'column_category-id' => 'Category ID (matching FF3)', - 'column_category-name' => 'Category name', - 'column_currency-code' => 'Currency code (ISO 4217)', - 'column_foreign-currency-code' => 'Foreign currency code (ISO 4217)', - 'column_currency-id' => 'Currency ID (matching FF3)', - 'column_currency-name' => 'Currency name (matching FF3)', - 'column_currency-symbol' => 'Currency symbol (matching FF3)', - 'column_date-interest' => 'Interest calculation date', - 'column_date-book' => 'Transaction booking date', - 'column_date-process' => 'Transaction process date', - 'column_date-transaction' => 'Date', - 'column_date-due' => 'Transaction due date', - 'column_date-payment' => 'Transaction payment date', - 'column_date-invoice' => 'Transaction invoice date', - 'column_description' => 'Description', - 'column_opposing-iban' => 'Opposing account (IBAN)', - 'column_opposing-bic' => 'Opposing account (BIC)', - 'column_opposing-id' => 'Opposing account ID (matching FF3)', - 'column_external-id' => 'External ID', - 'column_opposing-name' => 'Opposing account (name)', - 'column_rabo-debit-credit' => 'Rabobank specific debit/credit indicator', - 'column_ing-debit-credit' => 'ING specific debit/credit indicator', - 'column_generic-debit-credit' => 'Generic bank debit/credit indicator', - 'column_sepa_ct_id' => 'SEPA end-to-end Identifier', - 'column_sepa_ct_op' => 'SEPA Opposing Account Identifier', - 'column_sepa_db' => 'SEPA Mandate Identifier', - 'column_sepa_cc' => 'SEPA Clearing Code', - 'column_sepa_ci' => 'SEPA Creditor Identifier', - 'column_sepa_ep' => 'SEPA External Purpose', - 'column_sepa_country' => 'SEPA Country Code', - 'column_sepa_batch_id' => 'SEPA Batch ID', - 'column_tags-comma' => 'Tags (comma separated)', - 'column_tags-space' => 'Tags (space separated)', - 'column_account-number' => 'Asset account (account number)', - 'column_opposing-number' => 'Opposing account (account number)', - 'column_note' => 'Note(s)', - 'column_internal-reference' => 'Internal reference', - // error message 'duplicate_row' => 'Row #:row (":description") could not be imported. It already exists.', diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php index ef42efe246..451e1b4c3e 100644 --- a/resources/lang/en_US/list.php +++ b/resources/lang/en_US/list.php @@ -41,13 +41,11 @@ return [ 'transaction_type' => 'Type', 'lastActivity' => 'Last activity', 'balanceDiff' => 'Balance difference', - 'matchesOn' => 'Matched on', 'other_meta_data' => 'Other meta data', 'account_type' => 'Account type', 'created_at' => 'Created at', 'account' => 'Account', 'matchingAmount' => 'Amount', - 'split_number' => 'Split #', 'destination' => 'Destination', 'source' => 'Source', 'next_expected_match' => 'Next expected match', @@ -55,7 +53,6 @@ return [ 'repeat_freq' => 'Repeats', 'description' => 'Description', 'amount' => 'Amount', - 'internal_reference' => 'Internal reference', 'date' => 'Date', 'interest_date' => 'Interest date', 'book_date' => 'Book date', @@ -63,7 +60,6 @@ return [ 'due_date' => 'Due date', 'payment_date' => 'Payment date', 'invoice_date' => 'Invoice date', - 'interal_reference' => 'Internal reference', 'notes' => 'Notes', 'from' => 'From', 'piggy_bank' => 'Piggy bank', diff --git a/resources/views/v1/reports/budget/partials/account-per-budget.twig b/resources/views/v1/reports/budget/partials/account-per-budget.twig index f979a37c82..0266078590 100644 --- a/resources/views/v1/reports/budget/partials/account-per-budget.twig +++ b/resources/views/v1/reports/budget/partials/account-per-budget.twig @@ -27,4 +27,4 @@ {% endfor %} {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/reports/budget/partials/accounts.twig b/resources/views/v1/reports/budget/partials/accounts.twig index b85fe8cf11..cb21e4f5f5 100644 --- a/resources/views/v1/reports/budget/partials/accounts.twig +++ b/resources/views/v1/reports/budget/partials/accounts.twig @@ -29,4 +29,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/reports/category/partials/account-per-category.twig b/resources/views/v1/reports/category/partials/account-per-category.twig index a45085672c..cb960c33bb 100644 --- a/resources/views/v1/reports/category/partials/account-per-category.twig +++ b/resources/views/v1/reports/category/partials/account-per-category.twig @@ -28,4 +28,4 @@ {% endfor %} {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/reports/category/partials/accounts.twig b/resources/views/v1/reports/category/partials/accounts.twig index 5fd35138ef..4e9ce9e9a2 100644 --- a/resources/views/v1/reports/category/partials/accounts.twig +++ b/resources/views/v1/reports/category/partials/accounts.twig @@ -43,4 +43,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/reports/double/partials/accounts-per-asset.twig b/resources/views/v1/reports/double/partials/accounts-per-asset.twig index 59a20b9703..6a19774fbf 100644 --- a/resources/views/v1/reports/double/partials/accounts-per-asset.twig +++ b/resources/views/v1/reports/double/partials/accounts-per-asset.twig @@ -41,4 +41,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/reports/double/partials/accounts.twig b/resources/views/v1/reports/double/partials/accounts.twig index 104243afc0..7149f2f45e 100644 --- a/resources/views/v1/reports/double/partials/accounts.twig +++ b/resources/views/v1/reports/double/partials/accounts.twig @@ -52,4 +52,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/reports/tag/partials/account-per-tag.twig b/resources/views/v1/reports/tag/partials/account-per-tag.twig index 2df6c1c0ae..871cf05d71 100644 --- a/resources/views/v1/reports/tag/partials/account-per-tag.twig +++ b/resources/views/v1/reports/tag/partials/account-per-tag.twig @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/resources/views/v1/reports/tag/partials/accounts.twig b/resources/views/v1/reports/tag/partials/accounts.twig index 5fd35138ef..4e9ce9e9a2 100644 --- a/resources/views/v1/reports/tag/partials/accounts.twig +++ b/resources/views/v1/reports/tag/partials/accounts.twig @@ -43,4 +43,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/resources/views/v1/transactions/single/edit.twig b/resources/views/v1/transactions/single/edit.twig index 2a701f88ce..8faafdbec8 100644 --- a/resources/views/v1/transactions/single/edit.twig +++ b/resources/views/v1/transactions/single/edit.twig @@ -1 +1 @@ - \ No newline at end of file + diff --git a/tests/Feature/Controllers/Recurring/ShowControllerTest.php b/tests/Feature/Controllers/Recurring/ShowControllerTest.php index e64db56a9d..f457f3c296 100644 --- a/tests/Feature/Controllers/Recurring/ShowControllerTest.php +++ b/tests/Feature/Controllers/Recurring/ShowControllerTest.php @@ -93,4 +93,4 @@ class ShowControllerTest extends TestCase $response->assertSee('
    '); } -} \ No newline at end of file +} diff --git a/tests/Support/TestDataTrait.php b/tests/Support/TestDataTrait.php index 959612b4ec..d6ef309a1d 100644 --- a/tests/Support/TestDataTrait.php +++ b/tests/Support/TestDataTrait.php @@ -492,4 +492,4 @@ trait TestDataTrait return $data; } -} \ No newline at end of file +}