diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 997b27a413..2587d6ce4c 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -6,6 +6,7 @@ use App\Events\CheckoutableCheckedIn; use App\Http\Requests\StoreAssetRequest; use App\Http\Traits\MigratesLegacyLocations; use App\Models\CheckoutAcceptance; +use App\Models\LicenseSeat; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Crypt; @@ -914,12 +915,9 @@ class AssetsController extends Controller $originalValues['action_date'] = $checkin_at; } - if(!empty($asset->licenseseats->all())){ - foreach ($asset->licenseseats as $seat){ - $seat->assigned_to = null; - $seat->save(); - } - } + $asset->licenseseats->each(function (LicenseSeat $seat) { + $seat->update(['assigned_to' => null]); + }); // Get all pending Acceptances for this asset and delete them CheckoutAcceptance::pending() diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php index 0a54a070f7..e224522fa7 100644 --- a/app/Http/Controllers/Assets/AssetCheckinController.php +++ b/app/Http/Controllers/Assets/AssetCheckinController.php @@ -9,6 +9,7 @@ use App\Http\Requests\AssetCheckinRequest; use App\Http\Traits\MigratesLegacyLocations; use App\Models\Asset; use App\Models\CheckoutAcceptance; +use App\Models\LicenseSeat; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; @@ -101,12 +102,9 @@ class AssetCheckinController extends Controller $checkin_at = $request->get('checkin_at'); } - if(!empty($asset->licenseseats->all())){ - foreach ($asset->licenseseats as $seat){ - $seat->assigned_to = null; - $seat->save(); - } - } + $asset->licenseseats->each(function (LicenseSeat $seat) { + $seat->update(['assigned_to' => null]); + }); // Get all pending Acceptances for this asset and delete them $acceptances = CheckoutAcceptance::pending()->whereHasMorph('checkoutable',