wip

app/Models/Accounting/RecurringInvoice.php

 use App\Models\Common\Client;
 use App\Models\Setting\CompanyProfile;
 use App\Observers\RecurringInvoiceObserver;
+use App\Support\ScheduleHandler;
 use App\Utilities\Localization\Timezone;
+use CodeWithDennis\SimpleAlert\Components\Forms\SimpleAlert;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Forms;
 
     public function calculateNextWeeklyDate(Carbon $lastDate): ?Carbon
     {
-        return $lastDate->copy()->next($this->day_of_week->value);
+        return $lastDate->copy()->next($this->day_of_week->name);
     }
 
     public function calculateNextMonthlyDate(Carbon $lastDate): ?Carbon
     {
-        return match (true) {
-            $lastDate->equalTo($this->start_date) => $lastDate->copy()->day(
-                min($this->day_of_month->value, $lastDate->daysInMonth)
-            ),
-
-            default => $lastDate->copy()->addMonth()->day(
-                min($this->day_of_month->value, $lastDate->copy()->addMonth()->daysInMonth)
-            ),
-        };
+        return $this->day_of_month->resolveDate($lastDate->copy()->addMonth());
     }
 
     public function calculateNextYearlyDate(Carbon $lastDate): ?Carbon
     {
-        return match (true) {
-            $lastDate->equalTo($this->start_date) => $lastDate->copy()
-                ->month($this->month->value)
-                ->day(min($this->day_of_month->value, $lastDate->daysInMonth)),
-
-            default => $lastDate->copy()
-                ->addYear()
-                ->month($this->month->value)
-                ->day(min($this->day_of_month->value, $lastDate->copy()->addYear()->month($this->month->value)->daysInMonth))
-        };
+        return $this->day_of_month->resolveDate($lastDate->copy()->addYear()->month($this->month->value));
     }
 
     protected function calculateCustomNextDate(Carbon $lastDate): ?Carbon
         return match ($this->interval_type) {
             IntervalType::Day => $lastDate->copy()->addDays($interval),
 
-            IntervalType::Week => match (true) {
-                $lastDate->equalTo($this->start_date) => $lastDate->copy()->next($this->day_of_week->value),
-
-                $lastDate->dayOfWeek === $this->day_of_week->value => $lastDate->copy()->addWeeks($interval),
-
-                default => $lastDate->copy()->next($this->day_of_week->value),
-            },
-
-            IntervalType::Month => match (true) {
-                $lastDate->equalTo($this->start_date) => $lastDate->copy()->day(
-                    min($this->day_of_month->value, $lastDate->daysInMonth)
-                ),
+            IntervalType::Week => $lastDate->copy()->addWeeks($interval),
 
-                default => $lastDate->copy()->addMonths($interval)->day(
-                    min($this->day_of_month->value, $lastDate->copy()->addMonths($interval)->daysInMonth)
-                ),
-            },
+            IntervalType::Month => $this->day_of_month->resolveDate($lastDate->copy()->addMonths($interval)),
 
-            IntervalType::Year => match (true) {
-                $lastDate->equalTo($this->start_date) => $lastDate->copy()
-                    ->month($this->month->value)
-                    ->day(min($this->day_of_month->value, $lastDate->daysInMonth)),
-
-                default => $lastDate->copy()
-                    ->addYears($interval)
-                    ->month($this->month->value)
-                    ->day(min($this->day_of_month->value, $lastDate->copy()->addYears($interval)->month($this->month->value)->daysInMonth))
-            },
+            IntervalType::Year => $this->day_of_month->resolveDate($lastDate->copy()->addYears($interval)->month($this->month->value)),
 
             default => null
         };
             ->form([
                 CustomSection::make('Frequency')
                     ->contained(false)
-                    ->schema([
-                        Forms\Components\Select::make('frequency')
-                            ->label('Repeats')
-                            ->options(Frequency::class)
-                            ->softRequired()
-                            ->live()
-                            ->afterStateUpdated(function (Forms\Set $set, $state) {
-                                $frequency = Frequency::parse($state);
-
-                                if ($frequency->isDaily()) {
-                                    $set('interval_value', null);
-                                    $set('interval_type', null);
-                                }
-
-                                if ($frequency->isWeekly()) {
-                                    $currentDayOfWeek = now()->dayOfWeek;
-                                    $currentDayOfWeek = DayOfWeek::parse($currentDayOfWeek);
-                                    $set('day_of_week', $currentDayOfWeek);
-                                    $set('interval_value', null);
-                                    $set('interval_type', null);
-                                }
-
-                                if ($frequency->isMonthly()) {
-                                    $set('day_of_month', DayOfMonth::First);
-                                    $set('interval_value', null);
-                                    $set('interval_type', null);
-                                }
-
-                                if ($frequency->isYearly()) {
-                                    $currentMonth = now()->month;
-                                    $currentMonth = Month::parse($currentMonth);
-                                    $set('month', $currentMonth);
-
-                                    $currentDay = now()->dayOfMonth;
-                                    $currentDay = DayOfMonth::parse($currentDay);
-                                    $set('day_of_month', $currentDay);
-
-                                    $set('interval_value', null);
-                                    $set('interval_type', null);
-                                }
-
-                                if ($frequency->isCustom()) {
-                                    $set('interval_value', 1);
-                                    $set('interval_type', IntervalType::Month);
-
-                                    $currentDay = now()->dayOfMonth;
-                                    $currentDay = DayOfMonth::parse($currentDay);
-                                    $set('day_of_month', $currentDay);
-                                }
-                            }),
-
-                        // Custom frequency fields in a nested grid
-                        Cluster::make([
-                            Forms\Components\TextInput::make('interval_value')
+                    ->schema(function (Forms\Get $get) {
+                        $frequency = Frequency::parse($get('frequency'));
+                        $intervalType = IntervalType::parse($get('interval_type'));
+                        $month = Month::parse($get('month'));
+                        $dayOfMonth = DayOfMonth::parse($get('day_of_month'));
+
+                        return [
+                            Forms\Components\Select::make('frequency')
+                                ->label('Repeats')
+                                ->options(Frequency::class)
                                 ->softRequired()
-                                ->numeric()
-                                ->default(1),
-                            Forms\Components\Select::make('interval_type')
-                                ->options(IntervalType::class)
-                                ->softRequired()
-                                ->default(IntervalType::Month)
                                 ->live()
                                 ->afterStateUpdated(function (Forms\Set $set, $state) {
-                                    $intervalType = IntervalType::parse($state);
+                                    $handler = new ScheduleHandler($set);
+                                    $handler->handleFrequencyChange($state);
+                                }),
 
-                                    if ($intervalType->isWeek()) {
-                                        $currentDayOfWeek = now()->dayOfWeek;
-                                        $currentDayOfWeek = DayOfWeek::parse($currentDayOfWeek);
-                                        $set('day_of_week', $currentDayOfWeek);
-                                    }
+                            // Custom frequency fields in a nested grid
+                            Cluster::make([
+                                Forms\Components\TextInput::make('interval_value')
+                                    ->softRequired()
+                                    ->numeric()
+                                    ->default(1),
+                                Forms\Components\Select::make('interval_type')
+                                    ->options(IntervalType::class)
+                                    ->softRequired()
+                                    ->default(IntervalType::Month)
+                                    ->live()
+                                    ->afterStateUpdated(function (Forms\Set $set, $state) {
+                                        $handler = new ScheduleHandler($set);
+                                        $handler->handleIntervalTypeChange($state);
+                                    }),
+                            ])
+                                ->live()
+                                ->label('Every')
+                                ->required()
+                                ->markAsRequired(false)
+                                ->visible($frequency->isCustom()),
+
+                            // Specific schedule details
+                            Forms\Components\Select::make('month')
+                                ->label('Month')
+                                ->options(Month::class)
+                                ->softRequired()
+                                ->visible($frequency->isYearly() || $intervalType?->isYear())
+                                ->live()
+                                ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                    $handler = new ScheduleHandler($set, $get);
+                                    $handler->handleDateChange('month', $state);
+                                }),
 
-                                    if ($intervalType->isMonth()) {
-                                        $currentDay = now()->dayOfMonth;
-                                        $currentDay = DayOfMonth::parse($currentDay);
-                                        $set('day_of_month', $currentDay);
+                            Forms\Components\Select::make('day_of_month')
+                                ->label('Day of Month')
+                                ->options(function () use ($month) {
+                                    if (! $month) {
+                                        return DayOfMonth::class;
                                     }
 
-                                    if ($intervalType->isYear()) {
-                                        $currentMonth = now()->month;
-                                        $currentMonth = Month::parse($currentMonth);
-                                        $set('month', $currentMonth);
+                                    $daysInMonth = Carbon::createFromDate(null, $month->value)->daysInMonth;
 
-                                        $currentDay = now()->dayOfMonth;
-                                        $currentDay = DayOfMonth::parse($currentDay);
-                                        $set('day_of_month', $currentDay);
-                                    }
+                                    return collect(DayOfMonth::cases())
+                                        ->filter(static fn (DayOfMonth $dayOfMonth) => $dayOfMonth->value <= $daysInMonth || $dayOfMonth->isLast())
+                                        ->mapWithKeys(fn (DayOfMonth $dayOfMonth) => [$dayOfMonth->value => $dayOfMonth->getLabel()]);
+                                })
+                                ->softRequired()
+                                ->visible(in_array($frequency, [Frequency::Monthly, Frequency::Yearly]) || in_array($intervalType, [IntervalType::Month, IntervalType::Year]))
+                                ->live()
+                                ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                    $handler = new ScheduleHandler($set, $get);
+                                    $handler->handleDateChange('day_of_month', $state);
                                 }),
-                        ])
-                            ->live()
-                            ->label('Every')
-                            ->required()
-                            ->markAsRequired(false)
-                            ->visible(fn (Forms\Get $get) => Frequency::parse($get('frequency'))?->isCustom()),
-
-                        // Specific schedule details
-                        Forms\Components\Select::make('month')
-                            ->label('Month')
-                            ->options(Month::class)
-                            ->softRequired()
-                            ->visible(
-                                fn (Forms\Get $get) => Frequency::parse($get('frequency'))->isYearly() ||
-                                IntervalType::parse($get('interval_type'))?->isYear()
-                            )
-                            ->live()
-                            ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                $dayOfMonth = DayOfMonth::parse($get('day_of_month'));
-                                $frequency = Frequency::parse($get('frequency'));
-                                $intervalType = IntervalType::parse($get('interval_type'));
-                                $month = Month::parse($state);
-
-                                if (($frequency->isYearly() || $intervalType?->isYear()) && $month && $dayOfMonth) {
-                                    $date = $dayOfMonth->resolveDate(today()->month($month->value))->toImmutable();
-
-                                    $adjustedStartDate = $date->lt(today())
-                                        ? $dayOfMonth->resolveDate($date->addYear()->month($month->value))
-                                        : $dayOfMonth->resolveDate($date->month($month->value));
-
-                                    $adjustedDay = min($dayOfMonth->value, $adjustedStartDate->daysInMonth);
 
-                                    $set('day_of_month', $adjustedDay);
+                            SimpleAlert::make('dayOfMonthNotice')
+                                ->title(function () use ($dayOfMonth) {
+                                    return "The invoice will be created on the {$dayOfMonth->getLabel()} day of each month, or on the last day for months ending earlier.";
+                                })
+                                ->columnSpanFull()
+                                ->visible($dayOfMonth?->value > 28),
 
-                                    $set('start_date', $adjustedStartDate);
-                                }
-                            }),
-
-                        Forms\Components\Select::make('day_of_month')
-                            ->label('Day of Month')
-                            ->options(function (Forms\Get $get) {
-                                $month = Month::parse($get('month')) ?? Month::January;
-
-                                $daysInMonth = Carbon::createFromDate(null, $month->value)->daysInMonth;
-
-                                return collect(DayOfMonth::cases())
-                                    ->filter(static fn (DayOfMonth $dayOfMonth) => $dayOfMonth->value <= $daysInMonth || $dayOfMonth->isLast())
-                                    ->mapWithKeys(fn (DayOfMonth $dayOfMonth) => [$dayOfMonth->value => $dayOfMonth->getLabel()]);
-                            })
-                            ->softRequired()
-                            ->visible(
-                                fn (Forms\Get $get) => Frequency::parse($get('frequency'))?->isMonthly() ||
-                                Frequency::parse($get('frequency'))?->isYearly() ||
-                                IntervalType::parse($get('interval_type'))?->isMonth() ||
-                                IntervalType::parse($get('interval_type'))?->isYear()
-                            )
-                            ->live()
-                            ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                $dayOfMonth = DayOfMonth::parse($state);
-                                $frequency = Frequency::parse($get('frequency'));
-                                $intervalType = IntervalType::parse($get('interval_type'));
-                                $month = Month::parse($get('month'));
-
-                                if (($frequency->isMonthly() || $intervalType?->isMonth()) && $dayOfMonth) {
-                                    $date = $dayOfMonth->resolveDate(today())->toImmutable();
-
-                                    $adjustedStartDate = $date->lt(today())
-                                        ? $dayOfMonth->resolveDate($date->addMonth())
-                                        : $dayOfMonth->resolveDate($date);
-
-                                    $set('start_date', $adjustedStartDate);
-                                }
-
-                                if (($frequency->isYearly() || $intervalType?->isYear()) && $month && $dayOfMonth) {
-                                    $date = $dayOfMonth->resolveDate(today()->month($month->value))->toImmutable();
-
-                                    $adjustedStartDate = $date->lt(today())
-                                        ? $dayOfMonth->resolveDate($date->addYear()->month($month->value))
-                                        : $dayOfMonth->resolveDate($date->month($month->value));
-
-                                    $set('start_date', $adjustedStartDate);
-                                }
-                            }),
-
-                        Forms\Components\Select::make('day_of_week')
-                            ->label('Day of Week')
-                            ->options(DayOfWeek::class)
-                            ->softRequired()
-                            ->visible(
-                                fn (Forms\Get $get) => Frequency::parse($get('frequency'))?->isWeekly() ||
-                                IntervalType::parse($get('interval_type'))?->isWeek()
-                            )
-                            ->live()
-                            ->afterStateUpdated(function (Forms\Set $set, $state) {
-                                $dayOfWeek = DayOfWeek::parse($state);
-
-                                $adjustedStartDate = today()->is($dayOfWeek->name)
-                                    ? today()
-                                    : today()->next($dayOfWeek->name);
-
-                                $set('start_date', $adjustedStartDate);
-                            }),
-                    ])->columns(2),
+                            Forms\Components\Select::make('day_of_week')
+                                ->label('Day of Week')
+                                ->options(DayOfWeek::class)
+                                ->softRequired()
+                                ->visible($frequency->isWeekly() || $intervalType?->isWeek())
+                                ->live()
+                                ->afterStateUpdated(function (Forms\Set $set, $state) {
+                                    $handler = new ScheduleHandler($set);
+                                    $handler->handleDateChange('day_of_week', $state);
+                                }),
+                        ];
+                    })->columns(2),
 
                 CustomSection::make('Dates & Time')
                     ->contained(false)
                             ->live()
                             ->minDate(today())
                             ->closeOnDateSelection()
