A free open source IT asset/license management system
Fire CheckoutableCheckedIn event when checking in accessory
Marcus Mooree51d8bb10618
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.phpindex 7f8aa23e59..42acd36ee4 100644--- a/app/Http/Controllers/Api/AccessoriesController.php+++ b/app/Http/Controllers/Api/AccessoriesController.php@@ -2,6 +2,7 @@namespace App\Http\Controllers\Api;+use App\Events\CheckoutableCheckedIn;use App\Events\CheckoutableCheckedOut;use App\Helpers\Helper;use App\Http\Controllers\Controller;@@ -503,13 +504,8 @@ class AccessoriesController extends Controller$accessory = Accessory::find($accessory_checkout->accessory_id);$this->authorize('checkin', $accessory);- $accessory->logCheckin(User::find($accessory_checkout->assigned_to), $request->input('note'));-- // Was the accessory updated?if ($accessory_checkout->delete()) {- if (! is_null($accessory_checkout->assigned_to)) {- $user = User::find($accessory_checkout->assigned_to);- }+ event(new CheckoutableCheckedIn($accessory, $accessory_checkout->assignedTo, auth()->user(), $request->input('note')));$payload = ['accessory_id' => $accessory->id,diff --git a/tests/Feature/Checkins/Api/AccessoryCheckinTest.php b/tests/Feature/Checkins/Api/AccessoryCheckinTest.phpindex ce9820fb55..06d4eea38f 100644--- a/tests/Feature/Checkins/Api/AccessoryCheckinTest.php+++ b/tests/Feature/Checkins/Api/AccessoryCheckinTest.php@@ -140,7 +140,7 @@ class AccessoryCheckinTest extends TestCase implements TestsFullMultipleCompanie{$user = User::factory()->create();$accessory = Accessory::factory()->checkedOutToUser($user)->create();- $accessory->category->update(['require_acceptance' => true]);+ $accessory->category->update(['require_acceptance' => true, 'checkin_email' => true]);$checkout = $accessory->checkouts()->where('assigned_type', User::class)