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

Fixed deprecations

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-06-21 21:06:43 +01:00
parent 077a6949e2
commit 3531256c3f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Asset.php
View file

@ -568,7 +568,7 @@ class Asset extends Depreciable
*/ */
public function assignedType() public function assignedType()
{ {
return strtolower(class_basename($this->assigned_type)); return $this->assigned_type ? strtolower(class_basename($this->assigned_type)) : null;
} }

10
app/Models/Depreciable.php
View file

@ -173,10 +173,14 @@ class Depreciable extends SnipeModel
public function depreciated_date() public function depreciated_date()
{ {
$date = date_create($this->purchase_date); if (($this->purchase_date) && ($this->get_depreciation())) {
date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months')); $date = date_create($this->purchase_date);
return date_add($date, date_interval_create_from_date_string($this->get_depreciation()->months.' months'));//date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization
}
return null;
return $date; //date_format($date, 'Y-m-d'); //don't bake-in format, for internationalization
} }
// it's necessary for unit tests // it's necessary for unit tests