FEATURE: Option for Notes to be Required on Asset Checkin/Checkout

app/Http/Controllers/Assets/AssetCheckinController.php

@@ -116,6 +116,12 @@ public function store(AssetCheckinRequest $request, $assetId = null, $backto = n
             $seat->update(['assigned_to' => null]);
         });
 
+        $settings = \App\Models\Setting::getSettings();
+
+        if($settings->require_checkinout_notes=="1" && (is_null($request->note))) {
+            return redirect()->to("hardware/$assetId/checkin")->with('error', trans('admin/hardware/message.update.no_note'));
+        }
+
         // Get all pending Acceptances for this asset and delete them
         $acceptances = CheckoutAcceptance::pending()->whereHasMorph('checkoutable',
             [Asset::class],

app/Http/Controllers/Assets/AssetCheckoutController.php

@@ -102,6 +102,10 @@ public function store(AssetCheckoutRequest $request, $assetId) : RedirectRespons
 
             $settings = \App\Models\Setting::getSettings();
 
+            if($settings->require_checkinout_notes=="1" && (is_null($request->note))) {
+                   return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.update.no_note'));
+            }
+
             // We have to check whether $target->company_id is null here since locations don't have a company yet
             if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) &&  (!is_null($asset->company_id)))) {
                 if ($target->company_id != $asset->company_id){

app/Http/Controllers/SettingsController.php

@@ -343,6 +343,8 @@ public function postSettings(Request $request) : RedirectResponse
         $setting->depreciation_method = $request->input('depreciation_method');
         $setting->dash_chart_type = $request->input('dash_chart_type');
         $setting->profile_edit = $request->input('profile_edit', 0);
+        $setting->require_checkinout_notes = $request->input('require_checkinout_notes', 0);
+
 
         if ($request->input('per_page') != '') {
             $setting->per_page = $request->input('per_page');

app/Http/Requests/AssetCheckinRequest.php

@@ -14,18 +14,6 @@ public function authorize()
         return true;
     }
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-
-        ];
-    }
-
     public function response(array $errors)
     {
         return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);

database/migrations/2024_08_01_201721_add_required_notes_setting.php

@@ -0,0 +1,30 @@
+<?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('settings', function (Blueprint $table) {
+            $table->boolean('require_checkinout_notes')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'require_checkinout_notes')) {
+                $table->dropColumn('require_checkinout_notes');
+            }
+        });
+    }
+};

resources/lang/en-US/admin/hardware/message.php

@@ -23,6 +23,7 @@
         'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'no_note'           => 'Note field is empty',
     ],
 
     'restore' => [
@@ -76,6 +77,7 @@
         'user_does_not_exist' => 'That user is invalid. Please try again.',
         'not_available' => 'That asset is not available for checkout!',
         'no_assets_selected' => 'You must select at least one asset from the list',
+
     ],
 
     'checkin' => [

resources/lang/en-US/admin/settings/general.php

@@ -278,6 +278,8 @@
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/views/hardware/checkin.blade.php

@@ -113,17 +113,19 @@
                                             </div>
                                         </div>
 
-                                        <!-- Note -->
-                                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                                            <label for="note" class="col-sm-3 control-label">
-                                                {{ trans('general.notes') }}
-                                            </label>
-                                            <div class="col-md-8">
-                                                <textarea class="col-md-6 form-control" id="note"
-                                                          name="note">{{ old('note', $asset->note) }}</textarea>
-                                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                                            </div>
-                                        </div>
+                        <!-- Note -->
+                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                            <label for="note" class="col-md-3 control-label">
+                                {{ trans('general.notes') }}
+                            </label>
+                            @if($snipeSettings->require_checkinout_notes=="1")
+                            <div class="col-md-8 required">
+                                <textarea class="col-md-6 form-control" id="note" required="true"
+                                        name="note">{{ old('note', $asset->note) }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                                @endif
+                        </div>
                     </div> <!--/.box-body-->
                 </div> <!--/.box-body-->
 

resources/views/hardware/checkout.blade.php

@@ -140,11 +140,19 @@
                             <label for="note" class="col-md-3 control-label">
                                 {{ trans('general.notes') }}
                             </label>
+                            @if($snipeSettings->require_checkinout_notes=="1")
+                            <div class="col-md-8 required">
+                                <textarea class="col-md-6 form-control" id="note" required="true"
+                                          name="note">{{ old('note', $asset->note) }}</textarea>
+                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                            @else
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note"
                                           name="note">{{ old('note', $asset->note) }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
+                            @endif
                         </div>
 
                         @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))

resources/views/settings/general.blade.php

@@ -215,6 +215,23 @@
                        </div>
                    </div>
 
+                   <!-- Require Notes on checkin/checkout checkbox -->
+                   <div class="form-group">
+                       <div class="col-md-3">
+                           <label>
+                               {{ trans('admin/settings/general.require_checkinout_notes') }}
+                           </label>
+                       </div>
+                       <div class="col-md-8">
+                           <label class="form-control">
+                               <input type="checkbox" value="1" name="require_checkinout_notes" {{ (old('require_checkinout_notes', $setting->require_checkinout_notes)) == '1' ? ' checked="checked"' : '' }} aria-label="require_checkinout_notes">
+                               {{ trans('general.yes') }}
+                           </label>
+                               <p class="help-block">{{ trans('admin/settings/general.require_checkinout_notes_help_text') }}</p>
+                       </div>
+                   </div>
+                   <!-- /.form-group -->
+
 
                     <!-- login text -->
                     <div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">