From fb9a5f928fe713ef8256449ae16187ea8f27087d Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 15 May 2024 16:39:26 -0700 Subject: [PATCH] removed license changes --- app/Helpers/Helper.php | 8 ++------ .../Controllers/Licenses/LicenseCheckoutController.php | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 573c1792e..8599fd3e0 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1461,7 +1461,7 @@ class Helper } - static public function getRedirectOption($request, $Id, $table) + static public function getRedirectOption($request, $id, $table) { $redirect_option = session::get('redirect_option'); $checkout_to_type = session::get('checkout_to_type'); @@ -1470,16 +1470,12 @@ class Helper switch ($table) { case "Assets": return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkout.success')); - case "Licenses": - return redirect()->route('licenses.index')->with('success', trans('admin/hardware/message.checkout.success')); } } if ($redirect_option == '1') { switch ($table) { case "Assets": - return redirect()->route('hardware.show', $Id)->with('success', trans('admin/hardware/message.checkout.success')); - case "Licenses": - return redirect()->route('licenses.show', $Id)->with('success', trans('admin/hardware/message.checkout.success')); + return redirect()->route('hardware.show', $id)->with('success', trans('admin/hardware/message.checkout.success')); } } if ($redirect_option == '2') { diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php index aa2a32e69..ca2bfd1ad 100644 --- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php +++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php @@ -43,7 +43,7 @@ class LicenseCheckoutController extends Controller } // Return the checkout view - return view('licenses/checkout', compact('license'))->with('table_name' , 'Licenses'); + return view('licenses/checkout', compact('license')); } // Invalid category