Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit 54b1d65e3c78 · 2025-05-09T14:46:37.000+01:00
diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -34,7 +34,7 @@ public function index(Request $request, $licenseId) : JsonResponse | array
             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
@@ -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, ($total - $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 @@ public function transformLicenseSeat(LicenseSeat $seat, $seat_count = 0)
             '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/Models/Asset.php b/app/Models/Asset.php
@@ -656,6 +656,8 @@ public function getImageUrl()
             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;
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
@@ -230,16 +230,7 @@ public static function dataTableLayoutSeats()
                 '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 @@ public static function dataTableLayoutSeats()
                 'searchable' => false,
                 'sortable' => true,
                 'visible' => false,
-                'title' => trans('general.date'),
+                'title' => trans('general.updated_at'),
                 'formatter' => 'dateDisplayFormatter',
             ],
             [
diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php
@@ -99,7 +99,7 @@
                 {{ trans('admin/asset_maintenances/form.cost') }}
               </div>
               <div class="col-md-9">
-                {{ trans( 'general.currency' ) . Helper::formatCurrencyOutput($assetMaintenance->cost) }}
+                {{ \App\Models\Setting::getSettings()->default_currency .' '. Helper::formatCurrencyOutput($assetMaintenance->cost) }}
               </div>
             </div> <!-- /row -->
             @endif
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
@@ -106,11 +106,11 @@
                                         <div class="form-group">
                                             <div class="col-md-9 col-md-offset-3">
                                                 <label class="form-control">
-                                                    {{ Form::radio('update_default_location', '1', old('update_default_location'), ['checked'=> 'checked', 'aria-label'=>'update_default_location']) }}
+                                                    <input name="update_default_location" type="radio" value="1" checked="checked" aria-label="update_default_location" />
                                                     {{ trans('admin/hardware/form.asset_location') }}
                                                 </label>
                                                 <label class="form-control">
-                                                    {{ Form::radio('update_default_location', '0', old('update_default_location'), ['aria-label'=>'update_default_location']) }}
+                                                    <input name="update_default_location" type="radio" value="0" aria-label="update_default_location" />
                                                     {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                                                 </label>
                                             </div>
diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
@@ -40,11 +40,11 @@
     <div class="form-group">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-                {{ Form::radio('update_default_location', '1', old('update_default_location'), ['checked'=> 'checked', 'aria-label'=>'update_default_location']) }}
+                <input name="update_default_location" type="radio" value="1" checked="checked" aria-label="update_default_location" />
                 {{ trans('admin/hardware/form.asset_location') }}
             </label>
             <label class="form-control">
-                {{ Form::radio('update_default_location', '0', old('update_default_location'), ['aria-label'=>'update_default_location']) }}
+                <input name="update_default_location" type="radio" value="0" aria-label="update_default_location" />
                 {{ trans('admin/hardware/form.asset_location_update_default_current') }}
             </label>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function index(Request $request, $licenseId) : JsonResponse \| array`
`34`	`34`	`if ($request->input('sort') == 'department') {`
`35`	`35`	`$seats->OrderDepartments($order);`
`36`	`36`	`} else {`
`37`		`- $seats->orderBy('id', $order);`
	`37`	`+ $seats->orderBy('updated_at', $order);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`$total = $seats->count();`
Original file line number	Diff line number	Diff line change
`@@ -656,6 +656,8 @@ public function getImageUrl()`
`656`	`656`	`return Storage::disk('public')->url(app('assets_upload_path').e($this->image));`
`657`	`657`	`} elseif ($this->model && ! empty($this->model->image)) {`
`658`	`658`	`return Storage::disk('public')->url(app('models_upload_path').e($this->model->image));`
	`659`	`+ } elseif ($this->model->category && ! empty($this->model->category->image)) {`
	`660`	`+ return Storage::disk('public')->url(app('categories_upload_path').e($this->model->category->image));`
`659`	`661`	`}`
`660`	`662`
`661`	`663`	`return false;`