wip revert

app/Concerns/GeneratesDocumentNumbers.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-use RuntimeException;
-
-trait GeneratesDocumentNumbers
-{
-    public static function getNextDocumentNumber(): string
-    {
-        $company = auth()->user()->currentCompany;
-
-        if (! $company) {
-            throw new RuntimeException('No current company is set for the user.');
-        }
-
-        $settings = $company->{static::getSettingsKey()};
-        $numberField = static::getDocumentNumberField();
-
-        $latestDocument = static::query()
-            ->whereNotNull($numberField)
-            ->latest($numberField)
-            ->first();
-
-        $lastNumberPart = $latestDocument
-            ? (int) substr($latestDocument->{$numberField}, strlen($settings->number_prefix))
-            : 0;
-
-        return $settings->getNumberNext(
-            padded: true,
-            format: true,
-            prefix: $settings->number_prefix,
-            digits: $settings->number_digits,
-            next: $lastNumberPart + 1
-        );
-    }
-}

app/Concerns/HandlesCurrencyConversion.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
-
-trait HandlesCurrencyConversion
-{
-    public function convertAmountToDefaultCurrency(int $amountCents): int
-    {
-        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
-        $needsConversion = $this->currency_code !== $defaultCurrency;
-
-        if ($needsConversion) {
-            return CurrencyConverter::convertBalance(
-                $amountCents,
-                $this->currency_code,
-                $defaultCurrency
-            );
-        }
-
-        return $amountCents;
-    }
-
-    public function formatAmountToDefaultCurrency(int $amountCents): string
-    {
-        $convertedCents = $this->convertAmountToDefaultCurrency($amountCents);
-
-        return CurrencyConverter::convertCentsToFormatSimple($convertedCents);
-    }
-}

app/Enums/Accounting/EstimateStatus.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Enums\Accounting;
-
-use App\Enums\Concerns\ParsesEnum;
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasLabel;
-
-enum EstimateStatus: string implements HasColor, HasLabel
-{
-    use ParsesEnum;
-
-    case Draft = 'draft';
-    case Sent = 'sent';
-    case Approved = 'approved';
-    case Accepted = 'accepted';
-    case Rejected = 'rejected';
-    case Expired = 'expired';
-    case Converted = 'converted';
-
-    public function getLabel(): ?string
-    {
-        return $this->name;
-    }
-
-    public function getColor(): string | array | null
-    {
-        return match ($this) {
-            self::Draft => 'gray',
-            self::Sent => 'primary',
-            self::Approved, self::Accepted => 'success',
-            self::Rejected => 'danger',
-            self::Expired => 'warning',
-            self::Converted => 'info',
-        };
-    }
-}

app/Models/Accounting/Bill.php

@@ -2,66 +2,118 @@
 
 namespace App\Models\Accounting;
 
+use App\Casts\MoneyCast;
+use App\Casts\RateCast;
+use App\Collections\Accounting\DocumentCollection;
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\BillStatus;
-use App\Enums\Accounting\DocumentType;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Purchases\BillResource;
+use App\Models\Banking\BankAccount;
 use App\Models\Common\Vendor;
-use App\Models\Setting\DocumentDefault;
+use App\Models\Setting\Currency;
 use App\Observers\BillObserver;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use Filament\Actions\MountableAction;
 use Filament\Actions\ReplicateAction;
+use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Carbon;
 
 #[ObservedBy(BillObserver::class)]
-class Bill extends Document
+#[CollectedBy(DocumentCollection::class)]
+class Bill extends Model
 {
+    use Blamable;
+    use CompanyOwned;
+    use HasFactory;
+
     protected $table = 'bills';
 
     protected $fillable = [
-        ...self::COMMON_FILLABLE,
-        ...self::BILL_FILLABLE,
-    ];
-
-    protected const BILL_FILLABLE = [
+        'company_id',
         'vendor_id',
         'bill_number',
+        'order_number',
+        'date',
+        'due_date',
+        'paid_at',
+        'status',
+        'currency_code',
+        'discount_method',
+        'discount_computation',
+        'discount_rate',
+        'subtotal',
+        'tax_total',
+        'discount_total',
+        'total',
+        'amount_paid',
         'notes',
+        'created_by',
+        'updated_by',
     ];
 
-    protected function casts(): array
+    protected $casts = [
+        'date' => 'date',
+        'due_date' => 'date',
+        'paid_at' => 'datetime',
+        'status' => BillStatus::class,
+        'discount_method' => DocumentDiscountMethod::class,
+        'discount_computation' => AdjustmentComputation::class,
+        'discount_rate' => RateCast::class,
+        'subtotal' => MoneyCast::class,
+        'tax_total' => MoneyCast::class,
+        'discount_total' => MoneyCast::class,
+        'total' => MoneyCast::class,
+        'amount_paid' => MoneyCast::class,
+        'amount_due' => MoneyCast::class,
+    ];
+
+    public function currency(): BelongsTo
     {
-        return [
-            ...parent::casts(),
-            'status' => BillStatus::class,
-        ];
+        return $this->belongsTo(Currency::class, 'currency_code', 'code');
     }
 
-    public static function documentNumberColumn(): string
+    public function vendor(): BelongsTo
     {
-        return 'bill_number';
+        return $this->belongsTo(Vendor::class);
     }
 
-    public static function documentType(): DocumentType
+    public function lineItems(): MorphMany
     {
-        return DocumentType::Bill;
+        return $this->morphMany(DocumentLineItem::class, 'documentable');
     }
 
-    public static function getDocumentSettings(): DocumentDefault
+    public function transactions(): MorphMany
     {
-        return auth()->user()->currentCompany->defaultBill;
+        return $this->morphMany(Transaction::class, 'transactionable');
     }
 
-    public function vendor(): BelongsTo
+    public function payments(): MorphMany
     {
-        return $this->belongsTo(Vendor::class);
+        return $this->transactions()->where('is_payment', true);
+    }
+
+    public function deposits(): MorphMany
+    {
+        return $this->transactions()->where('type', TransactionType::Deposit)->where('is_payment', true);
+    }
+
+    public function withdrawals(): MorphMany
+    {
+        return $this->transactions()->where('type', TransactionType::Withdrawal)->where('is_payment', true);
     }
 
     public function initialTransaction(): MorphOne
@@ -70,6 +122,13 @@ class Bill extends Document
             ->where('type', TransactionType::Journal);
     }
 
