Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit 00c394345ac2 · 2025-09-03T15:09:42.000+01:00
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
@@ -16,6 +16,7 @@ public static function icon($type) {
             case 'clone':
                 return 'far fa-clone';
             case 'delete':
+            case 'upload deleted':
                 return 'fas fa-trash';
             case 'create':
                 return 'fa-solid fa-plus';
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
@@ -50,6 +50,7 @@ public function index(Request $request) : JsonResponse | array
                 'fieldset',
                 'deleted_at',
                 'updated_at',
+                'require_serial',
             ];
 
         $assetmodels = AssetModel::select([
@@ -69,6 +70,7 @@ public function index(Request $request) : JsonResponse | array
             'models.fieldset_id',
             'models.deleted_at',
             'models.updated_at',
+            'models.require_serial'
          ])
             ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
             ->withCount('assets as assets_count');
diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -51,11 +51,7 @@ public function index(Request $request, $object_type, $id) : JsonResponse | arra
             ];
 
 
-        $uploads = Actionlog::select('action_logs.*')
-            ->whereNotNull('filename')
-            ->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)
-            ->where('action_type', '=', 'uploaded')
+        $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
             ->with('adminuser');
 
         $offset = ($request->input('offset') > $uploads->count()) ? $uploads->count() : abs($request->input('offset'));
@@ -206,7 +202,7 @@ public function destroy($object_type, $id, $file_id) : JsonResponse
                 Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename);
             }
             // Delete the record of the file
