wip

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

@@ -58,7 +58,7 @@ class ViewRecurringInvoice extends ViewRecord
                     ->info()
                     ->title('Schedule Not Set')
                     ->description('The schedule for this recurring invoice has not been set. You must set a schedule before you can approve this draft and start creating invoices.')
-                    ->visible(fn (RecurringInvoice $record) => ! $record->hasSchedule())
+                    ->visible(fn (RecurringInvoice $record) => ! $record->hasValidStartDate())
                     ->columnSpanFull()
                     ->actions([
                         RecurringInvoice::getUpdateScheduleAction(Action::class)
@@ -68,7 +68,7 @@ class ViewRecurringInvoice extends ViewRecord
                     ->info()
                     ->title('Ready to Approve')
                     ->description('This recurring invoice is ready for approval. Review the details, and approve it when you’re ready to start generating invoices.')
-                    ->visible(fn (RecurringInvoice $record) => $record->isDraft() && $record->hasSchedule())
+                    ->visible(fn (RecurringInvoice $record) => $record->canBeApproved())
                     ->columnSpanFull()
                     ->actions([
                         RecurringInvoice::getApproveDraftAction(Action::class)

app/Models/Accounting/RecurringInvoice.php

@@ -177,7 +177,7 @@ class RecurringInvoice extends Document
 
     public function canBeApproved(): bool
     {
-        return $this->isDraft() && $this->hasSchedule() && ! $this->wasApproved();
+        return $this->isDraft() && $this->hasSchedule() && ! $this->wasApproved() && $this->hasValidStartDate();
     }
 
     public function canBeEnded(): bool
@@ -187,15 +187,17 @@ class RecurringInvoice extends Document
 
     public function hasSchedule(): bool
     {
-        if (! $this->start_date) {
-            return false;
-        }
+        return $this->start_date !== null;
+    }
 
-        if (! $this->wasApproved() && $this->start_date->lt(today())) {
-            return false;
+    public function hasValidStartDate(): bool
+    {
+        if ($this->wasApproved()) {
+            return true;
         }
 
-        return true;
+        // For unapproved/draft invoices, start date must be today or in the future
+        return $this->start_date?->gte(today()) ?? false;
     }
 
     public function getScheduleDescription(): string

app/Observers/RecurringInvoiceObserver.php

@@ -13,7 +13,7 @@ class RecurringInvoiceObserver
     {
         if (
             $recurringInvoice->wasApproved() &&
-            (($recurringInvoice->isDirty('start_date') && ! $recurringInvoice->last_date) || $this->otherScheduleDetailsChanged($recurringInvoice))
+            (($recurringInvoice->isDirty('start_date') && ! $recurringInvoice->last_date))
         ) {
             $recurringInvoice->next_date = $recurringInvoice->calculateNextDate();
         }

app/Support/ScheduleHandler.php

@@ -77,7 +77,7 @@ class ScheduleHandler
             'interval_value' => null,
             'interval_type' => null,
             'day_of_month' => null,
-            'start_date' => $this->today,
+            'start_date' => $this->today->toDateString(),
         ]);
     }
 
@@ -87,7 +87,7 @@ class ScheduleHandler
 
         $this->setMany($this->set, [
             'day_of_week' => $currentDayOfWeek,
-            'start_date' => $this->today,
+            'start_date' => $this->today->toDateString(),
             'interval_value' => null,
             'interval_type' => null,
             'day_of_month' => null,
@@ -106,7 +106,7 @@ class ScheduleHandler
         $this->setMany($this->set, [
             'month' => null,
             'day_of_month' => $dayOfMonth,
-            'start_date' => $adjustedStartDate,
+            'start_date' => $adjustedStartDate->toDateString(),
             'interval_value' => null,
             'interval_type' => null,
         ]);
@@ -120,7 +120,7 @@ class ScheduleHandler
         $this->setMany($this->set, [
             'month' => $currentMonth,
             'day_of_month' => $currentDayOfMonth,
-            'start_date' => $this->today,
+            'start_date' => $this->today->toDateString(),
             'interval_value' => null,
             'interval_type' => null,
         ]);
@@ -140,7 +140,7 @@ class ScheduleHandler
             'interval_type' => IntervalType::Month,
             'month' => null,
             'day_of_month' => $dayOfMonth,
-            'start_date' => $adjustedStartDate,
+            'start_date' => $adjustedStartDate->toDateString(),
         ]);
     }
 
@@ -150,7 +150,7 @@ class ScheduleHandler
 
         $this->setMany($this->set, [
             'day_of_week' => $currentDayOfWeek,
-            'start_date' => $this->today,
+            'start_date' => $this->today->toDateString(),
         ]);
     }
 
@@ -166,7 +166,7 @@ class ScheduleHandler
         $this->setMany($this->set, [
             'month' => null,
             'day_of_month' => $dayOfMonth,
-            'start_date' => $adjustedStartDate,
+            'start_date' => $adjustedStartDate->toDateString(),
         ]);
     }
 
