wip budgets

app/Enums/Accounting/BudgetIntervalType.php

@@ -9,7 +9,6 @@ enum BudgetIntervalType: string implements HasLabel
 {
     use ParsesEnum;
 
-    case Week = 'week';
     case Month = 'month';
     case Quarter = 'quarter';
     case Year = 'year';
@@ -17,18 +16,12 @@ enum BudgetIntervalType: string implements HasLabel
     public function getLabel(): ?string
     {
         return match ($this) {
-            self::Week => 'Weekly',
             self::Month => 'Monthly',
             self::Quarter => 'Quarterly',
             self::Year => 'Yearly',
         };
     }
 
-    public function isWeek(): bool
-    {
-        return $this === self::Week;
-    }
-
     public function isMonth(): bool
     {
         return $this === self::Month;

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

@@ -46,7 +46,6 @@ class BudgetResource extends Resource
                             ->live()
                             ->disabled(static fn (Forms\Get $get) => blank($get('start_date')))
                             ->minDate(fn (Forms\Get $get) => match (BudgetIntervalType::parse($get('interval_type'))) {
-                                BudgetIntervalType::Week => Carbon::parse($get('start_date'))->addWeek(),
                                 BudgetIntervalType::Month => Carbon::parse($get('start_date'))->addMonth(),
                                 BudgetIntervalType::Quarter => Carbon::parse($get('start_date'))->addQuarter(),
                                 BudgetIntervalType::Year => Carbon::parse($get('start_date'))->addYear(),
@@ -57,144 +56,144 @@ class BudgetResource extends Resource
                             ->columnSpanFull(),
                     ]),
 
-                Forms\Components\Section::make('Budget Items')
-                    ->headerActions([
-                        Forms\Components\Actions\Action::make('addAccounts')
-                            ->label('Add Accounts')
-                            ->icon('heroicon-m-plus')
-                            ->outlined()
-                            ->color('primary')
-                            ->form(fn (Forms\Get $get) => [
-                                Forms\Components\Select::make('selected_accounts')
-                                    ->label('Choose Accounts to Add')
-                                    ->options(function () use ($get) {
-                                        $existingAccounts = collect($get('budgetItems'))->pluck('account_id')->toArray();
-
-                                        return Account::query()
-                                            ->budgetable()
-                                            ->whereNotIn('id', $existingAccounts) // Prevent duplicate selections
-                                            ->pluck('name', 'id');
-                                    })
-                                    ->searchable()
-                                    ->multiple()
-                                    ->hint('Select the accounts you want to add to this budget'),
-                            ])
-                            ->action(static fn (Forms\Set $set, Forms\Get $get, array $data) => self::addSelectedAccounts($set, $get, $data)),
-
-                        Forms\Components\Actions\Action::make('addAllAccounts')
-                            ->label('Add All Accounts')
-                            ->icon('heroicon-m-folder-plus')
-                            ->outlined()
-                            ->color('primary')
-                            ->action(static fn (Forms\Set $set, Forms\Get $get) => self::addAllAccounts($set, $get))
-                            ->hidden(static fn (Forms\Get $get) => filled($get('budgetItems'))),
-
-                        Forms\Components\Actions\Action::make('increaseAllocations')
-                            ->label('Increase Allocations')
-                            ->icon('heroicon-m-arrow-up')
-                            ->outlined()
-                            ->color('success')
-                            ->form(fn (Forms\Get $get) => [
-                                Forms\Components\Select::make('increase_type')
-                                    ->label('Increase Type')
-                                    ->options([
-                                        'percentage' => 'Percentage (%)',
-                                        'fixed' => 'Fixed Amount',
-                                    ])
-                                    ->default('percentage')
-                                    ->live()
-                                    ->required(),
-
-                                Forms\Components\TextInput::make('percentage')
-                                    ->label('Increase by %')
-                                    ->numeric()
-                                    ->suffix('%')
-                                    ->required()
-                                    ->hidden(fn (Forms\Get $get) => $get('increase_type') !== 'percentage'),
-
-                                Forms\Components\TextInput::make('fixed_amount')
-                                    ->label('Increase by Fixed Amount')
-                                    ->numeric()
-                                    ->suffix('USD')
-                                    ->required()
-                                    ->hidden(fn (Forms\Get $get) => $get('increase_type') !== 'fixed'),
-
-                                Forms\Components\Select::make('apply_to_accounts')
-                                    ->label('Apply to Accounts')
-                                    ->options(function () use ($get) {
-                                        $budgetItems = $get('budgetItems') ?? [];
-                                        $accountIds = collect($budgetItems)
-                                            ->pluck('account_id')
-                                            ->filter()
-                                            ->unique()
-                                            ->toArray();
-
-                                        return Account::query()
-                                            ->whereIn('id', $accountIds)
-                                            ->pluck('name', 'id')
-                                            ->toArray();
-                                    })
-                                    ->searchable()
-                                    ->multiple()
-                                    ->hint('Leave blank to apply to all accounts'),
-
-                                Forms\Components\Select::make('apply_to_periods')
-                                    ->label('Apply to Periods')
-                                    ->options(static function () use ($get) {
-                                        $startDate = $get('start_date');
-                                        $endDate = $get('end_date');
-                                        $intervalType = $get('interval_type');
-
-                                        if (blank($startDate) || blank($endDate) || blank($intervalType)) {
-                                            return [];
-                                        }
-
-                                        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
-
-                                        return array_combine($labels, $labels);
-                                    })
-                                    ->searchable()
-                                    ->multiple()
-                                    ->hint('Leave blank to apply to all periods'),
-                            ])
-                            ->action(static fn (Forms\Set $set, Forms\Get $get, array $data) => self::increaseAllocations($set, $get, $data))
-                            ->visible(static fn (Forms\Get $get) => filled($get('budgetItems'))),
-                    ])
-                    ->schema([
-                        Forms\Components\Repeater::make('budgetItems')
-                            ->columns(4)
-                            ->hiddenLabel()
-                            ->schema([
-                                Forms\Components\Select::make('account_id')
-                                    ->label('Account')
-                                    ->options(Account::query()
-                                        ->budgetable()
-                                        ->pluck('name', 'id'))
-                                    ->searchable()
-                                    ->disableOptionsWhenSelectedInSiblingRepeaterItems()
-                                    ->columnSpan(1)
-                                    ->required(),
-
-                                Forms\Components\TextInput::make('total_amount')
-                                    ->label('Total Amount')
-                                    ->numeric()
-                                    ->columnSpan(1)
-                                    ->suffixAction(
-                                        Forms\Components\Actions\Action::make('disperse')
-                                            ->label('Disperse')
-                                            ->icon('heroicon-m-bars-arrow-down')
-                                            ->color('primary')
-                                            ->action(static fn (Forms\Set $set, Forms\Get $get, $state) => self::disperseTotalAmount($set, $get, $state))
-                                    ),
-
-                                CustomSection::make('Budget Allocations')
-                                    ->contained(false)
-                                    ->columns(4)
-                                    ->schema(static fn (Forms\Get $get) => self::getAllocationFields($get('../../start_date'), $get('../../end_date'), $get('../../interval_type'))),
-                            ])
-                            ->defaultItems(0)
-                            ->addActionLabel('Add Budget Item'),
-                    ]),
+                //                Forms\Components\Section::make('Budget Items')
+                //                    ->headerActions([
+                //                        Forms\Components\Actions\Action::make('addAccounts')
+                //                            ->label('Add Accounts')
+                //                            ->icon('heroicon-m-plus')
+                //                            ->outlined()
+                //                            ->color('primary')
+                //                            ->form(fn (Forms\Get $get) => [
+                //                                Forms\Components\Select::make('selected_accounts')
+                //                                    ->label('Choose Accounts to Add')
+                //                                    ->options(function () use ($get) {
+                //                                        $existingAccounts = collect($get('budgetItems'))->pluck('account_id')->toArray();
+                //
+                //                                        return Account::query()
+                //                                            ->budgetable()
+                //                                            ->whereNotIn('id', $existingAccounts) // Prevent duplicate selections
+                //                                            ->pluck('name', 'id');
+                //                                    })
+                //                                    ->searchable()
+                //                                    ->multiple()
+                //                                    ->hint('Select the accounts you want to add to this budget'),
+                //                            ])
+                //                            ->action(static fn (Forms\Set $set, Forms\Get $get, array $data) => self::addSelectedAccounts($set, $get, $data)),
+                //
+                //                        Forms\Components\Actions\Action::make('addAllAccounts')
+                //                            ->label('Add All Accounts')
+                //                            ->icon('heroicon-m-folder-plus')
+                //                            ->outlined()
+                //                            ->color('primary')
+                //                            ->action(static fn (Forms\Set $set, Forms\Get $get) => self::addAllAccounts($set, $get))
+                //                            ->hidden(static fn (Forms\Get $get) => filled($get('budgetItems'))),
+                //
+                //                        Forms\Components\Actions\Action::make('increaseAllocations')
+                //                            ->label('Increase Allocations')
+                //                            ->icon('heroicon-m-arrow-up')
+                //                            ->outlined()
+                //                            ->color('success')
+                //                            ->form(fn (Forms\Get $get) => [
+                //                                Forms\Components\Select::make('increase_type')
+                //                                    ->label('Increase Type')
+                //                                    ->options([
+                //                                        'percentage' => 'Percentage (%)',
+                //                                        'fixed' => 'Fixed Amount',
+                //                                    ])
+                //                                    ->default('percentage')
+                //                                    ->live()
+                //                                    ->required(),
+                //
+                //                                Forms\Components\TextInput::make('percentage')
+                //                                    ->label('Increase by %')
+                //                                    ->numeric()
+                //                                    ->suffix('%')
+                //                                    ->required()
+                //                                    ->hidden(fn (Forms\Get $get) => $get('increase_type') !== 'percentage'),
+                //
+                //                                Forms\Components\TextInput::make('fixed_amount')
+                //                                    ->label('Increase by Fixed Amount')
+                //                                    ->numeric()
+                //                                    ->suffix('USD')
+                //                                    ->required()
+                //                                    ->hidden(fn (Forms\Get $get) => $get('increase_type') !== 'fixed'),
+                //
+                //                                Forms\Components\Select::make('apply_to_accounts')
+                //                                    ->label('Apply to Accounts')
+                //                                    ->options(function () use ($get) {
+                //                                        $budgetItems = $get('budgetItems') ?? [];
+                //                                        $accountIds = collect($budgetItems)
+                //                                            ->pluck('account_id')
+                //                                            ->filter()
+                //                                            ->unique()
+                //                                            ->toArray();
+                //
+                //                                        return Account::query()
+                //                                            ->whereIn('id', $accountIds)
+                //                                            ->pluck('name', 'id')
+                //                                            ->toArray();
+                //                                    })
+                //                                    ->searchable()
+                //                                    ->multiple()
+                //                                    ->hint('Leave blank to apply to all accounts'),
+                //
+                //                                Forms\Components\Select::make('apply_to_periods')
+                //                                    ->label('Apply to Periods')
+                //                                    ->options(static function () use ($get) {
+                //                                        $startDate = $get('start_date');
+                //                                        $endDate = $get('end_date');
+                //                                        $intervalType = $get('interval_type');
+                //
+                //                                        if (blank($startDate) || blank($endDate) || blank($intervalType)) {
+                //                                            return [];
+                //                                        }
+                //
+                //                                        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
+                //
+                //                                        return array_combine($labels, $labels);
+                //                                    })
+                //                                    ->searchable()
+                //                                    ->multiple()
+                //                                    ->hint('Leave blank to apply to all periods'),
+                //                            ])
+                //                            ->action(static fn (Forms\Set $set, Forms\Get $get, array $data) => self::increaseAllocations($set, $get, $data))
+                //                            ->visible(static fn (Forms\Get $get) => filled($get('budgetItems'))),
+                //                    ])
+                //                    ->schema([
+                //                        Forms\Components\Repeater::make('budgetItems')
+                //                            ->columns(4)
+                //                            ->hiddenLabel()
+                //                            ->schema([
+                //                                Forms\Components\Select::make('account_id')
+                //                                    ->label('Account')
+                //                                    ->options(Account::query()
+                //                                        ->budgetable()
+                //                                        ->pluck('name', 'id'))
+                //                                    ->searchable()
+                //                                    ->disableOptionsWhenSelectedInSiblingRepeaterItems()
+                //                                    ->columnSpan(1)
+                //                                    ->required(),
+                //
+                //                                Forms\Components\TextInput::make('total_amount')
+                //                                    ->label('Total Amount')
+                //                                    ->numeric()
+                //                                    ->columnSpan(1)
+                //                                    ->suffixAction(
+                //                                        Forms\Components\Actions\Action::make('disperse')
+                //                                            ->label('Disperse')
+                //                                            ->icon('heroicon-m-bars-arrow-down')
+                //                                            ->color('primary')
+                //                                            ->action(static fn (Forms\Set $set, Forms\Get $get, $state) => self::disperseTotalAmount($set, $get, $state))
+                //                                    ),
+                //
+                //                                CustomSection::make('Budget Allocations')
+                //                                    ->contained(false)
+                //                                    ->columns(4)
+                //                                    ->schema(static fn (Forms\Get $get) => self::getAllocationFields($get('../../start_date'), $get('../../end_date'), $get('../../interval_type'))),
+                //                            ])
+                //                            ->defaultItems(0)
+                //                            ->addActionLabel('Add Budget Item'),
+                //                    ]),
             ]);
     }
 
