ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added logic to handle the CLI importer. (#9088)

Browse Source
This commit is contained in:
Ivan Nieto
2021-02-17 15:13:17 -06:00
committed by GitHub
parent 8fb97da314
commit 2e2d087639
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Asset.php
+8 -3
View File
@@ -279,7 +279,7 @@ class Asset extends Depreciable
* @since [v3.0]
* @return boolean
*/
public function checkOut($target, $admin = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null)
public function checkOut($target, $admin_id = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null)
{
if (!$target) {
return false;
@@ -313,9 +313,14 @@ class Asset extends Depreciable
}
if ($this->save()) {
if(isset($admin_id)){
$checkedOutBy = User::find($admin_id);
event(new CheckoutableCheckedOut($this, $target, Auth::user(), $note));
event(new CheckoutableCheckedOut($this, $target, $checkedOutBy, $note));
} else {
event(new CheckoutableCheckedOut($this, $target, Auth::user(), $note));
}
$this->increment('checkout_counter', 1);
return true;
}