+    protected function isCurrentlyOverdue(): Attribute
+    {
+        return Attribute::get(function () {
+            return $this->due_date->isBefore(today()) && $this->canBeOverdue();
+        });
+    }
+
     public function canBeOverdue(): bool
     {
         return in_array($this->status, BillStatus::canBeOverdue());
@@ -83,6 +142,44 @@ class Bill extends Document
         ]) && $this->currency_code === CurrencyAccessor::getDefaultCurrency();
     }
 
+    public function hasPayments(): bool
+    {
+        return $this->payments->isNotEmpty();
+    }
+
+    public static function getNextDocumentNumber(): string
+    {
+        $company = auth()->user()->currentCompany;
+
+        if (! $company) {
+            throw new \RuntimeException('No current company is set for the user.');
+        }
+
+        $defaultBillSettings = $company->defaultBill;
+
+        $numberPrefix = $defaultBillSettings->number_prefix;
+        $numberDigits = $defaultBillSettings->number_digits;
+
+        $latestDocument = static::query()
+            ->whereNotNull('bill_number')
+            ->latest('bill_number')
+            ->first();
+
+        $lastNumberNumericPart = $latestDocument
+            ? (int) substr($latestDocument->bill_number, strlen($numberPrefix))
+            : 0;
+
+        $numberNext = $lastNumberNumericPart + 1;
+
+        return $defaultBillSettings->getNumberNext(
+            padded: true,
+            format: true,
+            prefix: $numberPrefix,
+            digits: $numberDigits,
+            next: $numberNext
+        );
+    }
+
     public function hasInitialTransaction(): bool
     {
         return $this->initialTransaction()->exists();
@@ -99,14 +196,44 @@ class Bill extends Document
 
     public function recordPayment(array $data): void
     {
+        $transactionType = TransactionType::Withdrawal;
         $transactionDescription = "Bill #{$this->bill_number}: Payment to {$this->vendor->name}";
 
-        $this->recordTransaction(
-            $data,
-            TransactionType::Withdrawal, // Always withdrawal for bills
-            $transactionDescription,
-            Account::getAccountsPayableAccount()->id // Account ID specific to bills
-        );
+        // Add multi-currency handling
+        $bankAccount = BankAccount::findOrFail($data['bank_account_id']);
+        $bankAccountCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
+        $billCurrency = $this->currency_code;
+        $requiresConversion = $billCurrency !== $bankAccountCurrency;
+
+        if ($requiresConversion) {
+            $amountInBillCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $billCurrency);
+            $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
+                $amountInBillCurrencyCents,
+                $billCurrency,
+                $bankAccountCurrency
+            );
+            $formattedAmountForBankCurrency = CurrencyConverter::convertCentsToFormatSimple(
+                $amountInBankCurrencyCents,
+                $bankAccountCurrency
+            );
+        } else {
+            $formattedAmountForBankCurrency = $data['amount']; // Already in simple format
+        }
+
+        // Create transaction with converted amount
+        $this->transactions()->create([
+            'company_id' => $this->company_id,
+            'type' => $transactionType,
+            'is_payment' => true,
+            'posted_at' => $data['posted_at'],
+            'amount' => $formattedAmountForBankCurrency,
+            'payment_method' => $data['payment_method'],
+            'bank_account_id' => $data['bank_account_id'],
+            'account_id' => Account::getAccountsPayableAccount()->id,
+            'description' => $transactionDescription,
+            'notes' => $data['notes'] ?? null,
+        ]);
     }
 
     public function createInitialTransaction(?Carbon $postedAt = null): void
@@ -208,6 +335,25 @@ class Bill extends Document
         $this->createInitialTransaction();
     }
 
