Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Account/AcceptanceController.php

@@ -248,15 +248,15 @@ public function store(Request $request, $id) : RedirectResponse
 
                 // Add the attachment for the signing user into the $data array
                 $data['file'] = $pdf_filename;
-
+                $locale = $assigned_user->locale;
                 try {
-                    $assigned_user->notify(new AcceptanceAssetAcceptedToUserNotification($data));
+                    $assigned_user->notify((new AcceptanceAssetAcceptedToUserNotification($data))->locale($locale));
                 } catch (\Exception $e) {
                     Log::warning($e);
                 }
             }
             try {
-                $acceptance->notify(new AcceptanceAssetAcceptedNotification($data));
+                $acceptance->notify((new AcceptanceAssetAcceptedNotification($data))->locale(Setting::getSettings()->locale));
             } catch (\Exception $e) {
                 Log::warning($e);
             }

app/Listeners/CheckoutableListener.php

@@ -96,7 +96,8 @@ public function onCheckedOut($event)
 
             if (!empty($to)) {
                 try {
-                    Mail::to(array_flatten($to))->cc(array_flatten($cc))->send($mailable);
+                    Mail::to(array_flatten($to))->send($mailable->locale($notifiable->locale));
+                    Mail::to(array_flatten($cc))->send($mailable->locale(Setting::getSettings()->locale));
                     Log::info('Checkout Mail sent to checkout target');
                 } catch (ClientException $e) {
                     Log::debug("Exception caught during checkout email: " . $e->getMessage());
@@ -180,7 +181,8 @@ public function onCheckedIn($event)
 
             try {
                 if (!empty($to)) {
-                    Mail::to(array_flatten($to))->cc(array_flatten($cc))->send($mailable);
+                    Mail::to(array_flatten($to))->send($mailable->locale($notifiable->locale));
+                    Mail::to(array_flatten($cc))->send($mailable->locale(Setting::getSettings()->locale));
                     Log::info('Checkin Mail sent to CC addresses');
                 }
             } catch (ClientException $e) {

app/Models/CheckoutAcceptance.php

@@ -32,7 +32,19 @@ public function routeNotificationForMail()
 
         return array_filter($recipients);
     }
-
+    public function getCheckoutableItemTypeAttribute(): string
+    {
+        $type = $this->checkoutable_type;
+
+        return match ($type) {
+            Asset::class       => trans('general.asset'),
+            LicenseSeat::class => trans('general.license'),
+            Accessory::class   => trans('general.accessory'),
+            Component::class   => trans('general.component'),
+            Consumable::class  => trans('general.consumable'),
+            default            => class_basename($type),
+        };
+    }
     /**
      * The resource that was is out
      *

resources/views/account/accept/index.blade.php

@@ -31,6 +31,7 @@ class="table table-striped snipe-table"
             <thead>
               <tr>
                 <th>{{ trans('general.name')}}</th>
+                  <th>{{ trans('general.type')}}</th>
                 <th>{{ trans('general.serial_number')}}</th>
                 <th>{{ trans('table.actions')}}</th>
               </tr>
@@ -40,6 +41,7 @@ class="table table-striped snipe-table"
               <tr>
                 @if ($acceptance->checkoutable)
                 <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>
+                  <td>{{ $acceptance->checkoutable_item_type }}</td>
                   <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->serial : '' }}</td>
                 <td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">{{ trans('general.accept_decline') }}</a></td>
                 @else

tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php

@@ -58,7 +58,7 @@ public function testCanBulkCheckoutAssets()
             $this->assertHasTheseActionLogs($asset, ['create', 'checkout']); //Note: '$this' gets auto-bound in closures, so this does work.
         });
 
-        Mail::assertSent(CheckoutAssetMail::class, 2);
+        Mail::assertSent(CheckoutAssetMail::class, 4);
         Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
             return $mail->hasTo('[email protected]');
         });

tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckinTest.php

@@ -51,8 +51,12 @@ public function test_admin_alert_email_sends()
 
         $this->fireCheckInEvent($this->asset, $this->user);
 
+        Mail::assertSentCount(2);
         Mail::assertSent(CheckinAssetMail::class, function ($mail) {
-            return $mail->hasTo($this->user->email) && $mail->hasCc('[email protected]');
+            return $mail->hasTo($this->user->email);
+        });
+        Mail::assertSent(CheckinAssetMail::class, function ($mail) {
+            return $mail->hasTo('[email protected]');
         });
     }
 

tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckoutTest.php

@@ -48,7 +48,7 @@ public function test_admin_alert_email_sends()
         $this->fireCheckoutEvent();
 
         Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
-            return $mail->hasCc('[email protected]');
+            return $mail->hasTo('[email protected]');
         });
     }