A free open source IT asset/license management system
WIP - adding qty to more event calls
Marcus Moore18c639e6c0da
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.phpindex 9ed8c0fe45..8241c65c77 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php@@ -67,7 +67,7 @@ class AccessoryCheckoutController extends Controller*/public function store(AccessoryCheckoutRequest $request, Accessory $accessory) : RedirectResponse{-+$this->authorize('checkout', $accessory);$target = $this->determineCheckoutTarget();@@ -89,7 +89,14 @@ class AccessoryCheckoutController extends Controller$accessory_checkout->save();}- event(new CheckoutableCheckedOut($accessory, $target, auth()->user(), $request->input('note')));+ event(new CheckoutableCheckedOut(+ $accessory,+ $target,+ auth()->user(),+ $request->input('note'),+ [],+ $accessory->checkout_qty,+ ));$request->request->add(['checkout_to_type' => request('checkout_to_type')]);$request->request->add(['assigned_to' => $target->id]);diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.phpindex 68695cf821..d1db385400 100644--- a/app/Http/Controllers/Api/ComponentsController.php+++ b/app/Http/Controllers/Api/ComponentsController.php@@ -321,7 +321,7 @@ class ComponentsController extends Controller'note' => $request->get('note'),]);- $component->logCheckout($request->input('note'), $asset);+ $component->logCheckout($request->input('note'), $asset, null, [], $request->get('assigned_qty', 1));return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.checkout.success')));}diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.phpindex 7191b0b94a..3b0dfcc199 100644--- a/app/Http/Controllers/Api/ConsumablesController.php+++ b/app/Http/Controllers/Api/ConsumablesController.php@@ -326,8 +326,14 @@ class ConsumablesController extends Controller);}-- event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));+ event(new CheckoutableCheckedOut(+ $consumable,+ $user,+ auth()->user(),+ $request->input('note'),+ [],+ $consumable->checkout_qty,+ ));return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.phpindex 4214abb434..30e06e3855 100644--- a/app/Http/Controllers/Components/ComponentCheckoutController.php+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php@@ -115,7 +115,14 @@ class ComponentCheckoutController extends Controller'note' => $request->input('note'),]);- event(new CheckoutableCheckedOut($component, $asset, auth()->user(), $request->input('note')));+ event(new CheckoutableCheckedOut(+ $component,+ $asset,+ auth()->user(),+ $request->input('note'),+ [],+ $component->checkout_qty,+ ));$request->request->add(['checkout_to_type' => 'asset']);$request->request->add(['assigned_asset' => $asset->id]);diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.phpindex 3e972e1085..b723be2302 100644--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php@@ -102,7 +102,15 @@ class ConsumableCheckoutController extends Controller}$consumable->checkout_qty = $quantity;- event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));++ event(new CheckoutableCheckedOut(+ $consumable,+ $user,+ auth()->user(),+ $request->input('note'),+ [],+ $consumable->checkout_qty,+ ));$request->request->add(['checkout_to_type' => 'user']);$request->request->add(['assigned_user' => $user->id]);diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.phpindex d0320d0068..b3a965b3d6 100644--- a/app/Models/Traits/Loggable.php+++ b/app/Models/Traits/Loggable.php@@ -40,7 +40,7 @@ trait Loggable* @since [v3.4]* @return \App\Models\Actionlog*/- public function logCheckout($note, $target, $action_date = null, $originalValues = [], $qty)+ public function logCheckout($note, $target, $action_date = null, $originalValues = [], $qty = 1){$log = new Actionlog;diff --git a/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.phpindex 76814eb819..c50184ae77 100644--- a/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php+++ b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php@@ -152,7 +152,7 @@ class ConsumableCheckoutTest extends TestCasepublic function test_quantity_stored_in_action_log(){- $consumable = Consumable::factory()->create();+ $consumable = Consumable::factory()->create(['qty' => 3]);$user = User::factory()->create();$admin = User::factory()->admin()->create();@@ -162,7 +162,7 @@ class ConsumableCheckoutTest extends TestCase->post(route('consumables.checkout.store', $consumable), ['assigned_to' => $user->id,'redirect_option' => 'target',- 'assigned_qty' => 2,+ 'checkout_qty' => 2,]);$this->assertDatabaseHas('action_logs', [