DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 00:37:39 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-02-22 18:01:06 -08:00
parent 225b6ef310 4a9ced192b
commit adb166fb8d
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Models/Asset.php
View file

@ -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

2
resources/views/notifications/markdown/user-inventory.blade.php
View file

@ -47,7 +47,7 @@
## {{ $licenses->count() }} {{ trans('general.licenses') }}
<table width="100%">
<tr><th align="left"{{ trans('mail.name') }} </th></tr>
<tr><th align="left">{{ trans('mail.name') }} </th></tr>
@foreach($licenses as $license)
<tr>
<td>{{ $license->name }}</td>