From 578f350498b75f31d321c78a608c7f7b3b7b07e9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 20 Sep 2021 06:39:10 +0200 Subject: [PATCH] Convert GET routes to POST. --- app/Http/Controllers/CurrencyController.php | 92 +++++++++++-------- .../Transaction/CreateController.php | 45 +++++---- public/v1/js/ff/currencies/index.js | 35 +++++++ public/v1/js/ff/list/groups.js | 18 +++- public/v1/js/ff/transactions/show.js | 17 ++++ resources/views/v1/currencies/index.twig | 10 +- resources/views/v1/list/groups.twig | 7 +- resources/views/v1/transactions/show.twig | 8 +- routes/web.php | 6 +- 9 files changed, 167 insertions(+), 71 deletions(-) diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 22cd0a8cbad..c2781f39e33 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -213,52 +213,59 @@ public function destroy(Request $request, TransactionCurrency $currency) * @return RedirectResponse|Redirector * @throws FireflyException */ - public function disableCurrency(Request $request, TransactionCurrency $currency) + public function disableCurrency(Request $request) { - app('preferences')->mark(); + $currencyId = (int)$request->get('id'); + if ($currencyId > 0) { + // valid currency? + $currency = $this->repository->find($currencyId); + if (null !== $currency) { + app('preferences')->mark(); - /** @var User $user */ - $user = auth()->user(); - if (!$this->userRepository->hasRole($user, 'owner')) { + /** @var User $user */ + $user = auth()->user(); + if (!$this->userRepository->hasRole($user, 'owner')) { - $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => e(config('firefly.site_owner'))])); - Log::channel('audit')->info(sprintf('Tried to disable currency %s but is not site owner.', $currency->code)); + $request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => e(config('firefly.site_owner'))])); + Log::channel('audit')->info(sprintf('Tried to disable currency %s but is not site owner.', $currency->code)); - return redirect(route('currencies.index')); + return redirect(route('currencies.index')); - } + } - if ($this->repository->currencyInUse($currency)) { + if ($this->repository->currencyInUse($currency)) { - $location = $this->repository->currencyInUseAt($currency); - $message = (string)trans(sprintf('firefly.cannot_disable_currency_%s', $location), ['name' => e($currency->name)]); + $location = $this->repository->currencyInUseAt($currency); + $message = (string)trans(sprintf('firefly.cannot_disable_currency_%s', $location), ['name' => e($currency->name)]); - $request->session()->flash('error', $message); - Log::channel('audit')->info(sprintf('Tried to disable currency %s but is in use.', $currency->code)); + $request->session()->flash('error', $message); + Log::channel('audit')->info(sprintf('Tried to disable currency %s but is in use.', $currency->code)); - return redirect(route('currencies.index')); - } + return redirect(route('currencies.index')); + } - $this->repository->disable($currency); - Log::channel('audit')->info(sprintf('Disabled currency %s.', $currency->code)); - // if no currencies are enabled, enable the first one in the DB (usually the EUR) - if (0 === $this->repository->get()->count()) { - /** @var TransactionCurrency $first */ - $first = $this->repository->getAll()->first(); - if (null === $first) { - throw new FireflyException('No currencies found.'); - } - Log::channel('audit')->info(sprintf('Auto-enabled currency %s.', $first->code)); - $this->repository->enable($first); - app('preferences')->set('currencyPreference', $first->code); - app('preferences')->mark(); - } + $this->repository->disable($currency); + Log::channel('audit')->info(sprintf('Disabled currency %s.', $currency->code)); + // if no currencies are enabled, enable the first one in the DB (usually the EUR) + if (0 === $this->repository->get()->count()) { + /** @var TransactionCurrency $first */ + $first = $this->repository->getAll()->first(); + if (null === $first) { + throw new FireflyException('No currencies found.'); + } + Log::channel('audit')->info(sprintf('Auto-enabled currency %s.', $first->code)); + $this->repository->enable($first); + app('preferences')->set('currencyPreference', $first->code); + app('preferences')->mark(); + } - if ('EUR' === $currency->code) { - session()->flash('warning', (string)trans('firefly.disable_EUR_side_effects')); - } + if ('EUR' === $currency->code) { + session()->flash('warning', (string)trans('firefly.disable_EUR_side_effects')); + } - session()->flash('success', (string)trans('firefly.currency_is_now_disabled', ['name' => $currency->name])); + session()->flash('success', (string)trans('firefly.currency_is_now_disabled', ['name' => $currency->name])); + } + } return redirect(route('currencies.index')); } @@ -311,13 +318,20 @@ public function edit(Request $request, TransactionCurrency $currency) * * @return RedirectResponse|Redirector */ - public function enableCurrency(TransactionCurrency $currency) + public function enableCurrency(Request $request) { - app('preferences')->mark(); + $currencyId = (int)$request->get('id'); + if ($currencyId > 0) { + // valid currency? + $currency = $this->repository->find($currencyId); + if (null !== $currency) { + app('preferences')->mark(); - $this->repository->enable($currency); - session()->flash('success', (string)trans('firefly.currency_is_now_enabled', ['name' => $currency->name])); - Log::channel('audit')->info(sprintf('Enabled currency %s.', $currency->code)); + $this->repository->enable($currency); + session()->flash('success', (string)trans('firefly.currency_is_now_enabled', ['name' => $currency->name])); + Log::channel('audit')->info(sprintf('Enabled currency %s.', $currency->code)); + } + } return redirect(route('currencies.index')); } diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php index 4fc8d3c4264..5664a0e012f 100644 --- a/app/Http/Controllers/Transaction/CreateController.php +++ b/app/Http/Controllers/Transaction/CreateController.php @@ -28,17 +28,20 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Services\Internal\Update\GroupCloneService; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; -use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; +use Illuminate\Http\JsonResponse; +use Illuminate\Http\Request; /** * Class CreateController */ class CreateController extends Controller { + private TransactionGroupRepositoryInterface $repository; + /** * CreateController constructor. * @@ -49,9 +52,10 @@ public function __construct() parent::__construct(); $this->middleware( - static function ($request, $next) { + function ($request, $next) { app('view')->share('title', (string)trans('firefly.transactions')); app('view')->share('mainTitleIcon', 'fa-exchange'); + $this->repository = app(TransactionGroupRepositoryInterface::class); return $next($request); } @@ -59,28 +63,35 @@ static function ($request, $next) { } /** - * @param TransactionGroup $group + * @param Request $request * - * @return RedirectResponse|Redirector + * @return JsonResponse */ - public function cloneGroup(TransactionGroup $group) + public function cloneGroup(Request $request): JsonResponse { + $groupId = (int)$request->get('id'); + if (0 !== $groupId) { + $group = $this->repository->find($groupId); + if (null !== $group) { + /** @var GroupCloneService $service */ + $service = app(GroupCloneService::class); + $newGroup = $service->cloneGroup($group); - /** @var GroupCloneService $service */ - $service = app(GroupCloneService::class); - $newGroup = $service->cloneGroup($group); + // event! + event(new StoredTransactionGroup($newGroup)); - // event! - event(new StoredTransactionGroup($newGroup)); + app('preferences')->mark(); - app('preferences')->mark(); + $title = $newGroup->title ?? $newGroup->transactionJournals->first()->description; + $link = route('transactions.show', [$newGroup->id]); + session()->flash('success', trans('firefly.stored_journal', ['description' => $title])); + session()->flash('success_url', $link); - $title = $newGroup->title ?? $newGroup->transactionJournals->first()->description; - $link = route('transactions.show', [$newGroup->id]); - session()->flash('success', trans('firefly.stored_journal', ['description' => $title])); - session()->flash('success_url', $link); + return response()->json(['redirect' => route('transactions.show', [$newGroup->id])]); + } + } - return redirect(route('transactions.show', [$newGroup->id])); + return response()->json(['redirect' => route('transactions.show', [$groupId])]); } /** diff --git a/public/v1/js/ff/currencies/index.js b/public/v1/js/ff/currencies/index.js index eb0ad1f1f2e..dbccfae942f 100644 --- a/public/v1/js/ff/currencies/index.js +++ b/public/v1/js/ff/currencies/index.js @@ -25,6 +25,8 @@ $(function () { "use strict"; $('.make_default').on('click', setDefaultCurrency); + $('.enable-currency').on('click', enableCurrency); + $('.disable-currency').on('click', disableCurrency); }); function setDefaultCurrency(e) { @@ -40,4 +42,37 @@ function setDefaultCurrency(e) { }).fail(function () { console.error('I failed :('); }); + return false; +} + +function enableCurrency(e) { + var button = $(e.currentTarget); + var currencyId = parseInt(button.data('id')); + + $.post(enableCurrencyUrl, { + _token: token, + id: currencyId + }).done(function (data) { + // lame but it works + location.reload(); + }).fail(function () { + console.error('I failed :('); + }); + return false; +} + +function disableCurrency(e) { + var button = $(e.currentTarget); + var currencyId = parseInt(button.data('id')); + + $.post(disableCurrencyUrl, { + _token: token, + id: currencyId + }).done(function (data) { + // lame but it works + location.reload(); + }).fail(function () { + console.error('I failed :('); + }); + return false; } diff --git a/public/v1/js/ff/list/groups.js b/public/v1/js/ff/list/groups.js index 98bc371cf56..a18a1cca6e2 100644 --- a/public/v1/js/ff/list/groups.js +++ b/public/v1/js/ff/list/groups.js @@ -23,6 +23,7 @@ var count = 0; $(document).ready(function () { updateListButtons(); addSort(); + $('.clone-transaction').click(cloneTransaction); }); var fixHelper = function (e, tr) { @@ -206,4 +207,19 @@ function updateActionButtons() { if (0 === count) { $('.action-menu').hide(); } -} \ No newline at end of file +} +function cloneTransaction(e) { + var button = $(e.currentTarget); + var groupId = parseInt(button.data('id')); + + $.post(cloneGroupUrl, { + _token: token, + id: groupId + }).done(function (data) { + // lame but it works + location.href = data.redirect; + }).fail(function () { + console.error('I failed :('); + }); + return false; +} diff --git a/public/v1/js/ff/transactions/show.js b/public/v1/js/ff/transactions/show.js index ada41fc76be..72ad1490b3a 100644 --- a/public/v1/js/ff/transactions/show.js +++ b/public/v1/js/ff/transactions/show.js @@ -23,6 +23,7 @@ $(function () { "use strict"; $('.link-modal').click(getLinkModal); + $('.clone-transaction').click(cloneTransaction); $('#linkJournalModal').on('shown.bs.modal', function () { makeAutoComplete(); }) @@ -80,3 +81,19 @@ function selectedJournal(event, journal) { $('#selected-journal').html('' + journal.description + '').show(); $('input[name="opposing"]').val(journal.id); } + +function cloneTransaction(e) { + var button = $(e.currentTarget); + var groupId = parseInt(button.data('id')); + + $.post(cloneGroupUrl, { + _token: token, + id: groupId + }).done(function (data) { + // lame but it works + location.href = data.redirect; + }).fail(function () { + console.error('I failed :('); + }); + return false; +} \ No newline at end of file diff --git a/resources/views/v1/currencies/index.twig b/resources/views/v1/currencies/index.twig index 8320003ba76..40ecba91111 100644 --- a/resources/views/v1/currencies/index.twig +++ b/resources/views/v1/currencies/index.twig @@ -69,14 +69,14 @@ class="fa fa-fw fa-star"> {{ 'make_default_currency'|_ }} {% endif %} {% if currency.enabled %} - + {{ 'disable_currency'|_ }} {% endif %} {% if not currency.enabled %} - + {{ 'enable_currency'|_ }} {% endif %} @@ -101,6 +101,8 @@ {% block scripts %} {% endblock %} diff --git a/resources/views/v1/list/groups.twig b/resources/views/v1/list/groups.twig index e799367791a..1ce20727fef 100644 --- a/resources/views/v1/list/groups.twig +++ b/resources/views/v1/list/groups.twig @@ -85,7 +85,7 @@ class="fa fa-fw fa-pencil"> {{ 'edit'|_ }}
  • {{ 'delete'|_ }}
    • -
  • {{ 'clone'|_ }}
    • @@ -249,7 +249,7 @@ class="fa fa-fw fa-pencil"> {{ 'edit'|_ }}
  • {{ 'delete'|_ }}
    • -
  • {{ 'clone'|_ }}
  • + diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index 668c9c3609a..f00d0303bd7 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -35,9 +35,8 @@ {# clone #} {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %} -
    • -
  • {{ 'clone'|_ }}
    • +
  • {{ 'clone'|_ }}
    • {% endif %} @@ -208,9 +207,8 @@ {# clone #} {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %} - -
  • {{ 'clone'|_ }}
    • +
  • {{ 'clone'|_ }}
    • {% endif %}
  • {{ 'link_transaction'|_ }}
    • @@ -219,7 +217,6 @@
  • {{ 'create_recurring_from_transaction'|_ }}
    • -
    @@ -425,6 +422,7 @@ var modalDialogURI = '{{ route('transactions.link.modal', ['%JOURNAL%']) }}'; var acURI = '{{ route('api.v1.autocomplete.transactions-with-id') }}'; var groupURI = '{{ route('transactions.show',['%GROUP%']) }}'; + var cloneGroupUrl = '{{ route('transactions.clone') }}'; diff --git a/routes/web.php b/routes/web.php index d9b42c4b446..5452cae5dc7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -338,8 +338,8 @@ static function () { Route::get('edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'edit']); Route::get('delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'delete']); Route::post('default', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'default']); - Route::get('enable/{currency}', ['uses' => 'CurrencyController@enableCurrency', 'as' => 'enable']); - Route::get('disable/{currency}', ['uses' => 'CurrencyController@disableCurrency', 'as' => 'disable']); + Route::post('enable', ['uses' => 'CurrencyController@enableCurrency', 'as' => 'enable']); + Route::post('disable', ['uses' => 'CurrencyController@disableCurrency', 'as' => 'disable']); Route::post('store', ['uses' => 'CurrencyController@store', 'as' => 'store']); Route::post('update/{currency}', ['uses' => 'CurrencyController@update', 'as' => 'update']); @@ -1012,7 +1012,7 @@ static function () { Route::post('store', ['uses' => 'Transaction\CreateController@store', 'as' => 'store']); // clone group - Route::get('clone/{transactionGroup}', ['uses' => 'Transaction\CreateController@cloneGroup', 'as' => 'clone']); + Route::post('clone', ['uses' => 'Transaction\CreateController@cloneGroup', 'as' => 'clone']); // edit group Route::get('edit/{transactionGroup}', ['uses' => 'Transaction\EditController@edit', 'as' => 'edit']);