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

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig
This commit is contained in:
James Cole 2022-10-24 19:35:47 +02:00
commit b21461c824
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
22 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Chart/BillController.php
View File

@ -31,7 +31,6 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use JsonException;
/**
* Class BillController.
@ -134,7 +133,7 @@ class BillController extends Controller
}
);
$chartData = [
$chartData = [
['type' => 'line', 'label' => (string) trans('firefly.min-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol,
'currency_code' => $bill->transactionCurrency->code, 'entries' => []],
['type' => 'line', 'label' => (string) trans('firefly.max-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol,
@ -142,7 +141,7 @@ class BillController extends Controller
['type' => 'bar', 'label' => (string) trans('firefly.journal-amount'), 'currency_symbol' => $bill->transactionCurrency->symbol,
'currency_code' => $bill->transactionCurrency->code, 'entries' => []],
];
$currencyId = (int) $bill->transaction_currency_id;
foreach ($journals as $journal) {
$date = $journal['date']->isoFormat((string) trans('config.month_and_day_js', [], $locale));
$chartData[0]['entries'][$date] = $bill->amount_min; // minimum amount of bill
@ -152,7 +151,12 @@ class BillController extends Controller
if (!array_key_exists($date, $chartData[2]['entries'])) {
$chartData[2]['entries'][$date] = '0';
}
$amount = bcmul($journal['amount'], '-1');
$amount = bcmul($journal['amount'], '-1');
if ($currencyId === $journal['foreign_currency_id']) {
$amount = bcmul($journal['foreign_amount'], '-1');
}
$chartData[2]['entries'][$date] = bcadd($chartData[2]['entries'][$date], $amount); // amount of journal
}

10
resources/assets/js/components/passport/Clients.vue
View File

@ -127,7 +127,7 @@
<label class="col-md-3 col-form-label">{{ $t('firefly.name') }}</label>
<div class="col-md-9">
<input id="create-client-name" v-model="createForm.name" class="form-control"
<input id="create-client-name" v-model="createForm.name" class="form-control" spellcheck="false"
type="text" @keyup.enter="store">
<span class="form-text text-muted">
@ -141,7 +141,7 @@
<label class="col-md-3 col-form-label">{{ $t('firefly.profile_oauth_redirect_url') }}</label>
<div class="col-md-9">
<input v-model="createForm.redirect" class="form-control" name="redirect"
<input v-model="createForm.redirect" class="form-control" name="redirect" spellcheck="false"
type="text" @keyup.enter="store">
<span class="form-text text-muted">
@ -214,7 +214,7 @@
<label class="col-md-3 col-form-label">{{ $t('firefly.name') }}</label>
<div class="col-md-9">
<input id="edit-client-name" v-model="editForm.name" class="form-control"
<input id="edit-client-name" v-model="editForm.name" class="form-control" spellcheck="false"
type="text" @keyup.enter="update">
<span class="form-text text-muted">
@ -228,7 +228,7 @@
<label class="col-md-3 col-form-label">{{ $t('firefly.profile_oauth_redirect_url') }}</label>
<div class="col-md-9">
<input v-model="editForm.redirect" class="form-control" name="redirect"
<input v-model="editForm.redirect" class="form-control" name="redirect" spellcheck="false"
type="text" @keyup.enter="update">
<span class="form-text text-muted">
@ -268,7 +268,7 @@
{{ $t('firefly.profile_oauth_client_secret_expl') }}
</p>
<input v-model="clientSecret" class="form-control" type="text">
<input v-model="clientSecret" class="form-control" type="text" spellcheck="false">
</div>
<!-- Modal Actions -->

2
resources/assets/js/components/passport/PersonalAccessTokens.vue
View File

@ -108,7 +108,7 @@
<label class="col-md-4 col-form-label">{{ $t('firefly.name') }}</label>
<div class="col-md-6">
<input id="create-token-name" v-model="form.name" class="form-control" name="name" type="text">
<input id="create-token-name" v-model="form.name" class="form-control" name="name" type="text" spellcheck="false">
</div>
</div>

1
resources/assets/js/components/transactions/AccountSelect.vue
View File

@ -25,6 +25,7 @@
<div class="col-sm-12">
<div class="input-group">
<input
spellcheck="false"
ref="input"
:data-index="index"
:disabled="inputDisabled"

2
resources/assets/js/components/transactions/Amount.vue
View File

@ -26,7 +26,7 @@
<label ref="cur" class="col-sm-4 control-label"></label>
<div class="col-sm-8">
<div class="input-group">
<input ref="amount"
<input ref="amount" spellcheck="false"
:title="$t('firefly.amount')"
:value="value"
autocomplete="off"

1
resources/assets/js/components/transactions/Category.vue
View File

@ -26,6 +26,7 @@
<div class="col-sm-12">
<div class="input-group">
<input
spellcheck="false"
ref="input"
:value="value"
autocomplete="off"

2
resources/assets/js/components/transactions/CustomAttachments.vue
View File

@ -27,7 +27,7 @@
</div>
<div class="col-sm-12">
<div class="input-group">
<input ref="input"
<input ref="input" spellcheck="false"
:name="name"
:placeholder="title"
:title="title"

2
resources/assets/js/components/transactions/CustomDate.vue
View File

@ -27,7 +27,7 @@
</div>
<div class="col-sm-12">
<div class="input-group">
<input ref="date" :name="name" :placeholder="title"
<input ref="date" :name="name" :placeholder="title" spellcheck="false"
:title="title" :value="value ? value.substr(0,10): ''"
autocomplete="off"
class="form-control" type="date"

2
resources/assets/js/components/transactions/CustomString.vue
View File

@ -27,7 +27,7 @@
</div>
<div class="col-sm-12">
<div class="input-group">
<input ref="str" :name="name" :placeholder="title"
<input ref="str" :name="name" :placeholder="title" spellcheck="false"
:title="title" :value="value"
autocomplete="off"
class="form-control" type="text"

2
resources/assets/js/components/transactions/CustomUri.vue
View File

@ -27,7 +27,7 @@
</div>
<div class="col-sm-12">
<div class="input-group">
<input ref="uri" :name="name" :placeholder="title"
<input ref="uri" :name="name" :placeholder="title" spellcheck="false"
:title="title" :value="value"
autocomplete="off"
class="form-control" type="url"

1
resources/assets/js/components/transactions/GroupDescription.vue
View File

@ -26,6 +26,7 @@
<div class="col-sm-12">
<div class="input-group">
<input
spellcheck="false"
ref="descr"
:value="value"
autocomplete="off"

1
resources/assets/js/components/transactions/TransactionDescription.vue
View File

@ -26,6 +26,7 @@
<div class="col-sm-12">
<div class="input-group">
<input
spellcheck="false"
ref="descr"
:title="$t('firefly.description')"
:value="value"

8
resources/views/accounts/reconcile/index.twig
View File

@ -41,13 +41,13 @@
<div class="input-group-addon">
<span class="fa fa-calendar"></span>
</div>
<input type="date" value="{{ start.format('Y-m-d') }}" name="start_date" class="form-control">
<input type="date" value="{{ start.format('Y-m-d') }}" name="start_date" class="form-control" spellcheck="false">
</div>
</td>
<td>
<div class="input-group">
<span class="input-group-addon non-selectable-currency-symbol">{{ currency.symbol }}</span>
<input type="number" value="{{ startBalance }}" name="start_balance" class="form-control">
<input type="number" value="{{ startBalance }}" name="start_balance" class="form-control" spellcheck="false">
</div>
</td>
<td>
@ -55,13 +55,13 @@
<div class="input-group-addon">
<span class="fa fa-calendar"></span>
</div>
<input type="date" value="{{ end.format('Y-m-d') }}" name="end_date" class="form-control">
<input type="date" value="{{ end.format('Y-m-d') }}" name="end_date" class="form-control" spellcheck="false">
</div>
</td>
<td>
<div class="input-group">
<span class="input-group-addon non-selectable-currency-symbol">{{ currency.symbol }}</span>
<input type="number" value="{{ endBalance }}" name="end_balance" class="form-control">
<input type="number" value="{{ endBalance }}" name="end_balance" class="form-control" spellcheck="false">
</div>
</td>
</tr>

2
resources/views/auth/two-factor-removeme.twig
View File

@ -22,7 +22,7 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="form-group has-feedback">
<input type="number" name="code" class="form-control" placeholder="{{ 'two_factor_code_here'|_ }}"/>
<input type="number" name="code" class="form-control" placeholder="{{ 'two_factor_code_here'|_ }}" spellcheck="false"/>
</div>
<div class="row">

2
resources/views/layout/default.twig
View File

@ -101,7 +101,7 @@
<section class="sidebar">
<form action="{{ route('search.index') }}" method="get" class="sidebar-form">
<div class="input-group">
<input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
<input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}" spellcheck="false"/>
<span class="input-group-btn">
<button type='submit' name='go' id='search-btn' class="btn btn-flat"><span class="fa fa-search"></span></button>
</span>

2
resources/views/profile/change-email.twig
View File

@ -29,7 +29,7 @@
<div class="form-group">
<label for="email" class="col-sm-4 control-label">{{ trans('form.new_email_address') }}</label>
<div class="col-sm-8">
<input type="email" class="form-control" id="email" placeholder="{{ 'new_email_address'|_ }}"
<input type="email" class="form-control" id="email" placeholder="{{ 'new_email_address'|_ }}" spellcheck="false"
value="{{ old('email')|default(email) }}"
name="email">
</div>

6
resources/views/profile/change-password.twig
View File

@ -30,7 +30,7 @@
<label for="inputOldPassword" class="col-sm-4 control-label">{{ 'current_password'|_ }}</label>
<div class="col-sm-8">
<input type="password" class="form-control" id="inputOldPassword" placeholder="{{ 'current_password'|_ }}"
<input type="password" class="form-control" id="inputOldPassword" placeholder="{{ 'current_password'|_ }}" spellcheck="false"
name="current_password">
</div>
</div>
@ -39,7 +39,7 @@
<label for="inputNewPassword1" class="col-sm-4 control-label">{{ 'new_password'|_ }}</label>
<div class="col-sm-8">
<input type="password" class="form-control" id="inputNewPassword1" placeholder="{{ 'new_password'|_ }}" name="new_password">
<input type="password" class="form-control" id="inputNewPassword1" placeholder="{{ 'new_password'|_ }}" name="new_password" spellcheck="false">
</div>
</div>
@ -47,7 +47,7 @@
<label for="inputNewPassword2" class="col-sm-4 control-label">{{ 'new_password_again'|_ }}</label>
<div class="col-sm-8">
<input type="password" class="form-control" id="inputNewPassword2" placeholder="{{ 'new_password_again'|_ }}"
<input type="password" class="form-control" id="inputNewPassword2" placeholder="{{ 'new_password_again'|_ }}" spellcheck="false"
name="new_password_confirmation">
</div>
</div>

2
resources/views/profile/delete-account.twig
View File

@ -38,7 +38,7 @@
<label for="password" class="col-sm-4 control-label">{{ 'password'|_ }}</label>
<div class="col-sm-8">
<input type="password" class="form-control" id="password" placeholder="{{ 'password'|_ }}" name="password">
<input type="password" class="form-control" id="password" placeholder="{{ 'password'|_ }}" name="password" spellcheck="false">
</div>
</div>
</div>

2
resources/views/profile/logout-other-sessions.twig
View File

@ -19,7 +19,7 @@
<label for="inputOldPassword" class="col-sm-4 control-label">{{ 'current_password'|_ }}</label>
<div class="col-sm-8">
<input type="password" class="form-control" id="inputOldPassword" placeholder="{{ 'current_password'|_ }}"
<input type="password" class="form-control" id="inputOldPassword" placeholder="{{ 'current_password'|_ }}" spellcheck="false"
name="password">
</div>
</div>

2
resources/views/search/index.twig
View File

@ -20,7 +20,7 @@
<div class="form-group">
<label for="query" class="col-sm-1 control-label">{{ 'search_query'|_ }}</label>
<div class="col-sm-10">
<input autocomplete="off" maxlength="255" type="text" name="search" id="query" value="{{ fullQuery }}" class="form-control"
<input autocomplete="off" maxlength="255" type="text" name="search" id="query" value="{{ fullQuery }}" class="form-control" spellcheck="false"
placeholder="{{ fullQuery }}">
</div>
</div>

8
resources/views/transactions/bulk/edit.twig
View File

@ -60,8 +60,8 @@
({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
{% endif %}
{% endif %}
</td>
<td>{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
<td>
@ -104,7 +104,7 @@
<tr>
<th style="width:25%;">{{ trans('list.category') }}</th>
<td>
<input class="form-control" placeholder="" name="category" autocomplete="off" type="text" value="">
<input class="form-control" placeholder="" name="category" autocomplete="off" type="text" value="" spellcheck="false">
</td>
<td>
<div class="checkbox">
@ -136,7 +136,7 @@
<tr>
<th>{{ trans('list.tags') }}</th>
<td>
<input class="form-control" placeholder="" name="tags" autocomplete="off" type="text" value="">
<input class="form-control" placeholder="" name="tags" autocomplete="off" type="text" value="" spellcheck="false">
</td>
<td>
<div class="radio">

6
resources/views/transactions/mass/edit.twig
View File

@ -111,7 +111,7 @@
{# SOURCE ACCOUNT NAME FOR DEPOSIT #}
{% if journal.transaction_type_type == 'Deposit' %}
<input class="form-control input-sm"
<input class="form-control input-sm" spellcheck="false"
placeholder="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}{% endif %}"
autocomplete="off"
name="source_name[{{ journal.transaction_journal_id }}]" type="text"
@ -133,7 +133,7 @@
{# DESTINATION ACCOUNT NAME FOR WITHDRAWAL #}
{% if journal.transaction_type_type == 'Withdrawal' %}
<input class="form-control input-sm"
<input class="form-control input-sm" spellcheck="false"
placeholder="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}"
name="destination_name[{{ journal.transaction_journal_id }}]" type="text" autocomplete="off"
value="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}">
@ -141,7 +141,7 @@
</td>
{# category #}
<td style="position: relative;">
<input class="form-control input-sm" placeholder="{{ journal.category_name }}" autocomplete="off"
<input class="form-control input-sm" placeholder="{{ journal.category_name }}" autocomplete="off" spellcheck="false"
name="category[{{ journal.transaction_journal_id }}]" type="text" value="{{ journal.category_name }}">
</td>
{# budget #}