diff --git a/app/Api/V1/Requests/Generic/FilterRequest.php b/app/Api/V1/Requests/Generic/FilterRequest.php index d539a6ed12..5c30219d78 100644 --- a/app/Api/V1/Requests/Generic/FilterRequest.php +++ b/app/Api/V1/Requests/Generic/FilterRequest.php @@ -29,7 +29,6 @@ use FireflyIII\Rules\IsValidFilterInstruction; use FireflyIII\Support\Request\ChecksLogin; use FireflyIII\Support\Request\ConvertsDataTypes; use Illuminate\Contracts\Validation\Validator; -use RuntimeException; class FilterRequest extends ApiRequest { @@ -53,7 +52,7 @@ class FilterRequest extends ApiRequest public function rules(): array { return [ - 'filter' => ['min:0', 'max:255', $this->required, new IsValidFilterInstruction((string) $this->filterClass)], + 'filter' => ['min:0', 'max:255', $this->required, new IsValidFilterInstruction((string)$this->filterClass)], ]; } diff --git a/resources/assets/v3/js/pages/transactions/shared/changed-amount.js b/resources/assets/v3/js/pages/transactions/shared/changed-amount.js index 67026d09ad..797d5cc9a3 100644 --- a/resources/assets/v3/js/pages/transactions/shared/changed-amount.js +++ b/resources/assets/v3/js/pages/transactions/shared/changed-amount.js @@ -18,13 +18,9 @@ * along with this program. If not, see . */ -export function changedAmount(e, givenIndex) { - let index = 0; - if (null === e) { - index = parseInt(givenIndex); - } +export function changedAmount(e) { if (null !== e) { - index = parseInt(e.target.dataset.index); + let index = parseInt(e.target.dataset.index); let value = e.target.value; // switch commas for dots. let len = (value.match(/,/g) || []).length; diff --git a/resources/assets/v3/js/pages/transactions/shared/changed-foreign-amount.js b/resources/assets/v3/js/pages/transactions/shared/changed-foreign-amount.js index 3c592c517a..3f8e8644cb 100644 --- a/resources/assets/v3/js/pages/transactions/shared/changed-foreign-amount.js +++ b/resources/assets/v3/js/pages/transactions/shared/changed-foreign-amount.js @@ -18,13 +18,9 @@ * along with this program. If not, see . */ -export function changedForeignAmount(e, givenIndex) { - let index = 0; - if (null === e) { - index = parseInt(givenIndex); - } +export function changedForeignAmount(e) { if (null !== e) { - index = parseInt(e.target.dataset.index); + let index = parseInt(e.target.dataset.index); let value = e.target.value; // switch commas for dots. let len = (value.match(/,/g) || []).length; @@ -33,5 +29,4 @@ export function changedForeignAmount(e, givenIndex) { } this.entries[index].foreign_amount = parseFloat(value); } - } diff --git a/resources/assets/v3/js/pages/transactions/shared/clear-fields.js b/resources/assets/v3/js/pages/transactions/shared/clear-fields.js index 4094b48d2d..72e0f2d6d0 100644 --- a/resources/assets/v3/js/pages/transactions/shared/clear-fields.js +++ b/resources/assets/v3/js/pages/transactions/shared/clear-fields.js @@ -34,12 +34,12 @@ export function clearDescription(index) { } export function clearAmount(index) { this.entries[index].amount = ""; - this.changedAmount(null, index); + this.changedAmount(null); } export function clearForeignAmount(index) { this.entries[index].foreign_amount = ""; - this.changedForeignAmount(null, index); + // this.changedForeignAmount(null); } export function clearCategory(index) {