clean up variables names and types

Author: Godmartinz

app/Events/AssetsTransferredInBulk.php

@@ -15,7 +15,7 @@ class AssetsTransferredInBulk
     use Dispatchable, SerializesModels;
 
     public function __construct(
-        public Asset      $transferable,
+        public Collection $transferable,
         public Model      $transferredTo,
         public Model      $transferredFrom,
         public User       $admin,

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -746,7 +746,7 @@ public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse
                             $asset->status_id = $request->get('status_id');
                         }
 
-                        $checkout_success = $asset->transfer($target, $transferredFrom, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);
+                        $checkout_success = $asset->transfer($alreadyAssigned, $target, $transferredFrom, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);
 
                         //TODO - I think this logic is duplicated in the checkOut method?
                         if ($target->location_id != '') {

app/Listeners/TransferableListener.php

@@ -28,24 +28,22 @@ public function subscribe($events)
     {
         $events->listen(
             AssetsTransferredInBulk::class,
-            'App\Listeners\TransferrableListener@onTransfer'
+            'App\Listeners\TransferableListener@onTransfer'
         );
     }
     public function onTransfer($event){
-        if($this->shouldNotSendAnyNotifications($event->transferrable)){
-            return;
-        }
+
         $acceptance = $this->getTransferAcceptance($event);
 
-        $shouldSendEmailToUser = $this->shouldSendTransferEmailToUser($event->transferrable);
+        $shouldSendEmailToUser = $this->shouldSendTransferEmailToUser($event->transferable);
         $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress($acceptance);
         $shouldSendWebhookNotification = $this->shouldSendWebhookNotification();
 
         if (!$shouldSendEmailToUser && !$shouldSendEmailToAlertAddress && !$shouldSendWebhookNotification) {
             return;
         }
         if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
-            $mailable = new TransferredMail($event->transferrable, $event->transferedTo, $event->transferedBy, $acceptance, $event->transferred_at, $event->expected_checkin, $event->note);
+            $mailable = new TransferredMail($event->transferable, $event->transferredTo, $event->admin, $acceptance, $event->transferred_at, $event->expected_checkin, $event->note);
             $notifiable = $this->getNotifiableUser($event);
             $notifiableHasEmail = $notifiable instanceof User && $notifiable->email;
             $shouldSendEmailToUser = $shouldSendEmailToUser && $notifiableHasEmail;
@@ -93,7 +91,7 @@ private function getTransferAcceptance($event)
         }
 
         $acceptance = new CheckoutAcceptance;
-        $acceptance->checkoutable()->associate($event->trasnferable);
+        $acceptance->checkoutable()->associate($event->transferable);
         $acceptance->assignedTo()->associate($event->transferredTo);
 
         $acceptance->qty = 1;
@@ -112,10 +110,7 @@ private function getTransferAcceptance($event)
 
         return $acceptance;
     }
-    private function shouldNotSendAnyNotifications($transferable): bool
-    {
-        return in_array(get_class($transferable), $this->skipNotificationsFor);
-    }
+
     private function shouldSendWebhookNotification(): bool
     {
         return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;

app/Models/Asset.php

@@ -512,7 +512,7 @@ public function checkOut($target, $admin = null, $checkout_at = null, $expected_
         return false;
     }
 
-    public function transfer($target, $transferredFrom, $admin= null, $transferred_at = null, $expected_checkin = null, $note = null, $name = null, $location = null ){
+    public function transfer($alreadyAssigned, $target, $transferredFrom, $admin= null, $transferred_at = null, $expected_checkin = null, $note = null, $name = null, $location = null ){
         if (! $target) {
             return false;
         }
@@ -554,7 +554,7 @@ public function transfer($target, $transferredFrom, $admin= null, $transferred_a
                 $transferredBy = auth()->user();
             }
             event(new AssetsTransferredInBulk(
-                transferable: $this,
+                transferable: $alreadyAssigned,
                 transferredTo: $target,
                 transferredFrom: $transferredFrom,
                 admin: $transferredBy,