DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix decprecated implode usage

Browse source
This commit is contained in:
Dampfklon 2021-07-17 00:07:51 +02:00
parent ed99532c30
commit 9a9ca59544
1 changed files with 15 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ class ReportsController extends Controller
trans('admin/accessories/general.remaining'), trans('admin/accessories/general.remaining'),
]; ];
$header = array_map('trim', $header); $header = array_map('trim', $header);
$rows[] = implode($header, ', '); $rows[] = implode(', ', $header);
// Row per accessory // Row per accessory
foreach ($accessories as $accessory) { foreach ($accessories as $accessory) {
@ -85,10 +85,10 @@ class ReportsController extends Controller
$row[] = e($accessory->total); $row[] = e($accessory->total);
$row[] = e($accessory->remaining); $row[] = e($accessory->remaining);
$rows[] = implode($row, ','); $rows[] = implode(',', $row);
} }
$csv = implode($rows, "\n"); $csv = implode("\n", $rows);
$response = Response::make($csv, 200); $response = Response::make($csv, 200);
$response->header('Content-Type', 'text/csv'); $response->header('Content-Type', 'text/csv');
$response->header('Content-disposition', 'attachment;filename=report.csv'); $response->header('Content-disposition', 'attachment;filename=report.csv');
@ -346,7 +346,7 @@ class ReportsController extends Controller
]; ];
$header = array_map('trim', $header); $header = array_map('trim', $header);
$rows[] = implode($header, ', '); $rows[] = implode(', ', $header);
// Row per license // Row per license
foreach ($licenses as $license) { foreach ($licenses as $license) {
@ -360,10 +360,11 @@ class ReportsController extends Controller
$row[] = ($license->depreciation != '') ? '' : e($license->depreciation->name); $row[] = ($license->depreciation != '') ? '' : e($license->depreciation->name);
$row[] = '"'.Helper::formatCurrencyOutput($license->purchase_cost).'"'; $row[] = '"'.Helper::formatCurrencyOutput($license->purchase_cost).'"';
$rows[] = implode($row, ','); $rows[] = implode(',', $row);
} }
$csv = implode($rows, "\n");
$csv = implode("\n", $rows);
$response = Response::make($csv, 200); $response = Response::make($csv, 200);
$response->header('Content-Type', 'text/csv'); $response->header('Content-Type', 'text/csv');
$response->header('Content-disposition', 'attachment;filename=report.csv'); $response->header('Content-disposition', 'attachment;filename=report.csv');
@ -871,7 +872,7 @@ class ReportsController extends Controller
]; ];
$header = array_map('trim', $header); $header = array_map('trim', $header);
$rows[] = implode($header, ','); $rows[] = implode(',', $header);
foreach ($assetMaintenances as $assetMaintenance) { foreach ($assetMaintenances as $assetMaintenance) {
$row = []; $row = [];
@ -889,12 +890,12 @@ class ReportsController extends Controller
$improvementTime = intval($assetMaintenance->asset_maintenance_time); $improvementTime = intval($assetMaintenance->asset_maintenance_time);
} }
$row[] = $improvementTime; $row[] = $improvementTime;
$row[] = trans('general.currency').Helper::formatCurrencyOutput($assetMaintenance->cost); $row[] = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
$rows[] = implode($row, ','); $rows[] = implode(',', $row);
} }
// spit out a csv // spit out a csv
$csv = implode($rows, "\n"); $csv = implode("\n", $rows);
$response = Response::make($csv, 200); $response = Response::make($csv, 200);
$response->header('Content-Type', 'text/csv'); $response->header('Content-Type', 'text/csv');
$response->header('Content-disposition', 'attachment;filename=report.csv'); $response->header('Content-disposition', 'attachment;filename=report.csv');
@ -917,23 +918,14 @@ class ReportsController extends Controller
/** /**
* Get all assets with pending checkout acceptances * Get all assets with pending checkout acceptances
*/ */
<<<<<<< HEAD
$acceptances = CheckoutAcceptance::pending()->get();
=======
$acceptances = CheckoutAcceptance::pending()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get(); $acceptances = CheckoutAcceptance::pending()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
>>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added
$assetsForReport = $acceptances $assetsForReport = $acceptances
->filter(function ($acceptance) { ->filter(function ($acceptance) {
return $acceptance->checkoutable_type == \App\Models\Asset::class; return $acceptance->checkoutable_type == \App\Models\Asset::class;
}) })
<<<<<<< HEAD
->map(function ($acceptance) {
return $acceptance->checkoutable;
=======
->map(function($acceptance) { ->map(function($acceptance) {
return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance]; return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
>>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added
}); });
return view('reports/unaccepted_assets', compact('assetsForReport')); return view('reports/unaccepted_assets', compact('assetsForReport'));
@ -1033,17 +1025,8 @@ class ReportsController extends Controller
]; ];
$header = array_map('trim', $header); $header = array_map('trim', $header);
$rows[] = implode($header, ','); $rows[] = implode(',', $header);
<<<<<<< HEAD
foreach ($assetsForReport as $assetItem) {
$row = [];
$row[] = str_replace(',', '', e($assetItem->assetlog->model->category->name));
$row[] = str_replace(',', '', e($assetItem->assetlog->model->name));
$row[] = str_replace(',', '', e($assetItem->assetlog->present()->name()));
$row[] = str_replace(',', '', e($assetItem->assetlog->asset_tag));
$row[] = str_replace(',', '', e($assetItem->assetlog->assignedTo->present()->name()));
=======
foreach ($assetsForReport as $item) { foreach ($assetsForReport as $item) {
$row = [ ]; $row = [ ];
$row[] = str_replace(',', '', e($item['assetItem']->model->category->name)); $row[] = str_replace(',', '', e($item['assetItem']->model->category->name));
@ -1051,12 +1034,11 @@ class ReportsController extends Controller
$row[] = str_replace(',', '', e($item['assetItem']->name)); $row[] = str_replace(',', '', e($item['assetItem']->name));
$row[] = str_replace(',', '', e($item['assetItem']->asset_tag)); $row[] = str_replace(',', '', e($item['assetItem']->asset_tag));
$row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user'))); $row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
>>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added $rows[] = implode(',', $row);
$rows[] = implode($row, ',');
} }
// spit out a csv // spit out a csv
$csv = implode($rows, "\n"); $csv = implode("\n", $rows);
$response = Response::make($csv, 200); $response = Response::make($csv, 200);
$response->header('Content-Type', 'text/csv'); $response->header('Content-Type', 'text/csv');
$response->header('Content-disposition', 'attachment;filename=report.csv'); $response->header('Content-disposition', 'attachment;filename=report.csv');