DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-12 16:44:08 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add depreciation name and months to depreciation report

Browse source
This commit is contained in:
snipe 2016-05-18 15:59:54 -07:00
parent 0568e979e8
commit 7ee13113e0
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -232,7 +232,7 @@ class ReportsController extends Controller
{ {
// Grab all the assets // Grab all the assets
$assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog', 'company') $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog', 'company', 'depreciation')
->orderBy('created_at', 'DESC')->get(); ->orderBy('created_at', 'DESC')->get();
return View::make('reports/depreciation', compact('assets')); return View::make('reports/depreciation', compact('assets'));

12
resources/views/reports/depreciation.blade.php
View file

@ -32,6 +32,8 @@
<th class="col-sm-1">{{ trans('general.name') }}</th> <th class="col-sm-1">{{ trans('general.name') }}</th>
@endif @endif
<th class="col-sm-1">{{ trans('admin/hardware/table.serial') }}</th> <th class="col-sm-1">{{ trans('admin/hardware/table.serial') }}</th>
<th class="col-sm-1">{{ trans('admin/depreciations/general.depreciation_name') }}</th>
<th class="col-sm-1">{{ trans('admin/depreciations/general.number_of_months') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/table.checkoutto') }}</th> <th class="col-sm-1">{{ trans('admin/hardware/table.checkoutto') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/table.location') }}</th> <th class="col-sm-1">{{ trans('admin/hardware/table.location') }}</th>
<th class="col-sm-1">{{ trans('admin/hardware/table.purchase_date') }}</th> <th class="col-sm-1">{{ trans('admin/hardware/table.purchase_date') }}</th>
@ -59,6 +61,16 @@
<td>{{ $asset->name }}</td> <td>{{ $asset->name }}</td>
@endif @endif
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>
<td>
@if ($asset->model->depreciation)
{{ $asset->model->depreciation->name }}
@endif
</td>
<td>
@if ($asset->model->depreciation)
{{ $asset->model->depreciation->months }}
@endif
</td>
<td> <td>
@if ($asset->assigneduser) @if ($asset->assigneduser)
@if ($asset->assigneduser->deleted_at!='') @if ($asset->assigneduser->deleted_at!='')