Merge remote-tracking branch 'origin/develop'

resources/views/hardware/view.blade.php

@@ -1370,20 +1370,11 @@
                         <div class="col-md-12">
                             <table
                                     class="table table-striped snipe-table"
-                                    id="asseAuditHistory"
-
-                                    data-id-table="asseAuditHistory"
-
-
-
-
+                                    id="assetAuditHistory"
+                                    data-id-table="assetAuditHistory"
                                     data-side-pagination="server"
-
-
-
                                     data-sort-order="desc"
                                     data-sort-name="created_at"
-
                                     data-export-options='{
                          "fileName": "export-asset-{{  $asset->id }}-audits",
                          "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

resources/views/mail/markdown/checkout-accessory.blade.php

@@ -1,5 +1,5 @@
 @component('mail::message')
-# {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
+# {{ trans('mail.hello') }}{{ $target->assignedto?->present()->fullName() ? ' ' . $target->assignedto->present()->fullName() . ',' : ',' }}
 
 {{ trans('mail.new_item_checked') }}
 

resources/views/mail/markdown/checkout-asset.blade.php

@@ -1,5 +1,5 @@
 @component('mail::message')
-# {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
+# {{ trans('mail.hello') }}{{ $target->assignedto?->present()->fullName() ? ' ' . $target->assignedto->present()->fullName() . ',' : ',' }}
 
 {{ $introduction_line }}