wip

composer.lock

         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.22",
+            "version": "3.344.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "174cc187df3bde52c21e9c00a4e99610a08732a3"
+                "reference": "787a8ec6301657d9cbdb389db4fa92243c68666a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/174cc187df3bde52c21e9c00a4e99610a08732a3",
-                "reference": "174cc187df3bde52c21e9c00a4e99610a08732a3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/787a8ec6301657d9cbdb389db4fa92243c68666a",
+                "reference": "787a8ec6301657d9cbdb389db4fa92243c68666a",
                 "shasum": ""
             },
             "require": {
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.22"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.344.0"
             },
-            "time": "2025-05-30T18:11:02+00:00"
+            "time": "2025-06-04T18:36:41+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
         },
         {
             "name": "filament/actions",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "66b509aa72fa882ce91218eb743684a9350bc3fb"
+                "reference": "151f776552ee10d70591c2649708bc4b0a7cba91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/66b509aa72fa882ce91218eb743684a9350bc3fb",
-                "reference": "66b509aa72fa882ce91218eb743684a9350bc3fb",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/151f776552ee10d70591c2649708bc4b0a7cba91",
+                "reference": "151f776552ee10d70591c2649708bc4b0a7cba91",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-05-19T07:25:24+00:00"
+            "time": "2025-06-03T06:15:27+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
         },
         {
             "name": "filament/forms",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "5cef64051fcb23cbbc6152baaac5da1c44ec9a63"
+                "reference": "d73cdda057a4f5bd409eab9573101e73edb404cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/5cef64051fcb23cbbc6152baaac5da1c44ec9a63",
-                "reference": "5cef64051fcb23cbbc6152baaac5da1c44ec9a63",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/d73cdda057a4f5bd409eab9573101e73edb404cc",
+                "reference": "d73cdda057a4f5bd409eab9573101e73edb404cc",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-05-27T18:46:33+00:00"
+            "time": "2025-06-03T13:40:37+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "cc71f1c15f132660986384d302a33a2b20618a96"
+                "reference": "b54ff0fa89f654eca1c14edfd41a7e16ccb8165d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/cc71f1c15f132660986384d302a33a2b20618a96",
-                "reference": "cc71f1c15f132660986384d302a33a2b20618a96",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/b54ff0fa89f654eca1c14edfd41a7e16ccb8165d",
+                "reference": "b54ff0fa89f654eca1c14edfd41a7e16ccb8165d",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-04-23T06:39:44+00:00"
+            "time": "2025-06-02T09:43:23+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
         },
         {
             "name": "filament/support",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "537663fa2c5057aa236a189255b623b5124d32d8"
+                "reference": "4f9793ad3339301ca53ea6f2c984734f7ac38ce7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/537663fa2c5057aa236a189255b623b5124d32d8",
-                "reference": "537663fa2c5057aa236a189255b623b5124d32d8",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/4f9793ad3339301ca53ea6f2c984734f7ac38ce7",
+                "reference": "4f9793ad3339301ca53ea6f2c984734f7ac38ce7",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-05-21T08:45:20+00:00"
+            "time": "2025-06-03T06:16:13+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "64806e3c13caeabb23a8668a7aaf1efc8395df96"
+                "reference": "1a107a8411549297b97d1142b1f7a5fa7a65e32b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/64806e3c13caeabb23a8668a7aaf1efc8395df96",
-                "reference": "64806e3c13caeabb23a8668a7aaf1efc8395df96",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/1a107a8411549297b97d1142b1f7a5fa7a65e32b",
+                "reference": "1a107a8411549297b97d1142b1f7a5fa7a65e32b",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2025-05-19T07:26:42+00:00"
+            "time": "2025-06-02T09:43:47+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.3.17",
+            "version": "v3.3.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
         },
         {
             "name": "laravel/framework",
-            "version": "v11.45.0",
+            "version": "v11.45.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "d0730deb427632004d24801be7ca1ed2c10fbc4e"
+                "reference": "b09ba32795b8e71df10856a2694706663984a239"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d0730deb427632004d24801be7ca1ed2c10fbc4e",
-                "reference": "d0730deb427632004d24801be7ca1ed2c10fbc4e",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/b09ba32795b8e71df10856a2694706663984a239",
+                "reference": "b09ba32795b8e71df10856a2694706663984a239",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-05-20T15:15:58+00:00"
+            "time": "2025-06-03T14:01:40+00:00"
         },
         {
             "name": "laravel/prompts",
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.6",
+            "version": "v4.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "ce708655043c7050eb050df361c5e313cf708309"
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
-                "reference": "ce708655043c7050eb050df361c5e313cf708309",
+                "url": "https://api.github.com/repos/nette/utils/zipball/e67c4061eb40b9c113b218214e42cb5a0dda28f2",
+                "reference": "e67c4061eb40b9c113b218214e42cb5a0dda28f2",
                 "shasum": ""
             },
             "require": {
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.6"
+                "source": "https://github.com/nette/utils/tree/v4.0.7"
             },
