upgrade to filament v4

2026-02-19 01:26:02 +08:00
parent 90c92650b7
commit b95f23f223
122 changed files with 3615 additions and 3379 deletions
--- a/app/Filament/Resources/Clients/ClientResource.php
+++ b/app/Filament/Resources/Clients/ClientResource.php
@@ -1,42 +1,52 @@
 <?php

-namespace App\Filament\Resources;
+namespace App\Filament\Resources\Clients;

+use Filament\Pages\Enums\SubNavigationPosition;
+use Filament\Schemas\Schema;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Components\Grid;
+use Filament\Forms\Components\Select;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Filters\Filter;
+use Filament\Actions\ViewAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
 use App\DataObjects\CreateBranchDTO;
-use App\Filament\Resources\ClientResource\Pages\EditClient;
-use App\Filament\Resources\ClientResource\Pages\ListClients;
-use App\Filament\Resources\ClientResource\Pages\ViewClient;
-use App\Filament\Resources\ClientResource\Pages\GeneralLedger;
-use App\Filament\Resources\ClientResource\Pages\TrialBalance;
-use App\Filament\Resources\ClientResource\RelationManagers\AccountsRelationManager;
-use App\Filament\Resources\ClientResource\RelationManagers\BranchesRelationManager;
-use App\Filament\Resources\ClientResource\RelationManagers\DiscountRelationManager;
-use App\Filament\Resources\ClientResource\RelationManagers\ExpensesRelationManager;
-use App\Filament\Resources\ClientResource\RelationManagers\JournalsRelationManager;
-use App\Filament\Resources\ClientResource\RelationManagers\SalesRelationManager;
-use App\Filament\Resources\ClientResource\RelationManagers\TransmittalsRelationManager;
+use App\Filament\Resources\Clients\Pages\EditClient;
+use App\Filament\Resources\Clients\Pages\ListClients;
+use App\Filament\Resources\Clients\Pages\ViewClient;
+use App\Filament\Resources\Clients\Pages\GeneralLedger;
+use App\Filament\Resources\Clients\Pages\TrialBalance;
+use App\Filament\Resources\Clients\RelationManagers\AccountsRelationManager;
+use App\Filament\Resources\Clients\RelationManagers\BranchesRelationManager;
+use App\Filament\Resources\Clients\RelationManagers\DiscountRelationManager;
+use App\Filament\Resources\Clients\RelationManagers\ExpensesRelationManager;
+use App\Filament\Resources\Clients\RelationManagers\JournalsRelationManager;
+use App\Filament\Resources\Clients\RelationManagers\SalesRelationManager;
+use App\Filament\Resources\Clients\RelationManagers\TransmittalsRelationManager;
 use App\Models\Branch;
 use App\Models\Client;
 use App\Processes\Branch\CreateBranchProcess;
 use Filament\Forms;
-use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Filament\Pages\SubNavigationPosition;
 use Filament\Resources\Pages\Page;

 class ClientResource extends Resource
 {
    protected static ?string $model = Client::class;

-    protected static ?string $navigationIcon = 'heroicon-o-user';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-user';

    protected static ?string $recordTitleAttribute = 'company';
    
-    protected static SubNavigationPosition $subNavigationPosition = SubNavigationPosition::Top;
+    protected static ?\Filament\Pages\Enums\SubNavigationPosition $subNavigationPosition = SubNavigationPosition::Top;

    public static function authorizeView(Model $record): void
    {
@@ -53,16 +63,16 @@ class ClientResource extends Resource
        ]);
    }

