From 6e994c209f81b700d2ff628a813972fceda8f915 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Sun, 19 Feb 2023 12:31:10 -0600 Subject: [PATCH 1/2] Adds setter to model Asset class for expected checkin --- app/Models/Asset.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index e0908c0894..386650cac6 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -186,6 +186,14 @@ class Asset extends Depreciable 'model.manufacturer' => ['name'], ]; + // To properly set the expected checkin as Y-m-d + public function setExpectedCheckinAttribute($value) + { + if ($value == '') { + $value = null; + } + $this->attributes['expected_checkin'] = $value; + } /** * This handles the custom field validation for assets From 6c8de181cf319238d7457feaa775a4b064f55760 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 22 Feb 2023 17:52:47 -0800 Subject: [PATCH 2/2] Properly close tag in mail template --- resources/views/notifications/markdown/user-inventory.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/notifications/markdown/user-inventory.blade.php b/resources/views/notifications/markdown/user-inventory.blade.php index c7dfba9a30..7b298dbc32 100644 --- a/resources/views/notifications/markdown/user-inventory.blade.php +++ b/resources/views/notifications/markdown/user-inventory.blade.php @@ -47,7 +47,7 @@ ## {{ $licenses->count() }} {{ trans('general.licenses') }} - + @foreach($licenses as $license)
{{ trans('mail.name') }}
{{ $license->name }}