+    public function convertAmountToDefaultCurrency(int $amountCents): int
+    {
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+        $needsConversion = $this->currency_code !== $defaultCurrency;
+
+        if ($needsConversion) {
+            return CurrencyConverter::convertBalance($amountCents, $this->currency_code, $defaultCurrency);
+        }
+
+        return $amountCents;
+    }
+
+    public function formatAmountToDefaultCurrency(int $amountCents): string
+    {
+        $convertedCents = $this->convertAmountToDefaultCurrency($amountCents);
+
+        return CurrencyConverter::convertCentsToFormatSimple($convertedCents);
+    }
+
     public static function getReplicateAction(string $action = ReplicateAction::class): MountableAction
     {
         return $action::make()

app/Models/Accounting/Document.php

@@ -1,223 +0,0 @@
-<?php
-
-namespace App\Models\Accounting;
-
-use App\Casts\MoneyCast;
-use App\Casts\RateCast;
-use App\Collections\Accounting\DocumentCollection;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
-use App\Enums\Accounting\AdjustmentComputation;
-use App\Enums\Accounting\DocumentDiscountMethod;
-use App\Enums\Accounting\DocumentType;
-use App\Enums\Accounting\TransactionType;
-use App\Models\Banking\BankAccount;
-use App\Models\Setting\Currency;
-use App\Models\Setting\DocumentDefault;
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
-use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-abstract class Document extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
-    protected const COMMON_FILLABLE = [
-        'company_id',
-        'order_number',
-        'date',
-        'due_date',
-        'paid_at',
-        'status',
-        'currency_code',
-        'discount_method',
-        'discount_computation',
-        'discount_rate',
-        'subtotal',
-        'tax_total',
-        'discount_total',
-        'total',
-        'amount_paid',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $fillable = self::COMMON_FILLABLE;
-
-    protected function casts(): array
-    {
-        return [
-            'date' => 'date',
-            'due_date' => 'date',
-            'paid_at' => 'datetime',
-            'discount_method' => DocumentDiscountMethod::class,
-            'discount_computation' => AdjustmentComputation::class,
-            'discount_rate' => RateCast::class,
-            'subtotal' => MoneyCast::class,
-            'tax_total' => MoneyCast::class,
-            'discount_total' => MoneyCast::class,
-            'total' => MoneyCast::class,
-            'amount_paid' => MoneyCast::class,
-            'amount_due' => MoneyCast::class,
-        ];
-    }
-
-    public function currency(): BelongsTo
-    {
-        return $this->belongsTo(Currency::class, 'currency_code', 'code');
-    }
-
-    public function lineItems(): MorphMany
-    {
-        return $this->morphMany(DocumentLineItem::class, 'documentable');
-    }
-
-    public function transactions(): MorphMany
-    {
-        return $this->morphMany(Transaction::class, 'transactionable');
-    }
-
-    public function payments(): MorphMany
-    {
-        return $this->transactions()->where('is_payment', true);
-    }
-
-    public function deposits(): MorphMany
-    {
-        return $this->transactions()->where('type', TransactionType::Deposit)->where('is_payment', true);
-    }
-
-    public function withdrawals(): MorphMany
-    {
-        return $this->transactions()->where('type', TransactionType::Withdrawal)->where('is_payment', true);
-    }
-
-    public function hasPayments(): bool
-    {
-        return $this->payments->isNotEmpty();
-    }
-
-    protected function isCurrentlyOverdue(): Attribute
-    {
-        return Attribute::get(function () {
-            return $this->due_date->isBefore(today()) && $this->canBeOverdue();
-        });
-    }
-
-    public static function getNextDocumentNumber(): string
-    {
-        $company = auth()->user()->currentCompany;
-
-        if (! $company) {
-            throw new \RuntimeException('No current company is set for the user.');
-        }
-
-        $settings = static::getDocumentSettings();
-
-        $prefix = $settings->number_prefix;
-        $digits = $settings->number_digits;
-
-        $latestDocument = static::query()
-            ->whereNotNull(static::documentNumberColumn())
-            ->latest(static::documentNumberColumn())
-            ->first();
-
-        $lastNumber = $latestDocument
-            ? (int) substr($latestDocument->{static::documentNumberColumn()}, strlen($prefix))
-            : 0;
-
-        $numberNext = $lastNumber + 1;
-
-        return $settings->getNumberNext(
-            padded: true,
-            format: true,
-            prefix: $prefix,
-            digits: $digits,
-            next: $numberNext
-        );
-    }
-
-    protected function recordTransaction(array $data, string $transactionType, string $transactionDescription, int $accountId): void
-    {
-        $formattedAmount = $this->prepareAmountForTransaction($data);
-
-        $this->transactions()->create([
-            'company_id' => $this->company_id,
-            'type' => $transactionType,
-            'is_payment' => true,
-            'posted_at' => $data['posted_at'],
-            'amount' => $formattedAmount,
-            'payment_method' => $data['payment_method'],
-            'bank_account_id' => $data['bank_account_id'],
-            'account_id' => $accountId,
-            'description' => $transactionDescription,
-            'notes' => $data['notes'] ?? null,
-        ]);
-    }
-
-    protected function prepareAmountForTransaction(array $data): string
-    {
-        $bankAccount = BankAccount::findOrFail($data['bank_account_id']);
-        $bankAccountCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
-
-        $requiresConversion = $this->currency_code !== $bankAccountCurrency;
-
-        if ($requiresConversion) {
-            $amountInCents = CurrencyConverter::convertToCents($data['amount'], $this->currency_code);
-            $convertedAmount = CurrencyConverter::convertBalance(
-                $amountInCents,
-                $this->currency_code,
-                $bankAccountCurrency
-            );
-
-            return CurrencyConverter::convertCentsToFormatSimple($convertedAmount, $bankAccountCurrency);
-        }
-
-        return $data['amount'];
-    }
-
-    public function convertAmountToDefaultCurrency(int $amountCents): int
-    {
-        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
-        $needsConversion = $this->currency_code !== $defaultCurrency;
-
-        if ($needsConversion) {
-            return CurrencyConverter::convertBalance($amountCents, $this->currency_code, $defaultCurrency);
-        }
-
-        return $amountCents;
-    }
-
-    public function formatAmountToDefaultCurrency(int $amountCents): string
-    {
-        $convertedCents = $this->convertAmountToDefaultCurrency($amountCents);
-
-        return CurrencyConverter::convertCentsToFormatSimple($convertedCents);
-    }
-
-    /**
-     * Create a new Eloquent Collection instance.
-     *
-     * @param  array<int, Model>  $models
-     * @return Collection<int, Model>
-     */
-    public function newCollection(array $models = []): Collection
-    {
-        return new DocumentCollection($models);
-    }
-
-    abstract public static function documentType(): DocumentType;
-
-    abstract public static function documentNumberColumn(): string;
-
-    abstract public static function getDocumentSettings(): DocumentDefault;
-
-    abstract public function canBeOverdue(): bool;
-}

app/Models/Accounting/Estimate.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Models\Accounting;
-
-use App\Casts\MoneyCast;
-use App\Casts\RateCast;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
-use App\Enums\Accounting\AdjustmentComputation;
-use App\Enums\Accounting\DocumentDiscountMethod;
-use App\Enums\Accounting\EstimateStatus;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Estimate extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
-    protected $fillable = [
-        'client_id',
-        'logo',
-        'header',
-        'subheader',
-        'number',
-        'reference_number',
-        'date',
-        'expiry_date',
-        'approved_at',
-        'accepted_at',
-        'last_sent',
-        'status',
-        'currency_code',
-        'discount_method',
-        'discount_computation',
-        'discount_rate',
-        'subtotal',
-        'tax_total',
-        'discount_total',
-        'total',
-        'terms',
-        'footer',
-    ];
-
-    protected $casts = [
-        'date' => 'date',
-        'expiry_date' => 'date',
-        'approved_at' => 'datetime',
-        'accepted_at' => 'datetime',
-        'last_sent' => 'datetime',
-        'status' => EstimateStatus::class,
-        'discount_method' => DocumentDiscountMethod::class,
-        'discount_computation' => AdjustmentComputation::class,
-        'discount_rate' => RateCast::class,
-        'subtotal' => MoneyCast::class,
-        'tax_total' => MoneyCast::class,
-        'discount_total' => MoneyCast::class,
-        'total' => MoneyCast::class,
-    ];
-}

