mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-12-30 10:47:06 -06:00
Fix view of bills.
This commit is contained in:
parent
59f5b38dca
commit
89f8f9b45b
@ -74,15 +74,5 @@ class Kernel extends ConsoleKernel
|
||||
event(new AdminRequestedTestMessage($user, $ipAddress));
|
||||
}
|
||||
)->daily();
|
||||
|
||||
// send test email.
|
||||
$schedule->call(
|
||||
function () {
|
||||
$ipAddress = '127.0.0.2';
|
||||
/** @var User $user */
|
||||
$user = User::find(1);
|
||||
event(new AdminRequestedTestMessage($user, $ipAddress));
|
||||
}
|
||||
)->hourly();
|
||||
}
|
||||
}
|
||||
|
@ -50,6 +50,7 @@ class BillFormRequest extends Request
|
||||
'repeat_freq' => $this->string('repeat_freq'),
|
||||
'skip' => $this->integer('skip'),
|
||||
'notes' => $this->string('notes'),
|
||||
'active' => $this->boolean('active'),
|
||||
];
|
||||
}
|
||||
|
||||
@ -72,6 +73,7 @@ class BillFormRequest extends Request
|
||||
'date' => 'required|date',
|
||||
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',
|
||||
'skip' => 'required|between:0,31',
|
||||
'active' => 'boolean',
|
||||
];
|
||||
|
||||
return $rules;
|
||||
|
@ -51,7 +51,7 @@ class BillUpdateService
|
||||
$bill->repeat_freq = $data['repeat_freq'];
|
||||
$bill->skip = $data['skip'];
|
||||
$bill->automatch = true;
|
||||
$bill->active = $data['active'];
|
||||
$bill->active = $data['active']??true;
|
||||
$bill->save();
|
||||
|
||||
// update note:
|
||||
|
@ -91,13 +91,13 @@
|
||||
<a href="{{ route('bills.rescan',object.data.id) }}" class="btn btn-default">{{ 'rescan_old'|_ }}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% if object.data.notes != '' %}
|
||||
{% if object.data.notes.data[0] %}
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'notes'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive">
|
||||
{{ object.data.notes }}
|
||||
{{ object.data.notes.data[0].markdown|raw }}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
Loading…
Reference in New Issue
Block a user