DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-01-26 22:12:39 -08:00
parent f871759753 9f7f1460e9
commit 1d9741a49e
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Models/Asset.php
View file

@ -246,13 +246,18 @@ class Asset extends Depreciable
*/ */
public function availableForCheckout() public function availableForCheckout()
{ {
if (
((!$this->assignedTo) && ($this->assetstatus->archived == 0)) || // This asset is not currently assigned to anyone and is not deleted...
((empty($this->assigned_to)) && if ((!$this->assigned_to) && (!$this->deleted_at)) {
(empty($this->deleted_at)) &&
(($this->assetstatus) && ($this->assetstatus->deployable == 1)))) // The asset status is not archived and is deployable
{ if (($this->assetstatus) && ($this->assetstatus->archived == '0')
return true; && ($this->assetstatus->deployable == '1'))
{
return true;
}
} }
return false; return false;
} }