Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Listeners/CheckoutableListener.php

@@ -77,7 +77,7 @@ public function onCheckedOut($event)
              */
 
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
+                    $this->checkoutableShouldSendEmail($event)) {
                     Log::info('Sending checkout email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
                     if (!empty($notifiable)) {
                         Mail::to($notifiable)->cc($ccEmails)->send($mailable);
@@ -146,7 +146,6 @@ public function onCheckedIn($event)
         $ccEmails = array_filter($adminCcEmailsArray);
         $mailable =  $this->getCheckinMailType($event);
         $notifiable = $this->getNotifiables($event);
-
         if  (!$event->checkedOutTo->locale){
             $mailable->locale($event->checkedOutTo->locale);
         }
@@ -159,7 +158,7 @@ public function onCheckedIn($event)
              * 3. The item should send an email at check-in/check-out
              */
                 if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) {
+                    $this->checkoutableShouldSendEmail($event)) {
                     Log::info('Sending checkin email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
                     if (!empty($notifiable)) {
                         Mail::to($notifiable)->cc($ccEmails)->send($mailable);
@@ -338,4 +337,12 @@ private function shouldSendWebhookNotification(): bool
     {
         return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;
     }
+
+    private function checkoutableShouldSendEmail($event): bool
+    {
+        if($event->checkoutable instanceof LicenseSeat){
+            return $event->checkoutable->license->checkin_email();
+        }
+        return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email());
+    }
 }

resources/assets/less/overrides.less

@@ -47,7 +47,7 @@
   padding: 10px;
   background: #f4f4f4;
   margin-bottom: 3px;
-  border-left: 2px solid #e6e7e8;
+  border-inline: 2px solid #e6e7e8;
   color: #444;
   cursor: move;
 }

resources/assets/less/skins/skin-black-dark.less

@@ -112,8 +112,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;

resources/assets/less/skins/skin-blue-dark.less

@@ -107,6 +107,10 @@ a {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 
 

resources/assets/less/skins/skin-green-dark.less

@@ -107,6 +107,10 @@ a {
   color: #fff;
 }
 
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 
 

resources/assets/less/skins/skin-orange-dark.less

@@ -98,6 +98,11 @@ li.dropdown-item-marker {
   color: #fff;
 }
 
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
+
 :root {
   --background: #222;
   --back-main: #333;

resources/assets/less/skins/skin-purple-dark.less

@@ -108,8 +108,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;

resources/assets/less/skins/skin-red-dark.less

@@ -107,8 +107,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;

resources/assets/less/skins/skin-yellow-dark.less

@@ -104,8 +104,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;

resources/views/account/view-assets.blade.php

@@ -431,6 +431,9 @@ class="table table-striped snipe-table"
                       <th class="col-md-2" data-switchable="true" data-visible="false">
                         {{ trans('admin/hardware/form.default_location') }}
                       </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.location') }}
+                      </th>
 
                       @can('self.view_purchase_cost')
                         <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
@@ -489,6 +492,9 @@ class="table table-striped snipe-table"
                         <td>
                           {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}
                         </td>
+                        <td>
+                          {{ ($asset->location) ? $asset->location->name : '' }}
+                        </td>
                         @can('self.view_purchase_cost')
                         <td>
                           {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}