@@ -178,7 +178,7 @@ class ScheduleHandler
         $this->setMany($this->set, [
             'month' => $currentMonth,
             'day_of_month' => $currentDayOfMonth,
-            'start_date' => $this->today,
+            'start_date' => $this->today->toDateString(),
         ]);
     }
 
@@ -223,7 +223,7 @@ class ScheduleHandler
 
             $this->setMany($this->set, [
                 'day_of_month' => $adjustedDay,
-                'start_date' => $adjustedStartDate,
+                'start_date' => $adjustedStartDate->toDateString(),
             ]);
         }
     }
@@ -246,7 +246,7 @@ class ScheduleHandler
                 ? $dayOfMonth->resolveDate($date->addMonth())
                 : $dayOfMonth->resolveDate($date);
 
-            ($this->set)('start_date', $adjustedStartDate);
+            ($this->set)('start_date', $adjustedStartDate->toDateString());
         }
 
         if (($frequency->isYearly() || $intervalType?->isYear()) && $month && $dayOfMonth) {
@@ -256,7 +256,7 @@ class ScheduleHandler
                 ? $dayOfMonth->resolveDate($date->addYear()->month($month->value))
                 : $dayOfMonth->resolveDate($date->month($month->value));
 
-            ($this->set)('start_date', $adjustedStartDate);
+            ($this->set)('start_date', $adjustedStartDate->toDateString());
         }
     }
 
@@ -268,6 +268,6 @@ class ScheduleHandler
             ? $this->today
             : $this->today->next($dayOfWeek->name);
 
-        ($this->set)('start_date', $adjustedStartDate);
+        ($this->set)('start_date', $adjustedStartDate->toDateString());
     }
 }

composer.json

@@ -18,7 +18,7 @@
         "awcodes/filament-table-repeater": "^3.0",
         "barryvdh/laravel-snappy": "^1.0",
         "codewithdennis/filament-simple-alert": "^3.0",
-        "filament/filament": "^3.2",
+        "filament/filament": "v3.2.132",
         "guava/filament-clusters": "^1.1",
         "guzzlehttp/guzzle": "^7.8",
         "jaocero/radio-deck": "^1.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "decc627f2a7bd0c6546114ebb1f500f9",
