cleanup

app/Concerns/HasTransactionAction.php

@@ -14,8 +14,6 @@ use Awcodes\TableRepeater\Header;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action as FormAction;
 use Filament\Forms\Form;
-use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Str;
 
@@ -359,12 +357,9 @@ trait HasTransactionAction
         $typeLabel = $type->getLabel();
 
         return FormAction::make("add{$typeLabel}Entry")
-            ->label("Add {$typeLabel} entry")
             ->button()
             ->outlined()
             ->color($type->isDebit() ? 'primary' : 'gray')
-            ->iconSize(IconSize::Small)
-            ->iconPosition(IconPosition::Before)
             ->action(function (CustomTableRepeater $component) use ($type) {
                 $state = $component->getState();
                 $newUuid = (string) Str::uuid();

app/Filament/Company/Pages/Accounting/AccountChart.php

@@ -48,7 +48,7 @@ class AccountChart extends Page
     }
 
     #[Computed]
-    public function categories(): Collection
+    public function accountCategories(): Collection
     {
         return AccountSubtype::withCount('accounts')
             ->with(['accounts' => function ($query) {
@@ -58,42 +58,39 @@ class AccountChart extends Page
             ->groupBy('category');
     }
 
-    public function editChartAction(): Action
+    public function editAccountAction(): Action
     {
-        return EditAction::make()
-            ->iconButton()
-            ->name('editChart')
+        return EditAction::make('editAccount')
             ->label('Edit account')
-            ->modalHeading('Edit Account')
+            ->iconButton()
             ->icon('heroicon-m-pencil-square')
-            ->record(fn (array $arguments) => Account::find($arguments['chart']))
-            ->form(fn (Form $form) => $this->getChartForm($form)->operation('edit'));
+            ->record(fn (array $arguments) => Account::find($arguments['account']))
+            ->form(fn (Form $form) => $this->getAccountForm($form)->operation('edit'));
     }
 
-    public function createChartAction(): Action
+    public function createAccountAction(): Action
     {
-        return CreateAction::make()
+        return CreateAction::make('createAccount')
             ->link()
-            ->name('createChart')
             ->model(Account::class)
             ->label('Add a new account')
             ->icon('heroicon-o-plus-circle')
-            ->form(fn (Form $form) => $this->getChartForm($form)->operation('create'))
-            ->fillForm(fn (array $arguments): array => $this->getChartFormDefaults($arguments['subtype']));
+            ->form(fn (Form $form) => $this->getAccountForm($form)->operation('create'))
+            ->fillForm(fn (array $arguments): array => $this->getAccountFormDefaults($arguments['accountSubtype']));
     }
 
-    private function getChartFormDefaults(int $subtypeId): array
+    private function getAccountFormDefaults(int $accountSubtypeId): array
     {
-        $accountSubtype = AccountSubtype::find($subtypeId);
+        $accountSubtype = AccountSubtype::find($accountSubtypeId);
         $generatedCode = AccountCode::generate($accountSubtype);
 
         return [
-            'subtype_id' => $subtypeId,
+            'subtype_id' => $accountSubtypeId,
             'code' => $generatedCode,
         ];
     }
 
-    private function getChartForm(Form $form, bool $useActiveTab = true): Form
+    private function getAccountForm(Form $form, bool $useActiveTab = true): Form
     {
         return $form
             ->schema([
@@ -115,7 +112,7 @@ class AccountChart extends Page
             ->live()
             ->disabledOn('edit')
             ->searchable()
-            ->options($this->getChartSubtypeOptions($useActiveTab))
+            ->options($this->getAccountSubtypeOptions($useActiveTab))
             ->afterStateUpdated(static function (?string $state, Set $set): void {
                 if ($state) {
                     $accountSubtype = AccountSubtype::find($state);
@@ -150,12 +147,12 @@ class AccountChart extends Page
                         return false;
                     }
 
-                    $subtype = $get('subtype_id');
-                    if (empty($subtype)) {
+                    $accountSubtypeId = $get('subtype_id');
+                    if (empty($accountSubtypeId)) {
                         return false;
                     }
 
-                    $accountSubtype = AccountSubtype::find($subtype);
+                    $accountSubtype = AccountSubtype::find($accountSubtypeId);
 
                     if (! $accountSubtype) {
                         return false;
@@ -168,22 +165,22 @@ class AccountChart extends Page
                 })
                 ->afterStateUpdated(static function ($state, Get $get, Set $set) {
                     if ($state) {
-                        $subtypeId = $get('subtype_id');
+                        $accountSubtypeId = $get('subtype_id');
 
-                        if (empty($subtypeId)) {
+                        if (empty($accountSubtypeId)) {
                             return;
                         }
 
-                        $subtype = AccountSubtype::find($subtypeId);
+                        $accountSubtype = AccountSubtype::find($accountSubtypeId);
 
-                        if (! $subtype) {
+                        if (! $accountSubtype) {
                             return;
                         }
 
                         // Set default bank account type based on account category
-                        if ($subtype->category === AccountCategory::Asset) {
+                        if ($accountSubtype->category === AccountCategory::Asset) {
                             $set('bankAccount.type', BankAccountType::Depository->value);
-                        } elseif ($subtype->category === AccountCategory::Liability) {
+                        } elseif ($accountSubtype->category === AccountCategory::Liability) {
                             $set('bankAccount.type', BankAccountType::Credit->value);
                         }
                     } else {
@@ -198,13 +195,13 @@ class AccountChart extends Page
                     Select::make('type')
                         ->label('Bank account type')
                         ->options(function (Get $get) {
-                            $subtype = $get('../subtype_id');
+                            $accountSubtypeId = $get('../subtype_id');
 
-                            if (empty($subtype)) {
+                            if (empty($accountSubtypeId)) {
                                 return [];
                             }
 
-                            $accountSubtype = AccountSubtype::find($subtype);
+                            $accountSubtype = AccountSubtype::find($accountSubtypeId);
 
                             if (! $accountSubtype) {
                                 return [];
@@ -287,14 +284,14 @@ class AccountChart extends Page
             ->hiddenOn('create');
     }
 
-    private function getChartSubtypeOptions($useActiveTab = true): array
+    private function getAccountSubtypeOptions($useActiveTab = true): array
     {
-        $subtypes = $useActiveTab ?
+        $accountSubtypes = $useActiveTab ?
             AccountSubtype::where('category', $this->activeTab)->get() :
             AccountSubtype::all();
 
-        return $subtypes->groupBy(fn (AccountSubtype $subtype) => $subtype->type->getLabel())
-            ->map(fn (Collection $subtypes, string $type) => $subtypes->mapWithKeys(static fn (AccountSubtype $subtype) => [$subtype->id => $subtype->name]))
+        return $accountSubtypes->groupBy(fn (AccountSubtype $accountSubtype) => $accountSubtype->type->getLabel())
+            ->map(fn (Collection $accountSubtypes, string $type) => $accountSubtypes->mapWithKeys(static fn (AccountSubtype $accountSubtype) => [$accountSubtype->id => $accountSubtype->name]))
             ->toArray();
     }
 
@@ -303,9 +300,8 @@ class AccountChart extends Page
         return [
             CreateAction::make()
                 ->button()
-                ->label('Add new account')
                 ->model(Account::class)
-                ->form(fn (Form $form) => $this->getChartForm($form, false)->operation('create')),
+                ->form(fn (Form $form) => $this->getAccountForm($form, false)->operation('create')),
         ];
     }
 

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -17,7 +17,6 @@ use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
@@ -236,7 +235,6 @@ abstract class BaseReportPage extends Page
                 ->dropdownWidth('max-w-[7rem]')
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Accounting/TransactionResource/Pages/ListTransactions.php

@@ -28,16 +28,20 @@ class ListTransactions extends ListRecords
     {
         return [
             Actions\ActionGroup::make([
-                CreateTransactionAction::make('addDeposit')
+                CreateTransactionAction::make('createDeposit')
+                    ->label('Deposit')
                     ->type(TransactionType::Deposit),
-                CreateTransactionAction::make('addWithdrawal')
+                CreateTransactionAction::make('createWithdrawal')
+                    ->label('Withdrawal')
                     ->type(TransactionType::Withdrawal),
-                CreateTransactionAction::make('addTransfer')
+                CreateTransactionAction::make('createTransfer')
+                    ->label('Transfer')
                     ->type(TransactionType::Transfer),
-                CreateTransactionAction::make('addJournalEntry')
+                CreateTransactionAction::make('createJournalEntry')
+                    ->label('Journal entry')
                     ->type(TransactionType::Journal),
             ])
-                ->label('Add transaction')
+                ->label('New transaction')
                 ->button()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')

app/Filament/Company/Resources/Purchases/BillResource/Pages/ViewBill.php

@@ -12,7 +12,6 @@ use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 
 class ViewBill extends ViewRecord
 {
@@ -39,7 +38,6 @@ class ViewBill extends ViewRecord
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Purchases/VendorResource/Pages/ViewVendor.php

@@ -14,7 +14,6 @@ use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 
 class ViewVendor extends ViewRecord
 {
@@ -52,7 +51,6 @@ class ViewVendor extends ViewRecord
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Sales/ClientResource/Pages/ViewClient.php

@@ -16,7 +16,6 @@ use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Illuminate\Contracts\Support\Htmlable;
 
 class ViewClient extends ViewRecord
@@ -65,7 +64,6 @@ class ViewClient extends ViewRecord
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Sales/EstimateResource/Pages/ViewEstimate.php

@@ -16,7 +16,6 @@ use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Illuminate\Support\HtmlString;
 
 class ViewEstimate extends ViewRecord
@@ -50,7 +49,6 @@ class ViewEstimate extends ViewRecord
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/ViewInvoice.php

@@ -16,7 +16,6 @@ use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Illuminate\Support\HtmlString;
 
 class ViewInvoice extends ViewRecord
@@ -47,7 +46,6 @@ class ViewInvoice extends ViewRecord
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ViewRecurringInvoice.php

@@ -18,7 +18,6 @@ use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
-use Filament\Support\Enums\IconSize;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 
@@ -45,7 +44,6 @@ class ViewRecurringInvoice extends ViewRecord
                 ->outlined()
                 ->dropdownPlacement('bottom-end')
                 ->icon('heroicon-m-chevron-down')
-                ->iconSize(IconSize::Small)
                 ->iconPosition(IconPosition::After),
         ];
     }

resources/views/filament/company/pages/accounting/chart.blade.php

@@ -1,19 +1,19 @@
 <x-filament-panels::page>
     <div class="flex flex-col gap-y-6">
         <x-filament::tabs>
-            @foreach($this->categories as $categoryValue => $subtypes)
+            @foreach($this->accountCategories as $categoryValue => $accountSubtypes)
                 <x-filament::tabs.item
                     wire:key="tab-item-{{ $categoryValue }}"
                     :active="$activeTab === $categoryValue"
                     wire:click="$set('activeTab', '{{ $categoryValue }}')"
-                    :badge="$subtypes->sum('accounts_count')"
+                    :badge="$accountSubtypes->sum('accounts_count')"
                 >
                     {{ $this->getCategoryLabel($categoryValue) }}
                 </x-filament::tabs.item>
             @endforeach
         </x-filament::tabs>
 
-        @foreach($this->categories as $categoryValue => $subtypes)
+        @foreach($this->accountCategories as $categoryValue => $accountSubtypes)
             @if($activeTab === $categoryValue)
                 <div
                     class="es-table__container overflow-hidden rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:divide-white/10 dark:bg-gray-900 dark:ring-white/10">
@@ -29,7 +29,7 @@
                                 <col span="1" style="width: 10%;">
                                 <col span="1" style="width: 7.5%;">
                             </colgroup>
-                            @foreach($subtypes as $subtype)
+                            @foreach($accountSubtypes as $accountSubtype)
                                 <tbody
                                     class="es-table__rowgroup divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
                                 <!-- Subtype Name Header Row -->
@@ -38,10 +38,10 @@
                                         <div class="es-table__row-content flex items-center space-x-2">
                                             <span
                                                 class="es-table__row-title text-gray-800 dark:text-gray-200 font-semibold tracking-wider">
-                                                {{ $subtype->name }}
+                                                {{ $accountSubtype->name }}
                                             </span>
                                             <x-tooltip
-                                                text="{!! $subtype->description !!}"
+                                                text="{!! $accountSubtype->description !!}"
                                                 icon="heroicon-o-question-mark-circle"
                                                 placement="right"
                                                 maxWidth="300"
@@ -51,7 +51,7 @@
                                 </tr>
 
                                 <!-- Chart Rows -->
-                                @forelse($subtype->accounts as $account)
+                                @forelse($accountSubtype->accounts as $account)
                                     <tr class="es-table__row">
                                         <td colspan="1" class="es-table__cell px-4 py-4">{{ $account->code }}</td>
                                         <td colspan="1" class="es-table__cell px-4 py-4">
@@ -78,7 +78,7 @@
                                         <td colspan="1" class="es-table__cell px-4 py-4">
                                             <div>
                                                 @if($account->default === false && !$account->adjustment)
-                                                    {{ ($this->editChartAction)(['chart' => $account->id]) }}
+                                                    {{ ($this->editAccountAction)(['account' => $account->id]) }}
                                                 @endif
                                             </div>
                                         </td>
@@ -88,7 +88,7 @@
                                     <tr class="es-table__row">
                                         <td colspan="5"
                                             class="es-table__cell px-4 py-4 italic text-xs text-gray-500 dark:text-gray-400">
-                                            {{ __("You haven't added any {$subtype->name} accounts yet.") }}
+                                            {{ __("You haven't added any {$accountSubtype->name} accounts yet.") }}
                                         </td>
                                     </tr>
                                 @endforelse
@@ -96,7 +96,7 @@
                                 <!-- Add New Account Row -->
                                 <tr class="es-table__row">
                                     <td colspan="5" class="es-table__cell px-4 py-4">
-                                        {{ ($this->createChartAction)(['subtype' => $subtype->id]) }}
+                                        {{ ($this->createAccountAction)(['accountSubtype' => $accountSubtype->id]) }}
                                     </td>
                                 </tr>
                                 </tbody>