app/Models/Accounting/Invoice.php

@@ -2,75 +2,127 @@
 
 namespace App\Models\Accounting;
 
-use App\Enums\Accounting\DocumentType;
+use App\Casts\MoneyCast;
+use App\Casts\RateCast;
+use App\Collections\Accounting\DocumentCollection;
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
+use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
-use App\Models\Setting\DocumentDefault;
+use App\Models\Setting\Currency;
 use App\Observers\InvoiceObserver;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Actions\ReplicateAction;
+use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Carbon;
 
 #[ObservedBy(InvoiceObserver::class)]
-class Invoice extends Document
+#[CollectedBy(DocumentCollection::class)]
+class Invoice extends Model
 {
+    use Blamable;
+    use CompanyOwned;
+    use HasFactory;
+
     protected $table = 'invoices';
 
     protected $fillable = [
-        ...self::COMMON_FILLABLE,
-        ...self::INVOICE_FILLABLE,
-    ];
-
-    protected const INVOICE_FILLABLE = [
+        'company_id',
         'client_id',
         'logo',
         'header',
         'subheader',
         'invoice_number',
+        'order_number',
+        'date',
+        'due_date',
         'approved_at',
+        'paid_at',
         'last_sent',
+        'status',
+        'currency_code',
+        'discount_method',
+        'discount_computation',
+        'discount_rate',
+        'subtotal',
+        'tax_total',
+        'discount_total',
+        'total',
+        'amount_paid',
         'terms',
         'footer',
+        'created_by',
+        'updated_by',
     ];
 
-    protected function casts(): array
+    protected $casts = [
+        'date' => 'date',
+        'due_date' => 'date',
+        'approved_at' => 'datetime',
+        'paid_at' => 'datetime',
+        'last_sent' => 'datetime',
+        'status' => InvoiceStatus::class,
+        'discount_method' => DocumentDiscountMethod::class,
+        'discount_computation' => AdjustmentComputation::class,
+        'discount_rate' => RateCast::class,
+        'subtotal' => MoneyCast::class,
+        'tax_total' => MoneyCast::class,
+        'discount_total' => MoneyCast::class,
+        'total' => MoneyCast::class,
+        'amount_paid' => MoneyCast::class,
+        'amount_due' => MoneyCast::class,
+    ];
+
+    public function client(): BelongsTo
     {
-        return [
-            ...parent::casts(),
-            'approved_at' => 'datetime',
-            'last_sent' => 'datetime',
-            'status' => InvoiceStatus::class,
-        ];
+        return $this->belongsTo(Client::class);
     }
 
-    public static function documentNumberColumn(): string
+    public function currency(): BelongsTo
     {
-        return 'invoice_number';
+        return $this->belongsTo(Currency::class, 'currency_code', 'code');
     }
 
-    public static function documentType(): DocumentType
+    public function lineItems(): MorphMany
     {
-        return DocumentType::Invoice;
+        return $this->morphMany(DocumentLineItem::class, 'documentable');
     }
 
-    public static function getDocumentSettings(): DocumentDefault
+    public function transactions(): MorphMany
     {
-        return auth()->user()->currentCompany->defaultInvoice;
+        return $this->morphMany(Transaction::class, 'transactionable');
     }
 
-    public function client(): BelongsTo
+    public function payments(): MorphMany
     {
-        return $this->belongsTo(Client::class);
+        return $this->transactions()->where('is_payment', true);
+    }
+
+    public function deposits(): MorphMany
+    {
+        return $this->transactions()->where('type', TransactionType::Deposit)->where('is_payment', true);
+    }
+
+    public function withdrawals(): MorphMany
+    {
+        return $this->transactions()->where('type', TransactionType::Withdrawal)->where('is_payment', true);
     }
 
     public function approvalTransaction(): MorphOne
@@ -89,6 +141,13 @@ class Invoice extends Document
         ]);
     }
 
