Merge branch 'develop'

# Conflicts:
#	public/js/app.js

app/Console/Commands/Core/Cleanup.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands\Core;
 
-use Carbon\Carbon;
 use App\Models\SystemLog;
 use Illuminate\Console\Command;
 

app/Http/Controllers/Admin/SettingController.php

@@ -95,7 +95,7 @@ class SettingController extends Controller
     public function terms()
     {
         return inertia('Admin/Terms', [
-            'settings' => [
+            'terms_settings' => [
                 'logo' => setting('logo'),
                 'name' => setting('name'),
                 'terms_required' => setting('accept_terms_required'),

app/Http/Controllers/Admin/SystemController.php

@@ -12,10 +12,6 @@ class SystemController extends Controller
 {
     public function index(MasterSupervisorRepository $masterSupervisorRepository)
     {
-        if (config('app.demo')) {
-            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
-        }
-
         $version = (new VersionChecker)->getVersions();
 
         return inertia('Admin/System', [

resources/js/Pages/Admin/Terms.vue

@@ -126,15 +126,15 @@ export default {
             sending: false,
 
             form: this.$inertia.form({
-                terms: this.settings.terms,
-                terms_required: this.settings.terms_required,
-                privacy: this.settings.privacy,
+                terms: this.terms_settings.terms,
+                terms_required: this.terms_settings.terms_required,
+                privacy: this.terms_settings.privacy,
             })
         }
     },
 
     props: {
-        settings: Object,
+        terms_settings: Object,
     },
 
     methods: {

routes/admin.php

@@ -13,7 +13,6 @@ Route::group(['prefix' => 'settings'], function () {
     Route::delete('remove-logo', 'SettingController@removeLogo')->name('settings.remove-logo');
 });
 
-
 Route::get('system', 'SystemController@index')->name('system');
 Route::post('system/update', 'SystemController@update')->name('system.update');
 Route::get('status', 'StatusController@index')->name('status.index');