mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-01-07 06:31:22 +00:00
Code cleanup.
This commit is contained in:
James Cole
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* See the LICENSE file for details.
|
||||
*/
|
||||
|
||||
declare(strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
|
||||
@@ -144,13 +144,13 @@
|
||||
// uri's for charts:
|
||||
var chartUri = '{{ chartUri }}';
|
||||
{% if start and end %}
|
||||
var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
{% else %}
|
||||
var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}';
|
||||
var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}';
|
||||
var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}';
|
||||
var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, 'all', 'all']) }}';
|
||||
var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, 'all', 'all']) }}';
|
||||
var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, 'all', 'all']) }}';
|
||||
{% endif %}
|
||||
|
||||
</script>
|
||||
|
||||
@@ -72,14 +72,14 @@
|
||||
</div>
|
||||
</div>
|
||||
{% if budgets.count > 0 and inactive.count > 0 %}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'createBudget'|_ }}</h3>
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'createBudget'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<a href="{{ route('budgets.create') }}" class="btn btn-success pull-right">{{ 'createBudget'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<a href="{{ route('budgets.create') }}" class="btn btn-success pull-right">{{ 'createBudget'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
@@ -110,10 +110,10 @@
|
||||
<td style="text-align: right;">{{ period.earned|formatAmount }}</td>
|
||||
</tr>
|
||||
{% if period.earned != 0 and period.spent != 0 %}
|
||||
<tr>
|
||||
<td style="width:33%;">{{ 'sum'|_ }}</td>
|
||||
<td style="text-align: right;">{{ period.sum|formatAmount }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:33%;">{{ 'sum'|_ }}</td>
|
||||
<td style="text-align: right;">{{ period.sum|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr>
|
||||
<td style="width:33%;">{{ 'transferred'|_ }}</td>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{{ trans('demo.import-configure-security') }}
|
||||
<br /><br />
|
||||
<br/><br/>
|
||||
{{ trans('demo.import-configure-configuration') }}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{{ trans('demo.reports-index-start')|raw }}
|
||||
<br />
|
||||
<br />
|
||||
<br/>
|
||||
<br/>
|
||||
{{ trans('demo.reports-index-examples', {
|
||||
one: route('reports.report.default', ['1,2,3','currentMonthStart','currentMonthEnd']),
|
||||
two: route('reports.report.default', ['1,2,3','20160101','20161231']),
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
</p>
|
||||
|
||||
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
|
||||
<a href="{{ url }}">{{ url }}</a>
|
||||
<a href="{{ url }}">{{ url }}</a>
|
||||
</p>
|
||||
{% include 'emails.footer-html' %}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<html>
|
||||
<head>
|
||||
<base href="{{ route('index') }}/" />
|
||||
<base href="{{ route('index') }}/"/>
|
||||
<style>
|
||||
|
||||
/* latin */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<html>
|
||||
<head>
|
||||
<base href="{{ route('index') }}/" />
|
||||
<base href="{{ route('index') }}/"/>
|
||||
<title>Firefly III is in maintenance mode.</title>
|
||||
<style>
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
{{ 'import_finished_intro'|_ }}
|
||||
</p>
|
||||
{% if tagId > 0 %}
|
||||
<p>
|
||||
{{ trans('firefly.import_finished_text_with_link', {tag: tagId})|raw }}
|
||||
</p>
|
||||
<p>
|
||||
{{ trans('firefly.import_finished_text_with_link', {tag: tagId})|raw }}
|
||||
</p>
|
||||
{% else %}
|
||||
<p>
|
||||
{{ 'import_finished_text_without_link'|_ }}
|
||||
</p>
|
||||
<p>
|
||||
{{ 'import_finished_text_without_link'|_ }}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
<p>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var accountInfo = [];
|
||||
{% for id, account in accounts %}
|
||||
accountInfo[{{ id }}] = {preferredCurrency: {{ account.preferredCurrency}}};
|
||||
accountInfo[{{ id }}] = {preferredCurrency: {{ account.preferredCurrency }}};
|
||||
{% endfor %}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
// date range picker configuration:
|
||||
var dateRangeConfig = {
|
||||
startDate: moment("{{ picker.start }}"),
|
||||
endDate: moment("{{ picker.end }}"),
|
||||
linkTitle: "{{ linkTitle }}",
|
||||
URL: "{{ route('daterange') }}",
|
||||
firstDate: moment("{{ firstDate }}"),
|
||||
currentPeriod: "{{ picker.current }}",
|
||||
previousPeriod: "{{ picker.previous }}",
|
||||
nextPeriod: "{{ picker.next }}",
|
||||
everything: '{{ 'everything'|_|escape }}',
|
||||
customRangeLabel: '{{ 'customRange'|_|escape }}',
|
||||
applyLabel: '{{ 'apply'|_|escape }}',
|
||||
cancelLabel: '{{ 'cancel'|_|escape }}',
|
||||
fromLabel: '{{ 'from'|_|escape }}',
|
||||
toLabel: '{{ 'to'|_|escape }}',
|
||||
ranges: {{ picker.ranges|json_encode|raw }}
|
||||
startDate: moment("{{ picker.start }}"),
|
||||
endDate: moment("{{ picker.end }}"),
|
||||
linkTitle: "{{ linkTitle }}",
|
||||
URL: "{{ route('daterange') }}",
|
||||
firstDate: moment("{{ firstDate }}"),
|
||||
currentPeriod: "{{ picker.current }}",
|
||||
previousPeriod: "{{ picker.previous }}",
|
||||
nextPeriod: "{{ picker.next }}",
|
||||
everything: '{{ 'everything'|_|escape }}',
|
||||
customRangeLabel: '{{ 'customRange'|_|escape }}',
|
||||
applyLabel: '{{ 'apply'|_|escape }}',
|
||||
cancelLabel: '{{ 'cancel'|_|escape }}',
|
||||
fromLabel: '{{ 'from'|_|escape }}',
|
||||
toLabel: '{{ 'to'|_|escape }}',
|
||||
ranges: {{ picker.ranges|json_encode|raw }}
|
||||
};
|
||||
|
||||
var language = "{{ language|escape }}";
|
||||
|
||||
@@ -73,11 +73,11 @@
|
||||
</li>
|
||||
|
||||
{% if not SANDSTORM %}
|
||||
<li class="dropdown user user-menu">
|
||||
<li class="dropdown user user-menu">
|
||||
<span style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;">
|
||||
<span class="hidden-xs">{{ Auth.user.email }}</span>
|
||||
</span>
|
||||
</li>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li id="sidebar-toggle">
|
||||
<a href="#" data-toggle="control-sidebar"><i class="fa fa-plus-circle"></i></a>
|
||||
|
||||
@@ -149,12 +149,14 @@
|
||||
|
||||
<ul class="treeview-menu">
|
||||
{% if not SANDSTORM %}
|
||||
<li class="{{ activeRoutePartial('profile') }}">
|
||||
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}</a>
|
||||
</li>
|
||||
<li class="{{ activeRoutePartial('profile') }}">
|
||||
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li class="{{ activeRoutePartial('preferences') }}">
|
||||
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
|
||||
<a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i
|
||||
class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
|
||||
</li>
|
||||
<li class="{{ activeRoutePartial('currency') }}">
|
||||
<a class="{{ activeRoutePartial('currency') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>
|
||||
@@ -174,11 +176,11 @@
|
||||
|
||||
<!-- other options -->
|
||||
{% if not SANDSTORM %}
|
||||
<li>
|
||||
<a href="{{ route('logout') }}">
|
||||
<i class="fa fa-sign-out fa-fw"></i>
|
||||
<span>{{ 'logout'|_ }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ route('logout') }}">
|
||||
<i class="fa fa-sign-out fa-fw"></i>
|
||||
<span>{{ 'logout'|_ }}</span>
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
@@ -71,12 +71,12 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% if piggyBank.targetdate %}
|
||||
<tr>
|
||||
<td>{{ 'suggested_amount'|_ }}</td>
|
||||
<td>
|
||||
{{ suggestedMonthlyAmount(piggyBank)|formatAmount }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ 'suggested_amount'|_ }}</td>
|
||||
<td>
|
||||
{{ suggestedMonthlyAmount(piggyBank)|formatAmount }}
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</table>
|
||||
</div>
|
||||
@@ -100,7 +100,7 @@
|
||||
<h3 class="box-title">{{ trans('form.notes') }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
{{ note.markdown|raw }}
|
||||
{{ note.markdown|raw }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
{% endfor %}
|
||||
|
||||
<p class="text-info">
|
||||
<br />
|
||||
<br/>
|
||||
{{ 'pref_languages_locale'|_ }}
|
||||
</p>
|
||||
</div>
|
||||
@@ -128,11 +128,11 @@
|
||||
<div class="col-sm-10">
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" name="showDepositsFrontpage[]" value="{{ showDepositsFrontpage }}"
|
||||
{% if showDepositsFrontpage %}
|
||||
<input type="checkbox" name="showDepositsFrontpage[]" value="{{ showDepositsFrontpage }}"
|
||||
{% if showDepositsFrontpage %}
|
||||
checked
|
||||
{% endif %}
|
||||
> {{ 'pref_home_do_show_deposits'|_ }}
|
||||
{% endif %}
|
||||
> {{ 'pref_home_do_show_deposits'|_ }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
<a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
||||
</td>
|
||||
{% if accountSummary[account.id] %}
|
||||
<td data-value="{{ accountSummary[account.id] }}" style="text-align: right;">{{ accountSummary[account.id]|formatAmount }}</td>
|
||||
<td data-value="{{ accountSummary[account.id] }}"
|
||||
style="text-align: right;">{{ accountSummary[account.id]|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
@@ -93,7 +94,7 @@
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<div style="width:75%;margin:0 auto;">
|
||||
<canvas id="accounts-out-pie-chart" style="margin:0 auto;"></canvas>
|
||||
<canvas id="accounts-out-pie-chart" style="margin:0 auto;"></canvas>
|
||||
</div>
|
||||
<label style="font-weight:normal;">
|
||||
<input type="checkbox" id="accounts-out-pie-chart-checked">
|
||||
|
||||
@@ -28,12 +28,14 @@
|
||||
<a href="{{ route('accounts.show', account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
||||
</td>
|
||||
{% if accountSummary[account.id] %}
|
||||
<td data-value="{{ accountSummary[account.id].earned }}" style="text-align: right;">{{ accountSummary[account.id].earned|formatAmount }}</td>
|
||||
<td data-value="{{ accountSummary[account.id].earned }}"
|
||||
style="text-align: right;">{{ accountSummary[account.id].earned|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
{% if accountSummary[account.id] %}
|
||||
<td data-value="{{ accountSummary[account.id].spent }}" style="text-align: right;">{{ accountSummary[account.id].spent|formatAmount }}</td>
|
||||
<td data-value="{{ accountSummary[account.id].spent }}"
|
||||
style="text-align: right;">{{ accountSummary[account.id].spent|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
@@ -64,12 +66,14 @@
|
||||
<a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
|
||||
</td>
|
||||
{% if categorySummary[category.id] %}
|
||||
<td data-value="{{ categorySummary[category.id].earned }}" style="text-align: right;">{{ categorySummary[category.id].earned|formatAmount }}</td>
|
||||
<td data-value="{{ categorySummary[category.id].earned }}"
|
||||
style="text-align: right;">{{ categorySummary[category.id].earned|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
{% if categorySummary[category.id] %}
|
||||
<td data-value="{{ categorySummary[category.id].spent }}" style="text-align: right;">{{ categorySummary[category.id].spent|formatAmount }}</td>
|
||||
<td data-value="{{ categorySummary[category.id].spent }}"
|
||||
style="text-align: right;">{{ categorySummary[category.id].spent|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
|
||||
@@ -94,7 +94,6 @@
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
<div class="box">
|
||||
|
||||
@@ -201,9 +201,9 @@
|
||||
var accountIds = '{{ accountIds }}';
|
||||
|
||||
// report uri's
|
||||
var opChartUri ='{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var sumChartUri='{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var netWorthUri ='{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var opChartUri = '{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var sumChartUri = '{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var netWorthUri = '{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
|
||||
// data uri's
|
||||
var accountReportUri = '{{ route('report-data.account.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
|
||||
@@ -190,9 +190,9 @@
|
||||
var accountIds = '{{ accountIds }}';
|
||||
|
||||
// report uri's
|
||||
var opChartUri ='{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var sumChartUri='{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var netWorthUri ='{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var opChartUri = '{{ route('chart.report.operations', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var sumChartUri = '{{ route('chart.report.sum', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
var netWorthUri = '{{ route('chart.report.net-worth', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
|
||||
// data uri's
|
||||
var accountReportUri = '{{ route('report-data.account.general', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
</td>
|
||||
<td class="hidden-xs" data-value="{{ account.start_balance }}" style="text-align: right;">{{ account.start_balance|formatAmount }}</td>
|
||||
<td class="hidden-xs" data-value="{{ account.end_balance }}" style="text-align: right;">{{ account.end_balance|formatAmount }}</td>
|
||||
<td style="text-align: right;" data-value="{{ (account.end_balance - account.start_balance) }}">{{ (account.end_balance - account.start_balance)|formatAmount }}</td>
|
||||
<td style="text-align: right;"
|
||||
data-value="{{ (account.end_balance - account.start_balance) }}">{{ (account.end_balance - account.start_balance)|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
<tr>
|
||||
<td>
|
||||
{% if id != 0 %}
|
||||
<a class="btn btn-default btn-xs" href="{{ route('categories.show', [id]) }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
|
||||
<a class="btn btn-default btn-xs" href="{{ route('categories.show', [id]) }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
|
||||
{% else %}
|
||||
<a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
|
||||
<a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td data-value="{{ info.name }}">
|
||||
|
||||
@@ -107,7 +107,8 @@
|
||||
<a href="{{ route('tags.show', tag.id) }}" title="{{ tag.tag }}">{{ tag.tag }}</a>
|
||||
</td>
|
||||
{% if tagSummary[tag.id] %}
|
||||
<td data-value="{{ tagSummary[tag.id].earned }}" style="text-align: right;">{{ tagSummary[tag.id].earned|formatAmount }}</td>
|
||||
<td data-value="{{ tagSummary[tag.id].earned }}"
|
||||
style="text-align: right;">{{ tagSummary[tag.id].earned|formatAmount }}</td>
|
||||
{% else %}
|
||||
<td data-value="0" style="text-align: right;">{{ 0|formatAmount }}</td>
|
||||
{% endif %}
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
{% endif %}
|
||||
|
||||
{% if rule.description != "" %}
|
||||
<small class="hidden-xs"
|
||||
<small class="hidden-xs"
|
||||
{% if not rule.active %}
|
||||
class="text-muted"
|
||||
{% endif %}
|
||||
|
||||
@@ -33,4 +33,4 @@
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
</table>
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, journal.id]) }}" accept-charset="UTF-8" class="form-horizontal" id="store"
|
||||
<form method="POST" action="{{ route('transactions.convert.index.post', [destinationType.type|lower, journal.id]) }}" accept-charset="UTF-8"
|
||||
class="form-horizontal" id="store"
|
||||
enctype="multipart/form-data">
|
||||
<input name="_token" type="hidden" value="{{ csrf_token() }}">
|
||||
<div class="row">
|
||||
@@ -47,8 +48,7 @@
|
||||
sourceName: sourceAccount.name,
|
||||
destinationRoute: route('accounts.show', [destinationAccount.id]),
|
||||
destinationName: destinationAccount.name,
|
||||
})|raw
|
||||
}}
|
||||
})|raw }}
|
||||
</em>
|
||||
</p>
|
||||
<p><em>
|
||||
@@ -69,8 +69,7 @@
|
||||
sourceName: sourceAccount.name,
|
||||
destinationRoute: route('accounts.show', [destinationAccount.id]),
|
||||
destinationName: destinationAccount.name,
|
||||
})|raw
|
||||
}}
|
||||
})|raw }}
|
||||
</em></p>
|
||||
|
||||
<p>
|
||||
@@ -95,8 +94,7 @@
|
||||
sourceName: sourceAccount.name,
|
||||
destinationRoute: route('accounts.show', [destinationAccount.id]),
|
||||
destinationName: destinationAccount.name,
|
||||
})|raw
|
||||
}}
|
||||
})|raw }}
|
||||
</em>
|
||||
</p>
|
||||
<p>
|
||||
@@ -121,8 +119,7 @@
|
||||
sourceName: sourceAccount.name,
|
||||
destinationRoute: route('accounts.show', [destinationAccount.id]),
|
||||
destinationName: destinationAccount.name,
|
||||
})|raw
|
||||
}}
|
||||
})|raw }}
|
||||
</em>
|
||||
</p>
|
||||
<p>
|
||||
@@ -147,8 +144,7 @@
|
||||
sourceName: sourceAccount.name,
|
||||
destinationRoute: route('accounts.show', [destinationAccount.id]),
|
||||
destinationName: destinationAccount.name,
|
||||
})|raw
|
||||
}}
|
||||
})|raw }}
|
||||
</em>
|
||||
</p>
|
||||
|
||||
@@ -175,8 +171,7 @@
|
||||
sourceName: sourceAccount.name,
|
||||
destinationRoute: route('accounts.show', [destinationAccount.id]),
|
||||
destinationName: destinationAccount.name,
|
||||
})|raw
|
||||
}}
|
||||
})|raw }}
|
||||
</em>
|
||||
</p>
|
||||
|
||||
|
||||
@@ -69,7 +69,8 @@
|
||||
</select>
|
||||
{% else %}
|
||||
{# SOURCE ACCOUNT NAME FOR DEPOSIT #}
|
||||
<input class="form-control input-sm" placeholder="{{ journal.source_account_name }}" name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}">
|
||||
<input class="form-control input-sm" placeholder="{{ journal.source_account_name }}"
|
||||
name="source_account_name[{{ journal.id }}]" type="text" value="{{ journal.source_account_name }}">
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
@@ -83,20 +84,24 @@
|
||||
</select>
|
||||
{% else %}
|
||||
{# DESTINATION ACCOUNT NAME FOR EXPENSE #}
|
||||
<input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}" name="destination_account_name[{{ journal.id }}]" type="text" value="{{ journal.destination_account_name }}">
|
||||
<input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}"
|
||||
name="destination_account_name[{{ journal.id }}]" type="text"
|
||||
value="{{ journal.destination_account_name }}">
|
||||
{% endif %}
|
||||
</td>
|
||||
{# category #}
|
||||
<td>
|
||||
<input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}" name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}">
|
||||
<input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}"
|
||||
name="category[{{ journal.id }}]" type="text" value="{{ journal.categories[0].name }}">
|
||||
</td>
|
||||
{# budget #}
|
||||
<td>
|
||||
{% if journal.transaction_type_type == 'Withdrawal' %}
|
||||
<select class="form-control input-sm" name="budget_id[{{ journal.id }}]">
|
||||
<option value="0" label="(none)"
|
||||
{% if journal.budgets.count == 0 %}selected="selected"{% endif %}
|
||||
>(none)</option>
|
||||
{% if journal.budgets.count == 0 %}selected="selected"{% endif %}
|
||||
>(none)
|
||||
</option>
|
||||
{% for budget in budgets %}
|
||||
<option value="{{ budget.id }}"{% if budget.id==journal.budgets[0].id %} selected="selected"{% endif %}
|
||||
label="{{ budget.name }}">{{ budget.name }}</option>
|
||||
|
||||
@@ -243,12 +243,12 @@
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if transactions|length == 1 %}
|
||||
<p>
|
||||
<i class="fa fa-copy" aria-hidden="true"></i>
|
||||
<a href="{{ route('transactions.clone', [journal.id]) }}">
|
||||
{{ ('clone_'~journal.transactionType.type|lower)|_ }}
|
||||
</a>
|
||||
</p>
|
||||
<p>
|
||||
<i class="fa fa-copy" aria-hidden="true"></i>
|
||||
<a href="{{ route('transactions.clone', [journal.id]) }}">
|
||||
{{ ('clone_'~journal.transactionType.type|lower)|_ }}
|
||||
</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user