+    protected function isCurrentlyOverdue(): Attribute
+    {
+        return Attribute::get(function () {
+            return $this->due_date->isBefore(today()) && $this->canBeOverdue();
+        });
+    }
+
     public function isDraft(): bool
     {
         return $this->status === InvoiceStatus::Draft;
@@ -118,24 +177,90 @@ class Invoice extends Document
         return in_array($this->status, InvoiceStatus::canBeOverdue());
     }
 
+    public function hasPayments(): bool
+    {
+        return $this->payments->isNotEmpty();
+    }
+
+    public static function getNextDocumentNumber(): string
+    {
+        $company = auth()->user()->currentCompany;
+
+        if (! $company) {
+            throw new \RuntimeException('No current company is set for the user.');
+        }
+
+        $defaultInvoiceSettings = $company->defaultInvoice;
+
+        $numberPrefix = $defaultInvoiceSettings->number_prefix;
+        $numberDigits = $defaultInvoiceSettings->number_digits;
+
+        $latestDocument = static::query()
+            ->whereNotNull('invoice_number')
+            ->latest('invoice_number')
+            ->first();
+
+        $lastNumberNumericPart = $latestDocument
+            ? (int) substr($latestDocument->invoice_number, strlen($numberPrefix))
+            : 0;
+
+        $numberNext = $lastNumberNumericPart + 1;
+
+        return $defaultInvoiceSettings->getNumberNext(
+            padded: true,
+            format: true,
+            prefix: $numberPrefix,
+            digits: $numberDigits,
+            next: $numberNext
+        );
+    }
+
     public function recordPayment(array $data): void
     {
         $isRefund = $this->status === InvoiceStatus::Overpaid;
 
-        $transactionType = $isRefund
-            ? TransactionType::Withdrawal // Refunds are withdrawals
-            : TransactionType::Deposit;  // Payments are deposits
+        if ($isRefund) {
+            $transactionType = TransactionType::Withdrawal;
+            $transactionDescription = "Invoice #{$this->invoice_number}: Refund to {$this->client->name}";
+        } else {
+            $transactionType = TransactionType::Deposit;
+            $transactionDescription = "Invoice #{$this->invoice_number}: Payment from {$this->client->name}";
+        }
 
-        $transactionDescription = $isRefund
-            ? "Invoice #{$this->invoice_number}: Refund to {$this->client->name}"
-            : "Invoice #{$this->invoice_number}: Payment from {$this->client->name}";
+        $bankAccount = BankAccount::findOrFail($data['bank_account_id']);
+        $bankAccountCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
+        $invoiceCurrency = $this->currency_code;
+        $requiresConversion = $invoiceCurrency !== $bankAccountCurrency;
+
+        if ($requiresConversion) {
+            $amountInInvoiceCurrencyCents = CurrencyConverter::convertToCents($data['amount'], $invoiceCurrency);
+            $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
+                $amountInInvoiceCurrencyCents,
+                $invoiceCurrency,
+                $bankAccountCurrency
+            );
+            $formattedAmountForBankCurrency = CurrencyConverter::convertCentsToFormatSimple(
+                $amountInBankCurrencyCents,
+                $bankAccountCurrency
+            );
+        } else {
+            $formattedAmountForBankCurrency = $data['amount']; // Already in simple format
+        }
 
