Merge branch 'develop' into saving_custom_report_template

Author: marcusmoore

.github/workflows/tests-mysql.yml

@@ -77,7 +77,3 @@ jobs:
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           DB_USERNAME: root
         run: php artisan test
-
-      - name: Test failure
-        if: ${{ failure() }}
-        run: docker exec "$PROJECT_NAME-php-fpm" cat storage/logs/laravel.log

.github/workflows/tests-postgres.yml

@@ -75,7 +75,3 @@ jobs:
           DB_USERNAME: snipeit
           DB_PASSWORD: password
         run: php artisan test
-
-      - name: Test failure
-        if: ${{ failure() }}
-        run: docker exec "$PROJECT_NAME-php-fpm" cat storage/logs/laravel.log

.github/workflows/tests-sqlite.yml

@@ -59,7 +59,3 @@ jobs:
         env:
           DB_CONNECTION: sqlite_testing
         run: php artisan test
-
-      - name: Test failure
-        if: ${{ failure() }}
-        run: docker exec "$PROJECT_NAME-php-fpm" cat storage/logs/laravel.log

app/Helpers/Helper.php

@@ -16,6 +16,7 @@
 use Illuminate\Contracts\Encryption\DecryptException;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 use Illuminate\Support\Facades\Session;
 
@@ -708,6 +709,28 @@ public static function generateRandomString($length = 10)
 
         return $randomString;
     }
+    /**
+     * A method to be used to handle deprecations notifications, currently handling MS Teams. more can be added when needed.
+     *
+     *
+     * @author [Godfrey Martinez]
+     * @since [v7.0.14]
+     * @return array
+     */
+    public static function deprecationCheck()  : array {
+        // The check and message that the user is still using the deprecated version
+        $deprecations = [
+            'ms_teams_deprecated' => array(
+            'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows'),
+            'message' => 'The Microsoft Teams webhook URL being used will be deprecated Jan 31st, 2025. <a class="btn btn-primary" href="' . route('settings.slack.index') . '">Change webhook endpoint</a>'),
+        ];
+
+        // if item of concern is being used and its being used with the deprecated values return the notification array.
+        if(Setting::getSettings()->webhook_selected === 'microsoft' && $deprecations['ms_teams_deprecated']['check']) {
+            return $deprecations;
+        }
+            return [];
+    }
 
     /**
      * This nasty little method gets the low inventory info for the

app/Http/Controllers/Account/AcceptanceController.php

@@ -338,4 +338,5 @@ public function store(Request $request, $id) : RedirectResponse
         return redirect()->to('account/accept')->with('success', $return_msg);
 
     }
+
 }

app/Http/Controllers/ActionlogController.php

@@ -37,10 +37,18 @@ public function displaySig($filename) : RedirectResponse | Response | bool
         }
     }
 
-    public function getStoredEula($filename) : Response | BinaryFileResponse
+    public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
     {
         $this->authorize('view', \App\Models\Asset::class);
         $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
-        return response()->download($file);
+
+        if (Storage::exists($file)) {
+            return response()->download($file);
+        }
+
+        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
+
+
+
     }
 }

app/Http/Controllers/Api/ReportsController.php

@@ -44,21 +44,6 @@ public function index(Request $request) : JsonResponse | array
             });
         }
 
-        if ($request->filled('action_type')) {
-            $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'))->orderBy('created_at', 'desc');
-        }
-
-        if ($request->filled('created_by')) {
-            $actionlogs = $actionlogs->where('created_by', '=', $request->input('created_by'));
-        }
-
-        if ($request->filled('action_source')) {
-            $actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'))->orderBy('created_at', 'desc');
-        }
-
-        if ($request->filled('remote_ip')) {
-            $actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip'))->orderBy('created_at', 'desc');
-        }
 
         if ($request->filled('uploads')) {
             $actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc');
@@ -74,6 +59,8 @@ public function index(Request $request) : JsonResponse | array
             'note',
             'remote_ip',
             'user_agent',
+            'target_type',
+            'item_type',
             'action_source',
             'action_date',
         ];

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -245,10 +245,12 @@ public function update(Request $request) : RedirectResponse
             || ($request->filled('status_id'))
             || ($request->filled('model_id'))
             || ($request->filled('next_audit_date'))
+            || ($request->filled('asset_eol_date'))
             || ($request->filled('null_name'))
             || ($request->filled('null_purchase_date'))
             || ($request->filled('null_expected_checkin_date'))
             || ($request->filled('null_next_audit_date'))
+            || ($request->filled('null_asset_eol_date'))
             || ($request->anyFilled($custom_field_columns))
 
         ) {
@@ -271,7 +273,8 @@ public function update(Request $request) : RedirectResponse
                     ->conditionallyAddItem('requestable')
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
-                    ->conditionallyAddItem('next_audit_date');
+                    ->conditionallyAddItem('next_audit_date')
+                    ->conditionallyAddItem('asset_eol_date');
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
                    }
@@ -316,6 +319,17 @@ public function update(Request $request) : RedirectResponse
                     $this->update_array['next_audit_date'] = null;
                 }
 
+                if ($request->input('null_asset_eol_date')=='1') {
+                    $this->update_array['asset_eol_date'] = null;
+
+                    // If they are nulling the EOL date to allow it to calculate, set eol explicit to 0
+                    if ($request->input('calc_eol')=='1') {
+                        $this->update_array['eol_explicit'] = 0;
+                    }
+                }
+
+
+
                 if ($request->filled('purchase_cost')) {
                     $this->update_array['purchase_cost'] =  $request->input('purchase_cost');
                 }

app/Http/Requests/StoreNotificationSettings.php

@@ -25,7 +25,7 @@ public function rules(): array
     {
         return [
             'alert_email'                         => 'email_array|nullable',
-            'admin_cc_email'                      => 'email|nullable',
+            'admin_cc_email'                      => 'email_array|nullable',
             'alert_threshold'                     => 'numeric|nullable|gt:0',
             'alert_interval'                      => 'numeric|nullable|gt:0',
             'audit_warning_days'                  => 'numeric|nullable|gt:0',