ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated the csv values to be plain

Browse Source
This commit is contained in:
Godfrey M
2025-09-23 11:40:29 -07:00
parent 7077faaf4a
commit ca8eae4064
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportsController.php
+9 -19
View File
@@ -1219,25 +1219,13 @@ class ReportsController extends Controller
/**
* Get all assets with pending checkout acceptances
*/
if($showDeleted) {
$acceptances = CheckoutAcceptance::pending()
->with([
'checkoutable' => function (MorphTo $acceptance) {
$acceptance->morphWith([
Asset::class => ['model.category', 'assignedTo', 'company'],
Accessory::class => ['category','checkouts', 'company'],
LicenseSeat::class => ['user', 'license'],
Component::class => ['assignedTo', 'company'],
]);
},
'assignedTo' => function($acceptance){
'checkoutable' => function (MorphTo $acceptance) use ($showDeleted) {
if ($showDeleted) {
$acceptance->withTrashed();
}
])->orderByDesc('checkout_acceptances.created_at');
} else {
$acceptances = CheckoutAcceptance::pending()
->with([
'checkoutable' => function (MorphTo $acceptance) {
$acceptance->morphWith([
Asset::class => ['model.category', 'assignedTo', 'company'],
Accessory::class => ['category','checkouts', 'company'],
@@ -1245,10 +1233,12 @@ class ReportsController extends Controller
Component::class => ['assignedTo', 'company'],
]);
},
'assignedTo' => function($acceptances){
}
'assignedTo',
])->orderByDesc('checkout_acceptances.created_at');
}
if ($showDeleted) {
$acceptances->withTrashed();
}
$itemsForReport = $acceptances->get()->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));
@@ -1275,7 +1265,7 @@ class ReportsController extends Controller
$row = [ ];
$row[] = str_replace(',', '', $item->acceptance->created_at);
$row[] = str_replace(',', '', $item->type);
$row[] = str_replace(',', '', $item->company);
$row[] = str_replace(',', '', $item->company_plain);
$row[] = str_replace(',', '', $item->category_plain);
$row[] = str_replace(',', '', $item->model_plain);
$row[] = str_replace(',', '', $item->name_plain);