-            if ($log->delete()) {
+            if ($log->logUploadDelete($object, $log->filename)) {
                 return response()->json(Helper::formatStandardApiResponse('success', null, trans_choice('general.file_upload_status.delete.success', 1)), 200);
             }
 
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
@@ -82,6 +82,7 @@ public function store(StoreAssetModelRequest $request) : RedirectResponse
         $model->notes = $request->input('notes');
         $model->created_by = auth()->id();
         $model->requestable = $request->has('requestable');
+        $model->require_serial = $request->input('require_serial', 0);
 
         if ($request->input('fieldset_id') != '') {
             $model->fieldset_id = $request->input('fieldset_id');
@@ -155,7 +156,7 @@ public function update(StoreAssetModelRequest $request, AssetModel $model) : Red
         $model->category_id = $request->input('category_id');
         $model->notes = $request->input('notes');
         $model->requestable = $request->input('requestable', '0');
-
+        $model->require_serial = $request->input('require_serial', 0);
         $model->fieldset_id = $request->input('fieldset_id');
 
         if ($model->save()) {
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
@@ -110,17 +110,35 @@ public function store(ImageUploadRequest $request) : RedirectResponse
         // This is only necessary on create, not update, since bulk editing is handled
         // differently
         $asset_tags = $request->input('asset_tags');
+        $model = AssetModel::find($request->input('model_id'));
+        $serial_errors = [];
+        $serials = $request->input('serials');
 
         $settings = Setting::getSettings();
 
+        //Validate required serial based on model setting
+        for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {
+            if ($model && $model->require_serial === 1 && empty($serials[$a])) {
+                $serial_errors["serials.$a"] = trans('admin/hardware/form.serial_required', ['number' => $a]);
+            }
+
+        }
+
+        if (!empty($serial_errors)) {
+            return redirect()->back()
+                ->withInput()
+                ->withErrors($serial_errors);
+        }
+
+        $asset = null;
+        $companyId = Company::getIdForCurrentUser($request->input('company_id'));
         $successes = [];
         $failures = [];
-        $serials = $request->input('serials');
-        $asset = null;
 
-        for ($a = 1; $a <= count($asset_tags); $a++) {
+        for ($a = 1, $aMax = count($asset_tags); $a <= $aMax; $a++) {
             $asset = new Asset();
-            $asset->model()->associate(AssetModel::find($request->input('model_id')));
+
+            $asset->model()->associate($model);
             $asset->name = $request->input('name');
 
             // Check for a corresponding serial
@@ -132,7 +150,7 @@ public function store(ImageUploadRequest $request) : RedirectResponse
                 $asset->asset_tag = $asset_tags[$a];
             }
 
-            $asset->company_id              = Company::getIdForCurrentUser($request->input('company_id'));
+            $asset->company_id              = $companyId;
             $asset->model_id                = $request->input('model_id');
             $asset->order_number            = $request->input('order_number');
             $asset->notes                   = $request->input('notes');
@@ -172,7 +190,6 @@ public function store(ImageUploadRequest $request) : RedirectResponse
 
             // Update custom fields in the database.
             // Validation for these fields is handled through the AssetRequest form request
-            $model = AssetModel::find($request->get('model_id'));
 
             if (($model) && ($model->fieldset)) {
                 foreach ($model->fieldset->fields as $field) {
@@ -453,6 +470,13 @@ public function update(ImageUploadRequest $request, Asset $asset) : RedirectResp
         ]);
 
 
+        //Validate required serial based on model setting
+        if ($model && $model->require_serial === 1 && empty($serial[1])) {
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
+                ->with('warning', trans('admin/hardware/form.serial_required_post_model_update', [
+                    'asset_model' => $model->name
+                ]));
+        }
         if ($asset->save()) {
             return Helper::getRedirectOption($request, $asset->id, 'Assets')
                 ->with('success', trans('admin/hardware/message.update.success'));
diff --git a/app/Http/Controllers/BulkAssetModelsController.php b/app/Http/Controllers/BulkAssetModelsController.php
@@ -92,7 +92,9 @@ public function update(Request $request): View | RedirectResponse
             $update_array['min_amt'] = $request->input('min_amt');
         }
 
-
+        if ($request->filled('require_serial')) {
+            $update_array['require_serial'] = $request->input('require_serial');
+        }
 
         if (count($update_array) > 0) {
             AssetModel::whereIn('id', $models_raw_array)->update($update_array);
diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.php
@@ -148,7 +148,7 @@ public function destroy($object_type, $id, $file_id) : RedirectResponse
                 Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename);
             }
             // Delete the record of the file
-            if ($log->delete()) {
+            if ($log->logUploadDelete($object, $log->filename)) {
                 return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.delete.success', 1));
             }
 
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
@@ -50,17 +50,20 @@ private function clean_field($value)
 
     public function transformActionlog (Actionlog $actionlog, $settings = null)
     {
+
         $icon = $actionlog->present()->icon();
 
+        if (($actionlog->filename!='') && ($actionlog->action_type!='upload deleted')) {
+            $icon =  Helper::filetype_icon($actionlog->filename);
+        }
+
         static $custom_fields = false;
 
         if ($custom_fields === false) {
             $custom_fields = CustomField::all();
         }
 
-        if ($actionlog->filename!='') {
-            $icon =  Helper::filetype_icon($actionlog->filename);
-        }
+
 
         // This is necessary since we can't escape special characters within a JSON object
         if (($actionlog->log_meta) && ($actionlog->log_meta!='')) {
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
@@ -65,6 +65,7 @@ public function transformAssetModel(AssetModel $assetmodel)
             'default_fieldset_values' => $default_field_values,
             'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
             'requestable' => ($assetmodel->requestable == '1') ? true : false,
+            'require_serial' => $assetmodel->require_serial,
             'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
             'created_by' => ($assetmodel->adminuser) ? [
                 'id' => (int) $assetmodel->adminuser->id,
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
@@ -66,7 +66,7 @@ class Accessory extends SnipeModel
         'company_id'        => 'integer|nullable',
         'location_id'       => 'exists:locations,id|nullable|fmcs_location',
         'min_amt'           => 'integer|min:0|nullable',
-        'purchase_cost'     => 'numeric|nullable|gte:0|max:9999999999999',
+        'purchase_cost'     =>  'numeric|nullable|gte:0|max:99999999999999999.99',
         'purchase_date'     => 'date_format:Y-m-d|nullable',
     ];
 
diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
@@ -246,19 +246,6 @@ public function targetType()
     }
 
 
-    /**
-     * Establishes the actionlog -> uploads relationship
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since  [v3.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
-     */
-    public function uploads()
-    {
-        return $this->morphTo('item')
-            ->where('action_type', '=', 'uploaded')
-            ->withTrashed();
-    }
 
     /**
      * Establishes the actionlog -> userlog relationship
@@ -456,6 +443,26 @@ public function determineActionSource(): string
 
     }
 
+
+    /**
+     * @author  Godfrey Martinez
+     * @since [v8.0.4]
+     * @return \App\Models\Actionlog
+     */
+    public function logUploadDelete($object, $filename)
+    {
+        $log = new Actionlog;
+        $log->item_type = $object instanceof SnipeModel ? get_class($object) : $object;
+        $log->item_id = $object->id;
+        $log->created_by = auth()->id();
+        $log->target_id = null;
+        $log->filename = $filename;
+        $log->created_at = date('Y-m-d H:i:s');
+        $log->logaction('upload deleted');
+
+        return $log;
+    }
+
     public function uploads_file_url()
     {
 
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -114,7 +114,7 @@ public function declinedCheckout(User $declinedBy, $signature)
         'rtd_location_id'   => ['nullable', 'exists:locations,id', 'fmcs_location'],
         'purchase_date'     => ['nullable', 'date', 'date_format:Y-m-d'],
         'serial'            => ['nullable', 'string', 'unique_undeleted:assets,serial'],
-        'purchase_cost'     => ['nullable', 'numeric', 'gte:0', 'max:9999999999999'],
+        'purchase_cost'     => ['nullable', 'numeric', 'gte:0', 'max:99999999999999999.99'],
         'supplier_id'       => ['nullable', 'exists:suppliers,id'],
         'asset_eol_date'    => ['nullable', 'date'],
         'eol_explicit'      => ['nullable', 'boolean'],
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
@@ -71,6 +71,7 @@ class AssetModel extends SnipeModel
         'name',
         'notes',
         'requestable',
+        'require_serial'
     ];
 
     use Searchable;
diff --git a/app/Models/Component.php b/app/Models/Component.php
@@ -43,7 +43,7 @@ class Component extends SnipeModel
         'location_id'    => 'exists:locations,id|nullable|fmcs_location',
         'min_amt'        => 'integer|min:0|nullable',
         'purchase_date'   => 'date_format:Y-m-d|nullable',
-        'purchase_cost'  => 'numeric|nullable|gte:0|max:9999999999999',
+        'purchase_cost'     =>  'numeric|nullable|gte:0|max:99999999999999999.99',
         'manufacturer_id'   => 'integer|exists:manufacturers,id|nullable',
     ];
 
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
@@ -47,7 +47,7 @@ class Consumable extends SnipeModel
         'company_id'  => 'integer|nullable',
         'location_id' => 'exists:locations,id|nullable|fmcs_location',
         'min_amt'     => 'integer|min:0|max:99999|nullable',
-        'purchase_cost'   => 'numeric|nullable|gte:0|max:9999999999999',
+        'purchase_cost'     =>  'numeric|nullable|gte:0|max:99999999999999999.99',
         'purchase_date'   => 'date_format:Y-m-d|nullable',
     ];
 
diff --git a/app/Models/License.php b/app/Models/License.php
@@ -51,7 +51,7 @@ class License extends Depreciable
         'notes'   => 'string|nullable',
         'category_id' => 'required|exists:categories,id',
         'company_id' => 'integer|nullable',
-        'purchase_cost'=> 'numeric|nullable|gte:0',
+        'purchase_cost'     =>  'numeric|nullable|gte:0|max:99999999999999999.99',
         'purchase_date'   => 'date_format:Y-m-d|nullable|max:10|required_with:depreciation_id',
         'expiration_date'   => 'date_format:Y-m-d|nullable|max:10',
         'termination_date'   => 'date_format:Y-m-d|nullable|max:10',
diff --git a/app/Models/Maintenance.php b/app/Models/Maintenance.php
@@ -32,12 +32,12 @@ class Maintenance extends SnipeModel implements ICompanyableChild
         'asset_id'               => 'required|integer',
         'supplier_id'            => 'nullable|integer',
         'asset_maintenance_type' => 'required',
-        'name'                  => 'required|max:100',
+        'name'                   => 'required|max:100',
         'is_warranty'            => 'boolean',
         'start_date'             => 'required|date_format:Y-m-d',
         'completion_date'        => 'date_format:Y-m-d|nullable|after_or_equal:start_date',
         'notes'                  => 'string|nullable',
-        'cost'                   => 'numeric|nullable',
+        'cost'                   =>  'numeric|nullable|gte:0|max:99999999999999999.99',
     ];
 
 
diff --git a/app/Models/Traits/HasUploads.php b/app/Models/Traits/HasUploads.php
@@ -12,7 +12,14 @@ public function uploads()
         return $this->hasMany(Actionlog::class, 'item_id')
             ->where('item_type', self::class)
             ->where('action_type', '=', 'uploaded')
-            ->whereNotNull('filename');
+            ->whereNotNull('filename')
+            ->whereNotIn('filename', function ($query) {
+                $query->select('filename')
+                    ->from('action_logs')
+                    ->where('item_type', '=', self::class)
+                    ->where('action_type', '=', 'upload deleted')
+                    ->where('item_id', $this->id);
+            });
     }
 
 
diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
@@ -62,6 +62,10 @@ public function icon()
                 return 'fa-solid fa-user-minus';
             }
 