+    "content-hash": "861a1aea38f7af0893ee251608dc7cfa",
     "packages": [
         {
             "name": "akaunting/laravel-money",
@@ -1735,16 +1735,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "33464f1583217b5eb12364b617b27abe5315eb88"
+                "reference": "887b9e5552658a37098e7a279196a4d188d94f50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/33464f1583217b5eb12364b617b27abe5315eb88",
-                "reference": "33464f1583217b5eb12364b617b27abe5315eb88",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/887b9e5552658a37098e7a279196a4d188d94f50",
+                "reference": "887b9e5552658a37098e7a279196a4d188d94f50",
                 "shasum": ""
             },
             "require": {
@@ -1756,7 +1756,7 @@
                 "illuminate/contracts": "^10.45|^11.0",
                 "illuminate/database": "^10.45|^11.0",
                 "illuminate/support": "^10.45|^11.0",
-                "league/csv": "^9.16",
+                "league/csv": "^9.14",
                 "openspout/openspout": "^4.23",
                 "php": "^8.1",
                 "spatie/laravel-package-tools": "^1.9"
@@ -1784,20 +1784,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:47:49+00:00"
+            "time": "2024-12-31T13:16:04+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "74550888c1c79761218aece3c339ca0e0cc260e8"
+                "reference": "54fcc0b883cc6622d1d9322d28c823ba6172f9ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/74550888c1c79761218aece3c339ca0e0cc260e8",
-                "reference": "74550888c1c79761218aece3c339ca0e0cc260e8",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/54fcc0b883cc6622d1d9322d28c823ba6172f9ef",
+                "reference": "54fcc0b883cc6622d1d9322d28c823ba6172f9ef",
                 "shasum": ""
             },
             "require": {
@@ -1849,20 +1849,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:48:32+00:00"
+            "time": "2024-12-31T13:16:24+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "20473c9eec7afa3ee618d2f86c7c449b3723d9fb"
+                "reference": "4abbf867f060483699f3cb8e1c1c8f4469b7980f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/20473c9eec7afa3ee618d2f86c7c449b3723d9fb",
-                "reference": "20473c9eec7afa3ee618d2f86c7c449b3723d9fb",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/4abbf867f060483699f3cb8e1c1c8f4469b7980f",
+                "reference": "4abbf867f060483699f3cb8e1c1c8f4469b7980f",
                 "shasum": ""
             },
             "require": {
@@ -1905,20 +1905,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:47:50+00:00"
+            "time": "2024-12-31T13:16:06+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "d3ee1eb508561f2b101c69cdb45c309539948d86"
+                "reference": "8c0344fc603085da8f385ed6a022aacbe3aa49fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/d3ee1eb508561f2b101c69cdb45c309539948d86",
-                "reference": "d3ee1eb508561f2b101c69cdb45c309539948d86",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/8c0344fc603085da8f385ed6a022aacbe3aa49fb",
+                "reference": "8c0344fc603085da8f385ed6a022aacbe3aa49fb",
                 "shasum": ""
             },
             "require": {
@@ -1956,20 +1956,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:48:11+00:00"
+            "time": "2024-12-31T13:16:16+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
-                "reference": "16cf5dbcbaf88cd9fff8d06aad866cb314b8bb64"
+                "reference": "c19df07c801c5550de0d30957c5a316f53019533"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/16cf5dbcbaf88cd9fff8d06aad866cb314b8bb64",
-                "reference": "16cf5dbcbaf88cd9fff8d06aad866cb314b8bb64",
+                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/c19df07c801c5550de0d30957c5a316f53019533",
+                "reference": "c19df07c801c5550de0d30957c5a316f53019533",
                 "shasum": ""
             },
             "require": {
@@ -2008,20 +2008,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:48:23+00:00"
+            "time": "2024-10-23T07:36:14+00:00"
         },
         {
             "name": "filament/support",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "38fd76ae4f96b53e6f98cbb7bad3f05ad5032cee"
+                "reference": "0bd91d5b937b0ae50394a976ba5fed9506581943"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/38fd76ae4f96b53e6f98cbb7bad3f05ad5032cee",
-                "reference": "38fd76ae4f96b53e6f98cbb7bad3f05ad5032cee",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/0bd91d5b937b0ae50394a976ba5fed9506581943",
+                "reference": "0bd91d5b937b0ae50394a976ba5fed9506581943",
                 "shasum": ""
             },
             "require": {
@@ -2067,20 +2067,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:48:52+00:00"
+            "time": "2024-12-31T13:16:28+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "6cbbea0bfd966ca2f26988c0fac4e02caebddf4a"
+                "reference": "e34f63f89ef672f8e810c2e181665d718e84ff37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/6cbbea0bfd966ca2f26988c0fac4e02caebddf4a",
-                "reference": "6cbbea0bfd966ca2f26988c0fac4e02caebddf4a",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/e34f63f89ef672f8e810c2e181665d718e84ff37",
+                "reference": "e34f63f89ef672f8e810c2e181665d718e84ff37",
                 "shasum": ""
             },
             "require": {
@@ -2119,20 +2119,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:48:48+00:00"
+            "time": "2024-12-31T13:16:31+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.133",
+            "version": "v3.2.132",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
-                "reference": "9f6674daceced7d5045494d0bf7e1d2908ea439d"
+                "reference": "869a419fe42e2cf1b9461f2d1e702e2fcad030ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/widgets/zipball/9f6674daceced7d5045494d0bf7e1d2908ea439d",
-                "reference": "9f6674daceced7d5045494d0bf7e1d2908ea439d",
+                "url": "https://api.github.com/repos/filamentphp/widgets/zipball/869a419fe42e2cf1b9461f2d1e702e2fcad030ae",
+                "reference": "869a419fe42e2cf1b9461f2d1e702e2fcad030ae",
                 "shasum": ""
             },
             "require": {
@@ -2163,7 +2163,7 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-01-10T12:48:52+00:00"
+            "time": "2024-12-17T13:03:07+00:00"
         },
         {
             "name": "firebase/php-jwt",

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -66,62 +66,84 @@ class RecurringInvoiceFactory extends Factory
         ?Carbon $startDate = null,
         ?EndType $endType = null
     ): static {
-        $frequency ??= $this->faker->randomElement(Frequency::class);
-        $endType ??= EndType::Never;
-
-        // Adjust the start date range based on frequency
-        $startDate = match ($frequency) {
-            Frequency::Daily => Carbon::parse($this->faker->dateTimeBetween('-30 days')), // At most 30 days back
-            default => $startDate ?? Carbon::parse($this->faker->dateTimeBetween('-1 year')),
-        };
-
-        return match ($frequency) {
-            Frequency::Daily => $this->withDailySchedule($startDate, $endType),
-            Frequency::Weekly => $this->withWeeklySchedule($startDate, $endType),
-            Frequency::Monthly => $this->withMonthlySchedule($startDate, $endType),
-            Frequency::Yearly => $this->withYearlySchedule($startDate, $endType),
-            Frequency::Custom => $this->withCustomSchedule($startDate, $endType),
-        };
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($frequency, $endType, $startDate) {
+            $this->ensureLineItems($recurringInvoice);
+
+            $frequency ??= $this->faker->randomElement(Frequency::class);
+            $endType ??= EndType::Never;
+
+            // Adjust the start date range based on frequency
+            $startDate = match ($frequency) {
+                Frequency::Daily => Carbon::parse($this->faker->dateTimeBetween('-30 days')), // At most 30 days back
+                default => $startDate ?? Carbon::parse($this->faker->dateTimeBetween('-1 year')),
+            };
+
+            $state = match ($frequency) {
+                Frequency::Daily => $this->withDailySchedule($startDate, $endType),
+                Frequency::Weekly => $this->withWeeklySchedule($startDate, $endType),
+                Frequency::Monthly => $this->withMonthlySchedule($startDate, $endType),
+                Frequency::Yearly => $this->withYearlySchedule($startDate, $endType),
+                Frequency::Custom => $this->withCustomSchedule($startDate, $endType),
+            };
+
+            $state->callAfterCreating(collect([$recurringInvoice]));
+        });
     }
 
     protected function withDailySchedule(Carbon $startDate, EndType $endType): static
     {
-        return $this->state([
-            'frequency' => Frequency::Daily,
-            'start_date' => $startDate,
-            'end_type' => $endType,
-        ]);
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
+            $this->ensureLineItems($recurringInvoice);
+
+            $recurringInvoice->updateQuietly([
+                'frequency' => Frequency::Daily,
+                'start_date' => $startDate,
+                'end_type' => $endType,
+            ]);
+        });
     }
 
     protected function withWeeklySchedule(Carbon $startDate, EndType $endType): static
     {
-        return $this->state([
-            'frequency' => Frequency::Weekly,
-            'day_of_week' => DayOfWeek::from($startDate->dayOfWeek),
-            'start_date' => $startDate,
-            'end_type' => $endType,
-        ]);
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
+            $this->ensureLineItems($recurringInvoice);
+
+            $recurringInvoice->updateQuietly([
+                'frequency' => Frequency::Weekly,
+                'day_of_week' => DayOfWeek::from($startDate->dayOfWeek),
+                'start_date' => $startDate,
+                'end_type' => $endType,
+            ]);
+        });
     }
 
     protected function withMonthlySchedule(Carbon $startDate, EndType $endType): static
     {
-        return $this->state([
-            'frequency' => Frequency::Monthly,
-            'day_of_month' => DayOfMonth::from($startDate->day),
-            'start_date' => $startDate,
-            'end_type' => $endType,
-        ]);
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
+            $this->ensureLineItems($recurringInvoice);
+
+            $recurringInvoice->updateQuietly([
+                'frequency' => Frequency::Monthly,
+                'day_of_month' => DayOfMonth::from($startDate->day),
+                'start_date' => $startDate,
+                'end_type' => $endType,
+            ]);
+        });
     }
 
     protected function withYearlySchedule(Carbon $startDate, EndType $endType): static
     {
-        return $this->state([
-            'frequency' => Frequency::Yearly,
-            'month' => Month::from($startDate->month),
-            'day_of_month' => DayOfMonth::from($startDate->day),
-            'start_date' => $startDate,
-            'end_type' => $endType,
-        ]);
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
+            $this->ensureLineItems($recurringInvoice);
+
+            $recurringInvoice->updateQuietly([
+                'frequency' => Frequency::Yearly,
+                'month' => Month::from($startDate->month),
+                'day_of_month' => DayOfMonth::from($startDate->day),
+                'start_date' => $startDate,
+                'end_type' => $endType,
+            ]);
+        });
     }
 
     protected function withCustomSchedule(
@@ -130,46 +152,50 @@ class RecurringInvoiceFactory extends Factory
         ?IntervalType $intervalType = null,
         ?int $intervalValue = null
     ): static {
-        $intervalType ??= $this->faker->randomElement(IntervalType::class);
-        $intervalValue ??= match ($intervalType) {
-            IntervalType::Day => $this->faker->numberBetween(1, 7),
-            IntervalType::Week => $this->faker->numberBetween(1, 4),
-            IntervalType::Month => $this->faker->numberBetween(1, 3),
-            IntervalType::Year => 1,
-        };
-
-        $state = [
-            'frequency' => Frequency::Custom,
-            'interval_type' => $intervalType,
-            'interval_value' => $intervalValue,
-            'start_date' => $startDate,
-            'end_type' => $endType,
-        ];
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($intervalType, $intervalValue, $startDate, $endType) {
+            $this->ensureLineItems($recurringInvoice);
 
-        // Add interval-specific attributes
-        switch ($intervalType) {
-            case IntervalType::Day:
-                // No additional attributes needed
-                break;
+            $intervalType ??= $this->faker->randomElement(IntervalType::class);
+            $intervalValue ??= match ($intervalType) {
+                IntervalType::Day => $this->faker->numberBetween(1, 7),
+                IntervalType::Week => $this->faker->numberBetween(1, 4),
+                IntervalType::Month => $this->faker->numberBetween(1, 3),
+                IntervalType::Year => 1,
+            };
 
-            case IntervalType::Week:
-                $state['day_of_week'] = DayOfWeek::from($startDate->dayOfWeek);
+            $state = [
+                'frequency' => Frequency::Custom,
+                'interval_type' => $intervalType,
+                'interval_value' => $intervalValue,
+                'start_date' => $startDate,
+                'end_type' => $endType,
+            ];
 
-                break;
+            // Add interval-specific attributes
+            switch ($intervalType) {
+                case IntervalType::Day:
+                    // No additional attributes needed
+                    break;
 
-            case IntervalType::Month:
-                $state['day_of_month'] = DayOfMonth::from($startDate->day);
+                case IntervalType::Week:
+                    $state['day_of_week'] = DayOfWeek::from($startDate->dayOfWeek);
 
-                break;
+                    break;
 
-            case IntervalType::Year:
-                $state['month'] = Month::from($startDate->month);
-                $state['day_of_month'] = DayOfMonth::from($startDate->day);
+                case IntervalType::Month:
+                    $state['day_of_month'] = DayOfMonth::from($startDate->day);
 
-                break;
-        }
+                    break;
+
+                case IntervalType::Year:
+                    $state['month'] = Month::from($startDate->month);
+                    $state['day_of_month'] = DayOfMonth::from($startDate->day);
 
-        return $this->state($state);
+                    break;
+            }
+
+            return $recurringInvoice->updateQuietly($state);
+        });
     }
 
     public function endAfter(int $occurrences = 12): static
