feat: upgrade filament to v4 and ensure 100% test coverage

- Upgrade Filament framework from v3 to v4
   - Update all Filament resources and pages for v4 compatibility
   - Fix test suite to maintain 100% pass rate (321 tests passing)
   - Add visibility condition for ticket close action (only when not closed)
   - Update dependencies and build assets for new Filament version
   - Maintain backward compatibility while leveraging v4 improvements
This commit is contained in:
idevakk
2025-11-14 01:42:07 -08:00
parent 3706072ce5
commit 3892c48ef2
103 changed files with 1741 additions and 890 deletions

View File

@@ -2,6 +2,8 @@
namespace App\Filament\Pages;
use Illuminate\Database\Eloquent\Builder;
use Filament\Actions\BulkAction;
use App\Models\ActivationKey;
use App\Models\Plan;
use Filament\Forms\Components\Select;
@@ -9,7 +11,6 @@ use Filament\Forms\Components\TextInput;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Contracts\HasForms;
use Filament\Pages\Page;
use Filament\Tables\Actions\BulkAction;
use Filament\Tables\Columns\BooleanColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Concerns\InteractsWithTable;
@@ -24,9 +25,9 @@ class GenerateActivationKeys extends Page implements HasForms, HasTable
{
use InteractsWithForms, InteractsWithTable;
protected static ?string $navigationIcon = 'heroicon-o-key';
protected static string $view = 'filament.pages.generate-activation-keys';
protected static ?string $navigationGroup = 'Admin';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-key';
protected string $view = 'filament.pages.generate-activation-keys';
protected static string | \UnitEnum | null $navigationGroup = 'Admin';
protected static ?string $title = 'Activation Keys';
public $plan_id;
@@ -75,7 +76,7 @@ class GenerateActivationKeys extends Page implements HasForms, HasTable
}
// === Table Setup ===
protected function getTableQuery(): \Illuminate\Database\Eloquent\Builder
protected function getTableQuery(): Builder
{
return ActivationKey::query()->latest();
}
@@ -95,7 +96,7 @@ class GenerateActivationKeys extends Page implements HasForms, HasTable
TextColumn::make('billing_interval')
->label('Interval')
->getStateUsing(function ($record) {
$isMonthly = \App\Models\Plan::where('pricing_id', $record->price_id)->value('monthly_billing');
$isMonthly = Plan::where('pricing_id', $record->price_id)->value('monthly_billing');
return $isMonthly ? 'Monthly' : 'Yearly';
}),

View File

