wip

app/Filament/Company/Resources/Accounting/BudgetResource.php

@@ -9,6 +9,7 @@ use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Budget;
 use App\Models\Accounting\BudgetItem;
+use App\Utilities\Currency\CurrencyConverter;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -263,6 +264,11 @@ class BudgetResource extends Resource
                                     ->align(Alignment::Right);
                             }
 
+                            $headers[] = Header::make('total')
+                                ->label('Total')
+                                ->width('120px')
+                                ->align(Alignment::Right);
+
                             return [
                                 CustomTableRepeater::make('budgetItems')
                                     ->relationship()
@@ -279,7 +285,6 @@ class BudgetResource extends Resource
                                                 ->mask(RawJs::make('$money($input)'))
                                                 ->stripCharacters(',')
                                                 ->numeric()
-                                                ->extraInputAttributes(['class' => 'text-right'])
                                                 ->afterStateHydrated(function ($component, $state, BudgetItem $record) use ($period) {
                                                     // Find the allocation for this period
                                                     $allocation = $record->allocations->firstWhere('period', $period);
@@ -287,6 +292,20 @@ class BudgetResource extends Resource
                                                 })
                                                 ->dehydrated(false); // We'll handle saving manually
                                         })->toArray(),
+
+                                        Forms\Components\Placeholder::make('total')
+                                            ->hiddenLabel()
+                                            ->content(function (BudgetItem $record) use ($periods) {
+                                                $total = 0;
+
+                                                // Calculate the total for this budget item across all periods
+                                                foreach ($periods as $period) {
+                                                    $allocation = $record->allocations->firstWhere('period', $period);
+                                                    $total += $allocation ? $allocation->amount : 0;
+                                                }
+
+                                                return CurrencyConverter::formatToMoney($total);
+                                            }),
                                     ])
                                     ->spreadsheet()
                                     ->itemLabel(fn (BudgetItem $record) => $record->account->name ?? 'Budget Item')
@@ -485,6 +504,7 @@ class BudgetResource extends Resource
             'create' => Pages\CreateBudget::route('/create'),
             'view' => Pages\ViewBudget::route('/{record}'),
             'edit' => Pages\EditBudget::route('/{record}/edit'),
+            'allocations' => Pages\ManageAllocations::route('/{record}/allocations'),
         ];
     }
 }

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/CreateBudget.php

