From 8df9db76bc6615e23f267cd1efe662f0de738163 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 22 Jun 2023 17:12:40 -0400
Subject: [PATCH] column ordering fix

---
 app/Http/Controllers/ReportsController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index e3fc761bcc..d440065212 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -530,12 +530,9 @@ class ReportsController extends Controller
                 $header[] = trans('general.status');
             }
 
-            if ($request->filled('checkout_date')) {
-                $header[] = trans('admin/hardware/table.checkout_date');
-            }
-
-            if ($request->filled('expected_checkin')) {
-                $header[] = trans('admin/hardware/form.expected_checkin');
+            if ($request->filled('warranty')) {
+                $header[] = trans('admin/hardware/form.warranty');
+                $header[] = trans('admin/hardware/form.warranty_expires');
             }
 
             if ($request->filled('depreciation')) {
@@ -544,9 +541,12 @@ class ReportsController extends Controller
                 $header[] = trans('admin/hardware/form.fully_depreciated');
             }
 
-            if ($request->filled('warranty')) {
-                $header[] = trans('admin/hardware/form.warranty');
-                $header[] = trans('admin/hardware/form.warranty_expires');
+            if ($request->filled('checkout_date')) {
+                $header[] = trans('admin/hardware/table.checkout_date');
+            }
+
+            if ($request->filled('expected_checkin')) {
+                $header[] = trans('admin/hardware/form.expected_checkin');
             }
 
             if ($request->filled('created_at')) {