Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Mail/CheckinAssetMail.php

@@ -47,7 +47,7 @@ public function envelope(): Envelope
 
         return new Envelope(
             from: $from,
-            subject: trans('mail.Asset_Checkin_Notification'),
+            subject: trans('mail.Asset_Checkin_Notification', ['tag' => $this->item->asset_tag]),
         );
     }
 

app/Mail/CheckoutAssetMail.php

@@ -125,7 +125,7 @@ public function attachments(): array
     private function getSubject(): string
     {
         if ($this->firstTimeSending) {
-            return trans('mail.Asset_Checkout_Notification');
+            return trans('mail.Asset_Checkout_Notification', ['tag' => $this->item->asset_tag]);
         }
 
         return trans('mail.unaccepted_asset_reminder');

resources/lang/en-US/mail.php

@@ -4,8 +4,8 @@
 
     'Accessory_Checkin_Notification' => 'Accessory checked in',
     'Accessory_Checkout_Notification' => 'Accessory checked out',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'Asset_Checkout_Notification' => 'Asset checked out',
+    'Asset_Checkin_Notification' => 'Asset checked in: [:tag]',
+    'Asset_Checkout_Notification' => 'Asset checked out: [:tag]',
     'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
     'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
     'Confirm_component_checkin' => 'Component checkin confirmation',

tests/Unit/Mail/CheckoutAssetMailTest.php

@@ -20,19 +20,20 @@ function () {
                     'asset' => $asset,
                     'acceptance' => CheckoutAcceptance::factory()->for($asset, 'checkoutable')->create(),
                     'first_time_sending' => true,
-                    'expected_subject' => 'Asset checked out',
+                    'expected_subject' => trans('mail.Asset_Checkout_Notification', ['tag' => $asset->asset_tag]),
                     'expected_opening' => 'A new item has been checked out under your name that requires acceptance, details are below.'
                 ];
             }
         ];
 
         yield 'Asset not requiring acceptance' => [
             function () {
+                $asset = Asset::factory()->doesNotRequireAcceptance()->create();
                 return [
-                    'asset' => Asset::factory()->doesNotRequireAcceptance()->create(),
+                    'asset' => $asset,
                     'acceptance' => null,
                     'first_time_sending' => true,
-                    'expected_subject' => 'Asset checked out',
+                    'expected_subject' => trans('mail.Asset_Checkout_Notification', ['tag' => $asset->asset_tag]),
                     'expected_opening' => 'A new item has been checked out under your name, details are below.'
                 ];
             }

tests/Unit/NotificationTest.php

@@ -31,8 +31,8 @@ public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA()
 
         Mail::fake();
         $asset->checkOut($user, $admin->id);
-        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) use ($user) {
-            return $mail->hasTo($user->email) && $mail->hasSubject(trans('mail.Asset_Checkout_Notification'));
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) use ($user, $asset) {
+            return $mail->hasTo($user->email) && $mail->hasSubject(trans('mail.Asset_Checkout_Notification', ['tag' => $asset->asset_tag]));
         });
     }
     public function testDefaultEulaIsSentWhenSetInCategory()