@@ -616,7 +616,7 @@ class CreateBudget extends CreateRecord
     private function determinePeriod(Carbon $date, BudgetIntervalType $intervalType): string
     {
         return match ($intervalType) {
-            BudgetIntervalType::Month => $date->format('F Y'),
+            BudgetIntervalType::Month => $date->format('M Y'),
             BudgetIntervalType::Quarter => 'Q' . $date->quarter . ' ' . $date->year,
             BudgetIntervalType::Year => (string) $date->year,
             default => $date->format('Y-m-d'),

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/ManageAllocations.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
+
+use App\Filament\Company\Resources\Accounting\BudgetResource;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Pages\ManageRelatedRecords;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class ManageAllocations extends ManageRelatedRecords
+{
+    protected static string $resource = BudgetResource::class;
+
+    protected static string $relationship = 'allocations';
+
+    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+
+    public static function getNavigationLabel(): string
+    {
+        return 'Allocations';
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('account_id')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('account_id')
+            ->columns([
+                Tables\Columns\TextColumn::make('budgetItem.account.name')
+                    ->label('Account')
+                    ->sortable()
+                    ->searchable(),
+
+                Tables\Columns\TextColumn::make('period')
+                    ->label('Period')
+                    ->sortable(),
+
+                Tables\Columns\TextColumn::make('amount')
+                    ->label('Amount')
+                    ->money()
+                    ->sortable(),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make(),
+                Tables\Actions\AssociateAction::make(),
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DissociateAction::make(),
+                Tables\Actions\DeleteAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DissociateBulkAction::make(),
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}

app/Filament/Company/Resources/Accounting/BudgetResource/RelationManagers/BudgetItemsRelationManager.php

@@ -2,11 +2,10 @@
 
 namespace App\Filament\Company\Resources\Accounting\BudgetResource\RelationManagers;
 
-use App\Models\Accounting\BudgetAllocation;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\TextInput;
+use App\Models\Accounting\BudgetItem;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
 
 class BudgetItemsRelationManager extends RelationManager
@@ -17,72 +16,42 @@ class BudgetItemsRelationManager extends RelationManager
 
     public function table(Table $table): Table
     {
+        $budget = $this->getOwnerRecord();
+
+        // Get distinct periods for this budget
+        $periods = \App\Models\Accounting\BudgetAllocation::query()
+            ->join('budget_items', 'budget_allocations.budget_item_id', '=', 'budget_items.id')
+            ->where('budget_items.budget_id', $budget->id)
+            ->orderBy('start_date')
+            ->pluck('period')
+            ->unique()
+            ->values()
+            ->toArray();
+
         return $table
             ->recordTitleAttribute('account_id')
-            ->columns([
-                Tables\Columns\TextColumn::make('account.name')
-                    ->label('Account')
+            ->paginated(false)
+            ->modifyQueryUsing(
+                fn ($query) => $query->with(['account', 'allocations'])
+            )
+            ->columns(array_merge([
+                TextColumn::make('account.name')
+                    ->label('Accounts')
                     ->sortable()
                     ->searchable(),
-
-                Tables\Columns\TextColumn::make('allocations_sum_amount')
-                    ->label('Total Allocations')
-                    ->sortable()
-                    ->alignEnd()
-                    ->sum('allocations', 'amount')
-                    ->money(divideBy: 100),
-            ])
-            ->filters([
-                //
-            ])
-            ->headerActions([
-                // Tables\Actions\CreateAction::make(),
-            ])
-            ->actions([
-                Tables\Actions\Action::make('editAllocations')
-                    ->label('Edit Allocations')
-                    ->icon('heroicon-o-pencil')
-                    ->modalHeading(fn ($record) => "Edit Allocations for {$record->account->name}")
-                    ->modalWidth('xl')
-                    ->form(function ($record) {
-                        $fields = [];
-
-                        // Get allocations ordered by date
-                        $allocations = $record->allocations()->orderBy('start_date')->get();
-
-                        foreach ($allocations as $allocation) {
-                            $fields[] = TextInput::make("allocations.{$allocation->id}")
-                                ->label($allocation->period)
-                                ->numeric()
-                                ->default(function () use ($allocation) {
-                                    return $allocation->amount;
-                                })
-                                ->prefix('$')
-                                ->live(debounce: 500)
-                                ->afterStateUpdated(function (TextInput $component, $state) {
-                                    // Format the value as needed
-                                    $component->state(number_format($state, 2, '.', ''));
-                                });
+            ], collect($periods)->map(
+                fn ($period) => TextInputColumn::make("allocations_by_period.{$period}")
+                    ->label($period)
+                    ->getStateUsing(
+                        fn ($record) => $record->allocations->firstWhere('period', $period)?->amount
+                    )
+                    ->updateStateUsing(function (BudgetItem $record, $state) use ($period) {
+                        $allocation = $record->allocations->firstWhere('period', $period);
+
+                        if ($allocation) {
+                            $allocation->update(['amount' => $state]);
                         }
-
-                        return [
-                            Grid::make()
-                                ->schema($fields)
-                                ->columns(3),
-                        ];
                     })
-                    ->action(function (array $data, $record) {
-                        foreach ($data['allocations'] as $allocationId => $amount) {
-                            BudgetAllocation::find($allocationId)->update([
-                                'amount' => $amount,
-                            ]);
-                        }
-                    }),
-            ])
-            ->bulkActions([
-                //                Tables\Actions\BulkActionGroup::make([
-                //                    Tables\Actions\DeleteBulkAction::make(),
-                //                ]),
-            ]);
+            )->all()));
     }
 }

app/Models/Accounting/BudgetAllocation.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Accounting;
 
-use App\Casts\DocumentMoneyCast;
+use App\Casts\MoneyCast;
 use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\BudgetIntervalType;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -28,7 +28,7 @@ class BudgetAllocation extends Model
         'start_date' => 'date',
         'end_date' => 'date',
         'interval_type' => BudgetIntervalType::class,
-        'amount' => DocumentMoneyCast::class,
+        'amount' => MoneyCast::class,
     ];
 
     public function budgetItem(): BelongsTo

app/Models/Accounting/BudgetItem.php

@@ -23,6 +23,13 @@ class BudgetItem extends Model
         'updated_by',
     ];
 
+    protected $appends = ['allocations_by_period'];
+
+    public function getAllocationsByPeriodAttribute(): array
+    {
+        return $this->allocations->pluck('amount', 'period')->toArray();
+    }
+
     public function budget(): BelongsTo
     {
         return $this->belongsTo(Budget::class);

resources/css/filament/company/form-fields.css

@@ -53,7 +53,7 @@
     cursor: pointer;
 }
 
-/* Base horizontal scrolling for all TableRepeater components */
+/* Base horizontal scrolling */
 .table-repeater-container {
     overflow-x: auto;
     max-width: 100%;
@@ -70,100 +70,101 @@
 }
 
 /* Excel/Spreadsheet styling */
-.is-spreadsheet .table-repeater-container {
-    border-radius: 0 !important;
-    border: 1px solid #e5e7eb !important;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-    @apply ring-0 !important;
-}
+.is-spreadsheet {
+    /* Container styles */
+
+    .table-repeater-container {
+        border: 1px solid #e5e7eb !important;
+        border-radius: 0 !important;
+        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+        @apply ring-0 !important;
+    }
 
-.is-spreadsheet .table-repeater-header {
-    background-color: #f8f9fa !important;
-    border-radius: 0 !important;
-}
+    /* Header styles */
 
-/* Fix for input alignment with headers */
-.is-spreadsheet .table-repeater-header-column,
-.is-spreadsheet .table-repeater-column {
-    padding: 6px 8px !important;
-}
+    .table-repeater-header {
+        background-color: #f8f9fa !important;
+        border-radius: 0 !important;
+    }
 
-/* Right-align all inputs */
-.is-spreadsheet .table-repeater-column input {
-    text-align: right !important;
-    width: 100% !important;
-}
+    .table-repeater-header-column {
+        border: 1px solid #e5e7eb !important;
+        background-color: #f8f9fa !important;
+        border-radius: 0 !important;
+        font-weight: 600 !important;
+        padding: 8px 12px !important;
+    }
 
-/* Remove any additional padding from input containers */
-.is-spreadsheet .fi-input-wrapper,
-.is-spreadsheet .fi-input {
-    padding: 0 !important;
-    width: 100% !important;
-}
+    /* Cell styles */
 
-.is-spreadsheet .table-repeater-header-column {
-    border-radius: 0 !important;
-    border: 1px solid #e5e7eb !important;
-    background-color: #f8f9fa !important;
-    font-weight: 600 !important;
-    padding: 6px 8px !important;
-}
+    .table-repeater-column {
+        border: 1px solid #e5e7eb !important;
+        padding: 8px 12px !important;
+    }
 
-.is-spreadsheet .table-repeater-column {
-    border: 1px solid #e5e7eb !important;
-    padding: 4px 8px !important;
-    position: relative !important;
-}
+    /* Input styles */
 
-/* Incorporate flat input styling from streamlined */
-.is-spreadsheet .fi-input-wrp,
-.is-spreadsheet .fi-fo-file-upload .filepond--root {
-    @apply ring-0 bg-transparent shadow-none !important;
-}
+    .table-repeater-column input {
+        text-align: right !important;
+        width: 100% !important;
+    }
 
-.is-spreadsheet .fi-input-wrp input {
-    @apply bg-transparent border-0 shadow-none !important;
-}
+    /* Flatten inputs */
 
-.is-spreadsheet .fi-select-trigger {
-    @apply ring-0 bg-transparent shadow-none !important;
-}
+    .fi-input-wrapper,
+    .fi-input {
+        padding: 0 !important;
+        width: 100% !important;
+    }
 
-/* Excel-like row styles */
-.is-spreadsheet .table-repeater-row:nth-child(even) {
-    background-color: #f9fafb;
-}
+    .fi-input-wrp,
+    .fi-fo-file-upload .filepond--root {
+        @apply ring-0 bg-transparent shadow-none !important;
+    }
 
-/* Excel-like focus/selection styles */
-.is-spreadsheet .table-repeater-column:focus-within {
-    outline: 2px solid #2563eb !important;
-    outline-offset: -2px !important;
-    z-index: 1 !important;
-}
+    .fi-input-wrp input {
+        @apply bg-transparent border-0 shadow-none !important;
+    }
 
-.is-spreadsheet .fi-input-wrp:focus-within {
-    @apply ring-0 shadow-none !important;
-}
+    /* Focus states */
 
-.is-spreadsheet input:focus,
-.is-spreadsheet select:focus,
-.is-spreadsheet textarea:focus {
-    @apply ring-0 shadow-none !important;
-    outline: none !important;
-}
+    .table-repeater-column:focus-within {
+        outline: 2px solid #2563eb !important;
+        outline-offset: -2px !important;
+        z-index: 1 !important;
+    }
 
-/* Spacing for form controls */
-.is-spreadsheet .fi-fo-field-wrp:has(.fi-fo-checkbox-list),
-.is-spreadsheet .fi-fo-field-wrp:has(.fi-checkbox-input),
-.is-spreadsheet .fi-fo-field-wrp:has(.fi-fo-radio) {
-    @apply py-2 px-3 !important;
-}
+    .fi-input-wrp:focus-within {
+        @apply ring-0 shadow-none !important;
+    }
 
-.is-spreadsheet .fi-fo-field-wrp:has(.fi-fo-toggle) {
-    @apply inline-block mt-1 !important;
+    input:focus,
+    select:focus,
+    textarea:focus {
+        @apply ring-0 shadow-none !important;
+        outline: none !important;
+    }
+
+    /* Row styling */
+
+    .table-repeater-row:nth-child(even) {
+        background-color: #f9fafb;
+    }
+
+    /* Form control spacing */
+
+    .fi-fo-field-wrp:has(.fi-fo-checkbox-list),
+    .fi-fo-field-wrp:has(.fi-checkbox-input),
+    .fi-fo-field-wrp:has(.fi-fo-radio) {
+        @apply py-2 px-3 !important;
+    }
+
+    .fi-fo-field-wrp:has(.fi-fo-toggle) {
+        @apply inline-block mt-1 !important;
+    }
 }
 
-/* Preserve responsive behavior */
+/* Responsive behavior */
 @media (max-width: theme('screens.sm')) {
     .table-repeater-component.break-point-sm .table-repeater-container {
         overflow-x: visible;