DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 16:27:35 -07: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-02-18 14:21:34 -08:00
parent 785bc40d9d 5754f0aa3f
commit ff341caf34
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Importer/AssetImporter.php
View file

@ -121,7 +121,7 @@ class AssetImporter extends ItemImporter
// If we have a target to checkout to, lets do so.
if(isset($target)) {
$asset->fresh()->checkOut($target, $this->user_id);
$asset->fresh()->checkOut($target);
}
return;
}

11
app/Models/Asset.php
View file

@ -279,7 +279,7 @@ class Asset extends Depreciable
* @since [v3.0]
* @return boolean
*/
public function checkOut($target, $admin_id = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null)
public function checkOut($target, $admin = null, $checkout_at = null, $expected_checkin = null, $note = null, $name = null, $location = null)
{
if (!$target) {
return false;
@ -313,14 +313,9 @@ class Asset extends Depreciable
}
if ($this->save()) {
if(isset($admin_id)){
$checkedOutBy = User::find($admin_id);
event(new CheckoutableCheckedOut($this, $target, $checkedOutBy, $note));
} else {
event(new CheckoutableCheckedOut($this, $target, Auth::user(), $note));
}
event(new CheckoutableCheckedOut($this, $target, Auth::user(), $note));
$this->increment('checkout_counter', 1);
return true;
}