DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fixed CSV asset export missing checked out to info

Browse source
This commit is contained in:
snipe 2017-11-22 13:05:48 -08:00
parent 2278d5bfd8
commit 8f160a8590
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/ReportsController.php
View file

@ -156,6 +156,7 @@ class ReportsController extends Controller
trans('admin/hardware/form.order'), trans('admin/hardware/form.order'),
trans('general.supplier'), trans('general.supplier'),
trans('admin/hardware/table.checkoutto'), trans('admin/hardware/table.checkoutto'),
trans('general.type'),
trans('admin/hardware/table.checkout_date'), trans('admin/hardware/table.checkout_date'),
trans('admin/hardware/table.location'), trans('admin/hardware/table.location'),
trans('general.notes'), trans('general.notes'),
@ -166,6 +167,8 @@ class ReportsController extends Controller
fputcsv($handle, $headers); fputcsv($handle, $headers);
foreach ($assets as $asset) { foreach ($assets as $asset) {
// Add a new row with data // Add a new row with data
$values=[ $values=[
($asset->company) ? $asset->company->name : '', ($asset->company) ? $asset->company->name : '',
@ -175,12 +178,13 @@ class ReportsController extends Controller
($asset->model->model_number) ? $asset->model->model_number : '', ($asset->model->model_number) ? $asset->model->model_number : '',
($asset->name) ? $asset->name : '', ($asset->name) ? $asset->name : '',
($asset->serial) ? $asset->serial : '', ($asset->serial) ? $asset->serial : '',
($asset->assetstatus) ? e($asset->assetstatus->name) : '', ($asset->assetstatus) ? e($asset->present()->statusText) : '',
($asset->purchase_date) ? e($asset->purchase_date) : '', ($asset->purchase_date) ? e($asset->purchase_date) : '',
($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '', ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
($asset->order_number) ? e($asset->order_number) : '', ($asset->order_number) ? e($asset->order_number) : '',
($asset->supplier) ? e($asset->supplier->name) : '', ($asset->supplier) ? e($asset->supplier->name) : '',
($asset->assignedTo) ? e($asset->assignedTo->present()->name()) : '', ($asset->checkedOutToUser()) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : ''),
($asset->checkedOutToUser()) ? 'user' : e($asset->assignedType()),
($asset->last_checkout!='') ? e($asset->last_checkout) : '', ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
($asset->location) ? e($asset->location->name) : '', ($asset->location) ? e($asset->location->name) : '',
($asset->notes) ? e($asset->notes) : '', ($asset->notes) ? e($asset->notes) : '',