A free open source IT asset/license management system
Oops. Forgot to commit accessories :D
snipeea4374a855e7
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.phpindex e23ea4f4a9..47c59c8134 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php@@ -9,6 +9,7 @@ use App\Http\Controllers\Controller;use App\Http\Requests\AccessoryCheckoutRequest;use App\Models\Accessory;use App\Models\AccessoryCheckout;+use App\Models\CheckoutAcceptance;use App\Models\User;use Carbon\Carbon;use Illuminate\Contracts\View\View;@@ -88,12 +89,53 @@ class AccessoryCheckoutController extends Controller$request->input('note'),[],$accessory->checkout_qty,+ $request->boolean('sign_in_place'),));$request->request->add(['checkout_to_type' => request('checkout_to_type')]);$request->request->add(['assigned_to' => $target->id]);- session()->put(['redirect_option' => $request->input('redirect_option'), 'checkout_to_type' => $request->input('checkout_to_type')]);+ session()->put([+ 'redirect_option' => $request->input('redirect_option'),+ 'checkout_to_type' => $request->input('checkout_to_type'),+ 'sign_in_place' => $request->boolean('sign_in_place'),+ ]);++ // When sign_in_place is requested for a user checkout, redirect to the+ // acceptance/signature page so the user can sign in person.+ if ($request->boolean('sign_in_place') && ! in_array($request->input('checkout_to_type'), ['asset', 'location'], true)) {+ $targetUser = User::find($target->id);++ if (! $targetUser instanceof User) {+ return redirect()->route('accessories.checkout.show', $accessory)+ ->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));+ }++ $acceptance = CheckoutAcceptance::where('checkoutable_type', Accessory::class)+ ->where('checkoutable_id', $accessory->id)+ ->where('assigned_to_id', $targetUser->id)+ ->pending()+ ->latest()+ ->first();++ // If requireAcceptance() is false the listener won't have created one; create it now.+ if (! $acceptance) {+ $acceptance = new CheckoutAcceptance;+ $acceptance->checkoutable()->associate($accessory);+ $acceptance->assignedTo()->associate($targetUser);+ $acceptance->qty = $accessory->checkout_qty;+ $acceptance->save();+ }++ session([+ 'sign_in_place_acceptance_id' => $acceptance->id,+ 'sign_in_place_item_id' => $accessory->id,+ 'sign_in_place_resource_type' => 'Accessories',+ ]);++ return redirect()->route('account.accept.item', $acceptance->id)+ ->with('success', trans('admin/accessories/message.checkout.success'));+ }// Redirect to the new accessory pagereturn Helper::getRedirectOption($request, $accessory->id, 'Accessories')diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.phpindex d828fda96d..ffc172b178 100755--- a/resources/views/accessories/checkout.blade.php+++ b/resources/views/accessories/checkout.blade.php@@ -121,6 +121,19 @@@endif</div></div>++ <!-- Sign in place checkbox -->+ <div class="form-group" id="sign_in_place_div">+ <div class="col-md-7 col-md-offset-3">+ <label class="form-control">+ <input type="checkbox" value="1" name="sign_in_place" @checked(old('sign_in_place', session('sign_in_place', false))) aria-label="sign_in_place">+ {{ trans('general.sign_in_place') }}+ </label>+ <p class="help-block">+ {{ trans('general.sign_in_place_help') }}+ </p>+ </div>+ </div></div>@endif<!-- Note -->diff --git a/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.phpindex 7a67f02378..fd1d15a011 100644--- a/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php+++ b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php@@ -206,4 +206,33 @@ class AccessoryAcceptanceTest extends TestCase$this->assertEquals($originalAccessoryCheckoutCount - 3, AccessoryCheckout::count());}++ public function test_admin_can_complete_sign_in_place_accessory_acceptance_and_is_redirected_to_selected_destination()+ {+ $assignee = User::factory()->create();+ $admin = User::factory()->admin()->create();+ $accessory = Accessory::factory()->create();++ $checkoutAcceptance = CheckoutAcceptance::factory()+ ->pending()+ ->for($assignee, 'assignedTo')+ ->for($accessory, 'checkoutable')+ ->create();++ $this->actingAs($admin)+ ->withSession([+ 'sign_in_place_acceptance_id' => $checkoutAcceptance->id,+ 'sign_in_place_item_id' => $accessory->id,+ 'sign_in_place_resource_type' => 'Accessories',+ 'redirect_option' => 'target',+ 'checkout_to_type' => 'user',+ ])+ ->post(route('account.store-acceptance', $checkoutAcceptance), [+ 'asset_acceptance' => 'accepted',+ 'note' => 'signed in person',+ ])+ ->assertRedirect(route('users.show', $assignee));++ $this->assertNotNull($checkoutAcceptance->refresh()->accepted_at);+ }}diff --git a/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.phpindex 3646d68b94..e1515bad42 100644--- a/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php+++ b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php@@ -6,6 +6,7 @@ use App\Mail\CheckoutAccessoryMail;use App\Models\Accessory;use App\Models\Actionlog;use App\Models\Asset;+use App\Models\CheckoutAcceptance;use App\Models\Location;use App\Models\User;use Illuminate\Support\Facades\Mail;@@ -173,7 +174,7 @@ class AccessoryCheckoutTest extends TestCase{Mail::fake();- $accessory = Accessory::factory()->requiringAcceptance()->create();+ $accessory = Accessory::factory()->requiringAcceptance()->create(['qty' => 5]);$user = User::factory()->create();$this->actingAs(User::factory()->checkoutAccessories()->create())@@ -267,4 +268,50 @@ class AccessoryCheckoutTest extends TestCase->assertStatus(302)->assertRedirect(route('users.show', $user));}++ public function test_accessory_checkout_page_post_redirects_to_signature_page_when_sign_in_place_is_checked()+ {+ $targetUser = User::factory()->create();+ $accessory = Accessory::factory()->requiringAcceptance()->create(['qty' => 5]);++ $response = $this->actingAs(User::factory()->admin()->create())+ ->from(route('accessories.checkout.show', $accessory))+ ->post(route('accessories.checkout.store', $accessory), [+ 'assigned_user' => $targetUser->id,+ 'checkout_to_type' => 'user',+ 'redirect_option' => 'index',+ 'checkout_qty' => 2,+ 'sign_in_place' => 1,+ ]);++ $acceptance = CheckoutAcceptance::query()+ ->where('checkoutable_type', Accessory::class)+ ->where('checkoutable_id', $accessory->id)+ ->where('assigned_to_id', $targetUser->id)+ ->pending()+ ->latest()+ ->first();++ $this->assertNotNull($acceptance);+ $this->assertEquals(2, $acceptance->qty);++ $response->assertStatus(302)+ ->assertRedirect(route('account.accept.item', $acceptance));+ }++ public function test_accessory_checkout_stores_sign_in_place_preference_in_session()+ {+ $targetUser = User::factory()->create();+ $accessory = Accessory::factory()->create();++ $response = $this->actingAs(User::factory()->admin()->create())+ ->post(route('accessories.checkout.store', $accessory), [+ 'assigned_user' => $targetUser->id,+ 'checkout_to_type' => 'user',+ 'redirect_option' => 'index',+ 'sign_in_place' => 1,+ ]);++ $response->assertSessionHas('sign_in_place', true);+ }}diff --git a/tests/Feature/Notifications/Email/SignInPlaceCheckoutEmailSuppressionTest.php b/tests/Feature/Notifications/Email/SignInPlaceCheckoutEmailSuppressionTest.phpindex 4c623de46a..929f32163e 100644--- a/tests/Feature/Notifications/Email/SignInPlaceCheckoutEmailSuppressionTest.php+++ b/tests/Feature/Notifications/Email/SignInPlaceCheckoutEmailSuppressionTest.php@@ -3,8 +3,10 @@namespace Tests\Feature\Notifications\Email;use App\Mail\CheckoutAssetMail;+use App\Mail\CheckoutAccessoryMail;use App\Mail\CheckoutConsumableMail;use App\Mail\CheckoutLicenseMail;+use App\Models\Accessory;use App\Models\Asset;use App\Models\AssetModel;use App\Models\Category;@@ -109,4 +111,31 @@ class SignInPlaceCheckoutEmailSuppressionTest extends TestCase$response->assertRedirect(route('account.accept.item', $acceptance));Mail::assertNotSent(CheckoutLicenseMail::class);}++ public function test_accessory_checkout_does_not_send_initial_acceptance_email_when_sign_in_place_is_selected(): void+ {+ $targetUser = User::factory()->create();+ $accessory = Accessory::factory()->requiringAcceptance()->create(['qty' => 5]);++ $response = $this->actingAs(User::factory()->admin()->create())+ ->post(route('accessories.checkout.store', $accessory), [+ 'assigned_user' => $targetUser->id,+ 'checkout_to_type' => 'user',+ 'redirect_option' => 'index',+ 'checkout_qty' => 2,+ 'sign_in_place' => 1,+ ]);++ $acceptance = CheckoutAcceptance::query()+ ->where('checkoutable_type', Accessory::class)+ ->where('checkoutable_id', $accessory->id)+ ->where('assigned_to_id', $targetUser->id)+ ->pending()+ ->latest()+ ->first();++ $this->assertNotNull($acceptance);+ $response->assertRedirect(route('account.accept.item', $acceptance));+ Mail::assertNotSent(CheckoutAccessoryMail::class);+ }}