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:
@@ -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', ''));
|
||||
|
||||
|
||||
@@ -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,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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user