IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add more details in message.

Browse Source
This commit is contained in:
James Cole 2024-01-04 11:46:23 +01:00
parent c32044a8eb
commit 1ba7847d84
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
6 changed files with 1648 additions and 1633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Exceptions/Handler.php
View File

@ -216,6 +216,7 @@ class Handler extends ExceptionHandler
'json' => request()->acceptsJson(), 'json' => request()->acceptsJson(),
'method' => request()->method(), 'method' => request()->method(),
'headers' => $headers, 'headers' => $headers,
'post' => 'POST' === request()->method() ? json_encode(request()->all()) : '',
]; ];
// create job that will mail. // create job that will mail.
@ -231,7 +232,7 @@ class Handler extends ExceptionHandler
* *
* @param Request $request * @param Request $request
*/ */
protected function invalid($request, LaravelValidationException $exception): \Illuminate\Http\Response|JsonResponse|RedirectResponse protected function invalid($request, LaravelValidationException $exception): \Illuminate\Http\Response | JsonResponse | RedirectResponse
{ {
// protect against open redirect when submitting invalid forms. // protect against open redirect when submitting invalid forms.
$previous = app('steam')->getSafePreviousUrl(); $previous = app('steam')->getSafePreviousUrl();
@ -239,8 +240,7 @@ class Handler extends ExceptionHandler
return redirect($redirect ?? $previous) return redirect($redirect ?? $previous)
->withInput(Arr::except($request->input(), $this->dontFlash)) ->withInput(Arr::except($request->input(), $this->dontFlash))
->withErrors($exception->errors(), $request->input('_error_bag', $exception->errorBag)) ->withErrors($exception->errors(), $request->input('_error_bag', $exception->errorBag));
;
} }
private function shouldntReportLocal(\Throwable $e): bool private function shouldntReportLocal(\Throwable $e): bool

8
app/Transformers/V2/TransactionGroupTransformer.php
View File

@ -46,10 +46,10 @@ class TransactionGroupTransformer extends AbstractTransformer
private ExchangeRateConverter $converter; private ExchangeRateConverter $converter;
private array $currencies = []; private array $currencies = [];
private TransactionCurrency $default; private TransactionCurrency $default;
private array $meta; private array $meta = [];
private array $notes; private array $notes = [];
private array $locations; private array $locations = [];
private array $tags; private array $tags = [];
public function collectMetaData(Collection $objects): void public function collectMetaData(Collection $objects): void
{ {

1
resources/lang/en_US/email.php
View File

@ -116,6 +116,7 @@ return [
'error_github_text' => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.', 'error_github_text' => 'If you prefer, you can also open a new issue on https://github.com/firefly-iii/firefly-iii/issues.',
'error_stacktrace_below' => 'The full stacktrace is below:', 'error_stacktrace_below' => 'The full stacktrace is below:',
'error_headers' => 'The following headers may also be relevant:', 'error_headers' => 'The following headers may also be relevant:',
'error_post' => 'This was submitted by the user:',
// Ignore this comment // Ignore this comment

1
resources/lang/en_US/firefly.php
View File

@ -1896,6 +1896,7 @@ return [
// Ignore this comment // Ignore this comment
// transactions: // transactions:
'wait_attachments' => 'Please wait for the attachments to upload.',
'amount_foreign_if' => 'Amount in foreign currency, if any', 'amount_foreign_if' => 'Amount in foreign currency, if any',
'amount_destination_account' => 'Amount in the currency of the destination account', 'amount_destination_account' => 'Amount in the currency of the destination account',
'edit_transaction_title' => 'Edit transaction ":description"', 'edit_transaction_title' => 'Edit transaction ":description"',

8
resources/views/emails/error-html.twig
View File

@ -52,5 +52,13 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</p> </p>
{% if ('' != post %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{{ trans('email.error_post') }}
</p>
<p style="font-family: monospace;font-size:11px;color:#aaa">
{{ post }}
</p>
{% endif %}
{% include 'emails.footer-html' %} {% include 'emails.footer-html' %}

5
resources/views/emails/error-text.twig
View File

@ -33,5 +33,10 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if ('' != post %}
{{ trans('email.error_post') }}
{{ post }}
{% endif %}
{% include 'emails.footer-text' %} {% include 'emails.footer-text' %}