@@ -208,10 +234,6 @@ class RecurringInvoiceFactory extends Factory
                 $recurringInvoice->refresh();
             }
 
-            if (! $recurringInvoice->canBeApproved()) {
-                return;
-            }
-
             $approvedAt = $recurringInvoice->start_date
                 ? $recurringInvoice->start_date->copy()->subDays($this->faker->numberBetween(1, 7))
                 : now()->subDays($this->faker->numberBetween(1, 30));
@@ -230,13 +252,17 @@ class RecurringInvoiceFactory extends Factory
     public function ended(): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
+            $this->ensureLineItems($recurringInvoice);
+
             if (! $recurringInvoice->canBeEnded()) {
                 $this->active()->callAfterCreating(collect([$recurringInvoice]));
             }
 
-            $endedAt = now()->subDays($this->faker->numberBetween(1, 30));
+            $endedAt = $recurringInvoice->last_date
+                ? $recurringInvoice->last_date->copy()->addDays($this->faker->numberBetween(1, 7))
+                : now()->subDays($this->faker->numberBetween(1, 30));
 
-            $recurringInvoice->update([
+            $recurringInvoice->updateQuietly([
                 'ended_at' => $endedAt,
                 'status' => RecurringInvoiceStatus::Ended,
             ]);
@@ -247,14 +273,6 @@ class RecurringInvoiceFactory extends Factory
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
             $this->ensureLineItems($recurringInvoice);
-
-            $nextDate = $recurringInvoice->calculateNextDate();
-
-            if ($nextDate) {
-                $recurringInvoice->updateQuietly([
-                    'next_date' => $nextDate,
-                ]);
-            }
         });
     }
 

