diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index d0c66d4b1..2947344a5 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -55,7 +55,9 @@ class BulkAssetsController extends Controller $asset_ids = $request->input('ids'); - $assets = Asset::with('assignedTo', 'location', 'model')->find($asset_ids); + // Using the 'short-ternary' A/K/A "Elvis operator" '?:' here because ->input() might return an empty string + list($sortname,$sortdir) = explode(" ",$request->input('sort') ?: 'id ASC'); + $assets = Asset::with('assignedTo', 'location', 'model')->whereIn('id', $asset_ids)->orderBy($sortname, $sortdir)->get(); $models = $assets->unique('model_id'); $modelNames = []; diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index 3463d5eff..fc69d4655 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -17,7 +17,7 @@
-
+ @@ -90,7 +90,7 @@
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php index a104a81e1..f6befa273 100644 --- a/resources/views/components/checkout.blade.php +++ b/resources/views/components/checkout.blade.php @@ -11,7 +11,7 @@
-
+ {{ csrf_field() }} @@ -56,7 +56,7 @@
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index bc17e893a..591f4db25 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -12,7 +12,7 @@
-
+ @@ -77,7 +77,7 @@
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 90e20d5d9..b7e8c325a 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -1012,6 +1012,14 @@ event.preventDefault(); $(this).ekkoLightbox(); }); + //This prevents multi-click checkouts for accessories, components, consumables + $(document).ready(function () { + $('#checkout_form').submit(function (event) { + event.preventDefault(); + $('#submit_button').prop('disabled', true); + this.submit(); + }); + }); diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php index 09519501c..d56c7dc39 100644 --- a/resources/views/partials/asset-bulk-actions.blade.php +++ b/resources/views/partials/asset-bulk-actions.blade.php @@ -6,7 +6,8 @@ 'id' => (isset($id_formname)) ? $id_formname : 'assetsBulkForm', ]) }} - + {{-- The 'id ASC' will only be used if the cookie is actually empty (like on first-use) --}} +