Merge remote-tracking branch 'origin/master' into develop

database/migrations/2023_01_21_225350_add_eol_date_on_assets_table.php

@@ -22,6 +22,14 @@ class AddEolDateOnAssetsTable extends Migration
                 $table->date('asset_eol_date')->after('purchase_date')->nullable()->default(null);
             }
 
+            // This is a back in time migration to fix restores from very old versions of Snipe-IT where
+            // companies were not soft-deletable.
+            Schema::table('companies', function (Blueprint $table) {
+                if (! Schema::hasColumn('companies', 'deleted_at')) {
+                    $table->softDeletes();
+                }
+            });
+
             // This is a temporary shim so we don't have to modify the asset observer for migrations where
             // there is a large version difference. (See the AssetObserver notes). This column gets created
             // later in 2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php

database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php

@@ -54,6 +54,7 @@ class DenormalizedEolAndAddColumnForExplicitDateToAssets extends Migration
             ->update([
                 'asset_eol_date' => $this->eolUpdateExpression(),
             ]);
+
     }
 
     /**

database/migrations/2026_03_26_150316_add_deleted_at_to_companies.php

@@ -11,8 +11,11 @@ return new class extends Migration
      */
     public function up(): void
     {
+
         Schema::table('companies', function (Blueprint $table) {
-            $table->softDeletes();
+            if (! Schema::hasColumn('companies', 'deleted_at')) {
+                $table->softDeletes();
+            }
         });
 
     }