From a500de8ab186ba9b77a535fc5eda4d8c5038df84 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 07:05:15 +0100 Subject: [PATCH] Auto commit for release 'branch-v6.2' on 2024-12-22 --- .../Model/ExchangeRate/IndexController.php | 15 +-- .../Model/ExchangeRate/ShowController.php | 19 ++-- .../TransactionCurrency/IndexController.php | 19 ++-- .../TransactionCurrency/ShowController.php | 14 +-- .../TransactionCurrency/IndexRequest.php | 1 - .../Commands/Correction/CorrectAmounts.php | 6 +- .../Commands/Correction/CorrectDatabase.php | 2 +- .../Correction/FixTransactionTypes.php | 1 + app/Events/DetectedNewIPAddress.php | 2 +- app/Handlers/Events/UserEventHandler.php | 4 +- .../ExchangeRates/IndexController.php | 4 +- app/Models/TransactionCurrency.php | 4 +- .../Admin/UnknownUserLoginAttempt.php | 6 +- .../Security/DisabledMFANotification.php | 2 +- .../Security/EnabledMFANotification.php | 2 +- .../Security/MFABackupFewLeftNotification.php | 2 +- .../Security/MFABackupNoLeftNotification.php | 2 +- .../MFAManyFailedAttemptsNotification.php | 2 +- .../MFAUsedBackupCodeNotification.php | 2 +- .../Security/NewBackupCodesNotification.php | 2 +- .../Security/UserFailedLoginAttempt.php | 2 +- app/Notifications/User/UserLogin.php | 23 +++-- app/Providers/CurrencyServiceProvider.php | 2 +- .../ExchangeRate/ExchangeRateRepository.php | 26 ++--- .../ExchangeRateRepositoryInterface.php | 3 +- .../V2/ExchangeRateTransformer.php | 22 ++--- composer.lock | 32 ++++--- config/translations.php | 4 +- package-lock.json | 12 +-- resources/assets/v1/mix-manifest.json | 9 +- resources/assets/v1/src/locales/bg.json | 3 +- resources/assets/v1/src/locales/ca.json | 3 +- resources/assets/v1/src/locales/cs.json | 3 +- resources/assets/v1/src/locales/da.json | 3 +- resources/assets/v1/src/locales/de.json | 7 +- resources/assets/v1/src/locales/el.json | 3 +- resources/assets/v1/src/locales/en-gb.json | 3 +- resources/assets/v1/src/locales/en.json | 3 +- resources/assets/v1/src/locales/es.json | 3 +- resources/assets/v1/src/locales/fi.json | 3 +- resources/assets/v1/src/locales/fr.json | 3 +- resources/assets/v1/src/locales/hu.json | 3 +- resources/assets/v1/src/locales/id.json | 3 +- resources/assets/v1/src/locales/it.json | 3 +- resources/assets/v1/src/locales/ja.json | 3 +- resources/assets/v1/src/locales/ko.json | 3 +- resources/assets/v1/src/locales/nb.json | 3 +- resources/assets/v1/src/locales/nl.json | 3 +- resources/assets/v1/src/locales/nn.json | 3 +- resources/assets/v1/src/locales/pl.json | 3 +- resources/assets/v1/src/locales/pt-br.json | 3 +- resources/assets/v1/src/locales/pt.json | 3 +- resources/assets/v1/src/locales/ro.json | 3 +- resources/assets/v1/src/locales/ru.json | 3 +- resources/assets/v1/src/locales/sk.json | 3 +- resources/assets/v1/src/locales/sl.json | 3 +- resources/assets/v1/src/locales/sv.json | 3 +- resources/assets/v1/src/locales/tr.json | 3 +- resources/assets/v1/src/locales/uk.json | 3 +- resources/assets/v1/src/locales/vi.json | 3 +- resources/assets/v1/src/locales/zh-cn.json | 3 +- resources/assets/v1/src/locales/zh-tw.json | 3 +- resources/lang/en_US/breadcrumbs.php | 4 +- resources/lang/en_US/firefly.php | 14 +-- resources/lang/en_US/form.php | 4 +- routes/api.php | 96 +++++++++---------- routes/web.php | 12 +-- 67 files changed, 256 insertions(+), 220 deletions(-) diff --git a/app/Api/V2/Controllers/Model/ExchangeRate/IndexController.php b/app/Api/V2/Controllers/Model/ExchangeRate/IndexController.php index 3caaabb2a1..af8a87d432 100644 --- a/app/Api/V2/Controllers/Model/ExchangeRate/IndexController.php +++ b/app/Api/V2/Controllers/Model/ExchangeRate/IndexController.php @@ -35,8 +35,8 @@ use Illuminate\Pagination\LengthAwarePaginator; */ class IndexController extends Controller { - public const string RESOURCE_KEY = 'exchange-rates'; use ValidatesUserGroupTrait; + public const string RESOURCE_KEY = 'exchange-rates'; private ExchangeRateRepositoryInterface $repository; @@ -55,11 +55,11 @@ class IndexController extends Controller public function index(): JsonResponse { - $piggies = $this->repository->getAll(); - $pageSize = $this->parameters->get('limit'); - $count = $piggies->count(); - $piggies = $piggies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); - $paginator = new LengthAwarePaginator($piggies, $count, $pageSize, $this->parameters->get('page')); + $piggies = $this->repository->getAll(); + $pageSize = $this->parameters->get('limit'); + $count = $piggies->count(); + $piggies = $piggies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $paginator = new LengthAwarePaginator($piggies, $count, $pageSize, $this->parameters->get('page')); var_dump('here we are'); @@ -68,6 +68,7 @@ class IndexController extends Controller return response() ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer)) - ->header('Content-Type', self::CONTENT_TYPE); + ->header('Content-Type', self::CONTENT_TYPE) + ; } } diff --git a/app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php b/app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php index 0517dc6eec..4c709009fe 100644 --- a/app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php +++ b/app/Api/V2/Controllers/Model/ExchangeRate/ShowController.php @@ -37,8 +37,8 @@ use Illuminate\Pagination\LengthAwarePaginator; */ class ShowController extends Controller { - public const string RESOURCE_KEY = 'exchange-rates'; use ValidatesUserGroupTrait; + public const string RESOURCE_KEY = 'exchange-rates'; private ExchangeRateRepositoryInterface $repository; @@ -57,19 +57,20 @@ class ShowController extends Controller public function show(TransactionCurrency $from, TransactionCurrency $to): JsonResponse { -// $piggies = $this->repository->getAll(); -// - $pageSize = $this->parameters->get('limit'); - $rates = $this->repository->getRates($from, $to); - $count = $rates->count(); - $rates = $rates->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); - $paginator = new LengthAwarePaginator($rates, $count, $pageSize, $this->parameters->get('page')); + // $piggies = $this->repository->getAll(); + // + $pageSize = $this->parameters->get('limit'); + $rates = $this->repository->getRates($from, $to); + $count = $rates->count(); + $rates = $rates->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $paginator = new LengthAwarePaginator($rates, $count, $pageSize, $this->parameters->get('page')); $transformer = new ExchangeRateTransformer(); $transformer->setParameters($this->parameters); // give params to transformer return response() ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer)) - ->header('Content-Type', self::CONTENT_TYPE); + ->header('Content-Type', self::CONTENT_TYPE) + ; } } diff --git a/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php b/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php index 947148a23e..607a953b2e 100644 --- a/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php +++ b/app/Api/V2/Controllers/Model/TransactionCurrency/IndexController.php @@ -34,7 +34,7 @@ use Illuminate\Pagination\LengthAwarePaginator; class IndexController extends Controller { - public const string RESOURCE_KEY = 'transaction-currencies'; + public const string RESOURCE_KEY = 'transaction-currencies'; private CurrencyRepositoryInterface $repository; protected array $acceptedRoles = [UserRoleEnum::READ_ONLY]; @@ -46,7 +46,7 @@ class IndexController extends Controller function ($request, $next) { $this->repository = app(CurrencyRepositoryInterface::class); // new way of user group validation - $userGroup = $this->validateUserGroup($request); + $userGroup = $this->validateUserGroup($request); $this->repository->setUserGroup($userGroup); return $next($request); @@ -56,20 +56,20 @@ class IndexController extends Controller public function index(IndexRequest $request): JsonResponse { - $settings = $request->getAll(); - if(true === $settings['enabled']) { + $settings = $request->getAll(); + if (true === $settings['enabled']) { $currencies = $this->repository->get(); } - if(true !== $settings['enabled']) { + if (true !== $settings['enabled']) { $currencies = $this->repository->getAll(); } - $pageSize = $this->parameters->get('limit'); - $count = $currencies->count(); + $pageSize = $this->parameters->get('limit'); + $count = $currencies->count(); // depending on the sort parameters, this list must not be split, because the // order is calculated in the account transformer and by that time it's too late. - $accounts = $currencies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $accounts = $currencies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page')); $transformer = new CurrencyTransformer(); @@ -78,6 +78,7 @@ class IndexController extends Controller return response() ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer)) - ->header('Content-Type', self::CONTENT_TYPE); + ->header('Content-Type', self::CONTENT_TYPE) + ; } } diff --git a/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php b/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php index f4d82134ac..d33e2b2f4e 100644 --- a/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php +++ b/app/Api/V2/Controllers/Model/TransactionCurrency/ShowController.php @@ -47,7 +47,7 @@ class ShowController extends Controller function ($request, $next) { $this->repository = app(CurrencyRepositoryInterface::class); // new way of user group validation - $userGroup = $this->validateUserGroup($request); + $userGroup = $this->validateUserGroup($request); $this->repository->setUserGroup($userGroup); return $next($request); @@ -57,9 +57,10 @@ class ShowController extends Controller public function show(TransactionCurrency $currency): JsonResponse { - $groups = $currency->userGroups()->where('user_groups.id', $this->repository->getUserGroup()->id)->get(); - $enabled = $groups->count() > 0; - $default = false; + $groups = $currency->userGroups()->where('user_groups.id', $this->repository->getUserGroup()->id)->get(); + $enabled = $groups->count() > 0; + $default = false; + /** @var UserGroup $group */ foreach ($groups as $group) { $default = 1 === $group->pivot->group_default; @@ -68,11 +69,12 @@ class ShowController extends Controller $currency->userGroupDefault = $default; - $transformer = new CurrencyTransformer(); + $transformer = new CurrencyTransformer(); $transformer->setParameters($this->parameters); return response() ->api($this->jsonApiObject(self::RESOURCE_KEY, $currency, $transformer)) - ->header('Content-Type', self::CONTENT_TYPE); + ->header('Content-Type', self::CONTENT_TYPE) + ; } } diff --git a/app/Api/V2/Request/Model/TransactionCurrency/IndexRequest.php b/app/Api/V2/Request/Model/TransactionCurrency/IndexRequest.php index 4984d7f5c0..426ccdb415 100644 --- a/app/Api/V2/Request/Model/TransactionCurrency/IndexRequest.php +++ b/app/Api/V2/Request/Model/TransactionCurrency/IndexRequest.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Api\V2\Request\Model\TransactionCurrency; -use Carbon\Carbon; use FireflyIII\Support\Http\Api\AccountFilter; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; diff --git a/app/Console/Commands/Correction/CorrectAmounts.php b/app/Console/Commands/Correction/CorrectAmounts.php index 9a16195304..5c3cc8329f 100644 --- a/app/Console/Commands/Correction/CorrectAmounts.php +++ b/app/Console/Commands/Correction/CorrectAmounts.php @@ -151,7 +151,6 @@ class CorrectAmounts extends Command /** * Foreach loop is unavoidable here. - * @return void */ private function fixRuleTriggers(): void { @@ -162,7 +161,7 @@ class CorrectAmounts extends Command foreach ($set as $item) { $result = $this->fixRuleTrigger($item); if (true === $result) { - $fixed++; + ++$fixed; } } if (0 === $fixed) { @@ -182,13 +181,16 @@ class CorrectAmounts extends Command $item->rule->active = false; $item->rule->save(); $item->forceDelete(); + return false; } if (-1 === $check) { $item->trigger_value = app('steam')->positive($item->trigger_value); $item->save(); + return true; } + return false; } } diff --git a/app/Console/Commands/Correction/CorrectDatabase.php b/app/Console/Commands/Correction/CorrectDatabase.php index 71c154a405..d3eadc0ee7 100644 --- a/app/Console/Commands/Correction/CorrectDatabase.php +++ b/app/Console/Commands/Correction/CorrectDatabase.php @@ -69,7 +69,7 @@ class CorrectDatabase extends Command 'firefly-iii:fix-long-descriptions', 'firefly-iii:fix-recurring-transactions', 'firefly-iii:upgrade-group-information', - //'firefly-iii:fix-transaction-types', // very resource heavy. + // 'firefly-iii:fix-transaction-types', // very resource heavy. 'firefly-iii:fix-frontpage-accounts', // new! 'firefly-iii:unify-group-accounts', diff --git a/app/Console/Commands/Correction/FixTransactionTypes.php b/app/Console/Commands/Correction/FixTransactionTypes.php index 9fe35a69dd..75059602f7 100644 --- a/app/Console/Commands/Correction/FixTransactionTypes.php +++ b/app/Console/Commands/Correction/FixTransactionTypes.php @@ -52,6 +52,7 @@ class FixTransactionTypes extends Command $count = 0; $journals = $this->collectJournals(); Log::debug(sprintf('In FixTransactionTypes, found %d journals.', $journals->count())); + /** @var TransactionJournal $journal */ foreach ($journals as $journal) { $fixed = $this->fixJournal($journal); diff --git a/app/Events/DetectedNewIPAddress.php b/app/Events/DetectedNewIPAddress.php index e473375768..0a9e7ac898 100644 --- a/app/Events/DetectedNewIPAddress.php +++ b/app/Events/DetectedNewIPAddress.php @@ -41,6 +41,6 @@ class DetectedNewIPAddress extends Event */ public function __construct(User $user) { - $this->user = $user; + $this->user = $user; } } diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 43b4ae47d9..4216169cbb 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -187,13 +187,13 @@ class UserEventHandler */ public function notifyNewIPAddress(DetectedNewIPAddress $event): void { - $user = $event->user; + $user = $event->user; if ($user->hasRole('demo')) { return; // do not email demo user. } - $list = app('preferences')->getForUser($user, 'login_ip_history', [])->data; + $list = app('preferences')->getForUser($user, 'login_ip_history', [])->data; if (!is_array($list)) { $list = []; } diff --git a/app/Http/Controllers/ExchangeRates/IndexController.php b/app/Http/Controllers/ExchangeRates/IndexController.php index bea8bf4a2d..793a8466db 100644 --- a/app/Http/Controllers/ExchangeRates/IndexController.php +++ b/app/Http/Controllers/ExchangeRates/IndexController.php @@ -1,4 +1,5 @@ share('mainTitleIcon', 'fa-exchange'); app('view')->share('title', (string) trans('firefly.header_exchange_rates')); + return $next($request); } ); @@ -56,5 +57,4 @@ class IndexController extends Controller { return view('exchange-rates.rates', compact('from', 'to')); } - } diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 1244484c9b..05d9d7e3f9 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -43,7 +43,7 @@ class TransactionCurrency extends Model public ?bool $userGroupDefault = null; public ?bool $userGroupEnabled = null; protected $casts - = [ + = [ 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', @@ -51,7 +51,7 @@ class TransactionCurrency extends Model 'enabled' => 'bool', ]; - protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled']; + protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled']; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). diff --git a/app/Notifications/Admin/UnknownUserLoginAttempt.php b/app/Notifications/Admin/UnknownUserLoginAttempt.php index ef4f2d37a9..5409b18ee9 100644 --- a/app/Notifications/Admin/UnknownUserLoginAttempt.php +++ b/app/Notifications/Admin/UnknownUserLoginAttempt.php @@ -68,7 +68,8 @@ class UnknownUserLoginAttempt extends Notification return new MailMessage() ->markdown('emails.owner.unknown-user', ['address' => $this->address, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time]) - ->subject((string) trans('email.unknown_user_subject')); + ->subject((string) trans('email.unknown_user_subject')) + ; } /** @@ -91,7 +92,8 @@ class UnknownUserLoginAttempt extends Notification public function toPushover(OwnerNotifiable $notifiable): PushoverMessage { return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address])) - ->title((string) trans('email.unknown_user_subject')); + ->title((string) trans('email.unknown_user_subject')) + ; } /** diff --git a/app/Notifications/Security/DisabledMFANotification.php b/app/Notifications/Security/DisabledMFANotification.php index 04c14fbdbf..c467c478bb 100644 --- a/app/Notifications/Security/DisabledMFANotification.php +++ b/app/Notifications/Security/DisabledMFANotification.php @@ -61,7 +61,7 @@ class DisabledMFANotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.disabled_mfa_subject'); + $subject = (string) trans('email.disabled_mfa_subject'); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/EnabledMFANotification.php b/app/Notifications/Security/EnabledMFANotification.php index 428a1f1570..daac64653b 100644 --- a/app/Notifications/Security/EnabledMFANotification.php +++ b/app/Notifications/Security/EnabledMFANotification.php @@ -61,7 +61,7 @@ class EnabledMFANotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.enabled_mfa_subject'); + $subject = (string) trans('email.enabled_mfa_subject'); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/MFABackupFewLeftNotification.php b/app/Notifications/Security/MFABackupFewLeftNotification.php index f185770c14..1d2bea958d 100644 --- a/app/Notifications/Security/MFABackupFewLeftNotification.php +++ b/app/Notifications/Security/MFABackupFewLeftNotification.php @@ -63,7 +63,7 @@ class MFABackupFewLeftNotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.mfa_few_backups_left_subject', ['count' => $this->count]); + $subject = (string) trans('email.mfa_few_backups_left_subject', ['count' => $this->count]); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/MFABackupNoLeftNotification.php b/app/Notifications/Security/MFABackupNoLeftNotification.php index 24ccd134c0..3bea79e4ab 100644 --- a/app/Notifications/Security/MFABackupNoLeftNotification.php +++ b/app/Notifications/Security/MFABackupNoLeftNotification.php @@ -61,7 +61,7 @@ class MFABackupNoLeftNotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.mfa_no_backups_left_subject'); + $subject = (string) trans('email.mfa_no_backups_left_subject'); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/MFAManyFailedAttemptsNotification.php b/app/Notifications/Security/MFAManyFailedAttemptsNotification.php index b081ca2cbd..bc867ab4c8 100644 --- a/app/Notifications/Security/MFAManyFailedAttemptsNotification.php +++ b/app/Notifications/Security/MFAManyFailedAttemptsNotification.php @@ -60,7 +60,7 @@ class MFAManyFailedAttemptsNotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.mfa_many_failed_subject', ['count' => $this->count]); + $subject = (string) trans('email.mfa_many_failed_subject', ['count' => $this->count]); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/MFAUsedBackupCodeNotification.php b/app/Notifications/Security/MFAUsedBackupCodeNotification.php index 6a073d8fc3..a98939a2b7 100644 --- a/app/Notifications/Security/MFAUsedBackupCodeNotification.php +++ b/app/Notifications/Security/MFAUsedBackupCodeNotification.php @@ -61,7 +61,7 @@ class MFAUsedBackupCodeNotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.used_backup_code_subject'); + $subject = (string) trans('email.used_backup_code_subject'); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/NewBackupCodesNotification.php b/app/Notifications/Security/NewBackupCodesNotification.php index e9b201f76f..43b4903301 100644 --- a/app/Notifications/Security/NewBackupCodesNotification.php +++ b/app/Notifications/Security/NewBackupCodesNotification.php @@ -61,7 +61,7 @@ class NewBackupCodesNotification extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.new_backup_codes_subject'); + $subject = (string) trans('email.new_backup_codes_subject'); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/Security/UserFailedLoginAttempt.php b/app/Notifications/Security/UserFailedLoginAttempt.php index d44b6c674f..017294436a 100644 --- a/app/Notifications/Security/UserFailedLoginAttempt.php +++ b/app/Notifications/Security/UserFailedLoginAttempt.php @@ -58,7 +58,7 @@ class UserFailedLoginAttempt extends Notification */ public function toMail(User $notifiable) { - $subject = (string) trans('email.failed_login_subject'); + $subject = (string) trans('email.failed_login_subject'); $ip = Request::ip(); $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); diff --git a/app/Notifications/User/UserLogin.php b/app/Notifications/User/UserLogin.php index 7681b8fed8..95e5bcba13 100644 --- a/app/Notifications/User/UserLogin.php +++ b/app/Notifications/User/UserLogin.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Notifications\User; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\Notifications\ReturnsAvailableChannels; use FireflyIII\Notifications\ReturnsSettings; use FireflyIII\Support\Facades\Steam; @@ -68,13 +67,13 @@ class UserLogin extends Notification public function toNtfy(User $notifiable): Message { - $ip = Request::ip(); - $host = Steam::getHostName($ip); + $ip = Request::ip(); + $host = Steam::getHostName($ip); $settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable); $message = new Message(); $message->topic($settings['ntfy_topic']); $message->title((string) trans('email.login_from_new_ip')); - $message->body((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host, ])); + $message->body((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host])); return $message; } @@ -84,9 +83,10 @@ class UserLogin extends Notification */ public function toPushover(User $notifiable): PushoverMessage { - $ip = Request::ip(); - $host = Steam::getHostName($ip); - return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host, ])) + $ip = Request::ip(); + $host = Steam::getHostName($ip); + + return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host])) ->title((string) trans('email.login_from_new_ip')) ; } @@ -96,9 +96,10 @@ class UserLogin extends Notification */ public function toSlack(User $notifiable) { - $ip = Request::ip(); - $host = Steam::getHostName($ip); - return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host, ])); + $ip = Request::ip(); + $host = Steam::getHostName($ip); + + return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host])); } /** @@ -108,6 +109,4 @@ class UserLogin extends Notification { return ReturnsAvailableChannels::returnChannels('user', $notifiable); } - - } diff --git a/app/Providers/CurrencyServiceProvider.php b/app/Providers/CurrencyServiceProvider.php index d26d8c0b22..601ea77f43 100644 --- a/app/Providers/CurrencyServiceProvider.php +++ b/app/Providers/CurrencyServiceProvider.php @@ -77,7 +77,7 @@ class CurrencyServiceProvider extends ServiceProvider $this->app->bind( ExchangeRateRepositoryInterface::class, static function (Application $app) { - /** @var ExchangeRateRepository $repository */ + // @var ExchangeRateRepository $repository return app(ExchangeRateRepository::class); } ); diff --git a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php index 5ae0292cbd..ebeba099f2 100644 --- a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php +++ b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php @@ -1,4 +1,5 @@ userGroup->currencyExchangeRates() - ->where(function (Builder $q) use ($from, $to) { - $q->where('from_currency_id', $from->id) - ->orWhere('to_currency_id', $to->id); - }) - ->orWhere(function (Builder $q) use ($from, $to) { - $q->where('from_currency_id', $to->id) - ->orWhere('to_currency_id', $from->id); - }) - ->orderBy('date', 'DESC')->get(); + ->where(function (Builder $q) use ($from, $to): void { + $q->where('from_currency_id', $from->id) + ->orWhere('to_currency_id', $to->id) + ; + }) + ->orWhere(function (Builder $q) use ($from, $to): void { + $q->where('from_currency_id', $to->id) + ->orWhere('to_currency_id', $from->id) + ; + }) + ->orderBy('date', 'DESC')->get() + ; } } diff --git a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php index 95200d569b..7390261e34 100644 --- a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php +++ b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php @@ -1,4 +1,5 @@ (string) $rate->id, - 'created_at' => $rate->created_at->toAtomString(), - 'updated_at' => $rate->updated_at->toAtomString(), + 'id' => (string) $rate->id, + 'created_at' => $rate->created_at->toAtomString(), + 'updated_at' => $rate->updated_at->toAtomString(), 'from_currency_id' => (string) $rate->fromCurrency->id, 'from_currency_code' => $rate->fromCurrency->code, 'from_currency_symbol' => $rate->fromCurrency->symbol, 'from_currency_decimal_places' => $rate->fromCurrency->decimal_places, - 'to_currency_id' => (string) $rate->toCurrency->id, - 'to_currency_code' => $rate->toCurrency->code, - 'to_currency_symbol' => $rate->toCurrency->symbol, - 'to_currency_decimal_places' => $rate->toCurrency->decimal_places, + 'to_currency_id' => (string) $rate->toCurrency->id, + 'to_currency_code' => $rate->toCurrency->code, + 'to_currency_symbol' => $rate->toCurrency->symbol, + 'to_currency_decimal_places' => $rate->toCurrency->decimal_places, - 'rate' => $rate->rate, - 'date' => $rate->date->toAtomString(), - 'links' => [ + 'rate' => $rate->rate, + 'date' => $rate->date->toAtomString(), + 'links' => [ [ 'rel' => 'self', 'uri' => sprintf('/exchange-rates/%s', $rate->id), diff --git a/composer.lock b/composer.lock index 1ad85ea9de..b99bd9f6fa 100644 --- a/composer.lock +++ b/composer.lock @@ -4439,16 +4439,16 @@ }, { "name": "nesbot/carbon", - "version": "3.8.2", + "version": "3.8.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" + "reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", - "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f01cfa96468f4c38325f507ab81a4f1d2cd93cfe", + "reference": "f01cfa96468f4c38325f507ab81a4f1d2cd93cfe", "shasum": "" }, "require": { @@ -4541,7 +4541,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T17:46:48+00:00" + "time": "2024-12-21T18:03:19+00:00" }, { "name": "nette/schema", @@ -10363,31 +10363,33 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "v2.2.7", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb" + "reference": "0d72ac1c00084279c1816675284073c5a337c20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb", - "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0d72ac1c00084279c1816675284073c5a337c20d", + "reference": "0d72ac1c00084279c1816675284073c5a337c20d", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5 || ^7.0 || ^8.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "php": "^7.4 || ^8.0", + "symfony/css-selector": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10" + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^8.5.21 || ^9.5.10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -10410,9 +10412,9 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.3.0" }, - "time": "2023-12-08T13:03:43+00:00" + "time": "2024-12-21T16:25:41+00:00" }, { "name": "twig/twig", diff --git a/config/translations.php b/config/translations.php index fd5feba0e6..8b40d4b1fb 100644 --- a/config/translations.php +++ b/config/translations.php @@ -273,7 +273,7 @@ return [ 'header_exchange_rates', 'exchange_rates_intro', 'exchange_rates_from_to', - 'exchange_rates_intro_rates' + 'exchange_rates_intro_rates', ], 'form' => [ 'url', @@ -291,7 +291,7 @@ return [ 'webhook_trigger', 'webhook_delivery', 'from_currency_to_currency', - 'to_currency_from_currency' + 'to_currency_from_currency', ], 'list' => [ 'active', diff --git a/package-lock.json b/package-lock.json index c15b8fb4aa..5cd70d1786 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7219,9 +7219,9 @@ "license": "MIT" }, "node_modules/is-core-module": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz", - "integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, "license": "MIT", "dependencies": { @@ -7442,9 +7442,9 @@ "license": "MIT" }, "node_modules/json-stable-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.0.tgz", - "integrity": "sha512-ex8jk9BZHBolvbd5cRnAgwyaYcYB0qZldy1e+LCOdcF6+AUmVZ6LcGUMzsRTW83QMeu+GxZGrcLqxqrgfXGvIw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz", + "integrity": "sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/resources/assets/v1/mix-manifest.json b/resources/assets/v1/mix-manifest.json index 56b2171215..528ebcb2cf 100644 --- a/resources/assets/v1/mix-manifest.json +++ b/resources/assets/v1/mix-manifest.json @@ -14,17 +14,14 @@ "/public/v1/js/app.js.LICENSE.txt": "/public/v1/js/app.js.LICENSE.txt", "/public/v1/js/app_vue.js": "/public/v1/js/app_vue.js", "/public/v1/js/app_vue.js.LICENSE.txt": "/public/v1/js/app_vue.js.LICENSE.txt", - "/public/v1/js/create.js": "/public/v1/js/create.js", - "/public/v1/js/create.js.LICENSE.txt": "/public/v1/js/create.js.LICENSE.txt", "/public/v1/js/create_transaction.js": "/public/v1/js/create_transaction.js", "/public/v1/js/create_transaction.js.LICENSE.txt": "/public/v1/js/create_transaction.js.LICENSE.txt", - "/public/v1/js/edit.js": "/public/v1/js/edit.js", - "/public/v1/js/edit.js.LICENSE.txt": "/public/v1/js/edit.js.LICENSE.txt", "/public/v1/js/edit_transaction.js": "/public/v1/js/edit_transaction.js", "/public/v1/js/edit_transaction.js.LICENSE.txt": "/public/v1/js/edit_transaction.js.LICENSE.txt", "/public/v1/js/exchange-rates/index.js": "/public/v1/js/exchange-rates/index.js", "/public/v1/js/exchange-rates/index.js.LICENSE.txt": "/public/v1/js/exchange-rates/index.js.LICENSE.txt", "/public/v1/js/exchange-rates/rates.js": "/public/v1/js/exchange-rates/rates.js", + "/public/v1/js/exchange-rates/rates.js.LICENSE.txt": "/public/v1/js/exchange-rates/rates.js.LICENSE.txt", "/public/v1/js/ff/accounts/create.js": "/public/v1/js/ff/accounts/create.js", "/public/v1/js/ff/accounts/edit-reconciliation.js": "/public/v1/js/ff/accounts/edit-reconciliation.js", "/public/v1/js/ff/accounts/edit.js": "/public/v1/js/ff/accounts/edit.js", @@ -93,8 +90,6 @@ "/public/v1/js/ff/transactions/mass/edit-bulk.js": "/public/v1/js/ff/transactions/mass/edit-bulk.js", "/public/v1/js/ff/transactions/mass/edit.js": "/public/v1/js/ff/transactions/mass/edit.js", "/public/v1/js/ff/transactions/show.js": "/public/v1/js/ff/transactions/show.js", - "/public/v1/js/index.js": "/public/v1/js/index.js", - "/public/v1/js/index.js.LICENSE.txt": "/public/v1/js/index.js.LICENSE.txt", "/public/v1/js/lib/Chart.bundle.min.js": "/public/v1/js/lib/Chart.bundle.min.js", "/public/v1/js/lib/accounting.min.js": "/public/v1/js/lib/accounting.min.js", "/public/v1/js/lib/bootstrap-multiselect.js": "/public/v1/js/lib/bootstrap-multiselect.js", @@ -153,8 +148,6 @@ "/public/v1/js/lib/vue.js": "/public/v1/js/lib/vue.js", "/public/v1/js/profile.js": "/public/v1/js/profile.js", "/public/v1/js/profile.js.LICENSE.txt": "/public/v1/js/profile.js.LICENSE.txt", - "/public/v1/js/show.js": "/public/v1/js/show.js", - "/public/v1/js/show.js.LICENSE.txt": "/public/v1/js/show.js.LICENSE.txt", "/public/v1/js/webhooks/create.js": "/public/v1/js/webhooks/create.js", "/public/v1/js/webhooks/create.js.LICENSE.txt": "/public/v1/js/webhooks/create.js.LICENSE.txt", "/public/v1/js/webhooks/edit.js": "/public/v1/js/webhooks/edit.js", diff --git a/resources/assets/v1/src/locales/bg.json b/resources/assets/v1/src/locales/bg.json index 61a4cb7e7a..2cc775e535 100644 --- a/resources/assets/v1/src/locales/bg.json +++ b/resources/assets/v1/src/locales/bg.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/ca.json b/resources/assets/v1/src/locales/ca.json index 6645c48663..d7e255796f 100644 --- a/resources/assets/v1/src/locales/ca.json +++ b/resources/assets/v1/src/locales/ca.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reiniciar el secret del webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/cs.json b/resources/assets/v1/src/locales/cs.json index 814f7b9ed2..34c14d7b02 100644 --- a/resources/assets/v1/src/locales/cs.json +++ b/resources/assets/v1/src/locales/cs.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Restartovat tajn\u00fd kl\u00ed\u010d webhooku", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/da.json b/resources/assets/v1/src/locales/da.json index 079605e734..bcddad1cb1 100644 --- a/resources/assets/v1/src/locales/da.json +++ b/resources/assets/v1/src/locales/da.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Nulstil webhook-hemmelighed", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/de.json b/resources/assets/v1/src/locales/de.json index 6dd63043bf..8526b80ac0 100644 --- a/resources/assets/v1/src/locales/de.json +++ b/resources/assets/v1/src/locales/de.json @@ -130,9 +130,10 @@ "response": "Antwort", "visit_webhook_url": "Webhook-URL besuchen", "reset_webhook_secret": "Webhook Secret zur\u00fccksetzen", - "header_exchange_rates": "Exchange rates", - "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "header_exchange_rates": "Wechselkurse", + "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in der Dokumentation<\/a>.", + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/el.json b/resources/assets/v1/src/locales/el.json index 3485310dfe..1269d128bd 100644 --- a/resources/assets/v1/src/locales/el.json +++ b/resources/assets/v1/src/locales/el.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03bc\u03c5\u03c3\u03c4\u03b9\u03ba\u03bf\u03cd webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL", diff --git a/resources/assets/v1/src/locales/en-gb.json b/resources/assets/v1/src/locales/en-gb.json index dc336a9d1a..f97e5e27c4 100644 --- a/resources/assets/v1/src/locales/en-gb.json +++ b/resources/assets/v1/src/locales/en-gb.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/en.json b/resources/assets/v1/src/locales/en.json index a3496cf582..2263d73548 100644 --- a/resources/assets/v1/src/locales/en.json +++ b/resources/assets/v1/src/locales/en.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between {from} and {to} (and the other way around)" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/es.json b/resources/assets/v1/src/locales/es.json index 7b28396cf1..39ca81d618 100644 --- a/resources/assets/v1/src/locales/es.json +++ b/resources/assets/v1/src/locales/es.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Restablecer secreto del webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/fi.json b/resources/assets/v1/src/locales/fi.json index ec11c9f013..588d5b12cb 100644 --- a/resources/assets/v1/src/locales/fi.json +++ b/resources/assets/v1/src/locales/fi.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL-osoite", diff --git a/resources/assets/v1/src/locales/fr.json b/resources/assets/v1/src/locales/fr.json index d31ab6bdb7..d062ce857b 100644 --- a/resources/assets/v1/src/locales/fr.json +++ b/resources/assets/v1/src/locales/fr.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "R\u00e9initialiser le secret du webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "Liens", diff --git a/resources/assets/v1/src/locales/hu.json b/resources/assets/v1/src/locales/hu.json index 6422064f9d..c401eb35f3 100644 --- a/resources/assets/v1/src/locales/hu.json +++ b/resources/assets/v1/src/locales/hu.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Webhook titok vissza\u00e1ll\u00edt\u00e1sa", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/id.json b/resources/assets/v1/src/locales/id.json index 1fc88dd2e8..d9d4708bd9 100644 --- a/resources/assets/v1/src/locales/id.json +++ b/resources/assets/v1/src/locales/id.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/it.json b/resources/assets/v1/src/locales/it.json index c428cabc05..adcc5a272f 100644 --- a/resources/assets/v1/src/locales/it.json +++ b/resources/assets/v1/src/locales/it.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reimposta il segreto del webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/ja.json b/resources/assets/v1/src/locales/ja.json index 430efaf1ed..2350ddeef1 100644 --- a/resources/assets/v1/src/locales/ja.json +++ b/resources/assets/v1/src/locales/ja.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Webhook\u306e\u30b7\u30fc\u30af\u30ec\u30c3\u30c8\u3092\u30ea\u30bb\u30c3\u30c8", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/ko.json b/resources/assets/v1/src/locales/ko.json index c6defcf176..398194ef6a 100644 --- a/resources/assets/v1/src/locales/ko.json +++ b/resources/assets/v1/src/locales/ko.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "\uc6f9\ud6c5 \uc2dc\ud06c\ub9bf \uc7ac\uc124\uc815", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/nb.json b/resources/assets/v1/src/locales/nb.json index 4e321ad0de..3d855b994f 100644 --- a/resources/assets/v1/src/locales/nb.json +++ b/resources/assets/v1/src/locales/nb.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Tilbakestill Webhook n\u00f8kkel", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "Nettadresse", diff --git a/resources/assets/v1/src/locales/nl.json b/resources/assets/v1/src/locales/nl.json index 743f95ef81..7199d055ef 100644 --- a/resources/assets/v1/src/locales/nl.json +++ b/resources/assets/v1/src/locales/nl.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook-geheim", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/nn.json b/resources/assets/v1/src/locales/nn.json index ccde8ab200..6eee4ce10e 100644 --- a/resources/assets/v1/src/locales/nn.json +++ b/resources/assets/v1/src/locales/nn.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Tilbakestill Webhook hemmelegheit", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "Nettadresse", diff --git a/resources/assets/v1/src/locales/pl.json b/resources/assets/v1/src/locales/pl.json index f4376672f2..77a28b3246 100644 --- a/resources/assets/v1/src/locales/pl.json +++ b/resources/assets/v1/src/locales/pl.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Resetuj sekret webhooka", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/pt-br.json b/resources/assets/v1/src/locales/pt-br.json index f11865a899..31d04d08d1 100644 --- a/resources/assets/v1/src/locales/pt-br.json +++ b/resources/assets/v1/src/locales/pt-br.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Redefinir chave do webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/pt.json b/resources/assets/v1/src/locales/pt.json index 62b099d96b..f1798798bf 100644 --- a/resources/assets/v1/src/locales/pt.json +++ b/resources/assets/v1/src/locales/pt.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Redefinir segredo webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/ro.json b/resources/assets/v1/src/locales/ro.json index 207b56e393..df6d2b7810 100644 --- a/resources/assets/v1/src/locales/ro.json +++ b/resources/assets/v1/src/locales/ro.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Resetare secret webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/ru.json b/resources/assets/v1/src/locales/ru.json index d24af626d2..cbeb70d17d 100644 --- a/resources/assets/v1/src/locales/ru.json +++ b/resources/assets/v1/src/locales/ru.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "\u0421\u0441\u044b\u043b\u043a\u0430", diff --git a/resources/assets/v1/src/locales/sk.json b/resources/assets/v1/src/locales/sk.json index 79707551ec..f355fa6a7b 100644 --- a/resources/assets/v1/src/locales/sk.json +++ b/resources/assets/v1/src/locales/sk.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/sl.json b/resources/assets/v1/src/locales/sl.json index 9c5a985e09..b6fbfca81f 100644 --- a/resources/assets/v1/src/locales/sl.json +++ b/resources/assets/v1/src/locales/sl.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Ponastavi skrivno kodo webhooka", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/sv.json b/resources/assets/v1/src/locales/sv.json index 170e69b89c..1e5fb21166 100644 --- a/resources/assets/v1/src/locales/sv.json +++ b/resources/assets/v1/src/locales/sv.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "L\u00e4nk", diff --git a/resources/assets/v1/src/locales/tr.json b/resources/assets/v1/src/locales/tr.json index 5b64f8eac4..7924c193a0 100644 --- a/resources/assets/v1/src/locales/tr.json +++ b/resources/assets/v1/src/locales/tr.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/uk.json b/resources/assets/v1/src/locales/uk.json index a35a5ddc43..1cd8336bf4 100644 --- a/resources/assets/v1/src/locales/uk.json +++ b/resources/assets/v1/src/locales/uk.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438 \u0441\u0456\u043a\u0440\u0435\u0442 \u0432\u0435\u0431-\u0445\u0443\u043a\u0430", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL-\u0430\u0434\u0440\u0435\u0441\u0430", diff --git a/resources/assets/v1/src/locales/vi.json b/resources/assets/v1/src/locales/vi.json index 73bb7bd8de..4c41803e3c 100644 --- a/resources/assets/v1/src/locales/vi.json +++ b/resources/assets/v1/src/locales/vi.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "C\u00e0i l\u1ea1i kh\u00f3a webhook", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/assets/v1/src/locales/zh-cn.json b/resources/assets/v1/src/locales/zh-cn.json index fca138790b..ff54f2ce84 100644 --- a/resources/assets/v1/src/locales/zh-cn.json +++ b/resources/assets/v1/src/locales/zh-cn.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "\u91cd\u7f6e webhook \u5bc6\u94a5", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "\u7f51\u5740", diff --git a/resources/assets/v1/src/locales/zh-tw.json b/resources/assets/v1/src/locales/zh-tw.json index 5ddf3878cc..ade882af8a 100644 --- a/resources/assets/v1/src/locales/zh-tw.json +++ b/resources/assets/v1/src/locales/zh-tw.json @@ -132,7 +132,8 @@ "reset_webhook_secret": "Reset webhook secret", "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between :from and :to" + "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", + "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates." }, "form": { "url": "URL", diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php index be09962d9a..a1d23ddd30 100644 --- a/resources/lang/en_US/breadcrumbs.php +++ b/resources/lang/en_US/breadcrumbs.php @@ -91,7 +91,7 @@ return [ 'notification_index' => 'Owner notifications', // exchange rates - 'exchange_rates_index' => 'Exchange rates', - 'exchange_rates_rates' => 'Exchange rates between :from and :to (and the other way around)', + 'exchange_rates_index' => 'Exchange rates', + 'exchange_rates_rates' => 'Exchange rates between :from and :to (and the other way around)', ]; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 0d56f4ecea..548cfbb421 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1395,13 +1395,13 @@ return [ 'discord_url_label' => 'Discord webhook URL', // exchange rates - 'menu_exchange_rates_index' => 'Exchange rates', - 'header_exchange_rates' => 'Exchange rates', - 'exchange_rates_intro' =>'Firefly III supports downloading and using exchange rates. Read more about this in the documentation.', - 'exchange_rates_from_to' => 'Between {from} and {to} (and the other way around)', - 'header_exchange_rates_rates' => 'Exchange rates', - 'exchange_rates_intro_rates' => 'Firefly III bla bla bla exchange rates.', - 'header_exchange_rates_table' => 'Table with exchange rates', + 'menu_exchange_rates_index' => 'Exchange rates', + 'header_exchange_rates' => 'Exchange rates', + 'exchange_rates_intro' => 'Firefly III supports downloading and using exchange rates. Read more about this in the documentation.', + 'exchange_rates_from_to' => 'Between {from} and {to} (and the other way around)', + 'header_exchange_rates_rates' => 'Exchange rates', + 'exchange_rates_intro_rates' => 'Firefly III bla bla bla exchange rates.', + 'header_exchange_rates_table' => 'Table with exchange rates', // Financial administrations 'administration_index' => 'Financial administration', diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php index 595565eae5..daa59bf741 100644 --- a/resources/lang/en_US/form.php +++ b/resources/lang/en_US/form.php @@ -113,8 +113,8 @@ return [ 'tag' => 'Tag', // exchange rates - 'from_currency_to_currency' => '{from} → {to}', - 'to_currency_from_currency' => '{to} → {from}', + 'from_currency_to_currency' => '{from} → {to}', + 'to_currency_from_currency' => '{to} → {from}', 'under' => 'Under', 'symbol' => 'Symbol', diff --git a/routes/api.php b/routes/api.php index d5c3b0eec9..b398aa7983 100644 --- a/routes/api.php +++ b/routes/api.php @@ -96,8 +96,8 @@ Route::group( static function (): void { Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); Route::get('{currency_code}', ['uses' => 'ShowController@show', 'as' => 'show']); -// Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']); -// + // Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']); + // // Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']); // Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']); // Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']); @@ -115,8 +115,8 @@ Route::group( static function (): void { Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); Route::get('{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'ShowController@show', 'as' => 'show']); -// Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']); -// + // Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']); + // // Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']); // Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']); // Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']); @@ -127,7 +127,7 @@ Route::group( // V2 API route for Summary boxes // BASIC -//Route::group( +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Summary', // 'prefix' => 'v2/summary', @@ -136,11 +136,11 @@ Route::group( // static function (): void { // // Route::get('basic', ['uses' => 'BasicController@basic', 'as' => 'basic']); // } -//); -//// V2 API route for all kinds of Transaction lists. -//// A lot of endpoints involve transactions. So any time Firefly III needs to list transactions -//// it's coming from these endpoints. -//Route::group( +// ); +// // V2 API route for all kinds of Transaction lists. +// // A lot of endpoints involve transactions. So any time Firefly III needs to list transactions +// // it's coming from these endpoints. +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\List', // 'prefix' => 'v2', @@ -154,12 +154,12 @@ Route::group( // // note how the check is done on the user group, not the user itself. // // Route::get('accounts/{userGroupAccount}/transactions', ['uses' => 'AccountController@list', 'as' => 'accounts.transactions']); // } -//); +// ); // V2 API routes for auto complete // -//// V2 API route for net worth endpoint(s); -//Route::group( +// // V2 API route for net worth endpoint(s); +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Summary', // 'prefix' => 'v2/net-worth', @@ -168,24 +168,24 @@ Route::group( // static function (): void { // // Route::get('', ['uses' => 'NetWorthController@get', 'as' => 'index']); // } -//); +// ); // -//// // V2 API route for accounts. -//// Route::group( -//// [ -//// 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Account', -//// 'prefix' => 'v2/accounts', -//// 'as' => 'api.v2.accounts.', -//// ], -//// static function (): void { -//// Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); -//// Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']); -//// Route::put('{account}', ['uses' => 'UpdateController@update', 'as' => 'update']); -//// } -//// ); +// // // V2 API route for accounts. +// // Route::group( +// // [ +// // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Account', +// // 'prefix' => 'v2/accounts', +// // 'as' => 'api.v2.accounts.', +// // ], +// // static function (): void { +// // Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); +// // Route::get('{account}', ['uses' => 'ShowController@show', 'as' => 'show']); +// // Route::put('{account}', ['uses' => 'UpdateController@update', 'as' => 'update']); +// // } +// // ); // -//// V2 API route for subscriptions. -//Route::group( +// // V2 API route for subscriptions. +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Bill', // 'prefix' => 'v2/subscriptions', @@ -197,10 +197,10 @@ Route::group( // // Route::get('sum/paid', ['uses' => 'SumController@paid', 'as' => 'sum.paid']); // // Route::get('sum/unpaid', ['uses' => 'SumController@unpaid', 'as' => 'sum.unpaid']); // } -//); +// ); // -//// V2 API route for piggy banks. -//Route::group( +// // V2 API route for piggy banks. +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\PiggyBank', // 'prefix' => 'v2/piggy-banks', @@ -209,10 +209,10 @@ Route::group( // static function (): void { // // Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); // } -//); +// ); // -//// V2 API route for transaction currencies -//Route::group( +// // V2 API route for transaction currencies +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Currency', // 'prefix' => 'v2/currencies', @@ -221,10 +221,10 @@ Route::group( // static function (): void { // // Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); // } -//); +// ); // -//// V2 API route for transactions -//Route::group( +// // V2 API route for transactions +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model\Transaction', // 'prefix' => 'v2/transactions', @@ -235,9 +235,9 @@ Route::group( // // Route::get('{userGroupTransaction}', ['uses' => 'ShowController@show', 'as' => 'show']); // // Route::put('{userGroupTransaction}', ['uses' => 'UpdateController@update', 'as' => 'update']); // } -//); -//// infinite (transactions) list: -//Route::group( +// ); +// // infinite (transactions) list: +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Transaction\List', // 'prefix' => 'v2/infinite/transactions', @@ -246,10 +246,10 @@ Route::group( // static function (): void { // // Route::get('', ['uses' => 'TransactionController@infiniteList', 'as' => 'list']); // } -//); +// ); // -//// V2 API route for budgets and budget limits: -//Route::group( +// // V2 API route for budgets and budget limits: +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\Model', // 'prefix' => 'v2/budgets', @@ -264,10 +264,10 @@ Route::group( // // Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']); // // Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']); // } -//); +// ); // -//// V2 API route for system -//Route::group( +// // V2 API route for system +// Route::group( // [ // 'namespace' => 'FireflyIII\Api\V2\Controllers\System', // 'prefix' => 'v2', @@ -276,7 +276,7 @@ Route::group( // static function (): void { // // Route::get('preferences/{preference}', ['uses' => 'PreferencesController@get', 'as' => 'preferences.get']); // } -//); +// ); // diff --git a/routes/web.php b/routes/web.php index c581fd4f03..53ec66f3e4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -366,12 +366,12 @@ Route::group( static function (): void { Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']); Route::get('{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'IndexController@rates', 'as' => 'rates']); -// Route::get('create', ['uses' => 'CreateController@create', 'as' => 'create']); -// Route::get('edit/{currency}', ['uses' => 'EditController@edit', 'as' => 'edit']); -// Route::get('delete/{currency}', ['uses' => 'DeleteController@delete', 'as' => 'delete']); -// Route::post('store', ['uses' => 'CreateController@store', 'as' => 'store']); -// Route::post('update/{currency}', ['uses' => 'EditController@update', 'as' => 'update']); -// Route::post('destroy/{currency}', ['uses' => 'DeleteController@destroy', 'as' => 'destroy']); + // Route::get('create', ['uses' => 'CreateController@create', 'as' => 'create']); + // Route::get('edit/{currency}', ['uses' => 'EditController@edit', 'as' => 'edit']); + // Route::get('delete/{currency}', ['uses' => 'DeleteController@delete', 'as' => 'delete']); + // Route::post('store', ['uses' => 'CreateController@store', 'as' => 'store']); + // Route::post('update/{currency}', ['uses' => 'EditController@update', 'as' => 'update']); + // Route::post('destroy/{currency}', ['uses' => 'DeleteController@destroy', 'as' => 'destroy']); } );