diff --git a/app/Filament/Central/Resources/CompanyResource.php b/app/Filament/Central/Resources/CompanyResource.php index 13e5fa0..ea3273c 100644 --- a/app/Filament/Central/Resources/CompanyResource.php +++ b/app/Filament/Central/Resources/CompanyResource.php @@ -110,7 +110,7 @@ class CompanyResource extends Resource Tables\Columns\TextColumn::make('slug') ->searchable() ->copyable() - ->url(fn (Company $r) => $r->url('/app')) + ->url(fn (Company $record) => $record->url('/app')) ->openUrlInNewTab(), Tables\Columns\TextColumn::make('name')->searchable()->sortable(), Tables\Columns\TextColumn::make('status') @@ -132,30 +132,30 @@ class CompanyResource extends Resource 'suspended' => 'Suspendat', 'archived' => 'Arhivat', ]), ]) - ->recordUrl(fn (Company $r) => CompanyResource::getUrl('view', ['record' => $r])) + ->recordUrl(fn (Company $record) => CompanyResource::getUrl('view', ['record' => $record])) ->actions([ Actions\ViewAction::make() - ->url(fn (Company $r) => CompanyResource::getUrl('view', ['record' => $r])), + ->url(fn (Company $record) => CompanyResource::getUrl('view', ['record' => $record])), Actions\Action::make('open_tenant') ->label('Deschide') ->icon('heroicon-m-arrow-top-right-on-square') ->color('primary') - ->url(fn (Company $r) => $r->url('/app')) + ->url(fn (Company $record) => $record->url('/app')) ->openUrlInNewTab(), Actions\Action::make('suspend') ->label('Suspendă') ->icon('heroicon-m-no-symbol') ->color('danger') - ->visible(fn (Company $r) => in_array($r->status, ['active', 'trial'])) + ->visible(fn (Company $record) => in_array($record->status, ['active', 'trial'])) ->requiresConfirmation() - ->action(fn (Company $r) => app(\App\Services\CompanyProvisioner::class)->suspend($r)), + ->action(fn (Company $record) => app(\App\Services\CompanyProvisioner::class)->suspend($record)), Actions\Action::make('activate') ->label('Activează') ->icon('heroicon-m-check-circle') ->color('success') - ->visible(fn (Company $r) => in_array($r->status, ['suspended', 'expired'])) + ->visible(fn (Company $record) => in_array($record->status, ['suspended', 'expired'])) ->requiresConfirmation() - ->action(fn (Company $r) => app(\App\Services\CompanyProvisioner::class)->reactivate($r)), + ->action(fn (Company $record) => app(\App\Services\CompanyProvisioner::class)->reactivate($record)), Actions\EditAction::make(), Actions\DeleteAction::make(), ]) diff --git a/app/Filament/Central/Resources/PlanResource.php b/app/Filament/Central/Resources/PlanResource.php index bd239d9..58ddb7c 100644 --- a/app/Filament/Central/Resources/PlanResource.php +++ b/app/Filament/Central/Resources/PlanResource.php @@ -88,11 +88,11 @@ class PlanResource extends Resource ->columns([ Tables\Columns\TextColumn::make('name')->searchable()->sortable(), Tables\Columns\TextColumn::make('price_monthly') - ->money(fn ($r) => $r->currency) + ->money(fn ($record) => $record->currency) ->label('Lunar') ->sortable(), Tables\Columns\TextColumn::make('price_yearly') - ->money(fn ($r) => $r->currency) + ->money(fn ($record) => $record->currency) ->label('Anual'), Tables\Columns\TextColumn::make('companies_count') ->counts('companies') diff --git a/app/Filament/Central/Resources/SubscriptionResource.php b/app/Filament/Central/Resources/SubscriptionResource.php index edb2a9f..aa0ce8f 100644 --- a/app/Filament/Central/Resources/SubscriptionResource.php +++ b/app/Filament/Central/Resources/SubscriptionResource.php @@ -109,19 +109,19 @@ class SubscriptionResource extends Resource ->columns([ Tables\Columns\TextColumn::make('invoice_number') ->label('Factură') - ->placeholder(fn ($r) => '—') + ->placeholder(fn ($record) => '—') ->copyable() ->searchable(), Tables\Columns\TextColumn::make('company.name') ->label('Companie') ->searchable() - ->url(fn ($r) => \App\Filament\Central\Resources\CompanyResource::getUrl('view', ['record' => $r->company_id])), + ->url(fn ($record) => \App\Filament\Central\Resources\CompanyResource::getUrl('view', ['record' => $record->company_id])), Tables\Columns\TextColumn::make('plan.name')->label('Plan')->placeholder('—'), Tables\Columns\TextColumn::make('period') ->formatStateUsing(fn ($s) => Subscription::PERIODS[$s] ?? $s) ->badge(), Tables\Columns\TextColumn::make('amount') - ->money(fn ($r) => $r->currency) + ->money(fn ($record) => $record->currency) ->sortable() ->weight('bold'), Tables\Columns\TextColumn::make('status') @@ -146,16 +146,16 @@ class SubscriptionResource extends Resource ->label('Marchează plătit') ->icon('heroicon-m-check-circle') ->color('success') - ->visible(fn ($r) => $r->status !== 'paid') + ->visible(fn ($record) => $record->status !== 'paid') ->requiresConfirmation() - ->action(function (Subscription $r) { - $r->update(['status' => 'paid', 'paid_at' => now()]); + ->action(function (Subscription $record) { + $record->update(['status' => 'paid', 'paid_at' => now()]); // Auto-extend company subscription - $r->company->update([ + $record->company->update([ 'status' => 'active', - 'active_until' => $r->period_end, + 'active_until' => $record->period_end, ]); - Notification::make()->title('Plată confirmată. Abonament extins până la ' . $r->period_end->format('d.m.Y'))->success()->send(); + Notification::make()->title('Plată confirmată. Abonament extins până la ' . $record->period_end->format('d.m.Y'))->success()->send(); }), Actions\EditAction::make(), Actions\DeleteAction::make(), diff --git a/app/Filament/Central/Resources/SuperAdminResource.php b/app/Filament/Central/Resources/SuperAdminResource.php index 2edf04f..208d310 100644 --- a/app/Filament/Central/Resources/SuperAdminResource.php +++ b/app/Filament/Central/Resources/SuperAdminResource.php @@ -93,7 +93,7 @@ class SuperAdminResource extends Resource Tables\Columns\IconColumn::make('app_authentication_secret') ->label('2FA') ->boolean() - ->getStateUsing(fn ($r) => $r->app_authentication_secret !== null) + ->getStateUsing(fn ($record) => $record?->app_authentication_secret !== null) ->trueIcon('heroicon-o-lock-closed') ->falseIcon('heroicon-o-lock-open') ->trueColor('success') @@ -114,18 +114,18 @@ class SuperAdminResource extends Resource Forms\Components\TextInput::make('new_password') ->password()->required()->minLength(8)->revealable(), ]) - ->action(function (SuperAdmin $r, array $data) { - $r->update(['password' => Hash::make($data['new_password'])]); + ->action(function (SuperAdmin $record, array $data) { + $record->update(['password' => Hash::make($data['new_password'])]); Notification::make()->title('Parolă resetată.')->success()->send(); }), Actions\Action::make('toggle_2fa') - ->label(fn ($r) => $r->app_authentication_secret ? 'Dezactivează 2FA' : 'Forțează re-setare 2FA') + ->label(fn (SuperAdmin $record) => $record->app_authentication_secret ? 'Dezactivează 2FA' : 'Forțează re-setare 2FA') ->icon('heroicon-m-lock-open') ->color('danger') - ->visible(fn ($r) => $r->app_authentication_secret !== null) + ->visible(fn (SuperAdmin $record) => $record->app_authentication_secret !== null) ->requiresConfirmation() - ->action(function (SuperAdmin $r) { - $r->forceFill([ + ->action(function (SuperAdmin $record) { + $record->forceFill([ 'app_authentication_secret' => null, 'app_authentication_recovery_codes' => null, 'email_authentication_at' => null, @@ -134,8 +134,8 @@ class SuperAdminResource extends Resource }), Actions\EditAction::make(), Actions\DeleteAction::make() - ->before(function (SuperAdmin $r) { - if (auth('central')->id() === $r->id) { + ->before(function (SuperAdmin $record) { + if (auth('central')->id() === $record->id) { Notification::make()->title('Nu te poți șterge pe tine!')->danger()->send(); return false; } diff --git a/app/Filament/Central/Widgets/PendingPayments.php b/app/Filament/Central/Widgets/PendingPayments.php index 14a854c..39c855b 100644 --- a/app/Filament/Central/Widgets/PendingPayments.php +++ b/app/Filament/Central/Widgets/PendingPayments.php @@ -29,10 +29,10 @@ class PendingPayments extends BaseWidget Tables\Columns\TextColumn::make('invoice_number') ->label('Factură') ->copyable() - ->url(fn ($r) => SubscriptionResource::getUrl('edit', ['record' => $r])), + ->url(fn ($record) => SubscriptionResource::getUrl('edit', ['record' => $record])), Tables\Columns\TextColumn::make('company.name')->label('Companie'), Tables\Columns\TextColumn::make('plan.name')->placeholder('—'), - Tables\Columns\TextColumn::make('amount')->money(fn ($r) => $r->currency)->weight('bold'), + Tables\Columns\TextColumn::make('amount')->money(fn ($record) => $record->currency)->weight('bold'), Tables\Columns\TextColumn::make('status') ->badge() ->color(fn ($s) => $s === 'overdue' ? 'danger' : 'warning') @@ -40,7 +40,7 @@ class PendingPayments extends BaseWidget Tables\Columns\TextColumn::make('due_at') ->label('Scadent') ->dateTime() - ->color(fn ($r) => $r->due_at && $r->due_at->isPast() ? 'danger' : null), + ->color(fn ($record) => $record->due_at && $record->due_at->isPast() ? 'danger' : null), ]) ->emptyStateHeading('🎉 Toate facturile sunt plătite') ->paginated(false); diff --git a/app/Filament/Central/Widgets/RecentTenants.php b/app/Filament/Central/Widgets/RecentTenants.php index 3ffb0c7..ec6b489 100644 --- a/app/Filament/Central/Widgets/RecentTenants.php +++ b/app/Filament/Central/Widgets/RecentTenants.php @@ -22,7 +22,7 @@ class RecentTenants extends BaseWidget ->columns([ Tables\Columns\TextColumn::make('slug') ->copyable() - ->url(fn (Company $r) => CompanyResource::getUrl('view', ['record' => $r])), + ->url(fn (Company $record) => CompanyResource::getUrl('view', ['record' => $record])), Tables\Columns\TextColumn::make('name')->weight('bold'), Tables\Columns\TextColumn::make('status') ->badge() diff --git a/app/Providers/Filament/CentralPanelProvider.php b/app/Providers/Filament/CentralPanelProvider.php index 926b8d9..baf6198 100644 --- a/app/Providers/Filament/CentralPanelProvider.php +++ b/app/Providers/Filament/CentralPanelProvider.php @@ -67,9 +67,22 @@ class CentralPanelProvider extends PanelProvider - + + BLADE) ) + ->renderHook( + PanelsRenderHook::BODY_END, + fn (): string => <<<'HTML' + + HTML + ) ->middleware([ EncryptCookies::class, AddQueuedCookiesToResponse::class, diff --git a/routes/web.php b/routes/web.php index 6b11c19..32da442 100644 --- a/routes/web.php +++ b/routes/web.php @@ -54,18 +54,112 @@ Route::get('/admin-manifest.json', function () { 'short_name' => 'AutoCRM', 'description' => 'Panou administrativ AutoCRM SaaS', 'start_url' => '/admin', + 'scope' => '/', 'display' => 'standalone', 'orientation' => 'any', 'background_color' => '#ffffff', 'theme_color' => '#6366f1', 'lang' => 'ro', 'icons' => [ - ['src' => '/pwa/admin-192.png', 'sizes' => '192x192', 'type' => 'image/png'], - ['src' => '/pwa/admin-512.png', 'sizes' => '512x512', 'type' => 'image/png'], + ['src' => '/pwa/admin-192.png', 'sizes' => '192x192', 'type' => 'image/png', 'purpose' => 'any'], + ['src' => '/pwa/admin-512.png', 'sizes' => '512x512', 'type' => 'image/png', 'purpose' => 'any'], + ['src' => '/pwa/admin-512.png', 'sizes' => '512x512', 'type' => 'image/png', 'purpose' => 'maskable'], ], ])->header('Cache-Control', 'public, max-age=3600'); }); +// SVG favicon for the central panel (referenced from ) +Route::get('/pwa/admin-icon.svg', function () { + $svg = ' + + A + '; + return response($svg, 200, ['Content-Type' => 'image/svg+xml', 'Cache-Control' => 'public, max-age=86400']); +}); + +// PNG icons generated on-the-fly with GD if available, with PNG fallback baked from SVG. +// Browsers (Chrome) require real PNG bytes for the install prompt. +Route::get('/pwa/admin-{size}.png', function (int $size) { + if (! in_array($size, [192, 512], true)) abort(404); + + if (! extension_loaded('gd')) { + // Fallback: serve a transparent 1x1 PNG. Install prompt may not show. + return response(base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg=='), + 200, ['Content-Type' => 'image/png']); + } + + $img = imagecreatetruecolor($size, $size); + $bg = imagecolorallocate($img, 99, 102, 241); // #6366f1 + $fg = imagecolorallocate($img, 255, 255, 255); + imagefilledrectangle($img, 0, 0, $size, $size, $bg); + + $letter = 'A'; + $fontSize = (int) ($size * 0.55); + // Use bundled GD font 5 (largest built-in) repeated. + if (function_exists('imagettftext')) { + $font = '/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf'; + if (file_exists($font)) { + $box = imagettfbbox($fontSize, 0, $font, $letter); + $w = $box[2] - $box[0]; + $h = $box[1] - $box[7]; + $x = (int) (($size - $w) / 2); + $y = (int) (($size + $h) / 2); + imagettftext($img, $fontSize, 0, $x, $y, $fg, $font, $letter); + } + } else { + // Fallback: built-in font + $charW = imagefontwidth(5); + $charH = imagefontheight(5); + $scale = max(1, (int) ($size / 8)); + imagestring($img, 5, (int) (($size - $charW * $scale) / 2), (int) (($size - $charH * $scale) / 2), $letter, $fg); + } + + ob_start(); + imagepng($img); + $png = ob_get_clean(); + imagedestroy($img); + + return response($png, 200, [ + 'Content-Type' => 'image/png', + 'Cache-Control' => 'public, max-age=86400', + ]); +})->where('size', '\d+'); + +// Service worker pentru PWA central (necesar pentru prompt-ul de install). +// Header `Service-Worker-Allowed: /admin` permite SW-ului servit de la root +// să controleze scope-ul `/admin/*` (cerut de manifest). +Route::get('/admin-sw.js', function () { + return response(<<<'JS' + const CACHE = 'autocrm-admin-shell-v1'; + const SHELL = ['/admin-manifest.json']; + self.addEventListener('install', e => { + e.waitUntil(caches.open(CACHE).then(c => c.addAll(SHELL).catch(() => {}))); + self.skipWaiting(); + }); + self.addEventListener('activate', e => { + e.waitUntil(caches.keys().then(keys => + Promise.all(keys.filter(k => k !== CACHE).map(k => caches.delete(k))) + )); + self.clients.claim(); + }); + self.addEventListener('fetch', e => { + if (e.request.method !== 'GET') return; + const u = new URL(e.request.url); + if (u.pathname.startsWith('/build/') || u.pathname.startsWith('/pwa/')) { + e.respondWith(caches.match(e.request).then(m => m || fetch(e.request).then(r => { + const copy = r.clone(); + caches.open(CACHE).then(c => c.put(e.request, copy)); + return r; + }).catch(() => caches.match(e.request)))); + } + }); + JS, 200, [ + 'Content-Type' => 'application/javascript', + 'Cache-Control' => 'public, max-age=3600', + 'Service-Worker-Allowed' => '/', + ]); +}); + // PWA — manifest dinamic per tenant. Route::get('/manifest.json', function (Request $request) { $tenant = app(TenantManager::class)->current();