column ordering fix

This commit is contained in:
akemidx 2023-06-22 17:12:40 -04:00
parent 8725d40f8d
commit 8df9db76bc

View file

@ -530,12 +530,9 @@ class ReportsController extends Controller
$header[] = trans('general.status'); $header[] = trans('general.status');
} }
if ($request->filled('checkout_date')) { if ($request->filled('warranty')) {
$header[] = trans('admin/hardware/table.checkout_date'); $header[] = trans('admin/hardware/form.warranty');
} $header[] = trans('admin/hardware/form.warranty_expires');
if ($request->filled('expected_checkin')) {
$header[] = trans('admin/hardware/form.expected_checkin');
} }
if ($request->filled('depreciation')) { if ($request->filled('depreciation')) {
@ -544,9 +541,12 @@ class ReportsController extends Controller
$header[] = trans('admin/hardware/form.fully_depreciated'); $header[] = trans('admin/hardware/form.fully_depreciated');
} }
if ($request->filled('warranty')) { if ($request->filled('checkout_date')) {
$header[] = trans('admin/hardware/form.warranty'); $header[] = trans('admin/hardware/table.checkout_date');
$header[] = trans('admin/hardware/form.warranty_expires'); }
if ($request->filled('expected_checkin')) {
$header[] = trans('admin/hardware/form.expected_checkin');
} }
if ($request->filled('created_at')) { if ($request->filled('created_at')) {