-        $this->recordTransaction(
-            $data,
-            $transactionType,
-            $transactionDescription,
-            Account::getAccountsReceivableAccount()->id // Account ID specific to invoices
-        );
+        // Create transaction
+        $this->transactions()->create([
+            'company_id' => $this->company_id,
+            'type' => $transactionType,
+            'is_payment' => true,
+            'posted_at' => $data['posted_at'],
+            'amount' => $formattedAmountForBankCurrency,
+            'payment_method' => $data['payment_method'],
+            'bank_account_id' => $data['bank_account_id'],
+            'account_id' => Account::getAccountsReceivableAccount()->id,
+            'description' => $transactionDescription,
+            'notes' => $data['notes'] ?? null,
+        ]);
     }
 
     public function approveDraft(?Carbon $approvedAt = null): void
@@ -241,6 +366,25 @@ class Invoice extends Document
         $this->createApprovalTransaction();
     }
 
+    public function convertAmountToDefaultCurrency(int $amountCents): int
+    {
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+        $needsConversion = $this->currency_code !== $defaultCurrency;
+
+        if ($needsConversion) {
+            return CurrencyConverter::convertBalance($amountCents, $this->currency_code, $defaultCurrency);
+        }
+
+        return $amountCents;
+    }
+
+    public function formatAmountToDefaultCurrency(int $amountCents): string
+    {
+        $convertedCents = $this->convertAmountToDefaultCurrency($amountCents);
+
+        return CurrencyConverter::convertCentsToFormatSimple($convertedCents);
+    }
+
     public static function getApproveDraftAction(string $action = Action::class): MountableAction
     {
         return $action::make('approveDraft')

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.2",
+            "version": "3.336.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4"
+                "reference": "5a62003bf183e32da038056a4b9077c27224e034"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/954bfdfc048840ca34afe2a2e1cbcff6681989c4",
-                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5a62003bf183e32da038056a4b9077c27224e034",
+                "reference": "5a62003bf183e32da038056a4b9077c27224e034",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "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.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.0"
             },
-            "time": "2024-12-20T19:05:10+00:00"
+            "time": "2024-12-18T19:04:32+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -4707,6 +4707,10 @@
             ],
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev",
+                    "dev-2.x": "2.x-dev"
+                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -4716,10 +4720,6 @@
                     "includes": [
                         "extension.neon"
                     ]
-                },
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev",
-                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {

database/factories/Accounting/EstimateFactory.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Database\Factories\Accounting;
-
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Accounting\Estimate>
- */
-class EstimateFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            //
-        ];
-    }
-}

database/migrations/2024_11_27_221657_create_bills_table.php

@@ -15,7 +15,7 @@ return new class extends Migration
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->foreignId('vendor_id')->nullable()->constrained('vendors')->nullOnDelete();
-            $table->string('number')->nullable();
+            $table->string('bill_number')->nullable();
             $table->string('order_number')->nullable(); // PO, SO, etc.
             $table->date('date')->nullable();
             $table->date('due_date')->nullable();

database/migrations/2024_11_27_223015_create_invoices_table.php

@@ -18,7 +18,7 @@ return new class extends Migration
             $table->string('logo')->nullable();
             $table->string('header')->nullable();
             $table->string('subheader')->nullable();
-            $table->string('number')->nullable();
+            $table->string('invoice_number')->nullable();
             $table->string('order_number')->nullable(); // PO, SO, etc.
             $table->date('date')->nullable();
             $table->date('due_date')->nullable();

database/migrations/2024_12_21_001553_create_estimates_table.php

@@ -1,52 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('estimates', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->foreignId('client_id')->nullable()->constrained('clients')->nullOnDelete();
-            $table->string('logo')->nullable();
-            $table->string('header')->nullable();
-            $table->string('subheader')->nullable();
-            $table->string('number')->nullable();
-            $table->string('reference_number')->nullable();
-            $table->date('date')->nullable();
-            $table->date('expiry_date')->nullable();
-            $table->timestamp('approved_at')->nullable();
-            $table->timestamp('accepted_at')->nullable();
-            $table->timestamp('last_sent')->nullable();
-            $table->string('status')->default('draft');
-            $table->string('currency_code')->nullable();
-            $table->string('discount_method')->default('per_line_item');
-            $table->string('discount_computation')->default('percentage');
-            $table->integer('discount_rate')->default(0);
-            $table->integer('subtotal')->default(0);
-            $table->integer('tax_total')->default(0);
-            $table->integer('discount_total')->default(0);
-            $table->integer('total')->default(0);
-            $table->text('terms')->nullable(); // terms, notes
-            $table->text('footer')->nullable();
-            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('estimates');
-    }
-};

package-lock.json

@@ -558,9 +558,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.0.tgz",
-            "integrity": "sha512-TnF0md3qWSRDlU96y9+0dd5RNrlXiQUp1K2pK1UpNmjeND+o9ts9Jxv3G6ntagkt8jVh0KAT1VYgU0nCz5gt2w==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz",
+            "integrity": "sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==",
             "cpu": [
                 "arm"
             ],
