A free open source IT asset/license management system
Better naming for session variable
snipe061b913413c2
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex 80eb1853e7..e3fd14150f 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -237,13 +237,13 @@ class AcceptanceController extends Controller$redirect = Helper::getRedirectOption($request,session('sign_in_place_item_id'),- session('sign_in_place_table'),+ session('sign_in_place_resource_type'),);session()->forget(['sign_in_place_acceptance_id','sign_in_place_item_id',- 'sign_in_place_table',+ 'sign_in_place_resource_type',]);return $redirect->with('success', $return_msg);diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.phpindex 8c31cabc7d..298a14c8e5 100644--- a/app/Http/Controllers/Assets/AssetCheckoutController.php+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php@@ -154,7 +154,7 @@ class AssetCheckoutController extends Controllersession(['sign_in_place_acceptance_id' => $acceptance->id,'sign_in_place_item_id' => $asset->id,- 'sign_in_place_table' => 'Assets',+ 'sign_in_place_resource_type' => 'Assets',]);return redirect()->route('account.accept.item', $acceptance->id)diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.phpindex 93905e01e2..cc283e1d46 100644--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php@@ -151,7 +151,7 @@ class ConsumableCheckoutController extends Controllersession(['sign_in_place_acceptance_id' => $acceptance->id,'sign_in_place_item_id' => $consumable->id,- 'sign_in_place_table' => 'Consumables',+ 'sign_in_place_resource_type' => 'Consumables',]);return redirect()->route('account.accept.item', $acceptance->id)diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.phpindex aa80eb7344..8f7ca26a14 100644--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php@@ -142,7 +142,7 @@ class LicenseCheckoutController extends Controllersession(['sign_in_place_acceptance_id' => $acceptance->id,'sign_in_place_item_id' => $license->id,- 'sign_in_place_table' => 'Licenses',+ 'sign_in_place_resource_type' => 'Licenses',]);return redirect()->route('account.accept.item', $acceptance->id)diff --git a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.phpindex a8c7866972..2fd5df3915 100644--- a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php+++ b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php@@ -179,7 +179,7 @@ class AssetAcceptanceTest extends TestCase->withSession(['sign_in_place_acceptance_id' => $checkoutAcceptance->id,'sign_in_place_item_id' => $asset->id,- 'sign_in_place_table' => 'Assets',+ 'sign_in_place_resource_type' => 'Assets','redirect_option' => 'target','checkout_to_type' => 'user',])