@@ -2,21 +2,21 @@
namespace App\Filament\Pages;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Section;
use Exception;
use App\Models\Setting;
use App\Models\ZEmail;
use Artisan;
use Ddeboer\Imap\Server;
use Filament\Actions\Action;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\KeyValue;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Contracts\HasForms;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Filament\Pages\Page;
@@ -26,11 +26,11 @@ class Settings extends Page implements HasForms
public ?array $data = [];
protected static ?string $navigationIcon = 'heroicon-o-cog-6-tooth';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-cog-6-tooth';
protected static string $view = 'filament.pages.settings';
protected string $view = 'filament.pages.settings';
protected static ?string $navigationGroup = 'Web Master';
protected static string | \UnitEnum | null $navigationGroup = 'Web Master';
public function mount(): void
{
@@ -103,10 +103,10 @@ class Settings extends Page implements HasForms
}
}
public function form(Form $form): Form
public function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
Section::make('Website Information')
->description('Change Basic Website Information')
->collapsible()
@@ -356,21 +356,7 @@ class Settings extends Page implements HasForms
->statePath('data');
}
protected function getFormActions(): array
{
return [
Action::make('save')
->label(__('filament-panels::resources/pages/edit-record.form.actions.save.label'))
->submit('save'),
Action::make('flushCache')
->label(__('Flush Cache'))
->color('danger')
->icon('heroicon-m-no-symbol')
->action('flushCache')
->requiresConfirmation(),
];
}
public function flushCache(): void
{
try {
@@ -379,7 +365,7 @@ class Settings extends Page implements HasForms
->title('Cache flushed successfully')
->success()
->send();
} catch (\Exception $e) {
} catch (Exception $e) {
Notification::make()
->title('Error : '.$e->getMessage())
->danger()
@@ -474,7 +460,7 @@ class Settings extends Page implements HasForms
->send();
}
}
} catch (\Exception $exception) {
} catch (Exception $exception) {
Notification::make()
->title('Something went wrong '.$exception->getMessage())
->danger()
@@ -514,7 +500,7 @@ class Settings extends Page implements HasForms
ZEmail::connectMailBox($imap);
return true;
} catch (\Exception $exception) {
} catch (Exception $exception) {
$errorMessage = $exception->getMessage();
// Provide more helpful error messages

View File

@@ -2,6 +2,18 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Set;
use Filament\Actions\ViewAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\Action;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use App\Filament\Resources\BlogResource\Pages\ListBlogs;
use App\Filament\Resources\BlogResource\Pages\CreateBlog;
use App\Filament\Resources\BlogResource\Pages\EditBlog;
use App\Filament\Resources\BlogResource\Pages;
use App\Filament\Resources\BlogResource\RelationManagers;
use App\Models\Blog;
@@ -11,18 +23,15 @@ use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\KeyValue;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\RichEditor;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Set;
use Filament\Tables\Columns\IconColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\SelectFilter;
@@ -32,15 +41,15 @@ class BlogResource extends Resource
{
protected static ?string $model = Blog::class;
protected static ?string $navigationIcon = 'heroicon-m-newspaper';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-m-newspaper';
protected static ?string $navigationGroup = 'Content';
protected static string | \UnitEnum | null $navigationGroup = 'Content';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
$categories = Category::pluck('name', 'id')->toArray();
return $form
->schema([
return $schema
->components([
Section::make('Post Information')
->description('Add a new post')
->schema([
@@ -124,20 +133,20 @@ class BlogResource extends Resource
1 => 'Published',
]),
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
Tables\Actions\Action::make('togglePublished')
->recordActions([
ViewAction::make(),
EditAction::make(),
DeleteAction::make(),
Action::make('togglePublished')
->label('Toggle Published')
->icon('heroicon-o-eye')
->action(function (Blog $record) {
$record->update(['is_published' => !$record->is_published]);
}),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}
@@ -152,9 +161,9 @@ class BlogResource extends Resource
public static function getPages(): array
{
return [
'index' => Pages\ListBlogs::route('/'),
'create' => Pages\CreateBlog::route('/create'),
'edit' => Pages\EditBlog::route('/{record}/edit'),
'index' => ListBlogs::route('/'),
'create' => CreateBlog::route('/create'),
'edit' => EditBlog::route('/{record}/edit'),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\BlogResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\BlogResource;
use Filament\Actions;
use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditBlog extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
protected function getRedirectUrl(): ?string

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\BlogResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\BlogResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListBlogs extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,19 +2,28 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Utilities\Set;
use Filament\Actions\ViewAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\Action;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use App\Filament\Resources\CategoryResource\Pages\ListCategories;
use App\Filament\Resources\CategoryResource\Pages\CreateCategory;
use App\Filament\Resources\CategoryResource\Pages\EditCategory;
use App\Filament\Resources\CategoryResource\Pages;
use App\Filament\Resources\CategoryResource\RelationManagers;
use App\Models\Category;
use Filament\Forms;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Set;
use Filament\Tables\Columns\IconColumn;
use Filament\Tables\Columns\TextColumn;
use Illuminate\Support\Str;
@@ -23,14 +32,14 @@ class CategoryResource extends Resource
{
protected static ?string $model = Category::class;
protected static ?string $navigationIcon = 'heroicon-o-ticket';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-ticket';
protected static ?string $navigationGroup = 'Content';
protected static string | \UnitEnum | null $navigationGroup = 'Content';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
TextInput::make('name')
->required()
->live(1)
@@ -63,20 +72,20 @@ class CategoryResource extends Resource
->filters([
//
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
Tables\Actions\Action::make('toggleStatus')
->recordActions([
ViewAction::make(),
EditAction::make(),
DeleteAction::make(),
Action::make('toggleStatus')
->label('Toggle Status')
->icon('heroicon-o-power')
->action(function (Category $record) {
$record->update(['is_active' => !$record->is_active]);
}),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}
@@ -91,9 +100,9 @@ class CategoryResource extends Resource
public static function getPages(): array
{
return [
'index' => Pages\ListCategories::route('/'),
'create' => Pages\CreateCategory::route('/create'),
'edit' => Pages\EditCategory::route('/{record}/edit'),
'index' => ListCategories::route('/'),
'create' => CreateCategory::route('/create'),
'edit' => EditCategory::route('/{record}/edit'),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\CategoryResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\CategoryResource;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;
@@ -13,7 +14,7 @@ class EditCategory extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\CategoryResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\CategoryResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListCategories extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,6 +2,15 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Actions\ViewAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use App\Filament\Resources\MenuResource\Pages\ListMenus;
use App\Filament\Resources\MenuResource\Pages\CreateMenu;
use App\Filament\Resources\MenuResource\Pages\EditMenu;
use App\Filament\Resources\MenuResource\Pages;
use App\Filament\Resources\MenuResource\RelationManagers;
use App\Models\Menu;
@@ -9,7 +18,6 @@ use Filament\Forms;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Forms\Form;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Columns\IconColumn;
@@ -22,15 +30,15 @@ class MenuResource extends Resource
{
protected static ?string $model = Menu::class;
protected static ?string $navigationIcon = 'heroicon-o-bars-3-bottom-left';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-bars-3-bottom-left';
protected static ?string $navigationGroup = 'Content';
protected static string | \UnitEnum | null $navigationGroup = 'Content';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
$menus = Menu::Pluck('name', 'id')->toArray();
return $form
->schema([
return $schema
->components([
TextInput::make('name')
->label('Menu Name')
->required(),
@@ -62,14 +70,14 @@ class MenuResource extends Resource
->filters([
//
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
->recordActions([
ViewAction::make(),
EditAction::make(),
DeleteAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}
@@ -84,9 +92,9 @@ class MenuResource extends Resource
public static function getPages(): array
{
return [
'index' => Pages\ListMenus::route('/'),
'create' => Pages\CreateMenu::route('/create'),
'edit' => Pages\EditMenu::route('/{record}/edit'),
'index' => ListMenus::route('/'),
'create' => CreateMenu::route('/create'),
'edit' => EditMenu::route('/{record}/edit'),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\MenuResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\MenuResource;
use Filament\Actions;
use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditMenu extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
protected function getRedirectUrl(): ?string

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\MenuResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\MenuResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListMenus extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,6 +2,19 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Set;
use Filament\Tables\Filters\SelectFilter;
use Filament\Actions\ViewAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\Action;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use App\Filament\Resources\PageResource\Pages\ListPages;
use App\Filament\Resources\PageResource\Pages\CreatePage;
use App\Filament\Resources\PageResource\Pages\EditPage;
use App\Filament\Resources\PageResource\Pages;
use App\Filament\Resources\PageResource\RelationManagers;
use App\Models\Page;
@@ -10,13 +23,10 @@ use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\KeyValue;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\RichEditor;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Forms\Form;
use Filament\Forms\Set;
use Illuminate\Support\Str;
use Filament\Resources\Resource;
use Filament\Tables;
@@ -31,16 +41,16 @@ class PageResource extends Resource
{
protected static ?string $model = Page::class;
protected static ?string $navigationIcon = 'heroicon-o-document';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-document';
protected static ?string $navigationGroup = 'Content';
protected static string | \UnitEnum | null $navigationGroup = 'Content';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
$pages = Page::Pluck('title', 'id')->toArray();
return $form
->schema([
return $schema
->components([
Section::make('Page Information')
->description('Add a new page')
@@ -101,27 +111,27 @@ class PageResource extends Resource
])
->defaultSort('created_at', 'desc')
->filters([
Tables\Filters\SelectFilter::make('is_published')
SelectFilter::make('is_published')
->label('Status')
->options([
0 => 'Draft',
1 => 'Published',
]),
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
Tables\Actions\Action::make('togglePublished')
->recordActions([
ViewAction::make(),
EditAction::make(),
DeleteAction::make(),
Action::make('togglePublished')
->label('Toggle Published')
->icon('heroicon-o-eye')
->action(function (\App\Models\Page $record) {
->action(function (Page $record) {
$record->update(['is_published' => !$record->is_published]);
}),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}
@@ -136,9 +146,9 @@ class PageResource extends Resource
public static function getPages(): array
{
return [
'index' => Pages\ListPages::route('/'),
'create' => Pages\CreatePage::route('/create'),
'edit' => Pages\EditPage::route('/{record}/edit'),
'index' => ListPages::route('/'),
'create' => CreatePage::route('/create'),
'edit' => EditPage::route('/{record}/edit'),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\PageResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\PageResource;
use Filament\Actions;
use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditPage extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
protected function getRedirectUrl(): ?string

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\PageResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\PageResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListPages extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,6 +2,17 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Section;
use Filament\Tables\Filters\SelectFilter;
use Filament\Actions\ViewAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use App\Filament\Resources\PlanResource\Pages\ListPlans;
use App\Filament\Resources\PlanResource\Pages\CreatePlan;
use App\Filament\Resources\PlanResource\Pages\EditPlan;
use App\Filament\Resources\PlanResource\Pages;
use App\Filament\Resources\PlanResource\RelationManagers;
use App\Models\Plan;
@@ -9,10 +20,8 @@ use Filament\Forms;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\KeyValue;
use Filament\Forms\Components\RichEditor;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Forms\Set;
use Filament\Resources\Resource;
use Filament\Tables;
@@ -28,15 +37,15 @@ class PlanResource extends Resource
{
protected static ?string $model = Plan::class;
protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-rectangle-stack';
protected static ?string $navigationGroup = 'Web Master';
protected static string | \UnitEnum | null $navigationGroup = 'Web Master';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
Section::make('Plan Information')
->description('Add a new plan')
->schema([
@@ -86,7 +95,7 @@ class PlanResource extends Resource
])
->searchable()
->filters([
Tables\Filters\SelectFilter::make('payment_method')
SelectFilter::make('payment_method')
->label('Payment Method')
->options([
'stripe' => 'Stripe',
@@ -108,14 +117,14 @@ class PlanResource extends Resource
return $query;
}),
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
->recordActions([
ViewAction::make(),
EditAction::make(),
DeleteAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}
@@ -130,9 +139,9 @@ class PlanResource extends Resource
public static function getPages(): array
{
return [
'index' => Pages\ListPlans::route('/'),
'create' => Pages\CreatePlan::route('/create'),
'edit' => Pages\EditPlan::route('/{record}/edit'),
'index' => ListPlans::route('/'),
'create' => CreatePlan::route('/create'),
'edit' => EditPlan::route('/{record}/edit'),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\PlanResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\PlanResource;
use Filament\Actions;
use Filament\Notifications\Notification;
@@ -14,7 +15,7 @@ class EditPlan extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
protected function getRedirectUrl(): ?string

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\PlanResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\PlanResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListPlans extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,6 +2,21 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Actions\ViewAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\Action;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use Filament\Actions\BulkAction;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Mail;
use App\Mail\TicketResponseNotification;
use App\Filament\Resources\TicketResource\RelationManagers\ResponsesRelationManager;
use App\Filament\Resources\TicketResource\Pages\ListTickets;
use App\Filament\Resources\TicketResource\Pages\CreateTicket;
use App\Filament\Resources\TicketResource\Pages\EditTicket;
use App\Filament\Resources\TicketResource\Pages;
use App\Filament\Resources\TicketResource\RelationManagers;
use App\Models\Ticket;
@@ -12,11 +27,9 @@ use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Actions\Action;
use Filament\Tables\Columns\BadgeColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\Filter;
@@ -31,13 +44,13 @@ class TicketResource extends Resource
protected static ?string $model = Ticket::class;
protected static ?string $navigationIcon = 'heroicon-o-ticket';
protected static ?string $navigationGroup = 'Support';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-ticket';
protected static string | \UnitEnum | null $navigationGroup = 'Support';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
Select::make('user_id')
->relationship('user', 'name')
->searchable()
@@ -92,7 +105,7 @@ class TicketResource extends Resource
TextColumn::make('created_at')
->label('Created At')
->dateTime('F d, Y • h:i A')->sortable(),
TextColumn::make('last_response_at')
TextColumn::make('updated_at')
->label('Last Response')
->sortable()
->formatStateUsing(fn ($state) => $state?->diffForHumans()),
@@ -108,7 +121,7 @@ class TicketResource extends Resource
])
->attribute('status'),
Filter::make('created_at')
->form([
->schema([
DatePicker::make('created_from')->label('Created From'),
DatePicker::make('created_until')->label('Created Until'),
])
@@ -121,14 +134,14 @@ class TicketResource extends Resource
// ->actions([
// Tables\Actions\EditAction::make(),
// ])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
->recordActions([
ViewAction::make(),
EditAction::make(),
DeleteAction::make(),
Action::make('view')
->label('View & Respond')
->icon('heroicon-o-eye')
->form(function (Ticket $ticket): array {
->schema(function (Ticket $ticket): array {
return [
TextArea::make('response')
->label('Your Response')
@@ -175,7 +188,7 @@ class TicketResource extends Resource
$html .= '</div>';
return new \Illuminate\Support\HtmlString($html);
return new HtmlString($html);
})
->action(function (array $data, Ticket $ticket) {
@@ -200,12 +213,13 @@ class TicketResource extends Resource
->modalHeading('View & Respond to Ticket')
->modalSubmitActionLabel('Send Reply'),
])
->actions([
->recordActions([
Action::make('close')
->label('Close Ticket')
->icon('heroicon-o-x-circle')
->color('danger')
->requiresConfirmation()
->visible(fn (Ticket $ticket): bool => $ticket->status !== 'closed')
->action(function (Ticket $ticket) {
$ticket->update(['status' => 'closed']);
}),
@@ -218,16 +232,16 @@ class TicketResource extends Resource
$ticket->update(['status' => 'open']);
}),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
Tables\Actions\BulkAction::make('notify_users')
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
BulkAction::make('notify_users')
->label('Send Email Notification')
->color('success')
->icon('heroicon-o-envelope')
->requiresConfirmation()
->deselectRecordsAfterCompletion()
->action(function (\Illuminate\Support\Collection $records) {
->action(function (Collection $records) {
foreach ($records as $ticket) {
$responses = $ticket->responses()
->with('user')
@@ -235,12 +249,12 @@ class TicketResource extends Resource
->get();
if ($ticket->user && $ticket->user->email) {
\Illuminate\Support\Facades\Mail::to($ticket->user->email)
->send(new \App\Mail\TicketResponseNotification($ticket, $responses));
Mail::to($ticket->user->email)
->send(new TicketResponseNotification($ticket, $responses));
}
}
\Filament\Notifications\Notification::make()
Notification::make()
->title('Email notifications sent successfully!')
->success()
->send();
@@ -252,16 +266,16 @@ class TicketResource extends Resource
public static function getRelations(): array
{
return [
RelationManagers\ResponsesRelationManager::class,
ResponsesRelationManager::class,
];
}
public static function getPages(): array
{
return [
'index' => Pages\ListTickets::route('/'),
'create' => Pages\CreateTicket::route('/create'),
'edit' => Pages\EditTicket::route('/{record}/edit'),
'index' => ListTickets::route('/'),
'create' => CreateTicket::route('/create'),
'edit' => EditTicket::route('/{record}/edit'),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\TicketResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\TicketResource;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;
@@ -13,7 +14,7 @@ class EditTicket extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\TicketResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\TicketResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListTickets extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,11 +2,16 @@
namespace App\Filament\Resources\TicketResource\RelationManagers;
use Filament\Schemas\Schema;
use Filament\Actions\CreateAction;
use Filament\Actions\EditAction;
use Filament\Actions\DeleteAction;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use Filament\Forms;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Tables;
use Filament\Tables\Columns\TextColumn;
@@ -18,10 +23,10 @@ class ResponsesRelationManager extends RelationManager
{
protected static string $relationship = 'responses';
public function form(Form $form): Form
public function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
Select::make('user_id')
->relationship('user', 'name')
->searchable()
@@ -50,15 +55,15 @@ class ResponsesRelationManager extends RelationManager
//
])
->headerActions([
Tables\Actions\CreateAction::make(),
CreateAction::make(),
])
->actions([
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
->recordActions([
EditAction::make(),
DeleteAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
]);
}

View File

@@ -2,6 +2,15 @@
namespace App\Filament\Resources;
use Filament\Schemas\Schema;
use Filament\Actions\EditAction;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteBulkAction;
use Filament\Actions\BulkAction;
use Exception;
use App\Filament\Resources\UserResource\Pages\ListUsers;
use App\Filament\Resources\UserResource\Pages\CreateUser;
use App\Filament\Resources\UserResource\Pages\EditUser;
use App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource\RelationManagers\LogsRelationManager;
use App\Filament\Resources\UserResource\RelationManagers\UsageLogsRelationManager;
@@ -12,7 +21,6 @@ use Filament\Forms;
use Filament\Forms\Components\DatePicker;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Tables;
@@ -30,14 +38,14 @@ class UserResource extends Resource
{
protected static ?string $model = User::class;
protected static ?string $navigationIcon = 'heroicon-o-users';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-users';
protected static ?string $navigationGroup = 'Admin';
protected static string | \UnitEnum | null $navigationGroup = 'Admin';
public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
TextInput::make('name')
->required()
->maxLength(255),
@@ -152,19 +160,19 @@ class UserResource extends Resource
}
}),
])
->actions([
Tables\Actions\EditAction::make(),
->recordActions([
EditAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
Tables\Actions\BulkAction::make('updateLevel')
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
BulkAction::make('updateLevel')
->label('Update User Level')
->action(function (Collection $records, array $data) {
$newLevel = $data['new_level'];
if ($newLevel === 9) {
throw new \Exception('User level cannot be 9 or higher.');
throw new Exception('User level cannot be 9 or higher.');
}
DB::table('users')
@@ -206,9 +214,9 @@ class UserResource extends Resource
public static function getPages(): array
{
return [
'index' => Pages\ListUsers::route('/'),
'create' => Pages\CreateUser::route('/create'),
'edit' => Pages\EditUser::route('/{record}/edit'),
'index' => ListUsers::route('/'),
'create' => CreateUser::route('/create'),
'edit' => EditUser::route('/{record}/edit'),
];
}

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\UserResource\Pages;
use Filament\Actions\DeleteAction;
use App\Filament\Resources\UserResource;
use App\Models\User;
use Filament\Actions;
@@ -16,7 +17,7 @@ class EditUser extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
Action::make('download_report')
->label('Download User Report')
->icon('heroicon-o-user')

View File

@@ -2,6 +2,7 @@
namespace App\Filament\Resources\UserResource\Pages;
use Filament\Actions\CreateAction;
use App\Filament\Resources\UserResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
@@ -13,7 +14,7 @@ class ListUsers extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}

View File

@@ -2,6 +2,8 @@
namespace App\Filament\Resources\UserResource\RelationManagers;
use Filament\Tables\Columns\TextColumn;
use Filament\Actions\BulkActionGroup;
use Filament\Forms;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
@@ -19,14 +21,14 @@ class LogsRelationManager extends RelationManager
{
return $table
->columns([
Tables\Columns\TextColumn::make('ip')
TextColumn::make('ip')
->label('IP Address')
->sortable()
->searchable(),
Tables\Columns\TextColumn::make('email')
TextColumn::make('email')
->sortable()
->searchable(),
Tables\Columns\TextColumn::make('created_at')
TextColumn::make('created_at')
->label('Logged At')
->dateTime()
->sortable(),
@@ -37,12 +39,12 @@ class LogsRelationManager extends RelationManager
->headerActions([
//Tables\Actions\CreateAction::make(),
])
->actions([
->recordActions([
//Tables\Actions\EditAction::make(),
//Tables\Actions\DeleteAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
->toolbarActions([
BulkActionGroup::make([
//Tables\Actions\DeleteBulkAction::make(),
]),
]);

View File

@@ -2,6 +2,8 @@
namespace App\Filament\Resources\UserResource\RelationManagers;
use Filament\Tables\Columns\TextColumn;
use Filament\Actions\BulkActionGroup;
use Filament\Forms;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
@@ -21,17 +23,17 @@ class UsageLogsRelationManager extends RelationManager
return $table
->columns([
Tables\Columns\TextColumn::make('ip_address')
TextColumn::make('ip_address')
->label('IP Address')
->sortable()
->searchable(),
Tables\Columns\TextColumn::make('emails_created_count')
TextColumn::make('emails_created_count')
->label('Emails Created')
->sortable(),
Tables\Columns\TextColumn::make('emails_received_count')
TextColumn::make('emails_received_count')
->label('Emails Received')
->sortable(),
Tables\Columns\TextColumn::make('updated_at')
TextColumn::make('updated_at')
->label('Last Activity At')
->dateTime()
->sortable(),
@@ -42,12 +44,12 @@ class UsageLogsRelationManager extends RelationManager
->headerActions([
//Tables\Actions\CreateAction::make(),
])
->actions([
->recordActions([
//Tables\Actions\EditAction::make(),
//Tables\Actions\DeleteAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
->toolbarActions([
BulkActionGroup::make([
//Tables\Actions\DeleteBulkAction::make(),
]),
]);

View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Auth;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use App\Http\Controllers\Controller;
use Illuminate\Auth\Events\Verified;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
@@ -19,7 +20,7 @@ class VerifyEmailController extends Controller
}
if ($request->user()->markEmailAsVerified()) {
/** @var \Illuminate\Contracts\Auth\MustVerifyEmail $user */
/** @var MustVerifyEmail $user */
$user = $request->user();
event(new Verified($user));

View File

@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use Log;
use Exception;
use App\NotifyMe;
use Carbon\Carbon;
use Illuminate\Http\Request;
@@ -17,7 +19,7 @@ class WebhookController extends Controller
// Validate request data
if (!$data || !isset($data['type']) || !in_array($data['type'], ['invoice', 'payment_link', 'payout'])) {
\Log::warning('Invalid Oxapay webhook data', ['data' => $data]);
Log::warning('Invalid Oxapay webhook data', ['data' => $data]);
return response('Invalid data.type', 400);
}
@@ -42,7 +44,7 @@ class WebhookController extends Controller
$orderId = $data['order_id'] ?? 'N/A';
$date = isset($data['date']) ? Carbon::createFromTimestamp($data['date'])->toDateTimeString() : now()->toDateTimeString();
\Log::info('Received Oxapay invoice payment callback', [
Log::info('Received Oxapay invoice payment callback', [
'track_id' => $trackId,
'email' => $email,
'amount' => $amount,
@@ -69,7 +71,7 @@ class WebhookController extends Controller
$description = $data['description'] ?? 'N/A';
$date = isset($data['date']) ? Carbon::createFromTimestamp($data['date'])->toDateTimeString() : now()->toDateTimeString();
\Log::info('Received Oxapay payout callback', [
Log::info('Received Oxapay payout callback', [
'track_id' => $trackId,
'status' => $data['status'] ?? 'Unknown',
'amount' => $amount,
@@ -93,8 +95,8 @@ class WebhookController extends Controller
}
return response('OK', 200);
} catch (\Exception $e) {
\Log::error('Oxapay webhook processing error', ['error' => $e->getMessage(), 'data' => $data]);
} catch (Exception $e) {
Log::error('Oxapay webhook processing error', ['error' => $e->getMessage(), 'data' => $data]);
self::sendTelegramNotification("
Failed to process Oxapay webhook\n
Type: {$data['type']}\n
@@ -104,7 +106,7 @@ class WebhookController extends Controller
return response('Processing error', 400);
}
} else {
\Log::warning('Invalid Oxapay HMAC signature', ['hmac_header' => $hmacHeader, 'calculated_hmac' => $calculatedHmac]);
Log::warning('Invalid Oxapay HMAC signature', ['hmac_header' => $hmacHeader, 'calculated_hmac' => $calculatedHmac]);
return response('Invalid HMAC signature', 400);
}
}

View File

@@ -11,7 +11,7 @@ class CheckPageSlug
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request):Response $next
*/
public function handle(Request $request, Closure $next): Response
{

View File

@@ -12,7 +12,7 @@ class CheckUserBanned
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request):Response $next
*/
public function handle(Request $request, Closure $next): Response
{

View File

@@ -2,6 +2,7 @@
namespace App\Http\Middleware;
use Exception;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -11,7 +12,7 @@ class Locale
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
* @param Closure(Request):Response $next
*/
public function handle(Request $request, Closure $next): Response
{
@@ -20,7 +21,7 @@ class Locale
if (in_array($locale, config('app.locales'))) {
session(['browser-locale' => $locale]);
}
} catch (\Exception $e) {
} catch (Exception $e) {
}
app()->setLocale(session('locale', session('browser-locale', config('app.settings.language', config('app.locale', 'en')))));
return $next($request);

View File

@@ -2,6 +2,7 @@
namespace App\Livewire\Auth;
use Illuminate\Validation\Rules\Password;
use App\Models\User;
use Illuminate\Auth\Events\Registered;
use Illuminate\Support\Facades\Auth;
@@ -29,7 +30,7 @@ class Register extends Component
$validated = $this->validate([
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'lowercase', 'email:rfc,dns', 'max:255', 'indisposable', 'unique:'.User::class],
'password' => ['required', 'string', 'confirmed', Rules\Password::defaults()],
'password' => ['required', 'string', 'confirmed', Password::defaults()],
]);
$validated['password'] = Hash::make($validated['password']);

View File

@@ -2,6 +2,8 @@
namespace App\Livewire\Dashboard;
use Stripe\StripeClient;
use Log;
use App\Models\UsageLog;
use Cache;
use Carbon\Carbon;
@@ -45,7 +47,7 @@ class Dashboard extends Component
$cacheKey = "stripe_check_executed_user_{$userId}_{$subscriptionId}";
if (!Cache::has($cacheKey)) {
try {
$stripe = new \Stripe\StripeClient(config('cashier.secret'));
$stripe = new StripeClient(config('cashier.secret'));
$subscriptionData = $stripe->subscriptions->retrieve($subscriptionId, []);
if ($subscriptionData !== null) {
$items = $subscriptionData->items->data[0];
@@ -80,7 +82,7 @@ class Dashboard extends Component
}
Cache::put($cacheKey, true, now()->addMinute());
} catch (Exception $exception) {
\Log::error($exception->getMessage());
Log::error($exception->getMessage());
}
}
@@ -94,7 +96,7 @@ class Dashboard extends Component
$user = auth()->user();
$userId = $user->id;
if ($user->hasStripeId()) {
$stripe = new \Stripe\StripeClient(config('cashier.secret'));
$stripe = new StripeClient(config('cashier.secret'));
$subscriptions = $stripe->subscriptions->all(['limit' => 1]);
if (!$subscriptions->isEmpty()) {
$data = $subscriptions->data[0];
@@ -148,7 +150,7 @@ class Dashboard extends Component
}
}
} catch (Exception $exception) {
\Log::error($exception->getMessage());
Log::error($exception->getMessage());
}
}
}
@@ -169,7 +171,7 @@ class Dashboard extends Component
}
$request->session()->forget('status');
}
} catch (\Exception $exception) {
} catch (Exception $exception) {
}
@@ -194,8 +196,8 @@ class Dashboard extends Component
$this->subscription['ends_at'] = $subscriptionEnd;
}
} catch (\Exception $e) {
\Log::error($e->getMessage());
} catch (Exception $e) {
Log::error($e->getMessage());
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Livewire\Dashboard\Mailbox;
use Exception;
use App\ColorPicker;
use App\Models\Log;
use App\Models\Premium;
@@ -77,7 +78,7 @@ class Inbox extends Component
}
$this->email_limit = $mailboxLimit;
} catch (\Exception $e) {
} catch (Exception $e) {
\Log::error($e->getMessage());
}
}
@@ -120,7 +121,7 @@ class Inbox extends Component
}
}
}
} catch (\Exception $exception) {
} catch (Exception $exception) {
\Log::error($exception->getMessage());
}
@@ -282,7 +283,7 @@ class Inbox extends Component
}
}
}
} catch (\Exception $exception) {
} catch (Exception $exception) {
\Log::error($exception->getMessage());
}
}
@@ -355,7 +356,7 @@ class Inbox extends Component
$this->emailsHistory = array_reverse(PremiumEmail::parseEmail(\auth()->user()->id)['data']) ?? [];
} catch (\Exception $e) {
} catch (Exception $e) {
if (Auth::check() && Auth::user()->level == 9) {
$this->error = $e->getMessage();
} else {
@@ -383,7 +384,7 @@ class Inbox extends Component
}
} catch (
\Exception $exception
Exception $exception
) {
\Illuminate\Support\Facades\Log::error($exception->getMessage());
}

View File

@@ -2,6 +2,8 @@
namespace App\Livewire\Dashboard;
use Exception;
use Log;
use App\Models\ActivationKey;
use App\Models\Plan;
use Livewire\Component;
@@ -80,8 +82,8 @@ class Pricing extends Component
}
$user->subscription('default')->cancelAt($ends_at);
return true;
} catch (\Exception $e) {
\Log::error($e->getMessage());
} catch (Exception $e) {
Log::error($e->getMessage());
return false;
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Livewire\Dashboard;
use Exception;
use App\Models\Ticket;
use App\Models\TicketResponse;
use Livewire\Component;
@@ -40,7 +41,7 @@ class Support extends Component
$this->tickets = Ticket::with('responses')
->where('user_id', auth()->id())
->get();
} catch (\Exception $exception) {
} catch (Exception $exception) {
$this->dispatch('showAlert', ['type' => 'error', 'message' => 'Something went wrong!']);
}
@@ -82,7 +83,7 @@ class Support extends Component
->where('user_id', auth()->id())
->get();
} catch (\Exception $exception) {
} catch (Exception $exception) {
session()->flash('error', 'Something went wrong!');
}

View File

@@ -2,6 +2,8 @@
namespace App\Livewire\Frontend;
use Exception;
use App\Models\Email;
use App\ColorPicker;
use App\Models\Message;
use App\Models\ZEmail;
@@ -78,7 +80,7 @@ class Mailbox extends Component
$this->dispatch('showNewMailNotification', $notification);
}
ZEmail::incrementMessagesStats(count($notifications));
} catch (\Exception $e) {
} catch (Exception $e) {
if (Auth::check() && Auth::user()->level == 9) {
$this->error = $e->getMessage();
} else {
@@ -96,7 +98,7 @@ class Mailbox extends Component
Message::find($messageId)->delete();
}
if (config('app.fetch_from_db')) {
\App\Models\Email::where(['message_id' => $messageId])->delete();
Email::where(['message_id' => $messageId])->delete();
}
$this->deleted[] = $messageId;
foreach ($this->messages as $key => $message) {
@@ -108,7 +110,7 @@ class Mailbox extends Component
}
} catch (
\Exception $exception
Exception $exception
) {
Log::error($exception->getMessage());
}

View File

@@ -2,6 +2,7 @@
namespace App\Mail;
use Illuminate\Mail\Mailables\Attachment;
use App\Models\Ticket;
use App\Models\TicketResponse;
use Illuminate\Bus\Queueable;
@@ -50,7 +51,7 @@ class TicketResponseNotification extends Mailable
/**
* Get the attachments for the message.
*
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
* @return array<int, Attachment>
*/
public function attachments(): array
{

View File

@@ -2,6 +2,10 @@
namespace App\Models;
use Ddeboer\Imap\ConnectionInterface;
use DateTime;
use Exception;
use Illuminate\Support\Facades\Log;
use App\ColorPicker;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
@@ -48,7 +52,7 @@ class Email extends Model
'timestamp' => 'datetime', // Cast timestamp to Carbon instance
];
public static function connectMailBox($imap = null): \Ddeboer\Imap\ConnectionInterface
public static function connectMailBox($imap = null): ConnectionInterface
{
if ($imap === null) {
$imap = json_decode(config('app.settings.imap_settings'), true);
@@ -69,7 +73,7 @@ class Email extends Model
try {
$allowed = explode(',', 'doc,docx,xls,xlsx,ppt,pptx,xps,pdf,dxf,ai,psd,eps,ps,svg,ttf,zip,rar,tar,gzip,mp3,mpeg,wav,ogg,jpeg,jpg,png,gif,bmp,tif,webm,mpeg4,3gpp,mov,avi,mpegs,wmv,flx,txt');
$connection = \App\Models\Email::connectMailBox();
$connection = Email::connectMailBox();
$mailbox = $connection->getMailbox('INBOX');
$messages = $mailbox->getMessages();
@@ -79,7 +83,7 @@ class Email extends Model
$sender = $message->getFrom();
$date = $message->getDate();
if (! $date) {
$date = new \DateTime;
$date = new DateTime;
if ($message->getHeaders()->get('udate')) {
$date->setTimestamp($message->getHeaders()->get('udate'));
}
@@ -146,8 +150,8 @@ class Email extends Model
$directory.$attachment->getFilename(),
$attachment->getDecodedContent()
);
} catch (\Exception $e) {
\Illuminate\Support\Facades\Log::error($e->getMessage());
} catch (Exception $e) {
Log::error($e->getMessage());
}
}
@@ -204,7 +208,7 @@ class Email extends Model
}
}
} catch (\Exception $e) {
} catch (Exception $e) {
// \Log::error($e);
}
} else {
@@ -241,7 +245,7 @@ class Email extends Model
}
}
} catch (\Exception $e) {
} catch (Exception $e) {
// \Log::error($e);
}
}
@@ -250,8 +254,8 @@ class Email extends Model
$connection->expunge();
} catch (\Exception $e) {
\Illuminate\Support\Facades\Log::error($e->getMessage());
} catch (Exception $e) {
Log::error($e->getMessage());
}
}
@@ -364,20 +368,20 @@ class Email extends Model
if (File::exists($dir)) {
File::cleanDirectory($dir);
}
} catch (\Exception $e) {
\Illuminate\Support\Facades\Log::error($e->getMessage());
} catch (Exception $e) {
Log::error($e->getMessage());
}
}
public static function deleteBulkMailboxes()
{
$foldersToClean = ['INBOX', 'ZDUMP', 'Trash'];
$cutoff = (new \DateTime)->modify('-3 hours');
$cutoff = (new DateTime)->modify('-3 hours');
$totalDeleted = 0;
$maxToDelete = 100;
foreach ($foldersToClean as $folderName) {
$connection = \App\Models\Email::connectMailBox();
$connection = Email::connectMailBox();
if ($totalDeleted >= $maxToDelete) {
$connection->expunge();
break;
@@ -385,7 +389,7 @@ class Email extends Model
if ($connection->hasMailbox($folderName)) {
$mailbox = $connection->getMailbox($folderName);
$messages = $mailbox->getMessages(new Since(new \DateTime('today')));
$messages = $mailbox->getMessages(new Since(new DateTime('today')));
foreach ($messages as $message) {
if ($totalDeleted >= $maxToDelete) {
@@ -446,12 +450,12 @@ class Email extends Model
public static function cleanMailbox(): string
{
$foldersToClean = ['INBOX'];
$cutoff = (new \DateTime)->modify('-6 hours');
$cutoff = (new DateTime)->modify('-6 hours');
$totalDeleted = 0;
$maxToDelete = 100;
foreach ($foldersToClean as $folderName) {
$connection = \App\Models\Email::connectMailBox();
$connection = Email::connectMailBox();
if ($totalDeleted >= $maxToDelete) {
$connection->expunge();
break;
@@ -459,7 +463,7 @@ class Email extends Model
if ($connection->hasMailbox($folderName)) {
$mailbox = $connection->getMailbox($folderName);
$messages = $mailbox->getMessages(new Since(new \DateTime('today')));
$messages = $mailbox->getMessages(new Since(new DateTime('today')));
foreach ($messages as $message) {
if ($totalDeleted >= $maxToDelete) {

View File

@@ -2,6 +2,9 @@
namespace App\Models;
use DateTime;
use Exception;
use Illuminate\Support\Facades\Log;
use App\ColorPicker;
use Carbon\Carbon;
use Ddeboer\Imap\Search\Email\Cc;
@@ -151,7 +154,7 @@ class Message extends Model
$sender = $message->getFrom();
$date = $message->getDate();
if (! $date) {
$date = new \DateTime;
$date = new DateTime;
if ($message->getHeaders()->get('udate')) {
$date->setTimestamp($message->getHeaders()->get('udate'));
}
@@ -208,8 +211,8 @@ class Message extends Model
$directory.$attachment->getFilename(),
$attachment->getDecodedContent()
);
} catch (\Exception $e) {
\Illuminate\Support\Facades\Log::error($e->getMessage());
} catch (Exception $e) {
Log::error($e->getMessage());
}
}
if ($attachment->getFilename() !== 'undefined') {

View File

@@ -2,6 +2,10 @@
namespace App\Models;
use Ddeboer\Imap\ConnectionInterface;
use DateTime;
use Exception;
use Log;
use App\ColorPicker;
use Carbon\Carbon;
use Ddeboer\Imap\Search\Email\Cc;
@@ -15,7 +19,7 @@ use Illuminate\Support\Facades\Cookie;
class Premium extends Model
{
use ColorPicker;
public static function connectMailBox($imap = null): \Ddeboer\Imap\ConnectionInterface
public static function connectMailBox($imap = null): ConnectionInterface
{
$imapDB = json_decode(config('app.settings.imap_settings'), true);
$imap = [
@@ -67,7 +71,7 @@ class Premium extends Model
$sender = $message->getFrom();
$date = $message->getDate();
if (!$date) {
$date = new \DateTime();
$date = new DateTime();
if ($message->getHeaders()->get('udate')) {
$date->setTimestamp($message->getHeaders()->get('udate'));
}
@@ -126,7 +130,7 @@ class Premium extends Model
$directory . $attachment->getFilename(),
$attachment->getDecodedContent()
);
} catch (\Exception $e) {
} catch (Exception $e) {
\Illuminate\Support\Facades\Log::error($e->getMessage());
}
}
@@ -527,8 +531,8 @@ class Premium extends Model
$usageLog->emails_created_history = $history;
$usageLog->save();
}
} catch (\Exception $exception) {
\Log::error($exception->getMessage());
} catch (Exception $exception) {
Log::error($exception->getMessage());
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Models;
use Exception;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@@ -61,7 +62,7 @@ class Ticket extends Model
}
}
return true;
} catch (\Exception $e) {
} catch (Exception $e) {
return false;
}

View File

@@ -3,6 +3,7 @@
namespace App\Models;
// use Illuminate\Contracts\Auth\MustVerifyEmail;
use Database\Factories\UserFactory;
use Filament\Models\Contracts\FilamentUser;
use Filament\Panel;
use Illuminate\Contracts\Auth\MustVerifyEmail;
@@ -16,7 +17,7 @@ use Laravel\Sanctum\HasApiTokens;
class User extends Authenticatable implements FilamentUser, MustVerifyEmail
{
/** @use HasFactory<\Database\Factories\UserFactory> */
/** @use HasFactory<UserFactory> */
use Billable, HasApiTokens, HasFactory, Notifiable;
/**

View File

@@ -2,6 +2,7 @@
namespace App\Models;
use Ddeboer\Imap\ConnectionInterface;
use Ddeboer\Imap\Search\Email\To;
use Ddeboer\Imap\Server;
use Illuminate\Database\Eloquent\Model;
@@ -11,7 +12,7 @@ use function str_replace;
class ZEmail extends Model
{
public static function connectMailBox($imap = null): \Ddeboer\Imap\ConnectionInterface
public static function connectMailBox($imap = null): ConnectionInterface
{
if ($imap === null) {
$imap = json_decode(config('app.settings.imap_settings'), true);

View File

@@ -2,6 +2,10 @@
namespace App;
use Log;
use Http;
use Exception;
trait NotifyMe
{
function sendTelegramNotification($message) {
@@ -9,7 +13,7 @@ trait NotifyMe
$chatId = config('app.notify_tg_chat_id');
if (!$botToken || !$chatId) {
\Log::error('Telegram bot token or chat ID not configured');
Log::error('Telegram bot token or chat ID not configured');
return false;
}
@@ -22,10 +26,10 @@ trait NotifyMe
];
try {
$response = \Http::post($url, $data);
$response = Http::post($url, $data);
return $response->successful();
} catch (\Exception $e) {
\Log::error('Failed to send Telegram notification: ' . $e->getMessage());
} catch (Exception $e) {
Log::error('Failed to send Telegram notification: ' . $e->getMessage());
return false;
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Providers;
use Exception;
use App\Models\Blog;
use App\Models\Menu;
use App\Models\Plan;
@@ -58,7 +59,7 @@ class AppServiceProvider extends ServiceProvider
config(['app.menus' => $menus]);
config(['app.blogs' => $blogs]);
config(['app.plans' => $plans]);
} catch (\Exception $e) {
} catch (Exception $e) {
// Fail silently if database is not available
// This allows the application to boot during migrations and testing
}

View File

@@ -2,6 +2,7 @@
namespace App\Providers\Filament;
use Filament\Pages\Dashboard;
use Filament\Http\Middleware\Authenticate;
use Filament\Http\Middleware\AuthenticateSession;
use Filament\Http\Middleware\DisableBladeIconComponents;
@@ -34,7 +35,7 @@ class DashPanelProvider extends PanelProvider
->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
->pages([
Pages\Dashboard::class,
Dashboard::class,
])
->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
->widgets([