From f10807661d0e412c16265ac2570822515edcb32a Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 30 Oct 2024 19:26:52 -0400
Subject: [PATCH 1/4] fixing bulk delete table

---
 resources/views/hardware/bulk-delete.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index 59ba82ff5..2e3604999 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -42,15 +42,15 @@
                 <td>{{ $asset->id }}</td>
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
-                  @if ($asset->location)
+                  @if ($asset->location_id)
                   {{ $asset->location->name }}
+                  @elseif($asset->rtd_location_id)
+                  {{ $asset->defaultLoc->name }}
                   @endif
                 </td>
                 <td>
-
-                  {{ $asset->assigned_to }}
-                  @if ($asset->assignedTo)
-                  {{ $asset->assignedTo->present()->name()}}
+                  @if ($asset->assigned_to)
+                    {{ $asset->assigned->present()->name() }}
                   @endif
                 </td>
               </tr>

From 2f5e468b3c6fae837149d27ed10ff0cc98fcf5f9 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 4 Nov 2024 19:48:34 -0500
Subject: [PATCH 2/4] this fixes the assigned to piece

---
 resources/views/hardware/bulk-delete.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index 2e3604999..fd48f8910 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -42,9 +42,9 @@
                 <td>{{ $asset->id }}</td>
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
-                  @if ($asset->location_id)
+                  @if ($asset->location)
                   {{ $asset->location->name }}
-                  @elseif($asset->rtd_location_id)
+                  @elseif($asset->rtd_location)
                   {{ $asset->defaultLoc->name }}
                   @endif
                 </td>

From 82c38a8b181dcb64b83ce03a2d1001ad36cf4024 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 4 Nov 2024 20:43:18 -0500
Subject: [PATCH 3/4] or statement for if/else

---
 resources/views/hardware/bulk-delete.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index fd48f8910..0e9f24ae5 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -42,10 +42,10 @@
                 <td>{{ $asset->id }}</td>
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
-                  @if ($asset->location)
-                  {{ $asset->location->name }}
-                  @elseif($asset->rtd_location)
-                  {{ $asset->defaultLoc->name }}
+                  @if ($asset->location || $asset->location_id)
+                  {{ $asset->location->present()->name() }}
+                  @elseif($asset->rtd_location || $asset->rtd_location_id)
+                  {{ $asset->defaultLoc->present()->name() }}
                   @endif
                 </td>
                 <td>

From efeef5cdc46760ff51ee9bec9b3c8392c7e4c6ac Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 13 Nov 2024 18:29:58 -0500
Subject: [PATCH 4/4] removing || parts of if else

---
 resources/views/hardware/bulk-delete.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index 0e9f24ae5..37977ca1e 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -42,9 +42,9 @@
                 <td>{{ $asset->id }}</td>
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
-                  @if ($asset->location || $asset->location_id)
+                  @if ($asset->location)
                   {{ $asset->location->present()->name() }}
-                  @elseif($asset->rtd_location || $asset->rtd_location_id)
+                  @elseif($asset->rtd_location)
                   {{ $asset->defaultLoc->present()->name() }}
                   @endif
                 </td>