+            if ($this->action_type == 'upload deleted') {
+                return 'fa-solid fa-trash';
+            }
+
             if ($this->action_type == 'update') {
                 return 'fa-solid fa-user-pen';
             }
@@ -74,7 +78,7 @@ public function icon()
             return 'fa-solid fa-plus';
         }
 
-        if ($this->action_type == 'delete') {
+        if (($this->action_type == 'delete') || ($this->action_type == 'upload deleted')) {
             return 'fa-solid fa-trash';
         }
 
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
@@ -143,6 +143,14 @@ public static function dataTableLayout()
                 'title' => trans('admin/hardware/general.requestable'),
                 'formatter' => 'trueFalseFormatter',
             ],
+            [
+                'field' => 'require_serial',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('admin/hardware/general.require_serial'),
+                'formatter' => 'trueFalseFormatter',
+            ],
             [
                 'field' => 'notes',
                 'searchable' => true,
diff --git a/database/factories/AssetModelFactory.php b/database/factories/AssetModelFactory.php
@@ -33,6 +33,7 @@ public function definition()
             'category_id' => Category::factory(),
             'model_number' => $this->faker->creditCardNumber(),
             'notes' => 'Created by demo seeder',
+            'require_serial' => 0,
 
         ];
     }
diff --git a/database/migrations/2025_05_12_183803_add_req_serial_bool_to_models_table.php b/database/migrations/2025_05_12_183803_add_req_serial_bool_to_models_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('models', function (Blueprint $table) {
+            $table->boolean( 'require_serial')->after('category_id')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('models', function (Blueprint $table) {
+            $table->dropColumn('require_serial');
+        });
+    }
+};
diff --git a/resources/lang/en-US/admin/hardware/form.php b/resources/lang/en-US/admin/hardware/form.php
@@ -44,6 +44,8 @@
     'redirect_to_checked_out_to'   => 'Go to Checked Out to',
     'select_statustype'	=> 'Select Status Type',
     'serial'			=> 'Serial',