-                            ->afterStateUpdated(function (Forms\Set $set, $state) {
-                                $startDate = Carbon::parse($state);
-
-                                $dayOfWeek = DayOfWeek::parse($startDate->dayOfWeek);
-
-                                $set('day_of_week', $dayOfWeek);
+                            ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                $handler = new ScheduleHandler($set, $get);
+                                $handler->handleDateChange('start_date', $state);
                             }),
 
                         Forms\Components\Group::make(function (Forms\Get $get) {
                                 ->afterStateUpdated(function (Forms\Set $set, $state) {
                                     $endType = EndType::parse($state);
 
-                                    if ($endType?->isNever()) {
-                                        $set('max_occurrences', null);
-                                        $set('end_date', null);
-                                    }
-
-                                    if ($endType?->isAfter()) {
-                                        $set('max_occurrences', 1);
-                                        $set('end_date', null);
-                                    }
-
-                                    if ($endType?->isOn()) {
-                                        $set('max_occurrences', null);
-                                        $set('end_date', now()->addMonth()->startOfMonth());
-                                    }
+                                    $set('max_occurrences', $endType?->isAfter() ? 1 : null);
+                                    $set('end_date', $endType?->isOn() ? now()->addMonth()->startOfMonth() : null);
                                 });
 
                             $endType = EndType::parse($get('end_type'));

app/Support/ScheduleHandler.php

+<?php
+
+namespace App\Support;
+
+use App\Enums\Accounting\DayOfMonth;
+use App\Enums\Accounting\DayOfWeek;
+use App\Enums\Accounting\Frequency;
+use App\Enums\Accounting\IntervalType;
+use App\Enums\Accounting\Month;
+use Carbon\CarbonImmutable;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
+use Illuminate\Support\Carbon;
+
+class ScheduleHandler
+{
+    protected CarbonImmutable $today;
+
+    protected Set $set;
+
+    protected ?Get $get;
+
+    public function __construct(Set $set, ?Get $get = null)
+    {
+        $this->today = today()->toImmutable();
+        $this->set = $set;
+        $this->get = $get;
+    }
+
+    protected function setMany(Set $set, array $values): void
+    {
+        foreach ($values as $key => $value) {
+            $set($key, $value);
+        }
+    }
+
+    public function handleFrequencyChange(mixed $state): void
+    {
+        $frequency = Frequency::parse($state);
+
+        match (true) {
+            $frequency->isDaily() => $this->handleDaily(),
+            $frequency->isWeekly() => $this->handleWeekly(),
+            $frequency->isMonthly() => $this->handleMonthly(),
+            $frequency->isYearly() => $this->handleYearly(),
+            $frequency->isCustom() => $this->handleCustom(),
+            default => null,
+        };
+    }
+
+    public function handleIntervalTypeChange(mixed $state): void
+    {
+        $intervalType = IntervalType::parse($state);
+
+        match (true) {
+            $intervalType->isWeek() => $this->handleWeeklyInterval(),
+            $intervalType->isMonth() => $this->handleMonthlyInterval(),
+            $intervalType->isYear() => $this->handleYearlyInterval(),
+            default => null,
+        };
+    }
+
+    public function handleDateChange(?string $component, mixed $state): void
+    {
+        match ($component) {
+            'start_date' => $this->syncComponentsToStartDate(Carbon::parse($state)),
+            'month' => $this->handleMonthChange($state),
+            'day_of_month' => $this->handleDayOfMonthChange($state),
+            'day_of_week' => $this->handleDayOfWeekChange($state),
+            default => null,
+        };
+    }
+
+    protected function handleDaily(): void
+    {
+        $this->setMany($this->set, [
+            'interval_value' => null,
+            'interval_type' => null,
+            'day_of_month' => null,
+            'start_date' => $this->today,
+        ]);
+    }
+
+    protected function handleWeekly(): void
+    {
+        $currentDayOfWeek = DayOfWeek::parse($this->today->dayOfWeek);
+
+        $this->setMany($this->set, [
+            'day_of_week' => $currentDayOfWeek,
+            'start_date' => $this->today,
+            'interval_value' => null,
+            'interval_type' => null,
+            'day_of_month' => null,
+        ]);
+    }
+
+    protected function handleMonthly(): void
+    {
+        $dayOfMonth = DayOfMonth::First;
+        $date = $dayOfMonth->resolveDate($this->today);
+
+        $adjustedStartDate = $date->lt($this->today)
+            ? $dayOfMonth->resolveDate($date->addMonth())
+            : $dayOfMonth->resolveDate($date);
+
+        $this->setMany($this->set, [
+            'month' => null,
+            'day_of_month' => $dayOfMonth,
+            'start_date' => $adjustedStartDate,
+            'interval_value' => null,
+            'interval_type' => null,
+        ]);
+    }
+
+    protected function handleYearly(): void
+    {
+        $currentMonth = Month::parse($this->today->month);
+        $currentDayOfMonth = DayOfMonth::parse($this->today->day);
+
+        $this->setMany($this->set, [
+            'month' => $currentMonth,
+            'day_of_month' => $currentDayOfMonth,
+            'start_date' => $this->today,
+            'interval_value' => null,
+            'interval_type' => null,
+        ]);
+    }
+
+    protected function handleCustom(): void
+    {
+        $dayOfMonth = DayOfMonth::First;
+        $date = $dayOfMonth->resolveDate($this->today);
+
+        $adjustedStartDate = $date->lt($this->today)
+            ? $dayOfMonth->resolveDate($date->addMonth())
+            : $dayOfMonth->resolveDate($date);
+
+        $this->setMany($this->set, [
+            'interval_value' => 1,
+            'interval_type' => IntervalType::Month,
+            'month' => null,
+            'day_of_month' => $dayOfMonth,
+            'start_date' => $adjustedStartDate,
+        ]);
+    }
+
+    protected function handleWeeklyInterval(): void
+    {
+        $currentDayOfWeek = DayOfWeek::parse($this->today->dayOfWeek);
+
+        $this->setMany($this->set, [
+            'day_of_week' => $currentDayOfWeek,
+            'start_date' => $this->today,
+        ]);
+    }
+
+    protected function handleMonthlyInterval(): void
+    {
+        $dayOfMonth = DayOfMonth::First;
+        $date = $dayOfMonth->resolveDate($this->today);
+
+        $adjustedStartDate = $date->lt($this->today)
+            ? $dayOfMonth->resolveDate($date->addMonth())
+            : $dayOfMonth->resolveDate($date);
+
+        $this->setMany($this->set, [
+            'month' => null,
+            'day_of_month' => $dayOfMonth,
+            'start_date' => $adjustedStartDate,
+        ]);
+    }
+
+    protected function handleYearlyInterval(): void
+    {
+        $currentMonth = Month::parse($this->today->month);
+        $currentDayOfMonth = DayOfMonth::parse($this->today->day);
+
+        $this->setMany($this->set, [
+            'month' => $currentMonth,
+            'day_of_month' => $currentDayOfMonth,
+            'start_date' => $this->today,
+        ]);
+    }
+
+    protected function syncComponentsToStartDate(Carbon $startDate): void
+    {
+        $frequency = Frequency::parse(($this->get)('frequency'));
+        $intervalType = IntervalType::parse(($this->get)('interval_type'));
+
+        if ($frequency->isWeekly() || $intervalType?->isWeek()) {
+            ($this->set)('day_of_week', DayOfWeek::parse($startDate->dayOfWeek));
+        }
+
+        if ($frequency->isMonthly() || $intervalType?->isMonth() ||
+            $frequency->isYearly() || $intervalType?->isYear()) {
+            ($this->set)('day_of_month', $startDate->day);
+        }
+
+        if ($frequency->isYearly() || $intervalType?->isYear()) {
+            ($this->set)('month', Month::parse($startDate->month));
+        }
+    }
+
+    protected function handleMonthChange(mixed $state): void
+    {
+        if (! $this->get) {
+            return;
+        }
+
+        $dayOfMonth = DayOfMonth::parse(($this->get)('day_of_month'));
+        $frequency = Frequency::parse(($this->get)('frequency'));
+        $intervalType = IntervalType::parse(($this->get)('interval_type'));
+        $month = Month::parse($state);
+
+        if (($frequency->isYearly() || $intervalType?->isYear()) && $month && $dayOfMonth) {
+            $date = $dayOfMonth->resolveDate($this->today->month($month->value));
+
+            $adjustedStartDate = $date->lt($this->today)
+                ? $dayOfMonth->resolveDate($date->addYear()->month($month->value))
+                : $dayOfMonth->resolveDate($date->month($month->value));
+
+            $adjustedDay = min($dayOfMonth->value, $adjustedStartDate->daysInMonth);
+
+            $this->setMany($this->set, [
+                'day_of_month' => $adjustedDay,
+                'start_date' => $adjustedStartDate,
+            ]);
+        }
+    }
+
+    protected function handleDayOfMonthChange(mixed $state): void
+    {
+        if (! $this->get) {
+            return;
+        }
+
+        $dayOfMonth = DayOfMonth::parse($state);
+        $frequency = Frequency::parse(($this->get)('frequency'));
+        $intervalType = IntervalType::parse(($this->get)('interval_type'));
+        $month = Month::parse(($this->get)('month'));
+
+        if (($frequency->isMonthly() || $intervalType?->isMonth()) && $dayOfMonth) {
+            $date = $dayOfMonth->resolveDate($this->today);
+
+            $adjustedStartDate = $date->lt($this->today)
+                ? $dayOfMonth->resolveDate($date->addMonth())
+                : $dayOfMonth->resolveDate($date);
+
+            ($this->set)('start_date', $adjustedStartDate);
+        }
+
+        if (($frequency->isYearly() || $intervalType?->isYear()) && $month && $dayOfMonth) {
+            $date = $dayOfMonth->resolveDate($this->today->month($month->value));
+
+            $adjustedStartDate = $date->lt($this->today)
+                ? $dayOfMonth->resolveDate($date->addYear()->month($month->value))
+                : $dayOfMonth->resolveDate($date->month($month->value));
+
+            ($this->set)('start_date', $adjustedStartDate);
+        }
+    }
+
+    protected function handleDayOfWeekChange(mixed $state): void
+    {
+        $dayOfWeek = DayOfWeek::parse($state);
+
+        $adjustedStartDate = $this->today->is($dayOfWeek->name)
+            ? $this->today
+            : $this->today->next($dayOfWeek->name);
+
+        ($this->set)('start_date', $adjustedStartDate);
+    }
+}

composer.lock

         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.8",
+            "version": "3.336.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6"
+                "reference": "bbc76138ed66f593dc2ae529c95fe1f794e6d77f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6",
-                "reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bbc76138ed66f593dc2ae529c95fe1f794e6d77f",
+                "reference": "bbc76138ed66f593dc2ae529c95fe1f794e6d77f",
                 "shasum": ""
             },
             "require": {
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.8"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.9"
             },
-            "time": "2025-01-03T19:06:11+00:00"
+            "time": "2025-01-06T19:06:42+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
         },
         {
             "name": "knplabs/knp-snappy",
-            "version": "v1.5.0",
+            "version": "v1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/KnpLabs/snappy.git",
-                "reference": "98468898b50c09f26d56d905b79b0f52a2215da6"
+                "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/98468898b50c09f26d56d905b79b0f52a2215da6",
-                "reference": "98468898b50c09f26d56d905b79b0f52a2215da6",
+                "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
+                "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
                 "shasum": ""
             },
             "require": {
             ],
             "support": {
                 "issues": "https://github.com/KnpLabs/snappy/issues",
-                "source": "https://github.com/KnpLabs/snappy/tree/v1.5.0"
+                "source": "https://github.com/KnpLabs/snappy/tree/v1.5.1"
             },
