diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 3da8dd903..b27fe9f0a 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -125,6 +125,10 @@ class AssetsController extends Controller $assets->ByManufacturer($request->input('manufacturer_id')); } + if ($request->has('depreciation_id')) { + $assets->ByDepreciationId($request->input('depreciation_id')); + } + $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : ''; $offset = request('offset', 0); @@ -155,6 +159,8 @@ class AssetsController extends Controller case 'Deployed': $assets->Deployed(); break; + default: + $assets->NotArchived(); } diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php index e4af31314..8eb14ccc8 100755 --- a/app/Http/Controllers/DepreciationsController.php +++ b/app/Http/Controllers/DepreciationsController.php @@ -155,5 +155,24 @@ class DepreciationsController extends Controller return redirect()->route('depreciations.index')->with('success', trans('admin/depreciations/message.delete.success')); } + /** + * Returns a view that displays a form to display depreciation listing + * + * @author [A. Gianotto] [route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist')); + } + + return view('depreciations/view', compact('depreciation')); + } + } diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 730ac7f8c..d8df3f788 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1106,4 +1106,20 @@ class Asset extends Depreciable } + /** + * Query builder scope to search on location ID + * + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $search Search term + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ + public function scopeByDepreciationId($query, $search) + { + return $query->join('models', 'assets.model_id', '=', 'models.id') + ->join('depreciations', 'models.depreciation_id', '=', 'depreciations.id')->where('models.depreciation_id', '=', $search); + + } + + } diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php new file mode 100644 index 000000000..89baef33f --- /dev/null +++ b/resources/views/depreciations/view.blade.php @@ -0,0 +1,54 @@ +@extends('layouts/default') + +{{-- Page title --}} +@section('title') + + {{ trans('general.depreciation') }} + : {{ $depreciation->name }} + + @parent +@stop + +@section('header_right') + {{ trans('admin/depreciations/table.update') }} +@stop + +{{-- Page content --}} +@section('content') + +
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+ +@stop + +@section('moar_scripts') + @include ('partials.bootstrap-table', [ + 'exportFile' => 'assets-export', + 'search' => true, + 'columns' => \App\Presenters\AssetPresenter::dataTableLayout() + ]) + +@stop