+    'serial_required'	=> 'Asset :number requires a serial number',
+    'serial_required_post_model_update'	=> ':asset_model have been updated to require a serial number. Please add a serial number for this asset.',
     'status'			=> 'Status',
     'tag'				=> 'Asset Tag',
     'update'			=> 'Asset Update',
diff --git a/resources/lang/en-US/admin/hardware/general.php b/resources/lang/en-US/admin/hardware/general.php
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
diff --git a/resources/views/maintenances/edit.blade.php b/resources/views/maintenances/edit.blade.php
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
diff --git a/resources/views/partials/forms/edit/purchase_cost.blade.php b/resources/views/partials/forms/edit/purchase_cost.blade.php
diff --git a/resources/views/partials/forms/edit/serial.blade.php b/resources/views/partials/forms/edit/serial.blade.php
diff --git a/routes/api.php b/routes/api.php
diff --git a/tests/Feature/Assets/Ui/StoreAssetsTest.php b/tests/Feature/Assets/Ui/StoreAssetsTest.php

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ public function update(Request $request): View \| RedirectResponse`
`92`	`92`	`$update_array['min_amt'] = $request->input('min_amt');`
`93`	`93`	`}`
`94`	`94`
`95`		`-`
	`95`	`+ if ($request->filled('require_serial')) {`
	`96`	`+ $update_array['require_serial'] = $request->input('require_serial');`
	`97`	`+ }`
`96`	`98`
`97`	`99`	`if (count($update_array) > 0) {`
`98`	`100`	`AssetModel::whereIn('id', $models_raw_array)->update($update_array);`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function destroy($object_type, $id, $file_id) : RedirectResponse`
`148`	`148`	`Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename);`
`149`	`149`	`}`
`150`	`150`	`// Delete the record of the file`
`151`		`- if ($log->delete()) {`
	`151`	`+ if ($log->logUploadDelete($object, $log->filename)) {`
`152`	`152`	`return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.delete.success', 1));`
`153`	`153`	`}`
`154`	`154`