@@ -206,6 +205,11 @@ class BudgetResource extends Resource
                     ->sortable()
                     ->searchable(),
 
+                Tables\Columns\TextColumn::make('status')
+                    ->label('Status')
+                    ->sortable()
+                    ->badge(),
+
                 Tables\Columns\TextColumn::make('interval_type')
                     ->label('Interval')
                     ->sortable()
@@ -373,7 +377,6 @@ class BudgetResource extends Resource
 
         while ($start->lte($end)) {
             $labels[] = match ($intervalTypeEnum) {
-                BudgetIntervalType::Week => 'W' . $start->weekOfYear . ' ' . $start->year, // Example: W10 2024
                 BudgetIntervalType::Month => $start->format('M'), // Example: Jan, Feb, Mar
                 BudgetIntervalType::Quarter => 'Q' . $start->quarter, // Example: Q1, Q2, Q3
                 BudgetIntervalType::Year => (string) $start->year, // Example: 2024, 2025
@@ -381,7 +384,6 @@ class BudgetResource extends Resource
             };
 
             match ($intervalTypeEnum) {
-                BudgetIntervalType::Week => $start->addWeek(),
                 BudgetIntervalType::Month => $start->addMonth(),
                 BudgetIntervalType::Quarter => $start->addQuarter(),
                 BudgetIntervalType::Year => $start->addYear(),
@@ -398,32 +400,15 @@ class BudgetResource extends Resource
             return [];
         }
 
-        $start = Carbon::parse($startDate);
-        $end = Carbon::parse($endDate);
-        $intervalTypeEnum = BudgetIntervalType::parse($intervalType);
         $fields = [];
 
-        while ($start->lte($end)) {
-            $label = match ($intervalTypeEnum) {
-                BudgetIntervalType::Week => 'W' . $start->weekOfYear . ' ' . $start->year, // Example: W10 2024
-                BudgetIntervalType::Month => $start->format('M'), // Example: Jan, Feb, Mar
-                BudgetIntervalType::Quarter => 'Q' . $start->quarter, // Example: Q1, Q2, Q3
-                BudgetIntervalType::Year => (string) $start->year, // Example: 2024, 2025
-                default => '',
-            };
+        $labels = self::generateFormattedLabels($startDate, $endDate, $intervalType);
 
+        foreach ($labels as $label) {
             $fields[] = Forms\Components\TextInput::make("amounts.{$label}")
                 ->label($label)
                 ->numeric()
                 ->required();
-
-            match ($intervalTypeEnum) {
-                BudgetIntervalType::Week => $start->addWeek(),
-                BudgetIntervalType::Month => $start->addMonth(),
-                BudgetIntervalType::Quarter => $start->addQuarter(),
-                BudgetIntervalType::Year => $start->addYear(),
-                default => null,
-            };
         }
 
         return $fields;

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

@@ -3,17 +3,167 @@
 namespace App\Filament\Company\Resources\Accounting\BudgetResource\Pages;
 
 use App\Enums\Accounting\BudgetIntervalType;
+use App\Facades\Accounting;
 use App\Filament\Company\Resources\Accounting\BudgetResource;
+use App\Models\Accounting\Account;
 use App\Models\Accounting\Budget;
+use App\Models\Accounting\BudgetAllocation;
 use App\Models\Accounting\BudgetItem;
+use Filament\Forms;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Wizard\Step;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 
 class CreateBudget extends CreateRecord
 {
+    use CreateRecord\Concerns\HasWizard;
+
     protected static string $resource = BudgetResource::class;
 
+    public function getSteps(): array
+    {
+        return [
+            Step::make('General Information')
+                ->columns(2)
+                ->schema([
+                    Forms\Components\TextInput::make('name')
+                        ->required()
+                        ->maxLength(255),
+                    Forms\Components\Select::make('interval_type')
+                        ->label('Budget Interval')
+                        ->options(BudgetIntervalType::class)
+                        ->default(BudgetIntervalType::Month->value)
+                        ->required()
+                        ->live(),
+                    Forms\Components\DatePicker::make('start_date')
+                        ->required()
+                        ->default(now()->startOfYear())
+                        ->live(),
+                    Forms\Components\DatePicker::make('end_date')
+                        ->required()
+                        ->default(now()->endOfYear())
+                        ->live()
+                        ->disabled(static fn (Forms\Get $get) => blank($get('start_date')))
+                        ->minDate(fn (Forms\Get $get) => match (BudgetIntervalType::parse($get('interval_type'))) {
+                            BudgetIntervalType::Month => Carbon::parse($get('start_date'))->addMonth(),
+                            BudgetIntervalType::Quarter => Carbon::parse($get('start_date'))->addQuarter(),
+                            BudgetIntervalType::Year => Carbon::parse($get('start_date'))->addYear(),
+                            default => Carbon::parse($get('start_date'))->addDay(),
+                        })
+                        ->maxDate(fn (Forms\Get $get) => Carbon::parse($get('start_date'))->endOfYear()),
+                ]),
+
+            Step::make('Budget Setup & Settings')
+                ->schema([
+                    // Prefill configuration
+                    Forms\Components\Toggle::make('prefill_data')
+                        ->label('Prefill Data')
+                        ->helperText('Enable this option to prefill the budget with historical data')
+                        ->default(false)
+                        ->live(),
+
+                    Forms\Components\Grid::make(1)
+                        ->schema([
+                            Forms\Components\Select::make('prefill_method')
+                                ->label('Prefill Method')
+                                ->options([
+                                    'previous_budget' => 'Copy from a previous budget',
+                                    'actuals' => 'Use historical actuals',
+                                ])
+                                ->live()
+                                ->required(),
+
+                            // If user selects to copy a previous budget
+                            Forms\Components\Select::make('source_budget_id')
+                                ->label('Source Budget')
+                                ->options(fn () => Budget::query()
+                                    ->orderByDesc('end_date')
+                                    ->pluck('name', 'id'))
+                                ->searchable()
+                                ->required()
+                                ->visible(fn (Forms\Get $get) => $get('prefill_method') === 'previous_budget'),
+
+                            // If user selects to use historical actuals
+                            Forms\Components\Select::make('actuals_fiscal_year')
+                                ->label('Reference Fiscal Year')
+                                ->options(function () {
+                                    $options = [];
+                                    $company = auth()->user()->currentCompany;
+                                    $earliestDate = Carbon::parse(Accounting::getEarliestTransactionDate());
+                                    $fiscalYearStartCurrent = Carbon::parse($company->locale->fiscalYearStartDate());
+
+                                    for ($year = $fiscalYearStartCurrent->year; $year >= $earliestDate->year; $year--) {
+                                        $options[$year] = $year;
+                                    }
+
+                                    return $options;
+                                })
+                                ->required()
+                                ->live()
+                                ->visible(fn (Forms\Get $get) => $get('prefill_method') === 'actuals'),
+                        ])->visible(fn (Forms\Get $get) => $get('prefill_data') === true),
+
+                    Forms\Components\Textarea::make('notes')
+                        ->label('Notes')
+                        ->columnSpanFull(),
+                ]),
+
+            Step::make('Modify Budget Structure')
+                ->schema([
+                    Forms\Components\CheckboxList::make('selected_accounts')
+                        ->label('Select Accounts to Exclude')
+                        ->options(function (Forms\Get $get) {
+                            $fiscalYear = $get('actuals_fiscal_year');
+
+                            // Get all budgetable accounts
+                            $allAccounts = Account::query()->budgetable()->pluck('name', 'id')->toArray();
+
+                            // Get accounts that have actuals for the selected fiscal year
+                            $accountsWithActuals = Account::query()
+                                ->budgetable()
+                                ->whereHas('journalEntries.transaction', function (Builder $query) use ($fiscalYear) {
+                                    $query->whereYear('posted_at', $fiscalYear);
+                                })
+                                ->pluck('name', 'id')
+                                ->toArray();
+
+                            return $allAccounts + $accountsWithActuals; // Merge both sets
+                        })
+                        ->columns(2) // Display in two columns
+                        ->searchable() // Allow searching for accounts
+                        ->bulkToggleable() // Enable "Select All" / "Deselect All"
+                        ->selectAllAction(
+                            fn (Action $action, Forms\Get $get) => $action
+                                ->label('Remove all items without past actuals (' .
+                                    Account::query()->budgetable()->whereDoesntHave('journalEntries.transaction', function (Builder $query) use ($get) {
+                                        $query->whereYear('posted_at', $get('actuals_fiscal_year'));
+                                    })->count() . ' lines)')
+                        )
+                        ->disableOptionWhen(fn (string $value, Forms\Get $get) => in_array(
+                            $value,
+                            Account::query()->budgetable()->whereHas('journalEntries.transaction', function (Builder $query) use ($get) {
+                                $query->whereYear('posted_at', Carbon::parse($get('actuals_fiscal_year'))->year);
+                            })->pluck('id')->toArray()
+                        ))
+                        ->visible(fn (Forms\Get $get) => $get('prefill_method') === 'actuals'),
+                ])
+                ->visible(function (Forms\Get $get) {
+                    $prefillMethod = $get('prefill_method');
+
+                    if ($prefillMethod !== 'actuals' || blank($get('actuals_fiscal_year'))) {
+                        return false;
+                    }
+
+                    return Account::query()->budgetable()->whereDoesntHave('journalEntries.transaction', function (Builder $query) use ($get) {
+                        $query->whereYear('posted_at', $get('actuals_fiscal_year'));
+                    })->exists();
+                }),
+        ];
+    }
+
     protected function handleRecordCreation(array $data): Model
     {
         /** @var Budget $budget */
@@ -25,15 +175,29 @@ class CreateBudget extends CreateRecord
             'notes' => $data['notes'] ?? null,
         ]);
 
-        foreach ($data['budgetItems'] as $itemData) {
+        $selectedAccounts = $data['selected_accounts'] ?? [];
+
+        $accountsToInclude = Account::query()
+            ->budgetable()
+            ->whereNotIn('id', $selectedAccounts)
+            ->get();
+
+        foreach ($accountsToInclude as $account) {
             /** @var BudgetItem $budgetItem */
             $budgetItem = $budget->budgetItems()->create([
-                'account_id' => $itemData['account_id'],
+                'account_id' => $account->id,
             ]);
 
             $allocationStart = Carbon::parse($data['start_date']);
 
-            foreach ($itemData['amounts'] as $periodLabel => $amount) {
+            // Determine amounts based on the prefill method
+            $amounts = match ($data['prefill_method'] ?? null) {
+                'actuals' => $this->getAmountsFromActuals($account, $data['actuals_fiscal_year'], BudgetIntervalType::parse($data['interval_type'])),
+                'previous_budget' => $this->getAmountsFromPreviousBudget($account, $data['source_budget_id'], BudgetIntervalType::parse($data['interval_type'])),
+                default => $this->generateZeroAmounts($data['start_date'], $data['end_date'], BudgetIntervalType::parse($data['interval_type'])),
+            };
+
+            foreach ($amounts as $periodLabel => $amount) {
                 $allocationEnd = self::calculateEndDate($allocationStart, BudgetIntervalType::parse($data['interval_type']));
 
                 $budgetItem->allocations()->create([
@@ -51,10 +215,82 @@ class CreateBudget extends CreateRecord
         return $budget;
     }
 
+    private function getAmountsFromActuals(Account $account, int $fiscalYear, BudgetIntervalType $intervalType): array
+    {
+        // Determine the fiscal year start and end dates
+        $fiscalYearStart = Carbon::create($fiscalYear, 1, 1)->startOfYear();
+        $fiscalYearEnd = $fiscalYearStart->copy()->endOfYear();
+
+        $netMovement = Accounting::getNetMovement($account, $fiscalYearStart->toDateString(), $fiscalYearEnd->toDateString());
+
+        return $this->distributeAmountAcrossPeriods($netMovement->getAmount(), $fiscalYearStart, $fiscalYearEnd, $intervalType);
+    }
+
+    private function distributeAmountAcrossPeriods(float $totalAmount, Carbon $startDate, Carbon $endDate, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+        $periods = [];
+
+        // Generate period labels based on interval type
+        $currentPeriod = $startDate->copy();
+        while ($currentPeriod->lte($endDate)) {
+            $periods[] = $this->determinePeriod($currentPeriod, $intervalType);
+            $currentPeriod->addUnit($intervalType->value);
+        }
+
+        // Evenly distribute total amount across periods
+        $periodCount = count($periods);
+        $amountPerPeriod = $periodCount > 0 ? round($totalAmount / $periodCount, 2) : 0;
+
+        foreach ($periods as $periodLabel) {
+            $amounts[$periodLabel] = $amountPerPeriod;
+        }
+
+        return $amounts;
+    }
+
+    private function getAmountsFromPreviousBudget(Account $account, int $sourceBudgetId, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+
+        $previousAllocations = BudgetAllocation::query()
+            ->whereHas('budgetItem', fn ($query) => $query->where('account_id', $account->id)->where('budget_id', $sourceBudgetId))
+            ->get();
+
+        foreach ($previousAllocations as $allocation) {
+            $amounts[$allocation->period] = $allocation->amount;
+        }
+
+        return $amounts;
+    }
+
+    private function generateZeroAmounts(string $startDate, string $endDate, BudgetIntervalType $intervalType): array
+    {
+        $amounts = [];
+
+        $currentPeriod = Carbon::parse($startDate);
+        while ($currentPeriod->lte(Carbon::parse($endDate))) {
+            $period = $this->determinePeriod($currentPeriod, $intervalType);
+            $amounts[$period] = 0.00;
+            $currentPeriod->addUnit($intervalType->value);
+        }
+
+        return $amounts;
+    }
+
+    private function determinePeriod(Carbon $date, BudgetIntervalType $intervalType): string
+    {
+        return match ($intervalType) {
+            BudgetIntervalType::Month => $date->format('F Y'),
+            BudgetIntervalType::Quarter => 'Q' . $date->quarter . ' ' . $date->year,
+            BudgetIntervalType::Year => (string) $date->year,
+            default => $date->format('Y-m-d'),
+        };
+    }
+
     private static function calculateEndDate(Carbon $startDate, BudgetIntervalType $intervalType): Carbon
     {
         return match ($intervalType) {
-            BudgetIntervalType::Week => $startDate->copy()->endOfWeek(),
             BudgetIntervalType::Month => $startDate->copy()->endOfMonth(),
             BudgetIntervalType::Quarter => $startDate->copy()->endOfQuarter(),
             BudgetIntervalType::Year => $startDate->copy()->endOfYear(),

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

@@ -95,7 +95,6 @@ class EditBudget extends EditRecord
     private static function calculateEndDate(Carbon $startDate, BudgetIntervalType $intervalType): Carbon
     {
         return match ($intervalType) {
-            BudgetIntervalType::Week => $startDate->copy()->endOfWeek(),
             BudgetIntervalType::Month => $startDate->copy()->endOfMonth(),
             BudgetIntervalType::Quarter => $startDate->copy()->endOfQuarter(),
             BudgetIntervalType::Year => $startDate->copy()->endOfYear(),

app/Models/Accounting/Account.php

@@ -88,12 +88,11 @@ class Account extends Model
 
     public function scopeBudgetable(Builder $query): Builder
     {
-        return $query->whereNotIn('category', [
-            AccountCategory::Equity,
-            AccountCategory::Liability,
+        return $query->whereIn('category', [
+            AccountCategory::Revenue,
+            AccountCategory::Expense,
         ])
             ->whereNotIn('type', [
-                AccountType::ContraAsset,
                 AccountType::ContraRevenue,
                 AccountType::ContraExpense,
                 AccountType::UncategorizedRevenue,

composer.lock

@@ -5997,16 +5997,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.7",
+            "version": "v0.12.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
+                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
-                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
+                "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
                 "shasum": ""
             },
             "require": {
@@ -6070,9 +6070,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
             },
-            "time": "2024-12-10T01:58:33+00:00"
+            "time": "2025-03-16T03:05:19+00:00"
         },
         {
             "name": "ralouphie/getallheaders",

database/migrations/2025_03_15_191245_create_budgets_table.php

@@ -17,7 +17,7 @@ return new class extends Migration
             $table->string('name');
             $table->date('start_date');
             $table->date('end_date');
-            $table->string('status')->default('active'); // draft, active, closed
+            $table->string('status')->default('draft'); // draft, active, closed
             $table->string('interval_type')->default('month'); // day, week, month, quarter, year
             $table->text('notes')->nullable();
             $table->timestamp('approved_at')->nullable();

package-lock.json

@@ -1088,9 +1088,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001704",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz",
-            "integrity": "sha512-+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==",
+            "version": "1.0.30001705",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz",
+            "integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==",
             "dev": true,
             "funding": [
                 {
@@ -1930,9 +1930,9 @@
             }
         },
         "node_modules/nanoid": {
-            "version": "3.3.9",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.9.tgz",
-            "integrity": "sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==",
+            "version": "3.3.10",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.10.tgz",
+            "integrity": "sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==",
             "dev": true,
             "funding": [
                 {