Fix timezone to Europe/Amsterdam, fix 500 error on communication and customer pages with bulletproof schema helper, and redesign admin header to compact grouped dropdowns

This commit is contained in:
2026-11-02 11:05:28 +01:00
parent da9992e060
commit 560a6ae20b
10 changed files with 327 additions and 169 deletions
@@ -6,13 +6,12 @@ use App\Http\Controllers\Controller;
use App\Mail\ContactInquiryReplyMail;
use App\Models\Communication;
use App\Models\CommunicationReply;
use App\Services\DatabaseSchemaHelper;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Schema;
use Illuminate\View\View;
class CommunicationController extends Controller
@@ -22,9 +21,7 @@ class CommunicationController extends Controller
*/
public function index(Request $request): View
{
if (! Schema::hasTable('communications')) {
Artisan::call('migrate', ['--force' => true]);
}
DatabaseSchemaHelper::ensureCommunicationsTables();
$query = Communication::with(['user', 'order', 'replies'])->latest();
@@ -6,10 +6,9 @@ use App\Http\Controllers\Controller;
use App\Models\Communication;
use App\Models\Order;
use App\Models\User;
use App\Services\DatabaseSchemaHelper;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Schema;
use Illuminate\View\View;
class CustomerController extends Controller
@@ -19,9 +18,7 @@ class CustomerController extends Controller
*/
public function index(Request $request): View
{
if (! Schema::hasTable('communications')) {
Artisan::call('migrate', ['--force' => true]);
}
DatabaseSchemaHelper::ensureCommunicationsTables();
$search = trim($request->input('q', ''));
+2 -9
View File
@@ -7,13 +7,12 @@ use App\Mail\ContactInquiryReceivedMail;
use App\Models\Communication;
use App\Models\Order;
use App\Models\Setting;
use App\Services\DatabaseSchemaHelper;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Schema;
use Illuminate\View\View;
class ContactController extends Controller
@@ -62,13 +61,7 @@ class ContactController extends Controller
}
}
if (! Schema::hasTable('communications')) {
Artisan::call('migrate', ['--force' => true]);
}
if (! \Illuminate\Support\Facades\Schema::hasTable('communications')) {
\Illuminate\Support\Facades\Artisan::call('migrate', ['--force' => true]);
}
DatabaseSchemaHelper::ensureCommunicationsTables();
$communication = Communication::create([
'user_id' => Auth::id(),
+2 -10
View File
@@ -2,11 +2,9 @@
namespace App\Http\Middleware;
use App\Services\DatabaseSchemaHelper;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Schema;
use Symfony\Component\HttpFoundation\Response;
class EnsureUserIsAdmin
@@ -28,13 +26,7 @@ class EnsureUserIsAdmin
// Auto-migrate check: Ensure that new database tables (like communications) are migrated
// automatically when an admin enters the admin panel, avoiding 500 errors on Coolify/production.
try {
if (! Schema::hasTable('communications')) {
Artisan::call('migrate', ['--force' => true]);
}
} catch (\Throwable $e) {
Log::warning('Auto-migration in EnsureUserIsAdmin failed: '.$e->getMessage());
}
DatabaseSchemaHelper::ensureCommunicationsTables();
return $next($request);
}
+65
View File
@@ -0,0 +1,65 @@
<?php
namespace App\Services;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Schema;
class DatabaseSchemaHelper
{
/**
* Ensure the communications and communication_replies tables exist.
* If missing, cleanly migrate or create them so the admin panel never throws a 500 error.
*/
public static function ensureCommunicationsTables(): void
{
try {
if (Schema::hasTable('communications') && Schema::hasTable('communication_replies')) {
return;
}
// If tables are missing but migration was recorded as ran, reset the migration record
if (Schema::hasTable('migrations')) {
DB::table('migrations')->where('migration', 'like', '%create_communications_table%')->delete();
}
Artisan::call('migrate', ['--force' => true]);
// Direct DDL Fallback if artisan migrate didn't create them
if (! Schema::hasTable('communications')) {
Schema::create('communications', function (Blueprint $table) {
$table->id();
$table->foreignId('user_id')->nullable()->constrained('users')->nullOnDelete();
$table->foreignId('order_id')->nullable()->constrained('orders')->nullOnDelete();
$table->string('name');
$table->string('email')->index();
$table->string('phone')->nullable();
$table->string('subject');
$table->text('message');
$table->string('status')->default('new')->index();
$table->text('admin_notes')->nullable();
$table->string('ip_address', 45)->nullable();
$table->text('user_agent')->nullable();
$table->timestamp('last_replied_at')->nullable();
$table->timestamps();
});
}
if (! Schema::hasTable('communication_replies')) {
Schema::create('communication_replies', function (Blueprint $table) {
$table->id();
$table->foreignId('communication_id')->constrained('communications')->cascadeOnDelete();
$table->foreignId('user_id')->nullable()->constrained('users')->nullOnDelete();
$table->boolean('is_admin_reply')->default(true);
$table->text('message');
$table->timestamps();
});
}
} catch (\Throwable $e) {
Log::error('ensureCommunicationsTables error: '.$e->getMessage(), ['trace' => $e->getTraceAsString()]);
}
}
}