Merge pull request #18223 from grokability/#18114-fixed-declined-notification-added-x-header

Fixed #18114 - include declined item name, added app headers

Author: snipe

app/Http/Controllers/Account/AcceptanceController.php

@@ -13,9 +13,9 @@
 use App\Models\Contracts\Acceptable;
 use App\Models\Setting;
 use App\Models\User;
-use App\Notifications\AcceptanceAssetAcceptedNotification;
-use App\Notifications\AcceptanceAssetAcceptedToUserNotification;
-use App\Notifications\AcceptanceAssetDeclinedNotification;
+use App\Notifications\AcceptanceItemAcceptedNotification;
+use App\Notifications\AcceptanceItemAcceptedToUserNotification;
+use App\Notifications\AcceptanceItemDeclinedNotification;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
@@ -145,7 +145,7 @@ public function store(Request $request, $id) : RedirectResponse
         // Get the data array ready for the notifications and PDF generation
         $data = [
             'item_tag' => $item->asset_tag,
-            'item_name' => $item->name, // this handles licenses seats, which don't have a 'name' field
+            'item_name' => $item->display_name, // this handles licenses seats, which don't have a 'name' field
             'item_model' => $item->model?->name,
             'item_serial' => $item->serial,
             'item_status' => $item->assetstatus?->name,
@@ -183,13 +183,13 @@ public function store(Request $request, $id) : RedirectResponse
                 // Add the attachment for the signing user into the $data array
                 $data['file'] = $pdf_filename;
                 try {
-                    $assigned_user->notify((new AcceptanceAssetAcceptedToUserNotification($data))->locale($assigned_user->locale));
+                    $assigned_user->notify((new AcceptanceItemAcceptedToUserNotification($data))->locale($assigned_user->locale));
                 } catch (\Exception $e) {
                     Log::warning($e);
                 }
             }
             try {
-                $acceptance->notify((new AcceptanceAssetAcceptedNotification($data))->locale(Setting::getSettings()->locale));
+                $acceptance->notify((new AcceptanceItemAcceptedNotification($data))->locale(Setting::getSettings()->locale));
             } catch (\Exception $e) {
                 Log::warning($e);
             }
@@ -204,7 +204,7 @@ public function store(Request $request, $id) : RedirectResponse
                 $acceptance->decline($sig_filename, $request->input('note'));
             }
 
-            $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
+            $acceptance->notify(new AcceptanceItemDeclinedNotification($data));
             Log::debug('New event acceptance.');
             event(new CheckoutDeclined($acceptance));
             $return_msg = trans('admin/users/message.declined');

app/Mail/BaseMailable.php

@@ -0,0 +1,18 @@
+<?php
+namespace App\Mail;
+
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Headers;
+
+class BaseMailable extends Mailable
+{
+    public function headers(): Headers
+    {
+        return new Headers(
+            text: [
+                'X-Auto-Response-Suppress' => 'OOF, DR, RN, NRN, AutoReply',
+                'X-System-Sender' => 'Snipe-IT',
+            ]
+        );
+    }
+}

app/Mail/CheckinAccessoryMail.php

@@ -6,14 +6,12 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
-class CheckinAccessoryMail extends Mailable
+class CheckinAccessoryMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckinAssetMail.php

@@ -7,15 +7,13 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\SerializesModels;
 
-class CheckinAssetMail extends Mailable
+class CheckinAssetMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckinComponentMail.php

@@ -7,14 +7,12 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
-class CheckinComponentMail extends Mailable
+class CheckinComponentMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckinLicenseMail.php

@@ -6,14 +6,12 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
-class CheckinLicenseMail extends Mailable
+class CheckinLicenseMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckoutAcceptanceResponseMail.php

@@ -5,13 +5,11 @@
 use App\Models\CheckoutAcceptance;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
-class CheckoutAcceptanceResponseMail extends Mailable
+class CheckoutAcceptanceResponseMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckoutAccessoryMail.php

@@ -8,15 +8,13 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
-class CheckoutAccessoryMail extends Mailable
+class CheckoutAccessoryMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckoutAssetMail.php

@@ -8,16 +8,14 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Attachment;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Queue\SerializesModels;
 
-class CheckoutAssetMail extends Mailable
+class CheckoutAssetMail extends BaseMailable
 {
     use Queueable, SerializesModels;
 

app/Mail/CheckoutComponentMail.php

@@ -6,13 +6,12 @@
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
 
-class CheckoutComponentMail extends Mailable
+class CheckoutComponentMail extends BaseMailable
 {
     use Queueable, SerializesModels;