-            "time": "2025-03-30T21:06:30+00:00"
+            "time": "2025-06-03T04:55:08+00:00"
         },
         {
             "name": "nikic/php-parser",
         },
         {
             "name": "filp/whoops",
-            "version": "2.18.0",
+            "version": "2.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
+                "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
-                "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26",
+                "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26",
                 "shasum": ""
             },
             "require": {
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.18.0"
+                "source": "https://github.com/filp/whoops/tree/2.18.1"
             },
             "funding": [
                 {
                     "type": "github"
                 }
             ],
-            "time": "2025-03-15T12:00:00+00:00"
+            "time": "2025-06-03T18:56:14+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
         },
         {
             "name": "php-di/php-di",
-            "version": "7.0.10",
+            "version": "7.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-DI/PHP-DI.git",
-                "reference": "0d1ed64126577e9a095b3204dcaee58cf76432c2"
+                "reference": "32f111a6d214564520a57831d397263e8946c1d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/0d1ed64126577e9a095b3204dcaee58cf76432c2",
-                "reference": "0d1ed64126577e9a095b3204dcaee58cf76432c2",
+                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/32f111a6d214564520a57831d397263e8946c1d2",
+                "reference": "32f111a6d214564520a57831d397263e8946c1d2",
                 "shasum": ""
             },
             "require": {
             ],
             "support": {
                 "issues": "https://github.com/PHP-DI/PHP-DI/issues",
-                "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.10"
+                "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.11"
             },
             "funding": [
                 {
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-22T08:53:15+00:00"
+            "time": "2025-06-03T07:45:57+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",

database/factories/Accounting/BillFactory.php

      */
     public function definition(): array
     {
-        $isFutureBill = $this->faker->boolean();
-
-        if ($isFutureBill) {
-            $billDate = $this->faker->dateTimeBetween('-10 days', '+10 days');
-        } else {
-            $billDate = $this->faker->dateTimeBetween('-1 year', '-30 days');
-        }
-
-        $dueDays = $this->faker->numberBetween(14, 60);
+        $billDate = $this->faker->dateTimeBetween('-1 year', '-1 day');
 
         return [
             'company_id' => 1,
-            'vendor_id' => fn (array $attributes) => Vendor::where('company_id', $attributes['company_id'])->inRandomOrder()->value('id'),
+            'vendor_id' => function (array $attributes) {
+                return Vendor::where('company_id', $attributes['company_id'])->inRandomOrder()->value('id')
+                    ?? Vendor::factory()->state([
+                        'company_id' => $attributes['company_id'],
+                    ]);
+            },
             'bill_number' => $this->faker->unique()->numerify('BILL-####'),
             'order_number' => $this->faker->unique()->numerify('PO-####'),
             'date' => $billDate,
-            'due_date' => Carbon::parse($billDate)->addDays($dueDays),
+            'due_date' => $this->faker->dateTimeInInterval($billDate, '+6 months'),
             'status' => BillStatus::Open,
             'discount_method' => $this->faker->randomElement(DocumentDiscountMethod::class),
             'discount_computation' => AdjustmentComputation::Percentage,
     public function withLineItems(int $count = 3): static
     {
         return $this->afterCreating(function (Bill $bill) use ($count) {
+            // Clear existing line items first
+            $bill->lineItems()->delete();
+
             DocumentLineItem::factory()
                 ->count($count)
                 ->forBill($bill)
     public function initialized(): static
     {
         return $this->afterCreating(function (Bill $bill) {
-            $this->ensureLineItems($bill);
-
-            if ($bill->wasInitialized()) {
-                return;
-            }
-
-            $postedAt = Carbon::parse($bill->date)
-                ->addHours($this->faker->numberBetween(1, 24));
-
-            $bill->createInitialTransaction($postedAt);
+            $this->performInitialization($bill);
         });
     }
 
     public function partial(int $maxPayments = 4): static
     {
         return $this->afterCreating(function (Bill $bill) use ($maxPayments) {
-            $this->ensureInitialized($bill);
-
-            $this->withPayments(max: $maxPayments, billStatus: BillStatus::Partial)
-                ->callAfterCreating(collect([$bill]));
+            $this->performInitialization($bill);
+            $this->performPayments($bill, $maxPayments, BillStatus::Partial);
         });
     }
 
     public function paid(int $maxPayments = 4): static
     {
         return $this->afterCreating(function (Bill $bill) use ($maxPayments) {
-            $this->ensureInitialized($bill);
-
-            $this->withPayments(max: $maxPayments)
-                ->callAfterCreating(collect([$bill]));
+            $this->performInitialization($bill);
+            $this->performPayments($bill, $maxPayments, BillStatus::Paid);
         });
     }
 
                 'due_date' => now()->subDays($this->faker->numberBetween(1, 30)),
             ])
             ->afterCreating(function (Bill $bill) {
-                $this->ensureInitialized($bill);
+                $this->performInitialization($bill);
             });
     }
 
-    public function withPayments(?int $min = null, ?int $max = null, BillStatus $billStatus = BillStatus::Paid): static
+    protected function performInitialization(Bill $bill): void
     {
-        $min ??= 1;
+        if ($bill->wasInitialized()) {
+            return;
+        }
 
-        return $this->afterCreating(function (Bill $bill) use ($billStatus, $max, $min) {
-            $this->ensureInitialized($bill);
+        $postedAt = Carbon::parse($bill->date)
+            ->addHours($this->faker->numberBetween(1, 24));
 
-            $bill->refresh();
+        if ($postedAt->isAfter(now())) {
+            $postedAt = Carbon::parse($this->faker->dateTimeBetween($bill->date, now()));
+        }
 
-            $amountDue = $bill->getRawOriginal('amount_due');
+        $bill->createInitialTransaction($postedAt);
+    }
 
-            $totalAmountDue = match ($billStatus) {
-                BillStatus::Partial => (int) floor($amountDue * 0.5),
-                default => $amountDue,
-            };
+    protected function performPayments(Bill $bill, int $maxPayments, BillStatus $billStatus): void
+    {
+        $bill->refresh();
 
-            if ($totalAmountDue <= 0 || empty($totalAmountDue)) {
-                return;
-            }
+        $amountDue = $bill->getRawOriginal('amount_due');
 
-            $paymentCount = $max && $min ? $this->faker->numberBetween($min, $max) : $min;
-            $paymentAmount = (int) floor($totalAmountDue / $paymentCount);
-            $remainingAmount = $totalAmountDue;
+        $totalAmountDue = match ($billStatus) {
+            BillStatus::Partial => (int) floor($amountDue * 0.5),
+            default => $amountDue,
+        };
 
-            $paymentDate = Carbon::parse($bill->initialTransaction->posted_at);
-            $paymentDates = [];
+        if ($totalAmountDue <= 0 || empty($totalAmountDue)) {
+            return;
+        }
 
-            for ($i = 0; $i < $paymentCount; $i++) {
-                $amount = $i === $paymentCount - 1 ? $remainingAmount : $paymentAmount;
+        $paymentCount = $this->faker->numberBetween(1, $maxPayments);
+        $paymentAmount = (int) floor($totalAmountDue / $paymentCount);
+        $remainingAmount = $totalAmountDue;
 
-                if ($amount <= 0) {
-                    break;
-                }
+        $initialPaymentDate = Carbon::parse($bill->initialTransaction->posted_at);
+        $maxPaymentDate = now();
+
+        $paymentDates = [];
 
-                $postedAt = $paymentDate->copy()->addDays($this->faker->numberBetween(1, 30));
-                $paymentDates[] = $postedAt;
+        for ($i = 0; $i < $paymentCount; $i++) {
+            $amount = $i === $paymentCount - 1 ? $remainingAmount : $paymentAmount;
 
-                $data = [
-                    'posted_at' => $postedAt,
-                    'amount' => $amount,
-                    'payment_method' => $this->faker->randomElement(PaymentMethod::class),
-                    'bank_account_id' => BankAccount::where('company_id', $bill->company_id)->inRandomOrder()->value('id'),
-                    'notes' => $this->faker->sentence,
-                ];
+            if ($amount <= 0) {
+                break;
+            }
 
-                $bill->recordPayment($data);
-                $remainingAmount -= $amount;
+            if ($i === 0) {
+                $postedAt = $initialPaymentDate->copy()->addDays($this->faker->numberBetween(1, 15));
+            } else {
+                $postedAt = $paymentDates[$i - 1]->copy()->addDays($this->faker->numberBetween(1, 10));
             }
 
-            if ($billStatus !== BillStatus::Paid) {
-                return;
+            if ($postedAt->isAfter($maxPaymentDate)) {
+                $postedAt = Carbon::parse($this->faker->dateTimeBetween($initialPaymentDate, $maxPaymentDate));
             }
 
+            $paymentDates[] = $postedAt;
+
+            $data = [
+                'posted_at' => $postedAt,
+                'amount' => $amount,
+                'payment_method' => $this->faker->randomElement(PaymentMethod::class),
+                'bank_account_id' => BankAccount::where('company_id', $bill->company_id)->inRandomOrder()->value('id'),
+                'notes' => $this->faker->sentence,
+            ];
+
+            $bill->recordPayment($data);
+            $remainingAmount -= $amount;
+        }
+
+        if ($billStatus === BillStatus::Paid && ! empty($paymentDates)) {
             $latestPaymentDate = max($paymentDates);
             $bill->updateQuietly([
                 'status' => $billStatus,
                 'paid_at' => $latestPaymentDate,
             ]);
-        });
+        }
     }
 
     public function configure(): static
     {
         return $this->afterCreating(function (Bill $bill) {
-            $this->ensureInitialized($bill);
+            DocumentLineItem::factory()
+                ->count(3)
+                ->forBill($bill)
+                ->create();
+
+            $this->recalculateTotals($bill);
 
             $number = DocumentDefault::getBaseNumber() + $bill->id;
 
         });
     }
 
-    protected function ensureLineItems(Bill $bill): void
-    {
-        if (! $bill->hasLineItems()) {
-            $this->withLineItems()->callAfterCreating(collect([$bill]));
-        }
-    }
-
-    protected function ensureInitialized(Bill $bill): void
-    {
-        if (! $bill->wasInitialized()) {
-            $this->initialized()->callAfterCreating(collect([$bill]));
-        }
-    }
-
     protected function recalculateTotals(Bill $bill): void
     {
         $bill->refresh();

database/factories/Accounting/EstimateFactory.php

      */
     public function definition(): array
     {
-        $estimateDate = $this->faker->dateTimeBetween('-1 year');
+        $estimateDate = $this->faker->dateTimeBetween('-2 months', '-1 day');
 
         return [
             'company_id' => 1,
-            'client_id' => fn (array $attributes) => Client::where('company_id', $attributes['company_id'])->inRandomOrder()->value('id'),
+            'client_id' => function (array $attributes) {
+                return Client::where('company_id', $attributes['company_id'])->inRandomOrder()->value('id')
+                    ?? Client::factory()->state([
+                        'company_id' => $attributes['company_id'],
+                    ]);
+            },
             'header' => 'Estimate',
             'subheader' => 'Estimate',
             'estimate_number' => $this->faker->unique()->numerify('EST-####'),
             'reference_number' => $this->faker->unique()->numerify('REF-####'),
             'date' => $estimateDate,
-            'expiration_date' => Carbon::parse($estimateDate)->addDays($this->faker->numberBetween(14, 30)),
+            'expiration_date' => $this->faker->dateTimeInInterval($estimateDate, '+3 months'),
             'status' => EstimateStatus::Draft,
             'discount_method' => $this->faker->randomElement(DocumentDiscountMethod::class),
             'discount_computation' => AdjustmentComputation::Percentage,
     public function withLineItems(int $count = 3): static
     {
         return $this->afterCreating(function (Estimate $estimate) use ($count) {
+            // Clear existing line items first
+            $estimate->lineItems()->delete();
+
             DocumentLineItem::factory()
                 ->count($count)
                 ->forEstimate($estimate)
     public function approved(): static
     {
         return $this->afterCreating(function (Estimate $estimate) {
-            $this->ensureLineItems($estimate);
-
-            if (! $estimate->canBeApproved()) {
-                return;
-            }
-
-            $approvedAt = Carbon::parse($estimate->date)
-                ->addHours($this->faker->numberBetween(1, 24));
-
-            $estimate->approveDraft($approvedAt);
+            $this->performApproval($estimate);
         });
     }
 
     public function accepted(): static
     {
         return $this->afterCreating(function (Estimate $estimate) {
-            $this->ensureSent($estimate);
+            $this->performSent($estimate);
 
             $acceptedAt = Carbon::parse($estimate->last_sent_at)
                 ->addDays($this->faker->numberBetween(1, 7));
 
+            if ($acceptedAt->isAfter(now())) {
+                $acceptedAt = Carbon::parse($this->faker->dateTimeBetween($estimate->last_sent_at, now()));
+            }
+
             $estimate->markAsAccepted($acceptedAt);
         });
     }
     {
         return $this->afterCreating(function (Estimate $estimate) {
             if (! $estimate->wasAccepted()) {
-                $this->accepted()->callAfterCreating(collect([$estimate]));
+                $this->performSent($estimate);
+
+                $acceptedAt = Carbon::parse($estimate->last_sent_at)
+                    ->addDays($this->faker->numberBetween(1, 7));
+
+                if ($acceptedAt->isAfter(now())) {
+                    $acceptedAt = Carbon::parse($this->faker->dateTimeBetween($estimate->last_sent_at, now()));
+                }
+
+                $estimate->markAsAccepted($acceptedAt);
             }
 
             $convertedAt = Carbon::parse($estimate->accepted_at)
                 ->addDays($this->faker->numberBetween(1, 7));
 
+            if ($convertedAt->isAfter(now())) {
+                $convertedAt = Carbon::parse($this->faker->dateTimeBetween($estimate->accepted_at, now()));
+            }
+
             $estimate->convertToInvoice($convertedAt);
         });
     }
     public function declined(): static
     {
         return $this->afterCreating(function (Estimate $estimate) {
-            $this->ensureSent($estimate);
+            $this->performSent($estimate);
 
             $declinedAt = Carbon::parse($estimate->last_sent_at)
                 ->addDays($this->faker->numberBetween(1, 7));
 
+            if ($declinedAt->isAfter(now())) {
+                $declinedAt = Carbon::parse($this->faker->dateTimeBetween($estimate->last_sent_at, now()));
+            }
+
             $estimate->markAsDeclined($declinedAt);
         });
     }
     public function sent(): static
     {
         return $this->afterCreating(function (Estimate $estimate) {
-            $this->ensureApproved($estimate);
-
-            $sentAt = Carbon::parse($estimate->approved_at)
-                ->addHours($this->faker->numberBetween(1, 24));
-
-            $estimate->markAsSent($sentAt);
+            $this->performSent($estimate);
         });
     }
 
     public function viewed(): static
     {
         return $this->afterCreating(function (Estimate $estimate) {
-            $this->ensureSent($estimate);
+            $this->performSent($estimate);
 
             $viewedAt = Carbon::parse($estimate->last_sent_at)
                 ->addHours($this->faker->numberBetween(1, 24));
 
+            if ($viewedAt->isAfter(now())) {
+                $viewedAt = Carbon::parse($this->faker->dateTimeBetween($estimate->last_sent_at, now()));
+            }
+
             $estimate->markAsViewed($viewedAt);
         });
     }
                 'expiration_date' => now()->subDays($this->faker->numberBetween(1, 30)),
             ])
             ->afterCreating(function (Estimate $estimate) {
-                $this->ensureApproved($estimate);
+                $this->performApproval($estimate);
             });
     }
 
+    protected function performApproval(Estimate $estimate): void
+    {
+        if (! $estimate->canBeApproved()) {
+            throw new \InvalidArgumentException('Estimate cannot be approved. Current status: ' . $estimate->status->value);
+        }
+
+        $approvedAt = Carbon::parse($estimate->date)
+            ->addHours($this->faker->numberBetween(1, 24));
+
+        if ($approvedAt->isAfter(now())) {
+            $approvedAt = Carbon::parse($this->faker->dateTimeBetween($estimate->date, now()));
+        }
+
+        $estimate->approveDraft($approvedAt);
+    }
+
+    protected function performSent(Estimate $estimate): void
+    {
+        if (! $estimate->wasApproved()) {
+            $this->performApproval($estimate);
+        }
+
+        $sentAt = Carbon::parse($estimate->approved_at)
+            ->addHours($this->faker->numberBetween(1, 24));
+
+        if ($sentAt->isAfter(now())) {
+            $sentAt = Carbon::parse($this->faker->dateTimeBetween($estimate->approved_at, now()));
+        }
+
+        $estimate->markAsSent($sentAt);
+    }
+
     public function configure(): static
     {
         return $this->afterCreating(function (Estimate $estimate) {
-            $this->ensureLineItems($estimate);
+            DocumentLineItem::factory()
+                ->count(3)
+                ->forEstimate($estimate)
+                ->create();
+
+            $this->recalculateTotals($estimate);
 
             $number = DocumentDefault::getBaseNumber() + $estimate->id;
 
         });
     }
 
-    protected function ensureLineItems(Estimate $estimate): void
-    {
-        if (! $estimate->hasLineItems()) {
-            $this->withLineItems()->callAfterCreating(collect([$estimate]));
-        }
-    }
-
-    protected function ensureApproved(Estimate $estimate): void
-    {
-        if (! $estimate->wasApproved()) {
-            $this->approved()->callAfterCreating(collect([$estimate]));
-        }
-    }
-
-    protected function ensureSent(Estimate $estimate): void
-    {
-        if (! $estimate->hasBeenSent()) {
-            $this->sent()->callAfterCreating(collect([$estimate]));
-        }
-    }
-
     protected function recalculateTotals(Estimate $estimate): void
     {
         $estimate->refresh();

database/factories/Accounting/InvoiceFactory.php

      */
     public function definition(): array
     {
-        $invoiceDate = $this->faker->dateTimeBetween('-2 months');
+        $invoiceDate = $this->faker->dateTimeBetween('-2 months', '-1 day');
 
         return [
             'company_id' => 1,
     public function withLineItems(int $count = 3): static
     {
         return $this->afterCreating(function (Invoice $invoice) use ($count) {
+            $invoice->lineItems()->delete();
+
             DocumentLineItem::factory()
                 ->count($count)
                 ->forInvoice($invoice)
 
     protected function performApproval(Invoice $invoice): void
     {
-        if (! $invoice->hasLineItems()) {
-            throw new \InvalidArgumentException('Cannot approve invoice without line items. Use withLineItems() first.');
-        }
-
         if (! $invoice->canBeApproved()) {
             throw new \InvalidArgumentException('Invoice cannot be approved. Current status: ' . $invoice->status->value);
         }
         $approvedAt = Carbon::parse($invoice->date)
             ->addHours($this->faker->numberBetween(1, 24));
 
+        if ($approvedAt->isAfter(now())) {
+            $approvedAt = Carbon::parse($this->faker->dateTimeBetween($invoice->date, now()));
+        }
+
         $invoice->approveDraft($approvedAt);
     }
 
         $sentAt = Carbon::parse($invoice->approved_at)
             ->addHours($this->faker->numberBetween(1, 24));
 
+        if ($sentAt->isAfter(now())) {
+            $sentAt = Carbon::parse($this->faker->dateTimeBetween($invoice->approved_at, now()));
+        }
+
         $invoice->markAsSent($sentAt);
     }
 
         $paymentAmount = (int) floor($totalAmountDue / $paymentCount);
         $remainingAmount = $totalAmountDue;
 
-        $paymentDate = Carbon::parse($invoice->approved_at);
+        $initialPaymentDate = Carbon::parse($invoice->approved_at);
+        $maxPaymentDate = now();
+
         $paymentDates = [];
 
         for ($i = 0; $i < $paymentCount; $i++) {
                 break;
             }
 
-            $postedAt = $paymentDate->copy()->addDays($this->faker->numberBetween(1, 30));
+            if ($i === 0) {
+                $postedAt = $initialPaymentDate->copy()->addDays($this->faker->numberBetween(1, 15));
+            } else {
+                $postedAt = $paymentDates[$i - 1]->copy()->addDays($this->faker->numberBetween(1, 10));
+            }
+
+            if ($postedAt->isAfter($maxPaymentDate)) {
+                $postedAt = Carbon::parse($this->faker->dateTimeBetween($initialPaymentDate, $maxPaymentDate));
+            }
+
             $paymentDates[] = $postedAt;
 
             $data = [
     public function configure(): static
     {
         return $this->afterCreating(function (Invoice $invoice) {
+            DocumentLineItem::factory()
+                ->count(3)
+                ->forInvoice($invoice)
+                ->create();
+
+            $this->recalculateTotals($invoice);
+
             $number = DocumentDefault::getBaseNumber() + $invoice->id;
 
             $invoice->updateQuietly([

database/factories/Accounting/RecurringInvoiceFactory.php

     {
         return [
             'company_id' => 1,
-            'client_id' => fn (array $attributes) => Client::where('company_id', $attributes['company_id'])->inRandomOrder()->value('id'),
+            'client_id' => function (array $attributes) {
+                return Client::where('company_id', $attributes['company_id'])->inRandomOrder()->value('id')
+                    ?? Client::factory()->state([
+                        'company_id' => $attributes['company_id'],
+                    ]);
+            },
             'header' => 'Invoice',
             'subheader' => 'Invoice',
             'order_number' => $this->faker->unique()->numerify('ORD-####'),
     public function withLineItems(int $count = 3): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($count) {
+            // Clear existing line items first
+            $recurringInvoice->lineItems()->delete();
+
             DocumentLineItem::factory()
                 ->count($count)
                 ->forInvoice($recurringInvoice)
         });
     }
 
+    public function configure(): static
+    {
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
+            DocumentLineItem::factory()
+                ->count(3)
+                ->forInvoice($recurringInvoice)
+                ->create();
+
+            $this->recalculateTotals($recurringInvoice);
+        });
+    }
+
     public function withSchedule(
         ?Frequency $frequency = null,
         ?Carbon $startDate = null,
         ?EndType $endType = null
     ): static {
-        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]));
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($frequency, $startDate, $endType) {
+            $this->performScheduleSetup($recurringInvoice, $frequency, $startDate, $endType);
         });
     }
 
     public function withDailySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
-            $this->ensureLineItems($recurringInvoice);
-
             $recurringInvoice->updateQuietly([
                 'frequency' => Frequency::Daily,
                 'start_date' => $startDate,
     public function withWeeklySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
-            $this->ensureLineItems($recurringInvoice);
-
             $recurringInvoice->updateQuietly([
                 'frequency' => Frequency::Weekly,
                 'day_of_week' => DayOfWeek::from($startDate->dayOfWeek),
     public function withMonthlySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
-            $this->ensureLineItems($recurringInvoice);
-
             $recurringInvoice->updateQuietly([
                 'frequency' => Frequency::Monthly,
                 'day_of_month' => DayOfMonth::from($startDate->day),
     public function withYearlySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
-            $this->ensureLineItems($recurringInvoice);
-
             $recurringInvoice->updateQuietly([
                 'frequency' => Frequency::Yearly,
                 'month' => Month::from($startDate->month),
         ?int $intervalValue = null
     ): static {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($intervalType, $intervalValue, $startDate, $endType) {
-            $this->ensureLineItems($recurringInvoice);
-
             $intervalType ??= $this->faker->randomElement(IntervalType::class);
             $intervalValue ??= match ($intervalType) {
                 IntervalType::Day => $this->faker->numberBetween(1, 7),
                     break;
             }
 
-            return $recurringInvoice->updateQuietly($state);
+            $recurringInvoice->updateQuietly($state);
         });
     }
 
     public function approved(): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
-            $this->ensureLineItems($recurringInvoice);
+            $this->performApproval($recurringInvoice);
+        });
+    }
 
+    public function active(): static
+    {
+        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
             if (! $recurringInvoice->hasSchedule()) {
-                $this->withSchedule()->callAfterCreating(collect([$recurringInvoice]));
+                $this->performScheduleSetup($recurringInvoice);
                 $recurringInvoice->refresh();
             }
 
-            $approvedAt = $recurringInvoice->start_date
-                ? $recurringInvoice->start_date->copy()->subDays($this->faker->numberBetween(1, 7))
-                : now()->subDays($this->faker->numberBetween(1, 30));
-
-            $recurringInvoice->approveDraft($approvedAt);
+            $this->performApproval($recurringInvoice);
         });
     }
 
-    public function active(): static
-    {
-        return $this->withLineItems()
-            ->withSchedule()
-            ->approved();
-    }
-
     public function ended(): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
-            $this->ensureLineItems($recurringInvoice);
-
             if (! $recurringInvoice->canBeEnded()) {
-                $this->active()->callAfterCreating(collect([$recurringInvoice]));
+                if (! $recurringInvoice->hasSchedule()) {
+                    $this->performScheduleSetup($recurringInvoice);
+                    $recurringInvoice->refresh();
+                }
+
+                $this->performApproval($recurringInvoice);
             }
 
             $endedAt = $recurringInvoice->last_date
         });
     }
 
-    public function configure(): static
+    protected function performScheduleSetup(
+        RecurringInvoice $recurringInvoice,
+        ?Frequency $frequency = null,
+        ?Carbon $startDate = null,
+        ?EndType $endType = null
+    ): void {
+        $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')),
+        };
+
+        match ($frequency) {
+            Frequency::Daily => $this->performDailySchedule($recurringInvoice, $startDate, $endType),
+            Frequency::Weekly => $this->performWeeklySchedule($recurringInvoice, $startDate, $endType),
+            Frequency::Monthly => $this->performMonthlySchedule($recurringInvoice, $startDate, $endType),
+            Frequency::Yearly => $this->performYearlySchedule($recurringInvoice, $startDate, $endType),
+            Frequency::Custom => $this->performCustomSchedule($recurringInvoice, $startDate, $endType),
+        };
+    }
+
+    protected function performDailySchedule(RecurringInvoice $recurringInvoice, Carbon $startDate, EndType $endType): void
     {
-        return $this->afterCreating(function (RecurringInvoice $recurringInvoice) {
-            $this->ensureLineItems($recurringInvoice);
-        });
+        $recurringInvoice->updateQuietly([
+            'frequency' => Frequency::Daily,
+            'start_date' => $startDate,
+            'end_type' => $endType,
+        ]);
     }
 
-    protected function ensureLineItems(RecurringInvoice $recurringInvoice): void
+    protected function performWeeklySchedule(RecurringInvoice $recurringInvoice, Carbon $startDate, EndType $endType): void
     {
-        if (! $recurringInvoice->hasLineItems()) {
-            $this->withLineItems()->callAfterCreating(collect([$recurringInvoice]));
+        $recurringInvoice->updateQuietly([
+            'frequency' => Frequency::Weekly,
+            'day_of_week' => DayOfWeek::from($startDate->dayOfWeek),
+            'start_date' => $startDate,
+            'end_type' => $endType,
+        ]);
+    }
+
+    protected function performMonthlySchedule(RecurringInvoice $recurringInvoice, Carbon $startDate, EndType $endType): void
+    {
+        $recurringInvoice->updateQuietly([
+            'frequency' => Frequency::Monthly,
+            'day_of_month' => DayOfMonth::from($startDate->day),
+            'start_date' => $startDate,
+            'end_type' => $endType,
+        ]);
+    }
+
+    protected function performYearlySchedule(RecurringInvoice $recurringInvoice, Carbon $startDate, EndType $endType): void
+    {
+        $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 performCustomSchedule(
+        RecurringInvoice $recurringInvoice,
+        Carbon $startDate,
+        EndType $endType,
+        ?IntervalType $intervalType = null,
+        ?int $intervalValue = null
+    ): void {
+        $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,
+        ];
+
+        // Add interval-specific attributes
+        switch ($intervalType) {
+            case IntervalType::Day:
+                // No additional attributes needed
+                break;
+
+            case IntervalType::Week:
+                $state['day_of_week'] = DayOfWeek::from($startDate->dayOfWeek);
+
+                break;
+
+            case IntervalType::Month:
+                $state['day_of_month'] = DayOfMonth::from($startDate->day);
+
+                break;
+
+            case IntervalType::Year:
+                $state['month'] = Month::from($startDate->month);
+                $state['day_of_month'] = DayOfMonth::from($startDate->day);
+
+                break;
         }
+
+        $recurringInvoice->updateQuietly($state);
+    }
+
+    protected function performApproval(RecurringInvoice $recurringInvoice): void
+    {
+        if (! $recurringInvoice->hasSchedule()) {
+            $this->performScheduleSetup($recurringInvoice);
+            $recurringInvoice->refresh();
+        }
+
+        $approvedAt = $recurringInvoice->start_date
+            ? $recurringInvoice->start_date->copy()->subDays($this->faker->numberBetween(1, 7))
+            : now()->subDays($this->faker->numberBetween(1, 30));
+
+        $recurringInvoice->approveDraft($approvedAt);
     }
 
     protected function recalculateTotals(RecurringInvoice $recurringInvoice): void

database/factories/Common/OfferingFactory.php

             'name' => $this->faker->words(3, true),
             'description' => $this->faker->sentence,
             'type' => $this->faker->randomElement(OfferingType::cases()),
-            'price' => $this->faker->numberBetween(5, 1000),
+            'price' => $this->faker->numberBetween(500, 50000), // $5.00 to $500.00
             'sellable' => false,
             'purchasable' => false,
             'income_account_id' => null,

tests/Feature/Accounting/RecurringInvoiceTest.php

     $this->withOfferings();
 });
 
+it('creates a basic recurring invoice with line items and calculates totals correctly', function () {
+    $recurringInvoice = RecurringInvoice::factory()
+        ->withLineItems()
+        ->create();
+
+    $recurringInvoice->refresh();
+
+    expect($recurringInvoice)
+        ->hasLineItems()->toBeTrue()
+        ->lineItems->count()->toBe(3)
+        ->subtotal->toBeGreaterThan(0)
+        ->total->toBeGreaterThan(0);
+});
+
 test('recurring invoice properly handles months with fewer days for monthly frequency', function () {
     // Start from January 31st
     Carbon::setTestNow('2024-01-31');