Fix view of bills.

This commit is contained in:
James Cole
2018-06-24 16:17:42 +02:00
parent 59f5b38dca
commit 89f8f9b45b
4 changed files with 5 additions and 13 deletions

View File

@@ -74,15 +74,5 @@ class Kernel extends ConsoleKernel
event(new AdminRequestedTestMessage($user, $ipAddress)); event(new AdminRequestedTestMessage($user, $ipAddress));
} }
)->daily(); )->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();
} }
} }

View File

@@ -50,6 +50,7 @@ class BillFormRequest extends Request
'repeat_freq' => $this->string('repeat_freq'), 'repeat_freq' => $this->string('repeat_freq'),
'skip' => $this->integer('skip'), 'skip' => $this->integer('skip'),
'notes' => $this->string('notes'), 'notes' => $this->string('notes'),
'active' => $this->boolean('active'),
]; ];
} }
@@ -72,6 +73,7 @@ class BillFormRequest extends Request
'date' => 'required|date', 'date' => 'required|date',
'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly', 'repeat_freq' => 'required|in:weekly,monthly,quarterly,half-year,yearly',
'skip' => 'required|between:0,31', 'skip' => 'required|between:0,31',
'active' => 'boolean',
]; ];
return $rules; return $rules;

View File

@@ -51,7 +51,7 @@ class BillUpdateService
$bill->repeat_freq = $data['repeat_freq']; $bill->repeat_freq = $data['repeat_freq'];
$bill->skip = $data['skip']; $bill->skip = $data['skip'];
$bill->automatch = true; $bill->automatch = true;
$bill->active = $data['active']; $bill->active = $data['active']??true;
$bill->save(); $bill->save();
// update note: // update note:

View File

@@ -91,13 +91,13 @@
<a href="{{ route('bills.rescan',object.data.id) }}" class="btn btn-default">{{ 'rescan_old'|_ }}</a> <a href="{{ route('bills.rescan',object.data.id) }}" class="btn btn-default">{{ 'rescan_old'|_ }}</a>
</div> </div>
</div> </div>
{% if object.data.notes != '' %} {% if object.data.notes.data[0] %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'notes'|_ }}</h3> <h3 class="box-title">{{ 'notes'|_ }}</h3>
</div> </div>
<div class="box-body table-responsive"> <div class="box-body table-responsive">
{{ object.data.notes }} {{ object.data.notes.data[0].markdown|raw }}
</div> </div>
</div> </div>
{% endif %} {% endif %}