lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

updates transformer, api controller

Browse source
This commit is contained in:
Godfrey M 2024-07-16 12:58:23 -07:00
parent aaa2858337
commit 48821f8391
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/DepreciationsController.php
View file

@ -20,9 +20,9 @@ class DepreciationsController extends Controller
public function index(Request $request) : JsonResponse | array public function index(Request $request) : JsonResponse | array
{ {
$this->authorize('view', Depreciation::class); $this->authorize('view', Depreciation::class);
$allowed_columns = ['id','name','months','depreciation_min','created_at']; $allowed_columns = ['id','name','months','depreciation_min', 'depreciation_type','created_at'];
$depreciations = Depreciation::select('id','name','months','depreciation_min','user_id','created_at','updated_at'); $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','user_id','created_at','updated_at');
if ($request->filled('search')) { if ($request->filled('search')) {
$depreciations = $depreciations->TextSearch($request->input('search')); $depreciations = $depreciations->TextSearch($request->input('search'));

3
app/Http/Transformers/DepreciationsTransformer.php
View file

@ -7,6 +7,7 @@ use App\Models\Depreciable;
use App\Models\Depreciation; use App\Models\Depreciation;
use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Gate;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Log;
class DepreciationsTransformer class DepreciationsTransformer
{ {
@ -26,7 +27,7 @@ class DepreciationsTransformer
'id' => (int) $depreciation->id, 'id' => (int) $depreciation->id,
'name' => e($depreciation->name), 'name' => e($depreciation->name),
'months' => $depreciation->months.' '.trans('general.months'), 'months' => $depreciation->months.' '.trans('general.months'),
'depreciation_min' => $depreciation->depreciation_min, 'depreciation_min' => $depreciation->depreciation_type === 'percent' ? $depreciation->depreciation_min.'%' : $depreciation->depreciation_min,
'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'), 'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime') 'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime')
]; ];

2
app/Models/Depreciable.php
View file

@ -190,7 +190,7 @@ class Depreciable extends SnipeModel
} }
private function calculateDepreciation(){ private function calculateDepreciation(){
$depreciation_min = 0; $depreciation_min = 0;
if($this->get_depreciation()->depreciation_type === 'percentage') { if($this->get_depreciation()->depreciation_type === 'percent') {
$depreciation_percent= $this->get_depreciation()->depreciation_min / 100; $depreciation_percent= $this->get_depreciation()->depreciation_min / 100;
$depreciation_min= $this->purchase_cost * $depreciation_percent; $depreciation_min= $this->purchase_cost * $depreciation_percent;
return $depreciation_min; return $depreciation_min;