renamed files, add namespace, register listener

Author: Godmartinz

app/Listeners/TransferrableListener.php renamed to app/Listeners/TransferableListener.php

@@ -1,11 +1,12 @@
 <?php
-
+namespace App\Listeners;
 use App\Events\AssetsTransferredInBulk;
 use App\Mail\CheckoutAccessoryMail;
 use App\Mail\CheckoutAssetMail;
 use App\Mail\CheckoutComponentMail;
 use App\Mail\CheckoutConsumableMail;
 use App\Mail\CheckoutLicenseMail;
+use App\Mail\TransferredMail;
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
@@ -18,9 +19,10 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
 use Symfony\Component\HttpClient\Exception\ClientException;
 
-class TransferrableListener
+class TransferableListener
 {
     public function subscribe($events)
     {
@@ -43,7 +45,7 @@ public function onTransfer($event){
             return;
         }
         if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
-            $mailable = new TransferredEmail($event->transferrable, $event->transferedTo, $event->transferedBy, $acceptance, $event->note);
+            $mailable = new TransferredMail($event->transferrable, $event->transferedTo, $event->transferedBy, $acceptance, $event->transferred_at, $event->expected_checkin, $event->note);
             $notifiable = $this->getNotifiableUser($event);
             $notifiableHasEmail = $notifiable instanceof User && $notifiable->email;
             $shouldSendEmailToUser = $shouldSendEmailToUser && $notifiableHasEmail;
@@ -79,7 +81,7 @@ public function onTransfer($event){
      * @param Event $event
      * @return mixed
      */
-    private function getTransferAcceptance(Event $event)
+    private function getTransferAcceptance($event)
     {
         $transferredToType = get_class($event->transferredTo);
         if ($transferredToType != "App\Models\User") {

app/Mail/TransferredMail.php

@@ -21,9 +21,11 @@ public function __construct(
         public Collection $items,
         public Model $target,
         public User $admin,
+        public Model $acceptance,
         public string $transferred_at,
         public string $expected_checkin,
         public string $note,
+
     ) {
         $this->require_acceptance = $this->requireAcceptance();
     }
@@ -45,6 +47,8 @@ public function content(): Content
             with: [
                 'introduction' => $this->getIntroduction(),
                 'requires_acceptance' => $this->requireAcceptance(),
+                'acceptance_url' => $this->acceptanceUrl(),
+                'eula' => $this->getEula(),
             ]
         );
     }

app/Providers/EventServiceProvider.php

@@ -4,6 +4,7 @@
 
 use App\Listeners\CheckoutableListener;
 use App\Listeners\LogListener;
+use App\Listeners\TransferableListener;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 
 class EventServiceProvider extends ServiceProvider
@@ -31,5 +32,6 @@ class EventServiceProvider extends ServiceProvider
     protected $subscribe = [
         LogListener::class,
         CheckoutableListener::class,
+        TransferableListener::class,
     ];
 }

resources/views/mail/markdown/transfer-items.blade.php

@@ -1 +1,69 @@
-<?php
+<x-mail::message>
+
+    <style>
+        th, td {
+            vertical-align: top;
+        }
+        hr {
+            display: block;
+            height: 1px;
+            border: 0;
+            border-top: 1px solid #ccc;
+            margin: 1em 0;
+            padding: 0;
+        }
+    </style>
+
+    {{ $introduction }}
+
+    @if ($requires_acceptance)
+        One or more items require acceptance.<br>
+        **[✔ Click here to review the terms of use and accept the items]({{ $acceptance_url }})**
+    @endif
+
+    <hr>
+
+    @if ((isset($expected_checkin)) && ($expected_checkin!=''))
+        **{{ trans('mail.expecting_checkin_date') }}**: {{ Helper::getFormattedDateObject($expected_checkin, 'date', false) }}
+    @endif
+
+    @if ($note)
+        **{{ trans('mail.additional_notes') }}**: {{ $note }}
+    @endif
+
+    @if ($eula)
+        <x-mail::panel>
+            {{ $eula }}
+        </x-mail::panel>
+    @endif
+
+    <x-mail::table>
+        |        |        |
+        | ------------- | ------------- |
+        @foreach($items as $item)
+            | **Asset Tag** | <a href="{{ route('hardware.show', $item->id) }}">{{ $item->display_name }}</a><br><small>{{trans('mail.serial').': '.$item->serial}}</small> |
+            @if (isset($item->model?->category))
+                | **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
+            @endif
+            @if (isset($item->manufacturer))
+                | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
+            @endif
+            @if (isset($item->model))
+                | **{{ trans('general.asset_model') }}** | {{ $item->model->name }} |
+            @endif
+            @if ((isset($asset->model?->model_number)))
+                | **{{ trans('general.model_no') }}** | {{ $item->model->model_number }} |
+            @endif
+            @if (isset($item->assetstatus))
+                | **{{ trans('general.status') }}** | {{ $item->assetstatus->name }} |
+            @endif
+            | <hr> | <hr> |
+        @endforeach
+    </x-mail::table>
+
+    **{{ trans('general.administrator') }}**: {{ $admin->display_name }}
+
+    {{ trans('mail.best_regards') }}<br>
+
+    {{ $snipeSettings->site_name }}
+</x-mail::message>