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

Merge pull request #11823 from Godmartinz/gh11822_depreciation_calc_off

Browse source 
Fixes depreciation calculations off
This commit is contained in:
snipe 2022-09-14 17:39:59 -07:00 committed by GitHub
parent d598f75721 6b6a079440
commit 284b4d869f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
namespace App\Http\Transformers;
use App\Helpers\Helper;
use App\Models\Depreciable;
use App\Models\Depreciation;
use Gate;
use Illuminate\Database\Eloquent\Collection;
@ -19,13 +20,14 @@ class DepreciationsTransformer
return (new DatatablesTransformer)->transformDatatables($array, $total);
}
public function transformDepreciation(Depreciation $depreciation)
public function transformDepreciation(Depreciation $depreciation, Depreciable $monthly_depreciation)
{
$array = [
'id' => (int) $depreciation->id,
'name' => e($depreciation->name),
'months' => $depreciation->months.' '.trans('general.months'),
'depreciation_min' => $depreciation->depreciation_min,
'monthly_depreciation' => $monthly_depreciation->getMonthlyDepreciation(),
'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime')
];

24
app/Models/Depreciable.php
View file

@ -68,21 +68,33 @@ class Depreciable extends SnipeModel
*/
public function getLinearDepreciatedValue() // TODO - for testing it might be nice to have an optional $relative_to param here, defaulted to 'now'
{
$months_remaining = $this->time_until_depreciated()->m + 12 * $this->time_until_depreciated()->y; //UGlY
$months_passed = $this->purchase_date->diff(now())->m;
$current_value = round(($months_remaining / $this->get_depreciation()->months) * $this->purchase_cost, 2);
if($months_passed >= $this->get_depreciation()->months){
//if there is a floor use it
if($this->get_depreciation()->deprecation_min->isNotEmpty()) {
if($this->get_depreciation()->depreciation_min > $current_value) {
$current_value = $this->get_depreciation()->depreciation_min;
$current_value=round($this->get_depreciation()->depreciation_min,2);
}else{
$current_value = 0;
}
}
if ($current_value < 0) {
$current_value = 0;
else {
// The equation here is (Purchase_Cost-Floor_min)*(Months_passed/Months_til_depreciated)
$current_value = round(($this->purchase_cost-($this->purchase_cost - ($this->get_depreciation()->depreciation_min)) * ($months_passed / $this->get_depreciation()->months)), 2);
}
return $current_value;
}
public function getMonthlyDepreciation(){
return ($this->purchase_cost-$this->get_depreciation()->depreciation_min)/$this->get_depreciation()->months;
}
/**
* @param onlyHalfFirstYear Boolean always applied only second half of the first year
* @return float|int