@@ -572,9 +572,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.0.tgz",
-            "integrity": "sha512-L/7oX07eY6ACt2NXDrku1JIPdf9VGV/DI92EjAd8FRDzMMub5hXFpT1OegBqimJh9xy9Vv+nToaVtZp4Ku9SEA==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz",
+            "integrity": "sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==",
             "cpu": [
                 "arm64"
             ],
@@ -586,9 +586,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.0.tgz",
-            "integrity": "sha512-I1ZucWPVS96hjAsMSJiGosHTqMulMynrmTN+Xde5OsLcU5SjE0xylBmQ/DbB2psJ+HasINrJYz8HQpojtAw2eA==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz",
+            "integrity": "sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==",
             "cpu": [
                 "arm64"
             ],
@@ -600,9 +600,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.0.tgz",
-            "integrity": "sha512-CTZ+lHMsTbH1q/XLKzmnJWxl2r/1xdv7cnjwbi5v+95nVA1syikxWLvqur4nDoGDHjC8oNMBGurnQptpuFJHXA==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz",
+            "integrity": "sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==",
             "cpu": [
                 "x64"
             ],
@@ -614,9 +614,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.0.tgz",
-            "integrity": "sha512-BB8+4OMzk2JiKL5+aK8A0pi9DPB5pkIBZWXr19+grdez9b0VKihvV432uSwuZLO0sI6zCyxak8NO3mZ1yjM1jA==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz",
+            "integrity": "sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==",
             "cpu": [
                 "arm64"
             ],
@@ -628,9 +628,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.0.tgz",
-            "integrity": "sha512-Udz9Uh26uEE6phGMG2++TfpsLK/z4cYJqrIOyVhig/PMoWiZLghpjZUQvsAylsoztbpg0/QmplkDAyyVq0x6Jg==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz",
+            "integrity": "sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==",
             "cpu": [
                 "x64"
             ],
@@ -642,9 +642,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.0.tgz",
-            "integrity": "sha512-IPSCTzP8GRYzY+siSnggIKrckC2U+kVXoen6eSHRDgU9a4EZCHHWWOiKio1EkieOOk2j6EvZaaHfQUCmt8UJBg==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz",
+            "integrity": "sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==",
             "cpu": [
                 "arm"
             ],
@@ -656,9 +656,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.0.tgz",
-            "integrity": "sha512-GvHPu0UIDx+ohyS8vTYnwoSVMM5BH3NO+JwQs6GWNCuQVlC5rKxnH2WClTGu3NxiIfhKLai08IKUwn3QbzX1UQ==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz",
+            "integrity": "sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==",
             "cpu": [
                 "arm"
             ],
@@ -670,9 +670,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.0.tgz",
-            "integrity": "sha512-Pnnn/2CAZWcH9GQoj1nnr85Ejh7aNDe5MsEV0xhuFNUPF0SdnutJ7b2muOI5Kx12T0/i2ol5B/tlhMviZQDL3g==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz",
+            "integrity": "sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==",
             "cpu": [
                 "arm64"
             ],
@@ -684,9 +684,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.0.tgz",
-            "integrity": "sha512-AP+DLj4q9FT22ZL43ssA3gizEn7/MfJcZ1BOuyEPqoriuH3a8VRuDddN0MtpUwEtiZL6jc1GY5/eL99hkloQ1Q==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz",
+            "integrity": "sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==",
             "cpu": [
                 "arm64"
             ],
@@ -698,9 +698,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.0.tgz",
-            "integrity": "sha512-1+jPFClHmDATqbk0Cwi74KEOymVcs09Vbqe/CTKqLwCP0TeP2CACfnMnjYBs5CJgO20e/4bxFtmbR/9fKE1gug==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz",
+            "integrity": "sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==",
             "cpu": [
                 "loong64"
             ],
@@ -712,9 +712,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.0.tgz",
-            "integrity": "sha512-Nmt5Us5w2dL8eh7QVyAIDVVwBv4wk8ljrBQe7lWkLaOcwABDaFQ3K4sAAC6IsOdJwaXXW+d85zVaMN+Xl8Co2w==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz",
+            "integrity": "sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==",
             "cpu": [
                 "ppc64"
             ],
@@ -726,9 +726,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.0.tgz",
-            "integrity": "sha512-KGuQ8WGhnq09LR7eOru7P9jfBSYXTMhq6TyavWfmEo+TxvkvuRwOCee5lPIa6HYjblOuFr4GeOxSE0c8iyw2Fg==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz",
+            "integrity": "sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==",
             "cpu": [
                 "riscv64"
             ],
@@ -740,9 +740,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.0.tgz",
-            "integrity": "sha512-lSQtvrYIONme7a4gbf4O9d3zbZat3/5covIeoqk27ZIkTgBeL/67x+wq2bZfpLjkqQQp5SjBPQ/n0sg8iArzTg==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz",
+            "integrity": "sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==",
             "cpu": [
                 "s390x"
             ],
@@ -754,9 +754,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.0.tgz",
-            "integrity": "sha512-qh0ussrXBwnF4L07M9t1+jpHRhiGSae+wpNQDbmlXHXciT7pqpZ5zpk4dyGZPtDGB2l2clDiufE16BufXPGRWQ==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz",
+            "integrity": "sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==",
             "cpu": [
                 "x64"
             ],
