Skip to content

Firefly III: a personal finances manager

Fix missing vars.

James Coledf7c6c8d788a
diff --git a/resources/views/budgets/show.blade.php b/resources/views/budgets/show.blade.php
index 3a66159397..37f8d7d3f6 100644
--- a/resources/views/budgets/show.blade.php
+++ b/resources/views/budgets/show.blade.php
@@ -7,7 +7,7 @@
<div class="row">
<div class="col-9">
<h3 class="card-title">
- @if(null !== ($budgetLimit ?? null))
+ @if(null !== $budgetLimit)
{{ trans('firefly.chart_budget_in_period', ['name' => $budget->name, 'start' => $budgetLimit->start_date->isoFormat($monthAndDayFormat), 'end' => $budgetLimit->end_date->isoFormat($monthAndDayFormat), 'currency' => $budgetLimit->transactionCurrency->name]) }}
@else
{{ trans('firefly.chart_all_journals_for_budget', ['name' => $budget->name]) }}
@@ -28,7 +28,7 @@
<div class="card-body">
<canvas id="budgetOverview" class="wide-chart" height="400" width="100%"></canvas>
</div>
- @if(null !== ($budgetLimit ?? null))
+ @if(null !== $budgetLimit)
<div class="card-footer">
<p class="text-muted">
{{ trans('firefly.chart_budget_in_period_only_currency', ['currency' => $budgetLimit->transactionCurrency->name]) }}
@@ -142,7 +142,7 @@
@if(count($limits) > 0)
<div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
@foreach($limits as $limit)
- <div class="card @if($limit->start_date == $budgetLimit->start_date) card-primary card-outline @endif">
+ <div class="card @if(null !== $budgetLimit && $limit->start_date === $budgetLimit->start_date) card-primary card-outline @endif">
<div class="card-header">
<h3 class="card-title"><a href="{{ route('budgets.show.limit',[$budget->id,$limit->id]) }}">{{ $limit->start_date->isoFormat($monthAndDayFormat) }} &mdash;{{ $limit->end_date->isoFormat($monthAndDayFormat) }}
</a>
diff --git a/resources/views/transactions/mass/edit.blade.php b/resources/views/transactions/mass/edit.blade.php
index e527f8f8a7..bb283270dc 100644
--- a/resources/views/transactions/mass/edit.blade.php
+++ b/resources/views/transactions/mass/edit.blade.php
@@ -135,9 +135,9 @@
{{-- DESTINATION ACCOUNT NAME FOR WITHDRAWAL --}}
@if($journal['transaction_type_type'] === 'Withdrawal')
<input class="form-control input-sm" spellcheck="false"
- placeholder="@if($journal['destination_type'] !== 'Cash account'){{ $journal['destination_account_name'] }}@endif"
+ placeholder="@if(array_key_exists('destination_type', $journal) && $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">
+ value="@if(array_key_exists('destination_type', $journal) && $journal['destination_type'] !== 'Cash account'){{ $journal['destination_account_name'] }}@endif">
@endif
@endif
</td>