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

remove license checkout changes p2

Browse source
This commit is contained in:
Godfrey M 2024-05-20 10:26:45 -07:00
parent 280c03dcad
commit a53f89cd2c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Licenses/LicenseCheckoutController.php
View file

@ -77,9 +77,9 @@ class LicenseCheckoutController extends Controller
$licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId); $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
$licenseSeat->user_id = Auth::id(); $licenseSeat->user_id = Auth::id();
$licenseSeat->notes = $request->input('notes'); $licenseSeat->notes = $request->input('notes');
$checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type')); $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
if ($this->$checkoutMethod($licenseSeat)) { if ($this->$checkoutMethod($licenseSeat)) {
return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success')); return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success'));
} }
@ -112,6 +112,7 @@ class LicenseCheckoutController extends Controller
return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.asset_does_not_exist')); return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.asset_does_not_exist'));
} }
$licenseSeat->asset_id = request('asset_id'); $licenseSeat->asset_id = request('asset_id');
// Override asset's assigned user if available // Override asset's assigned user if available
if ($target->checkedOutToUser()) { if ($target->checkedOutToUser()) {
$licenseSeat->assigned_to = $target->assigned_to; $licenseSeat->assigned_to = $target->assigned_to;