database/factories/CompanyFactory.php

@@ -2,7 +2,6 @@
 
 namespace Database\Factories;
 
-use App\Enums\Accounting\Frequency;
 use App\Models\Accounting\Bill;
 use App\Models\Accounting\Estimate;
 use App\Models\Accounting\Invoice;
@@ -178,7 +177,6 @@ class CompanyFactory extends Factory
             // Draft recurring invoices (no schedule)
             RecurringInvoice::factory()
                 ->count($draftCount)
-                ->withLineItems()
                 ->create([
                     'company_id' => $company->id,
                     'created_by' => $company->user_id,
@@ -188,7 +186,6 @@ class CompanyFactory extends Factory
             // Draft recurring invoices with schedule
             RecurringInvoice::factory()
                 ->count($scheduledCount)
-                ->withLineItems()
                 ->withSchedule()
                 ->create([
                     'company_id' => $company->id,
@@ -197,32 +194,18 @@ class CompanyFactory extends Factory
                 ]);
 
             // Active recurring invoices with various schedules and historical invoices
-            $frequencies = [
-                Frequency::Daily,
-                Frequency::Weekly,
-                Frequency::Monthly,
-                Frequency::Yearly,
-                Frequency::Custom,
-            ];
-
-            foreach (array_chunk(range(1, $activeCount), (int) ceil($activeCount / count($frequencies))) as $chunk) {
-                RecurringInvoice::factory()
-                    ->count(count($chunk))
-                    ->withLineItems()
-                    ->withSchedule(fake()->randomElement($frequencies)) // Randomize frequency
-                    ->active()
-                    ->create([
-                        'company_id' => $company->id,
-                        'created_by' => $company->user_id,
-                        'updated_by' => $company->user_id,
-                    ]);
-            }
+            RecurringInvoice::factory()
+                ->count($activeCount)
+                ->active()
+                ->create([
+                    'company_id' => $company->id,
+                    'created_by' => $company->user_id,
+                    'updated_by' => $company->user_id,
+                ]);
 
             // Manually ended recurring invoices
             RecurringInvoice::factory()
                 ->count($endedCount)
-                ->withLineItems()
-                ->withSchedule()
                 ->ended()
                 ->create([
                     'company_id' => $company->id,
@@ -233,10 +216,8 @@ class CompanyFactory extends Factory
             // Completed recurring invoices (reached end conditions)
             RecurringInvoice::factory()
                 ->count($completedCount)
-                ->withLineItems()
-                ->withSchedule()
-                ->endAfter($this->faker->numberBetween(5, 12))
                 ->active()
+                ->endAfter($this->faker->numberBetween(5, 12))
                 ->create([
                     'company_id' => $company->id,
                     'created_by' => $company->user_id,