wip

app/Concerns/HasTabSpecificColumnToggles.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Concerns;
+
+trait HasTabSpecificColumnToggles
+{
+    public function getTableColumnToggleFormStateSessionKey(): string
+    {
+        $table = class_basename($this::class);
+        $tab = $this->activeTab;
+
+        return "tables.{$table}_{$tab}_toggled_columns";
+    }
+
+    public function updatedActiveTab(): void
+    {
+        parent::updatedActiveTab();
+
+        // Load saved state for new tab or fall back to defaults
+        $this->toggledTableColumns = session(
+            $this->getTableColumnToggleFormStateSessionKey(),
+            $this->getDefaultTableColumnToggleState()
+        );
+
+        $this->updatedToggledTableColumns();
+    }
+}

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

@@ -311,7 +311,7 @@ class EstimateResource extends Resource
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (Estimate $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->alignEnd(),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('client')

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

@@ -317,7 +317,8 @@ class InvoiceResource extends Resource
                 Tables\Columns\TextColumn::make('due_date')
                     ->label('Due')
                     ->asRelativeDay()
-                    ->sortable(),
+                    ->sortable()
+                    ->hideOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('date')
                     ->date()
                     ->sortable(),
@@ -334,16 +335,20 @@ class InvoiceResource extends Resource
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (Invoice $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->toggleable()
+                    ->alignEnd(),
                 Tables\Columns\TextColumn::make('amount_paid')
                     ->label('Amount Paid')
                     ->currencyWithConversion(static fn (Invoice $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->alignEnd()
+                    ->showOnTabs(['unpaid']),
                 Tables\Columns\TextColumn::make('amount_due')
                     ->label('Amount Due')
                     ->currencyWithConversion(static fn (Invoice $record) => $record->currency_code)
-                    ->sortable(),
+                    ->sortable()
+                    ->alignEnd()
+                    ->hideOnTabs(['draft']),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('client')

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

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\HasTabSpecificColumnToggles;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
@@ -23,6 +24,7 @@ use Livewire\Attributes\Url;
 class ListInvoices extends ListRecords
 {
     use ExposesTableToWidgets;
+    use HasTabSpecificColumnToggles;
 
     protected static string $resource = InvoiceResource::class;
 

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

@@ -291,20 +291,31 @@ class RecurringInvoiceResource extends Resource
                     ->description(function (RecurringInvoice $record) {
                         return $record->getTimelineDescription();
                     }),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->label('Created')
+                    ->date()
+                    ->sortable()
+                    ->showOnTabs(['draft']),
+                Tables\Columns\TextColumn::make('start_date')
+                    ->label('First Invoice')
+                    ->date()
+                    ->sortable()
+                    ->showOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('last_date')
                     ->label('Last Invoice')
                     ->date()
                     ->sortable()
-                    ->searchable(),
+                    ->hideOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('next_date')
                     ->label('Next Invoice')
                     ->date()
                     ->sortable()
-                    ->searchable(),
+                    ->hideOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (RecurringInvoice $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->toggleable()
+                    ->alignEnd(),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('client')

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

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
+use App\Concerns\HasTabSpecificColumnToggles;
 use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use Filament\Actions;
@@ -12,6 +13,8 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ListRecurringInvoices extends ListRecords
 {
+    use HasTabSpecificColumnToggles;
+
     protected static string $resource = RecurringInvoiceResource::class;
 
     protected function getHeaderActions(): array

app/Models/Accounting/RecurringInvoice.php

@@ -200,8 +200,12 @@ class RecurringInvoice extends Document
         return $this->start_date?->gte(today()) ?? false;
     }
 
-    public function getScheduleDescription(): string
+    public function getScheduleDescription(): ?string
     {
+        if (! $this->hasSchedule()) {
+            return null;
+        }
+
         $frequency = $this->frequency;
 
         return match (true) {
@@ -215,7 +219,7 @@ class RecurringInvoice extends Document
 
             $frequency->isCustom() => $this->getCustomScheduleDescription(),
 
-            default => 'Not Configured',
+            default => null,
         };
     }
 
@@ -238,10 +242,10 @@ class RecurringInvoice extends Document
         return "Repeat every {$interval}{$dayDescription}";
     }
 
-    public function getEndDescription(): string
+    public function getEndDescription(): ?string
     {
         if (! $this->end_type) {
-            return 'Not configured';
+            return null;
         }
 
         return match (true) {
@@ -251,12 +255,16 @@ class RecurringInvoice extends Document
 
             $this->end_type->isOn() && $this->end_date => 'On ' . $this->end_date->toDefaultDateFormat(),
 
-            default => 'Not configured'
+            default => null,
         };
     }
 
-    public function getTimelineDescription(): string
+    public function getTimelineDescription(): ?string
     {
+        if (! $this->hasSchedule()) {
+            return null;
+        }
+
         $parts = [];
 
         if ($this->start_date) {

app/Providers/FilamentCompaniesServiceProvider.php

@@ -276,6 +276,10 @@ class FilamentCompaniesServiceProvider extends PanelProvider
                 ->filtersFormWidth(MaxWidth::Small)
                 ->filtersTriggerAction(fn (Tables\Actions\Action $action) => $action->slideOver());
         }, isImportant: true);
+
+        Tables\Columns\TextColumn::configureUsing(function (Tables\Columns\TextColumn $column): void {
+            $column->placeholder('–');
+        });
     }
 
     /**

app/Providers/MacroServiceProvider.php

@@ -19,6 +19,7 @@ use Filament\Forms\Components\Field;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Contracts\HasTable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\ServiceProvider;
 
@@ -113,6 +114,22 @@ class MacroServiceProvider extends ServiceProvider
                 });
         });
 
+        TextColumn::macro('hideOnTabs', function (array $tabs): static {
+            $this->toggleable(isToggledHiddenByDefault: function (HasTable $livewire) use ($tabs) {
+                return in_array($livewire->activeTab, $tabs);
+            });
+
+            return $this;
+        });
+
+        TextColumn::macro('showOnTabs', function (array $tabs): static {
+            $this->toggleable(isToggledHiddenByDefault: function (HasTable $livewire) use ($tabs) {
+                return ! in_array($livewire->activeTab, $tabs);
+            });
+
+            return $this;
+        });
+
         TextColumn::macro('defaultDateFormat', function (): static {
             $localization = Localization::firstOrFail();
 

resources/css/filament/company/theme.css

@@ -18,6 +18,15 @@
     display: inline-flex;
 }
 
+/* End Alignment sortable column enhancement */
+.fi-ta-header-cell:has(button.justify-end > svg.fi-ta-header-cell-sort-icon) {
+    padding-right: 0.25rem;
+}
+
+.fi-ta-cell:has(.fi-ta-col-wrp > .justify-end) {
+    padding-right: 1rem;
+}
+
 :not(.dark) .fi-body {
     position: relative;
     background-color: #E8E9EB;