Merge remote-tracking branch 'origin/develop'

snipe · Feb 23, 2023 · adb166f · adb166f
2 parents 225b6ef + 4a9ced1
commit adb166f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -186,6 +186,14 @@ public function declinedCheckout(User $declinedBy, $signature)
         '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

diff --git 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') }}
 
 <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>