Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json
snipe · Nov 26, 2024 · 37ac7fe · 37ac7fe
2 parents 6ee0c93 + 11f83b4
commit 37ac7fe
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 26 deletions.
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -334,6 +334,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');

diff --git a/app/Http/Requests/AssetCheckinRequest.php b/app/Http/Requests/AssetCheckinRequest.php
@@ -21,9 +21,14 @@ public function authorize()
      */
     public function rules()
     {
-        return [
+        $settings = \App\Models\Setting::getSettings();
 
-        ];
+        $rules = [];
+
+            if($settings->require_checkinout_notes) {
+            $rules['note'] = 'string|required';
+        }
+        return $rules;
     }
 
     public function response(array $errors)

diff --git a/app/Http/Requests/AssetCheckoutRequest.php b/app/Http/Requests/AssetCheckoutRequest.php
@@ -21,6 +21,8 @@ public function authorize()
      */
     public function rules()
     {
+        $settings = \App\Models\Setting::getSettings();
+
         $rules = [
             'assigned_user'         => 'required_without_all:assigned_asset,assigned_location',
             'assigned_asset'        => 'required_without_all:assigned_user,assigned_location',
@@ -35,7 +37,11 @@ public function rules()
                 'nullable',
                 'date'
             ],
-        ];
+            ];
+
+            if($settings->require_checkinout_notes) {
+                $rules['note'] = 'required|string';
+            }
 
         return $rules;
     }

diff --git a/app/Models/Setting.php b/app/Models/Setting.php
@@ -70,6 +70,7 @@ class Setting extends Model
 
     protected $casts = [
         'label2_asset_logo' => 'boolean',
+        'require_checkinout_notes' => 'boolean',
     ];
 
     /**

diff --git a/database/migrations/2024_08_01_201721_add_required_notes_setting.php b/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');
+            }
+        });
+    }
+};
diff --git a/public/css/build/app.css b/public/css/build/app.css
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -2,8 +2,8 @@
     "/js/build/app.js": "/js/build/app.js?id=5572f3bd32a6131651ab3022edd76941",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=d34ae2483cbe2c77478c45f4006eba55",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=b1c78591f51b52beab05b52f407ad6e6",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=49a09bf67bd6129ef4ce910d0be09757",
-    "/css/build/app.css": "/css/build/app.css?id=6b9acfefe41b964aa29d58dd26d6f910",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=b1146d30456ed95c3d4a9b60ddc58313",
+    "/css/build/app.css": "/css/build/app.css?id=e5f692af9dd2c217455ad87e520ef32a",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=a67bd93bed52e6a29967fe472de66d6c",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=53edc92eb2d272744bc7404ec259930e",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=18787b3f00a3be7be38ee4e26cbd2a07",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/all.css": "/css/dist/all.css?id=9a85a7206ecd9a5e74ec0736bec0026e",
+    "/css/dist/all.css": "/css/dist/all.css?id=fa28de72acfa72bfdd7ad4206a65d4eb",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less
@@ -384,7 +384,7 @@ a.logo.no-hover a:hover {
   background-color: transparent;
 }
 
-input:required, select:required {
+input:required, select:required, textarea:required {
   border-right: 6px solid orange;
 }
 

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
@@ -876,7 +876,6 @@ th.css-component > .th-inner::before
 }
 @media screen and (max-width: 992px){
   .info-stack-container {
-    display: flex;
     flex-direction: column;
   }
   .col-md-3.col-xs-12.col-sm-push-9.info-stack{
@@ -892,6 +891,12 @@ th.css-component > .th-inner::before
     float:none;
   }
 }
+@media screen and (max-width: 992px){
+  .row-new-striped div{
+    width:100%;
+  }
+}
+
 @media screen and (max-width: 1318px) and (min-width: 1200px){
   .admin.box{
     height:170px;

diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
@@ -280,6 +280,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',

diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
@@ -113,17 +113,17 @@
                                             </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>
+                            <div class="col-md-8">
+                                <textarea class="col-md-6 form-control" id="note" @required($snipeSettings->require_checkinout_notes)
+                                        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>
                     </div> <!--/.box-body-->
                 </div> <!--/.box-body-->
 

diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
@@ -141,8 +141,9 @@
                             <label for="note" class="col-md-3 control-label">
                                 {{ trans('general.notes') }}
                             </label>
+
                             <div class="col-md-8">
-                                <textarea class="col-md-6 form-control" id="note"
+                                <textarea class="col-md-6 form-control" id="note" @required($snipeSettings->require_checkinout_notes)
                                           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>

diff --git a/resources/views/settings/general.blade.php b/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' : '' }}">

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
@@ -309,10 +309,10 @@
                   <div class="row">
                     <!-- name -->
 
-                      <div class="col-md-3 col-sm-2">
+                      <div class="col-md-3">
                         {{ trans('admin/users/table.name') }}
                       </div>
-                      <div class="col-md-9 col-sm-2">
+                      <div class="col-md-9">
                         {{ $user->present()->fullName() }}
                       </div>
 
@@ -751,7 +751,7 @@
                            {{Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost)}}
 
                            <a id="optional_info" class="text-primary">
-                               <x-icon type="caret-right" id="optional_info_icon" /></i>
+                               <x-icon type="caret-right" id="optional_info_icon" />
                                <strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
                            </a>
                        </div>