Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Current value added to asset index page #13197

Merged
merged 3 commits into from
Jul 19, 2023
Merged

Current value added to asset index page #13197

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8725d40
current value added to asset index page. translations for this in rep…
akemidx Jun 22, 2023
8df9db7
column ordering fix
akemidx Jun 22, 2023
9e2987e
changing book value to be NOT searchable or sortable
akemidx Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
column ordering fix
  • Loading branch information
@akemidx
akemidx committed Jun 22, 2023
commit 8df9db76bc6615e23f267cd1efe662f0de738163
18 changes: 9 additions & 9 deletions app/Http/Controllers/ReportsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,12 +530,9 @@ public function postCustom(Request $request)
$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')) {
Expand All @@ -544,9 +541,12 @@ public function postCustom(Request $request)
$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')) {
Expand Down
Loading