-            "time": "2023-12-18T09:12:11+00:00"
+            "time": "2025-01-06T16:53:26+00:00"
         },
         {
             "name": "laravel/framework",
         },
         {
             "name": "sebastian/comparator",
-            "version": "6.2.1",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739"
+                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/43d129d6a0f81c78bee378b46688293eb7ea3739",
-                "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
+                "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
                 "shasum": ""
             },
             "require": {
             "require-dev": {
                 "phpunit/phpunit": "^11.4"
             },
+            "suggest": {
+                "ext-bcmath": "For comparing BcMath\\Number objects"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/6.2.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0"
             },
             "funding": [
                 {
                     "type": "github"
                 }
             ],
-            "time": "2024-10-31T05:30:08+00:00"
+            "time": "2025-01-06T10:28:19+00:00"
         },
         {
             "name": "sebastian/complexity",

package-lock.json

             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.2.tgz",
-            "integrity": "sha512-s/8RiF4bdmGnc/J0N7lHAr5ZFJj+NdJqJ/Hj29K+c4lEdoVlukzvWXB9XpWZCdakVT0YAw8iyIqUP2iFRz5/jA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.0.tgz",
+            "integrity": "sha512-qFcFto9figFLz2g25DxJ1WWL9+c91fTxnGuwhToCl8BaqDsDYMl/kOnBXAyAqkkzAWimYMSWNPWEjt+ADAHuoQ==",
             "cpu": [
                 "arm"
             ],
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.2.tgz",
-            "integrity": "sha512-mKRlVj1KsKWyEOwR6nwpmzakq6SgZXW4NUHNWlYSiyncJpuXk7wdLzuKdWsRoR1WLbWsZBKvsUCdCTIAqRn9cA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.30.0.tgz",
+            "integrity": "sha512-vqrQdusvVl7dthqNjWCL043qelBK+gv9v3ZiqdxgaJvmZyIAAXMjeGVSqZynKq69T7062T5VrVTuikKSAAVP6A==",
             "cpu": [
                 "arm64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.2.tgz",
-            "integrity": "sha512-vJX+vennGwygmutk7N333lvQ/yKVAHnGoBS2xMRQgXWW8tvn46YWuTDOpKroSPR9BEW0Gqdga2DHqz8Pwk6X5w==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.30.0.tgz",
+            "integrity": "sha512-617pd92LhdA9+wpixnzsyhVft3szYiN16aNUMzVkf2N+yAk8UXY226Bfp36LvxYTUt7MO/ycqGFjQgJ0wlMaWQ==",
             "cpu": [
                 "arm64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.2.tgz",
-            "integrity": "sha512-e2rW9ng5O6+Mt3ht8fH0ljfjgSCC6ffmOipiLUgAnlK86CHIaiCdHCzHzmTkMj6vEkqAiRJ7ss6Ibn56B+RE5w==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.30.0.tgz",
+            "integrity": "sha512-Y3b4oDoaEhCypg8ajPqigKDcpi5ZZovemQl9Edpem0uNv6UUjXv7iySBpGIUTSs2ovWOzYpfw9EbFJXF/fJHWw==",
             "cpu": [
                 "x64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.2.tgz",
-            "integrity": "sha512-/xdNwZe+KesG6XJCK043EjEDZTacCtL4yurMZRLESIgHQdvtNyul3iz2Ab03ZJG0pQKbFTu681i+4ETMF9uE/Q==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.30.0.tgz",
+            "integrity": "sha512-3REQJ4f90sFIBfa0BUokiCdrV/E4uIjhkWe1bMgCkhFXbf4D8YN6C4zwJL881GM818qVYE9BO3dGwjKhpo2ABA==",
             "cpu": [
                 "arm64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.2.tgz",
-            "integrity": "sha512-eXKvpThGzREuAbc6qxnArHh8l8W4AyTcL8IfEnmx+bcnmaSGgjyAHbzZvHZI2csJ+e0MYddl7DX0X7g3sAuXDQ==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.30.0.tgz",
+            "integrity": "sha512-ZtY3Y8icbe3Cc+uQicsXG5L+CRGUfLZjW6j2gn5ikpltt3Whqjfo5mkyZ86UiuHF9Q3ZsaQeW7YswlHnN+lAcg==",
             "cpu": [
                 "x64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.2.tgz",
-            "integrity": "sha512-h4VgxxmzmtXLLYNDaUcQevCmPYX6zSj4SwKuzY7SR5YlnCBYsmvfYORXgiU8axhkFCDtQF3RW5LIXT8B14Qykg==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.30.0.tgz",
+            "integrity": "sha512-bsPGGzfiHXMhQGuFGpmo2PyTwcrh2otL6ycSZAFTESviUoBOuxF7iBbAL5IJXc/69peXl5rAtbewBFeASZ9O0g==",
             "cpu": [
                 "arm"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.2.tgz",
-            "integrity": "sha512-EObwZ45eMmWZQ1w4N7qy4+G1lKHm6mcOwDa+P2+61qxWu1PtQJ/lz2CNJ7W3CkfgN0FQ7cBUy2tk6D5yR4KeXw==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.30.0.tgz",
+            "integrity": "sha512-kvyIECEhs2DrrdfQf++maCWJIQ974EI4txlz1nNSBaCdtf7i5Xf1AQCEJWOC5rEBisdaMFFnOWNLYt7KpFqy5A==",
             "cpu": [
                 "arm"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.2.tgz",
-            "integrity": "sha512-Z7zXVHEXg1elbbYiP/29pPwlJtLeXzjrj4241/kCcECds8Zg9fDfURWbZHRIKrEriAPS8wnVtdl4ZJBvZr325w==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.30.0.tgz",
+            "integrity": "sha512-CFE7zDNrokaotXu+shwIrmWrFxllg79vciH4E/zeK7NitVuWEaXRzS0mFfFvyhZfn8WfVOG/1E9u8/DFEgK7WQ==",
             "cpu": [
                 "arm64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.2.tgz",
-            "integrity": "sha512-TF4kxkPq+SudS/r4zGPf0G08Bl7+NZcFrUSR3484WwsHgGgJyPQRLCNrQ/R5J6VzxfEeQR9XRpc8m2t7lD6SEQ==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.30.0.tgz",
+            "integrity": "sha512-MctNTBlvMcIBP0t8lV/NXiUwFg9oK5F79CxLU+a3xgrdJjfBLVIEHSAjQ9+ipofN2GKaMLnFFXLltg1HEEPaGQ==",
             "cpu": [
                 "arm64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.2.tgz",
-            "integrity": "sha512-kO9Fv5zZuyj2zB2af4KA29QF6t7YSxKrY7sxZXfw8koDQj9bx5Tk5RjH+kWKFKok0wLGTi4bG117h31N+TIBEg==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.30.0.tgz",
+            "integrity": "sha512-fBpoYwLEPivL3q368+gwn4qnYnr7GVwM6NnMo8rJ4wb0p/Y5lg88vQRRP077gf+tc25akuqd+1Sxbn9meODhwA==",
             "cpu": [
                 "loong64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.2.tgz",
-            "integrity": "sha512-gIh776X7UCBaetVJGdjXPFurGsdWwHHinwRnC5JlLADU8Yk0EdS/Y+dMO264OjJFo7MXQ5PX4xVFbxrwK8zLqA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.30.0.tgz",
+            "integrity": "sha512-1hiHPV6dUaqIMXrIjN+vgJqtfkLpqHS1Xsg0oUfUVD98xGp1wX89PIXgDF2DWra1nxAd8dfE0Dk59MyeKaBVAw==",
             "cpu": [
                 "ppc64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.2.tgz",
-            "integrity": "sha512-YgikssQ5UNq1GoFKZydMEkhKbjlUq7G3h8j6yWXLBF24KyoA5BcMtaOUAXq5sydPmOPEqB6kCyJpyifSpCfQ0w==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.30.0.tgz",
+            "integrity": "sha512-U0xcC80SMpEbvvLw92emHrNjlS3OXjAM0aVzlWfar6PR0ODWCTQtKeeB+tlAPGfZQXicv1SpWwRz9Hyzq3Jx3g==",
             "cpu": [
                 "riscv64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.2.tgz",
-            "integrity": "sha512-9ouIR2vFWCyL0Z50dfnon5nOrpDdkTG9lNDs7MRaienQKlTyHcDxplmk3IbhFlutpifBSBr2H4rVILwmMLcaMA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.30.0.tgz",
+            "integrity": "sha512-VU/P/IODrNPasgZDLIFJmMiLGez+BN11DQWfTVlViJVabyF3JaeaJkP6teI8760f18BMGCQOW9gOmuzFaI1pUw==",
             "cpu": [
                 "s390x"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.2.tgz",
-            "integrity": "sha512-ckBBNRN/F+NoSUDENDIJ2U9UWmIODgwDB/vEXCPOMcsco1niTkxTXa6D2Y/pvCnpzaidvY2qVxGzLilNs9BSzw==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.30.0.tgz",
+            "integrity": "sha512-laQVRvdbKmjXuFA3ZiZj7+U24FcmoPlXEi2OyLfbpY2MW1oxLt9Au8q9eHd0x6Pw/Kw4oe9gwVXWwIf2PVqblg==",
             "cpu": [
                 "x64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.2.tgz",
-            "integrity": "sha512-jycl1wL4AgM2aBFJFlpll/kGvAjhK8GSbEmFT5v3KC3rP/b5xZ1KQmv0vQQ8Bzb2ieFQ0kZFPRMbre/l3Bu9JA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.30.0.tgz",
+            "integrity": "sha512-3wzKzduS7jzxqcOvy/ocU/gMR3/QrHEFLge5CD7Si9fyHuoXcidyYZ6jyx8OPYmCcGm3uKTUl+9jUSAY74Ln5A==",
             "cpu": [
                 "x64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.2.tgz",
-            "integrity": "sha512-S2V0LlcOiYkNGlRAWZwwUdNgdZBfvsDHW0wYosYFV3c7aKgEVcbonetZXsHv7jRTTX+oY5nDYT4W6B1oUpMNOg==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.30.0.tgz",
+            "integrity": "sha512-jROwnI1+wPyuv696rAFHp5+6RFhXGGwgmgSfzE8e4xfit6oLRg7GyMArVUoM3ChS045OwWr9aTnU+2c1UdBMyw==",
             "cpu": [
                 "arm64"
             ],
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.2.tgz",
-            "integrity": "sha512-pW8kioj9H5f/UujdoX2atFlXNQ9aCfAxFRaa+mhczwcsusm6gGrSo4z0SLvqLF5LwFqFTjiLCCzGkNK/LE0utQ==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.30.0.tgz",
+            "integrity": "sha512-duzweyup5WELhcXx5H1jokpr13i3BV9b48FMiikYAwk/MT1LrMYYk2TzenBd0jj4ivQIt58JWSxc19y4SvLP4g==",
             "cpu": [
                 "ia32"
             ],
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.2.tgz",
-            "integrity": "sha512-p6fTArexECPf6KnOHvJXRpAEq0ON1CBtzG/EY4zw08kCHk/kivBc5vUEtnCFNCHOpJZ2ne77fxwRLIKD4wuW2Q==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.30.0.tgz",
+            "integrity": "sha512-DYvxS0M07PvgvavMIybCOBYheyrqlui6ZQBHJs6GqduVzHSZ06TPPvlfvnYstjODHQ8UUXFwt5YE+h0jFI8kwg==",
             "cpu": [
                 "x64"
             ],
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.76",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
-            "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
+            "version": "1.5.77",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.77.tgz",
+            "integrity": "sha512-AnJSrt5JpRVgY6dgd5yccguLc5A7oMSF0Kt3fcW+Hp5WTuFbl5upeSFZbMZYy2o7jhmIhU8Ekrd82GhyXUqUUg==",
             "dev": true,
             "license": "ISC"
         },
             }
         },
         "node_modules/rollup": {
-            "version": "4.29.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.2.tgz",
-            "integrity": "sha512-tJXpsEkzsEzyAKIaB3qv3IuvTVcTN7qBw1jL4SPPXM3vzDrJgiLGFY6+HodgFaUHAJ2RYJ94zV5MKRJCoQzQeA==",
+            "version": "4.30.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.30.0.tgz",
+            "integrity": "sha512-sDnr1pcjTgUT69qBksNF1N1anwfbyYG6TBQ22b03bII8EdiUQ7J0TlozVaTMjT/eEJAO49e1ndV7t+UZfL1+vA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.29.2",
-                "@rollup/rollup-android-arm64": "4.29.2",
-                "@rollup/rollup-darwin-arm64": "4.29.2",
-                "@rollup/rollup-darwin-x64": "4.29.2",
-                "@rollup/rollup-freebsd-arm64": "4.29.2",
-                "@rollup/rollup-freebsd-x64": "4.29.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.29.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.29.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.29.2",
-                "@rollup/rollup-linux-arm64-musl": "4.29.2",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.29.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.29.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.29.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.29.2",
-                "@rollup/rollup-linux-x64-gnu": "4.29.2",
-                "@rollup/rollup-linux-x64-musl": "4.29.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.29.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.29.2",
-                "@rollup/rollup-win32-x64-msvc": "4.29.2",
+                "@rollup/rollup-android-arm-eabi": "4.30.0",
+                "@rollup/rollup-android-arm64": "4.30.0",
+                "@rollup/rollup-darwin-arm64": "4.30.0",
+                "@rollup/rollup-darwin-x64": "4.30.0",
+                "@rollup/rollup-freebsd-arm64": "4.30.0",
+                "@rollup/rollup-freebsd-x64": "4.30.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.30.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.30.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.30.0",
+                "@rollup/rollup-linux-arm64-musl": "4.30.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.30.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.30.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.30.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.30.0",
+                "@rollup/rollup-linux-x64-gnu": "4.30.0",
+                "@rollup/rollup-linux-x64-musl": "4.30.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.30.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.30.0",
+                "@rollup/rollup-win32-x64-msvc": "4.30.0",
                 "fsevents": "~2.3.2"
             }
         },

tests/Feature/Accounting/RecurringInvoiceTest.php

+<?php
+
+use App\Enums\Accounting\IntervalType;
+use App\Models\Accounting\RecurringInvoice;
+
+test('example', function () {
+    $recurringInvoice = RecurringInvoice::factory()
+        ->custom(IntervalType::Week, 2)
+        ->create([
+            'start_date' => today(),
+            'day_of_week' => today()->dayOfWeek,
+        ]);
+
+    $recurringInvoice->refresh();
+
+    $nextInvoiceDate = $recurringInvoice->calculateNextDate();
+
+    expect($nextInvoiceDate)->toEqual(today());
+
+    $recurringInvoice->update([
+        'last_date' => $nextInvoiceDate,
+    ]);
+
+    $recurringInvoice->refresh();
+
+    $nextInvoiceDate = $recurringInvoice->calculateNextDate();
+
+    expect($nextInvoiceDate)->toEqual(today()->addWeeks(2));
+});