-    public static function form(Form $form): Form
+    public static function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
-                Forms\Components\TextInput::make('firstname')->label('First Name')->required(),
-                Forms\Components\TextInput::make('middlename')->label('Middle Name')->nullable(),
-                Forms\Components\TextInput::make('lastname')->label('Last Name')->required(),
-                Forms\Components\Grid::make()->schema([
-                    Forms\Components\TextInput::make('company')->label('Company')->required(),
-                    Forms\Components\Select::make('type_id')
+        return $schema
+            ->components([
+                TextInput::make('firstname')->label('First Name')->required(),
+                TextInput::make('middlename')->label('Middle Name')->nullable(),
+                TextInput::make('lastname')->label('Last Name')->required(),
+                Grid::make()->schema([
+                    TextInput::make('company')->label('Company')->required(),
+                    Select::make('type_id')
                        ->relationship('type', 'type')
                        ->label('Type')->required(),
                ])->columns(2),
@@ -73,30 +83,30 @@ class ClientResource extends Resource
    {
        return $table
            ->columns([
-                Tables\Columns\TextColumn::make('firstname')->label('First Name')->searchable(),
-                Tables\Columns\TextColumn::make('middlename')->label('Middle Name'),
-                Tables\Columns\TextColumn::make('lastname')->label('Last Name'),
-                Tables\Columns\TextColumn::make('company')->label('Company')->searchable(),
-                Tables\Columns\TextColumn::make('type.type')->label('Type'),
+                TextColumn::make('firstname')->label('First Name')->searchable(),
+                TextColumn::make('middlename')->label('Middle Name'),
+                TextColumn::make('lastname')->label('Last Name'),
+                TextColumn::make('company')->label('Company')->searchable(),
+                TextColumn::make('type.type')->label('Type'),
            ])
            ->filters([
-                Tables\Filters\Filter::make('Vatable')
+                Filter::make('Vatable')
                    ->query(fn (Builder $query) => $query->orWhereHas('type', function (Builder $query) {
                        $query->where('type', 'Vatable');
                    })),
-                Tables\Filters\Filter::make('Non-Vatable')
+                Filter::make('Non-Vatable')
                    ->query(fn (Builder $query) => $query->orWhereHas('type', function (Builder $query) {
                        $query->where('type', 'Non Vatable');
                    })),
            ])
-            ->actions([
-                Tables\Actions\ViewAction::make(),
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make()->requiresConfirmation(),
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+                DeleteAction::make()->requiresConfirmation(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
--- a/app/Filament/Resources/Clients/Pages/CreateClient.php
+++ b/app/Filament/Resources/Clients/Pages/CreateClient.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Filament\Resources\ClientResource\Pages;
+namespace App\Filament\Resources\Clients\Pages;

-use App\Filament\Resources\ClientResource;
+use App\Filament\Resources\Clients\ClientResource;
 use Filament\Resources\Pages\CreateRecord;

 class CreateClient extends CreateRecord
--- a/app/Filament/Resources/Clients/Pages/EditClient.php
+++ b/app/Filament/Resources/Clients/Pages/EditClient.php
@@ -1,8 +1,9 @@
 <?php

-namespace App\Filament\Resources\ClientResource\Pages;
+namespace App\Filament\Resources\Clients\Pages;

-use App\Filament\Resources\ClientResource;
+use Filament\Actions\DeleteAction;
+use App\Filament\Resources\Clients\ClientResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;

@@ -13,7 +14,7 @@ class EditClient extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            Actions\DeleteAction::make()->icon('heroicon-s-trash')->requiresConfirmation(),
+            DeleteAction::make()->icon('heroicon-s-trash')->requiresConfirmation(),
        ];
    }

--- a/app/Filament/Resources/Clients/Pages/GeneralLedger.php
+++ b/app/Filament/Resources/Clients/Pages/GeneralLedger.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Filament\Resources\ClientResource\Pages;
+namespace App\Filament\Resources\Clients\Pages;

-use App\Filament\Resources\ClientResource;
+use App\Filament\Resources\Clients\ClientResource;
 use App\Models\Ledger;
 use Filament\Resources\Pages\Page;
 use Filament\Tables\Concerns\InteractsWithTable;
@@ -25,9 +25,9 @@ class GeneralLedger extends Page implements HasTable

    protected static string $resource = ClientResource::class;

-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-document-text';

-    protected static string $view = 'filament.resources.client-resource.pages.general-ledger';
+    protected string $view = 'filament.resources.client-resource.pages.general-ledger';

    public function mount(int | string $record): void
    {
@@ -79,7 +79,7 @@ class GeneralLedger extends Page implements HasTable
                    ->searchable()
                    ->preload(),
                Filter::make('date_range')
-                    ->form([
+                    ->schema([
                        DatePicker::make('from'),
                        DatePicker::make('to'),
                    ])
--- a/app/Filament/Resources/Clients/Pages/ListClients.php
+++ b/app/Filament/Resources/Clients/Pages/ListClients.php
@@ -1,9 +1,12 @@
 <?php

-namespace App\Filament\Resources\ClientResource\Pages;
+namespace App\Filament\Resources\Clients\Pages;

+use Filament\Actions\ExportAction;
+use Filament\Actions\Exports\Enums\ExportFormat;
+use Filament\Actions\CreateAction;
 use App\Filament\Exports\ClientExporter;
-use App\Filament\Resources\ClientResource;
+use App\Filament\Resources\Clients\ClientResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;

@@ -14,12 +17,12 @@ class ListClients extends ListRecords
    protected function getHeaderActions(): array
    {
        return [
-            Actions\ExportAction::make('Export clients')
+            ExportAction::make('Export clients')
            ->exporter(ClientExporter::class)
            ->formats([
-                Actions\Exports\Enums\ExportFormat::Csv,
+                ExportFormat::Csv,
            ]),
-            Actions\CreateAction::make()->slideOver(),
+            CreateAction::make()->slideOver(),
        ];
    }
 }
--- a/app/Filament/Resources/Clients/Pages/TrialBalance.php
+++ b/app/Filament/Resources/Clients/Pages/TrialBalance.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Filament\Resources\ClientResource\Pages;
+namespace App\Filament\Resources\Clients\Pages;

-use App\Filament\Resources\ClientResource;
+use App\Filament\Resources\Clients\ClientResource;
 use App\Models\Account;
 use Filament\Resources\Pages\Page;
 use Filament\Tables\Concerns\InteractsWithTable;
@@ -21,9 +21,9 @@ class TrialBalance extends Page implements HasTable

    protected static string $resource = ClientResource::class;

-    protected static ?string $navigationIcon = 'heroicon-o-scale';
+    protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-scale';

-    protected static string $view = 'filament.resources.client-resource.pages.trial-balance';
+    protected string $view = 'filament.resources.client-resource.pages.trial-balance';

    public function mount(int | string $record): void
    {
--- a/app/Filament/Resources/Clients/Pages/ViewClient.php
+++ b/app/Filament/Resources/Clients/Pages/ViewClient.php
@@ -1,21 +1,21 @@
 <?php

-namespace App\Filament\Resources\ClientResource\Pages;
+namespace App\Filament\Resources\Clients\Pages;

-use App\Filament\Resources\ClientResource;
-use Filament\Infolists\Components\Grid;
-use Filament\Infolists\Components\Section;
+use Filament\Schemas\Schema;
+use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Grid;
+use App\Filament\Resources\Clients\ClientResource;
 use Filament\Infolists\Components\TextEntry;
-use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;

 class ViewClient extends ViewRecord
 {
    protected static string $resource = ClientResource::class;

-    public function infolist(Infolist $infolist): Infolist
+    public function infolist(Schema $schema): Schema
    {
-        return $infolist
+        return $schema
            ->schema([
                Section::make()->schema([
                    Grid::make()->schema([
@@ -25,7 +25,7 @@ class ViewClient extends ViewRecord
                        TextEntry::make('company')->label('Company'),
                        TextEntry::make('type.type')->label('Type'),
                    ])->columns(3),
-                ]),
+                ])->columnSpanFull(),

                //                Section::make('Branches')->schema([
                //                    RepeatableEntry::make('branches')
--- a/app/Filament/Resources/Clients/RelationManagers/AccountsRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/AccountsRelationManager.php
@@ -1,13 +1,24 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

+use Filament\Schemas\Schema;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\Select;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Actions\Action;
+use Filament\Actions\ExportAction;
+use Filament\Actions\CreateAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
 use App\Commands\Clients\GenerateBaseAccountCommand;
 use App\Filament\Exports\ClientAccountsExporter;
 use App\Models\Account;
 use Filament\Actions\Exports\Enums\ExportFormat;
 use Filament\Forms;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -16,16 +27,16 @@ class AccountsRelationManager extends RelationManager
 {
    protected static string $relationship = 'accounts';

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
-                Forms\Components\TextInput::make('account')->required(),
-                Forms\Components\Textarea::make('description')->nullable(),
-                Forms\Components\Select::make('account_type_id')
+        return $schema
+            ->components([
+                TextInput::make('account')->required(),
+                Textarea::make('description')->nullable(),
+                Select::make('account_type_id')
                    ->relationship('accountType', 'type')
                    ->required(),
-                Forms\Components\Select::make('normal_balance')->options(
+                Select::make('normal_balance')->options(
                    ['debit' => 'Debit', 'credit' => 'Credit']
                )->required(),
            ]);
@@ -36,15 +47,15 @@ class AccountsRelationManager extends RelationManager
        return $table
            ->recordTitleAttribute('client_id')
            ->columns([
-                Tables\Columns\TextColumn::make('account')->description(fn (Account $record): string => $record->description ?? ''),
-                Tables\Columns\TextColumn::make('accountType.type'),
-                Tables\Columns\TextColumn::make('accountType.normal_balance')->label('Normal Balance'),
+                TextColumn::make('account')->description(fn (Account $record): string => $record->description ?? ''),
+                TextColumn::make('accountType.type'),
+                TextColumn::make('accountType.normal_balance')->label('Normal Balance'),
            ])
            ->filters([
                //
            ])
            ->headerActions([
-                 Tables\Actions\Action::make('generate-base-accounts')
+                 Action::make('generate-base-accounts')
                 ->requiresConfirmation()
                 ->label('Generate Base Accounts')
                 ->action(function () {
@@ -58,16 +69,16 @@ class AccountsRelationManager extends RelationManager
                    }
                    app(GenerateBaseAccountCommand::class)->execute($client);
                }),
-                Tables\Actions\ExportAction::make('Export Accounts')->exporter(ClientAccountsExporter::class)->formats([ExportFormat::Csv]),
-                Tables\Actions\CreateAction::make()->label('New Account')->icon('heroicon-o-plus')->slideOver(),
+                ExportAction::make('Export Accounts')->exporter(ClientAccountsExporter::class)->formats([ExportFormat::Csv]),
+                CreateAction::make()->label('New Account')->icon('heroicon-o-plus')->slideOver(),
            ])
-            ->actions([
-                Tables\Actions\EditAction::make()->slideOver(),
-                Tables\Actions\DeleteAction::make()->requiresConfirmation(),
+            ->recordActions([
+                EditAction::make()->slideOver(),
+                DeleteAction::make()->requiresConfirmation(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make()->icon('heroicon-s-trash')->requiresConfirmation(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()->icon('heroicon-s-trash')->requiresConfirmation(),
                ]),
            ]);
    }
--- a/app/Filament/Resources/Clients/RelationManagers/BranchesRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/BranchesRelationManager.php
@@ -1,13 +1,21 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

-use App\Filament\Resources\BranchResource\Pages\EditBranch;
-use App\Filament\Resources\ClientResource;
+use Filament\Schemas\Schema;
+use Filament\Forms\Components\Hidden;
+use Filament\Forms\Components\TextInput;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Actions\CreateAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use App\Filament\Resources\Branches\Pages\EditBranch;
+use App\Filament\Resources\Clients\ClientResource;
 use App\Models\Branch;
 use App\Processes\Branch\CreateBranchProcess;
 use Filament\Forms;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Support\RawJs;
 use Filament\Tables;
@@ -27,19 +35,19 @@ class BranchesRelationManager extends RelationManager
        $this->createBranchProcess = new CreateBranchProcess;
    }

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
-                Forms\Components\Hidden::make('id'),
-                Forms\Components\TextInput::make('code')->required()
+        return $schema
+            ->components([
+                Hidden::make('id'),
+                TextInput::make('code')->required()
                    ->unique(
                        'branches',
                        'code',
                        ignoreRecord: true,
                        modifyRuleUsing: fn (Unique $rule) => $rule->where('client_id', $this->getOwnerRecord()->id)
                    ),
-                Forms\Components\TextInput::make('series')->label('Current Series')
+                TextInput::make('series')->label('Current Series')
                    ->required()
                    ->numeric()
                    ->integer()
@@ -56,29 +64,29 @@ class BranchesRelationManager extends RelationManager
        return $table
            ->recordTitleAttribute('client_id')
            ->columns([
-                Tables\Columns\TextColumn::make('code')->label('Branch Code'),
-                Tables\Columns\TextColumn::make('current_series')->label('Current Series'),
+                TextColumn::make('code')->label('Branch Code'),
+                TextColumn::make('current_series')->label('Current Series'),
            ])
            ->filters([
                //
            ])
            ->headerActions([
-                Tables\Actions\CreateAction::make()
-                    ->mutateFormDataUsing(fn ($data) => $this->appendCientId($data))
+                CreateAction::make()
+                    ->mutateDataUsing(fn ($data) => $this->appendCientId($data))
                    ->using(fn ($data) => $this->saveBranch($data)),
            ])
-            ->actions([
+            ->recordActions([
                //                Tables\Actions\ViewAction::make()->url(fn ($record) => EditBranch::getUrl(['record' => $record->id])),
-                Tables\Actions\EditAction::make()
+                EditAction::make()
                    ->fillForm(fn ($record) => ['id' => $record->id, 'code' => $record->code, 'series' => $record->current_series])
-                    ->mutateFormDataUsing(fn ($data) => $this->appendCientId($data))
+                    ->mutateDataUsing(fn ($data) => $this->appendCientId($data))
                    ->using(fn ($data) => $this->saveBranch($data))
                    ->url(fn ($record) => EditBranch::getUrl(['record' => $record->id])),
-                Tables\Actions\DeleteAction::make(),
+                DeleteAction::make(),
            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
                ]),
            ]);
    }
--- a/app/Filament/Resources/Clients/RelationManagers/DiscountRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/DiscountRelationManager.php
@@ -1,9 +1,16 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

+use Filament\Schemas\Schema;
+use Filament\Forms\Components\TextInput;
+use Filament\Tables\Columns\TextColumn;
+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\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -14,11 +21,11 @@ class DiscountRelationManager extends RelationManager
 {
    protected static string $relationship = 'discounts';

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
-                Forms\Components\TextInput::make('discount')
+        return $schema
+            ->components([
+                TextInput::make('discount')
                    ->required()
                    ->maxLength(255),
            ]);
@@ -29,21 +36,21 @@ class DiscountRelationManager extends RelationManager
        return $table
            ->recordTitleAttribute('discount')
            ->columns([
-                Tables\Columns\TextColumn::make('discount'),
+                TextColumn::make('discount'),
            ])
            ->filters([
                //
            ])
            ->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(),
                ]),
            ]);
    }
--- a/app/Filament/Resources/Clients/RelationManagers/ExpensesRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/ExpensesRelationManager.php
@@ -1,10 +1,11 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

-use App\Filament\Resources\ExpenseResource;
+use Filament\Schemas\Schema;
+use Filament\Actions\Action;
+use App\Filament\Resources\Expenses\ExpenseResource;
 use App\Models\Expense;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
@@ -16,16 +17,16 @@ class ExpensesRelationManager extends RelationManager

    protected static ?string $title = 'Expenses';

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([]);
+        return $schema
+            ->components([]);
    }

    public function table(Table $table): Table
    {
        return ExpenseResource::table($table)->headerActions([
-            Tables\Actions\Action::make('New Expense')->action('openCreateForm'),
+            Action::make('New Expense')->action('openCreateForm'),
        ]);
    }

--- a/app/Filament/Resources/Clients/RelationManagers/JournalsRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/JournalsRelationManager.php
@@ -1,7 +1,16 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

+use Filament\Schemas\Schema;
+use Closure;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Actions\CreateAction;
+use App\Models\Account;
+use Filament\Actions\EditAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
 use App\Actions\Balances\CreateBalanceAction;
 use App\Actions\Ledgers\CreateLedgerAction;
 use App\DataObjects\CreateLedgerDTO;
@@ -14,7 +23,6 @@ use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Textarea;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -29,10 +37,10 @@ class JournalsRelationManager extends RelationManager

    protected static ?string $title = 'Journal Entries (Adjustments)';

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form
-            ->schema([
+        return $schema
+            ->components([
                Select::make('branch_id')
                    ->label('Branch')
                    ->options(fn () => Branch::where('client_id', $this->getOwnerRecord()->id)->pluck('code', 'id'))
@@ -78,7 +86,7 @@ class JournalsRelationManager extends RelationManager
                    ->minItems(2)
                    ->live()
                    ->rules([
-                        fn (): \Closure => function (string $attribute, $value, \Closure $fail) {
+                        fn (): Closure => function (string $attribute, $value, Closure $fail) {
                            $debit = collect($value)->sum('debit_amount');
                            $credit = collect($value)->sum('credit_amount');
                            if (abs($debit - $credit) > 0.01) {
@@ -97,18 +105,18 @@ class JournalsRelationManager extends RelationManager
        return $table
            ->recordTitleAttribute('description')
            ->columns([
-                Tables\Columns\TextColumn::make('happened_on')
+                TextColumn::make('happened_on')
                    ->date()
                    ->sortable(),
-                Tables\Columns\TextColumn::make('series')
+                TextColumn::make('series')
                    ->searchable(),
-                Tables\Columns\TextColumn::make('description')
+                TextColumn::make('description')
                    ->limit(50),
-                Tables\Columns\TextColumn::make('total_debit')
+                TextColumn::make('total_debit')
                    ->label('Total Debit')
                    ->state(fn (Journal $record) => $record->ledgers->sum('debit_amount'))
                    ->money('PHP'),
-                Tables\Columns\TextColumn::make('total_credit')
+                TextColumn::make('total_credit')
                    ->label('Total Credit')
                    ->state(fn (Journal $record) => $record->ledgers->sum('credit_amount'))
                    ->money('PHP'),
@@ -117,7 +125,7 @@ class JournalsRelationManager extends RelationManager
                //
            ])
            ->headerActions([
-                Tables\Actions\CreateAction::make()
+                CreateAction::make()
                    ->label('Add Adjustment Entry')
                    ->using(function (array $data, string $model) {
                        return DB::transaction(function () use ($data, $model) {
@@ -134,7 +142,7 @@ class JournalsRelationManager extends RelationManager
                                    ledger: null, // Will be created
                                    transaction: null, // No transaction
                                    journal: $journal,
-                                    account: \App\Models\Account::find($ledger['account_id']),
+                                    account: Account::find($ledger['account_id']),
                                    type: ($ledger['debit_amount'] > 0) ? 'debit' : 'credit'
                                );
                                
@@ -148,13 +156,13 @@ class JournalsRelationManager extends RelationManager
                        });
                    }),
            ])
-            ->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(),
                ]),
            ]);
    }
--- a/app/Filament/Resources/Clients/RelationManagers/SalesRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/SalesRelationManager.php
@@ -1,11 +1,12 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

-use App\Filament\Resources\SaleResource;
+use Filament\Schemas\Schema;
+use Filament\Actions\Action;
+use App\Filament\Resources\Sales\SaleResource;
 use App\Models\Sale;
 use Filament\Forms;
-use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
@@ -17,15 +18,15 @@ class SalesRelationManager extends RelationManager

    protected static ?string $title = 'Sales';

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return $form->schema([]);
+        return $schema->components([]);
    }

    public function table(Table $table): Table
    {
        return SaleResource::table($table)->headerActions([
-            Tables\Actions\Action::make('New Sale')->action('openCreateForm'),
+            Action::make('New Sale')->action('openCreateForm'),
        ]);
    }

--- a/app/Filament/Resources/Clients/RelationManagers/TransmittalsRelationManager.php
+++ b/app/Filament/Resources/Clients/RelationManagers/TransmittalsRelationManager.php
@@ -1,9 +1,10 @@
 <?php

-namespace App\Filament\Resources\ClientResource\RelationManagers;
+namespace App\Filament\Resources\Clients\RelationManagers;

-use App\Filament\Resources\TransmittalResource;
-use Filament\Forms\Form;
+use Filament\Schemas\Schema;
+use Filament\Actions\Action;
+use App\Filament\Resources\Transmittals\TransmittalResource;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -18,9 +19,9 @@ class TransmittalsRelationManager extends RelationManager
        return auth()->user()->can('update_transmittal');
    }

-    public function form(Form $form): Form
+    public function form(Schema $schema): Schema
    {
-        return TransmittalResource::form($form)
+        return TransmittalResource::form($schema)
            ->fill(
                ['client_id' => $this->getOwnerRecord()->id]
            );
@@ -29,7 +30,7 @@ class TransmittalsRelationManager extends RelationManager
    public function table(Table $table): Table
    {
        return TransmittalResource::table($table)->headerActions([
-            Tables\Actions\Action::make('New Transmittal')->action('openCreateForm'),
+            Action::make('New Transmittal')->action('openCreateForm'),
        ]);
    }