From 1c09dc139a9869502cdfaf7943ad11fb93ef9088 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 8 May 2025 16:40:24 +0100 Subject: [PATCH 1/6] Undo previous change Signed-off-by: snipe --- app/Http/Transformers/LicenseSeatsTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php index f2b8da6478..6b83f12925 100644 --- a/app/Http/Transformers/LicenseSeatsTransformer.php +++ b/app/Http/Transformers/LicenseSeatsTransformer.php @@ -16,7 +16,7 @@ class LicenseSeatsTransformer $seat_count = 0; foreach ($seats as $seat) { $seat_count++; - $array[] = self::transformLicenseSeat($seat, ($total - $seat_count)); + $array[] = self::transformLicenseSeat($seat, $seat_count); } return (new DatatablesTransformer)->transformDatatables($array, $total); From 13521bcf75988b0635afbf8ba6ea962831e0c518 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 8 May 2025 17:37:27 +0100 Subject: [PATCH 2/6] =?UTF-8?q?Removed=20seat=20=E2=80=9Cname=E2=80=9D=20f?= =?UTF-8?q?rom=20license=20seats=20API/UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- app/Http/Controllers/Api/LicenseSeatsController.php | 2 +- app/Http/Transformers/LicenseSeatsTransformer.php | 11 +++-------- app/Presenters/LicensePresenter.php | 13 ++----------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 1a76139447..babca4a319 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -34,7 +34,7 @@ class LicenseSeatsController extends Controller if ($request->input('sort') == 'department') { $seats->OrderDepartments($order); } else { - $seats->orderBy('id', $order); + $seats->orderBy('updated_at', $order); } $total = $seats->count(); diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php index 6b83f12925..57f4087e9f 100644 --- a/app/Http/Transformers/LicenseSeatsTransformer.php +++ b/app/Http/Transformers/LicenseSeatsTransformer.php @@ -13,16 +13,15 @@ class LicenseSeatsTransformer public function transformLicenseSeats(Collection $seats, $total) { $array = []; - $seat_count = 0; + foreach ($seats as $seat) { - $seat_count++; - $array[] = self::transformLicenseSeat($seat, $seat_count); + $array[] = self::transformLicenseSeat($seat); } return (new DatatablesTransformer)->transformDatatables($array, $total); } - public function transformLicenseSeat(LicenseSeat $seat, $seat_count = 0) + public function transformLicenseSeat(LicenseSeat $seat) { $array = [ 'id' => (int) $seat->id, @@ -55,10 +54,6 @@ class LicenseSeatsTransformer 'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')), ]; - if ($seat_count != 0) { - $array['name'] = trans('admin/licenses/general.seat_count', ['count' => $seat_count]); - } - $permissions_array['available_actions'] = [ 'checkout' => Gate::allows('checkout', License::class), 'checkin' => Gate::allows('checkin', License::class), diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index b0f63acdbd..e2a21a8bcf 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -230,16 +230,7 @@ class LicensePresenter extends Presenter 'switchable' => true, 'title' => trans('general.id'), 'visible' => false, - ], - [ - 'field' => 'name', - 'searchable' => false, - 'sortable' => false, - 'sorter' => 'numericOnly', - 'switchable' => true, - 'title' => trans('admin/licenses/general.seat'), - 'visible' => true, - ], [ + ],[ 'field' => 'assigned_user', 'searchable' => false, 'sortable' => false, @@ -285,7 +276,7 @@ class LicensePresenter extends Presenter 'searchable' => false, 'sortable' => true, 'visible' => false, - 'title' => trans('general.date'), + 'title' => trans('general.updated_at'), 'formatter' => 'dateDisplayFormatter', ], [ From 9357eca1cdea8a11b615a98eadb179a529dba055 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 8 May 2025 12:16:55 -0700 Subject: [PATCH 3/6] Replace Form::radio on asset checkin page --- resources/views/hardware/checkin.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index 4367d79b8a..287f47c074 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -106,11 +106,11 @@
From c157f4190e654c0d2561cb51ce8473156b24966d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 8 May 2025 12:25:48 -0700 Subject: [PATCH 4/6] Replace Form::radio in location partial --- resources/views/partials/forms/edit/location-select.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php index f7077e4de9..0f88e14204 100644 --- a/resources/views/partials/forms/edit/location-select.blade.php +++ b/resources/views/partials/forms/edit/location-select.blade.php @@ -40,11 +40,11 @@
From d4181549e8ddd808e2e4a3ca6884c9d65339b1b4 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 9 May 2025 12:43:49 +0100 Subject: [PATCH 5/6] Fixes #16901 - use default currency for maintenance cost display Signed-off-by: snipe --- resources/views/asset_maintenances/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php index d46d46d48c..718fe9d674 100644 --- a/resources/views/asset_maintenances/view.blade.php +++ b/resources/views/asset_maintenances/view.blade.php @@ -99,7 +99,7 @@ use Carbon\Carbon; {{ trans('admin/asset_maintenances/form.cost') }}
- {{ trans( 'general.currency' ) . Helper::formatCurrencyOutput($assetMaintenance->cost) }} + {{ \App\Models\Setting::getSettings()->default_currency .' '. Helper::formatCurrencyOutput($assetMaintenance->cost) }}
@endif From 0d5dca6456b231a448d9baae267e8b973179266c Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 9 May 2025 14:46:27 +0100 Subject: [PATCH 6/6] Fixed #16690 - fallback to category image if no model image is present Signed-off-by: snipe --- app/Models/Asset.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 757024fe54..eddb4f5e83 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -656,6 +656,8 @@ class Asset extends Depreciable return Storage::disk('public')->url(app('assets_upload_path').e($this->image)); } elseif ($this->model && ! empty($this->model->image)) { return Storage::disk('public')->url(app('models_upload_path').e($this->model->image)); + } elseif ($this->model->category && ! empty($this->model->category->image)) { + return Storage::disk('public')->url(app('categories_upload_path').e($this->model->category->image)); } return false;