@@ -768,9 +768,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.0.tgz",
-            "integrity": "sha512-YEABzSaRS7+v14yw6MVBZoMqLoUyTX1/sJoGeC0euvgMrzvw0i+jHo4keDZgYeOblfwdseVAf6ylxWSvcBAKTA==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz",
+            "integrity": "sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==",
             "cpu": [
                 "x64"
             ],
@@ -782,9 +782,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.0.tgz",
-            "integrity": "sha512-jA4+oxG7QTTtSQxwSHzFVwShcppHO2DpkbAM59pfD5WMG/da79yQaeBtXAfGTI+ciUx8hqK3RF3H2KWByITXtQ==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz",
+            "integrity": "sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==",
             "cpu": [
                 "arm64"
             ],
@@ -796,9 +796,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.0.tgz",
-            "integrity": "sha512-4TQbLoAQVu9uE+cvh47JnjRZylXVdRCoOkRSVF2Rr2T0U1YwphGRjR0sHyRPEt95y3ETT4YFTTzQPq1O4bcjmw==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz",
+            "integrity": "sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==",
             "cpu": [
                 "ia32"
             ],
@@ -810,9 +810,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.0.tgz",
-            "integrity": "sha512-GsFvcTZ7Yj9k94Qm0qgav7pxmQ7lQDR9NjoelRaxeV1UF6JSDfanR/2tHZ8hS7Ps4KPIVf5AElYPRPmN/Q0ZkQ==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz",
+            "integrity": "sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==",
             "cpu": [
                 "x64"
             ],
@@ -1057,9 +1057,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001690",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
-            "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
+            "version": "1.0.30001689",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz",
+            "integrity": "sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==",
             "dev": true,
             "funding": [
                 {
@@ -1218,9 +1218,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.75",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.75.tgz",
-            "integrity": "sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q==",
+            "version": "1.5.74",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz",
+            "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==",
             "dev": true,
             "license": "ISC"
         },
@@ -2192,9 +2192,9 @@
             }
         },
         "node_modules/resolve": {
-            "version": "1.22.10",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+            "version": "1.22.9",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.9.tgz",
+            "integrity": "sha512-QxrmX1DzraFIi9PxdG5VkRfRwIgjwyud+z/iBwfRRrVmHc+P9Q7u2lSSpQ6bjr2gy5lrqIiU9vb6iAeGf2400A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2205,9 +2205,6 @@
             "bin": {
                 "resolve": "bin/resolve"
             },
-            "engines": {
-                "node": ">= 0.4"
-            },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -2224,9 +2221,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.29.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.0.tgz",
-            "integrity": "sha512-pdftUn12oB9Qlka+Vpyc39R28D4NsP9Sz6neepSrekofJmWzPD1sxcSO9hEOxFF8+7Kz3sHvwSkkRREI28M1/w==",
+            "version": "4.28.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.28.1.tgz",
+            "integrity": "sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2240,25 +2237,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.29.0",
-                "@rollup/rollup-android-arm64": "4.29.0",
-                "@rollup/rollup-darwin-arm64": "4.29.0",
-                "@rollup/rollup-darwin-x64": "4.29.0",
-                "@rollup/rollup-freebsd-arm64": "4.29.0",
-                "@rollup/rollup-freebsd-x64": "4.29.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.29.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.29.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.29.0",
-                "@rollup/rollup-linux-arm64-musl": "4.29.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.29.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.29.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.29.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.29.0",
-                "@rollup/rollup-linux-x64-gnu": "4.29.0",
-                "@rollup/rollup-linux-x64-musl": "4.29.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.29.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.29.0",
-                "@rollup/rollup-win32-x64-msvc": "4.29.0",
+                "@rollup/rollup-android-arm-eabi": "4.28.1",
+                "@rollup/rollup-android-arm64": "4.28.1",
+                "@rollup/rollup-darwin-arm64": "4.28.1",
+                "@rollup/rollup-darwin-x64": "4.28.1",
+                "@rollup/rollup-freebsd-arm64": "4.28.1",
+                "@rollup/rollup-freebsd-x64": "4.28.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.28.1",
+                "@rollup/rollup-linux-arm-musleabihf": "4.28.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.28.1",
+                "@rollup/rollup-linux-arm64-musl": "4.28.1",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.28.1",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.28.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.28.1",
+                "@rollup/rollup-linux-s390x-gnu": "4.28.1",
+                "@rollup/rollup-linux-x64-gnu": "4.28.1",
+                "@rollup/rollup-linux-x64-musl": "4.28.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.28.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.28.1",
+                "@rollup/rollup-win32-x64-msvc": "4.28.1",
                 "fsevents": "~2.3.2"
             }
         },
@@ -2606,13 +2603,13 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.5.tgz",
-            "integrity": "sha512-akD5IAH/ID5imgue2DYhzsEwCi0/4VKY31uhMLEYJwPP4TiUp8pL5PIK+Wo7H8qT8JY9i+pVfPydcFPYD1EL7g==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+            "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "esbuild": "0.24.0",
+                "esbuild": "^0.24.0",
                 "postcss": "^8.4.49",
                 "rollup": "^4.23.0"
             },