wip: Added many new functionalities

app/Abstracts/Forms/EditFormRecord.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Abstracts\Forms;
+
+use Filament\Forms\ComponentContainer;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Notifications\Notification;
+use Illuminate\Database\Eloquent\Model;
+use Livewire\Component;
+
+/**
+ * @property ComponentContainer $form
+ */
+abstract class EditFormRecord extends Component implements HasForms
+{
+    use InteractsWithForms;
+
+    public ?array $data = [];
+
+    abstract protected function getFormModel(): Model|string|null;
+
+    public function mount(): void
+    {
+        $this->fillForm();
+    }
+
+    public function fillForm(): void
+    {
+        $data = $this->getFormModel()->attributesToArray();
+
+        $data = $this->mutateFormDataBeforeFill($data);
+
+        $this->form->fill($data);
+    }
+
+    protected function mutateFormDataBeforeFill(array $data): array
+    {
+        return $data;
+    }
+
+    public function save(): void
+    {
+        $data = $this->form->getState();
+
+        $data = $this->mutateFormDataBeforeSave($data);
+
+        $this->handleRecordUpdate($this->getFormModel(), $data);
+
+        $this->getSavedNotification()?->send();
+    }
+
+    protected function mutateFormDataBeforeSave(array $data): array
+    {
+        return $data;
+    }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        $record->update($data);
+
+        return $record;
+    }
+
+    protected function getSavedNotification(): ?Notification
+    {
+        $title = $this->getSavedNotificationTitle();
+        if (blank($title)) {
+            return null;
+        }
+        return Notification::make()
+            ->success()
+            ->title($title);
+    }
+
+    protected function getSavedNotificationTitle(): ?string
+    {
+        return __('filament::resources/pages/edit-record.messages.saved');
+    }
+}

app/Filament/Pages/CompanyDetails.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Filament\Pages;
+
+use Filament\Pages\Page;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Wallo\FilamentCompanies\FilamentCompanies;
+
+class CompanyDetails extends Page
+{
+    public mixed $company;
+
+    protected static ?string $navigationIcon = 'heroicon-o-document-text';
+
+    protected static ?string $navigationLabel = 'Company';
+
+    protected static ?string $navigationGroup = 'Settings';
+
+    protected static ?string $title = 'Company';
+
+    protected static string $view = 'filament.pages.company-details';
+
+    public function mount($company): void
+    {
+        $this->company = FilamentCompanies::newCompanyModel()->findOrFail($company);
+        $this->authorizeAccess();
+    }
+
+    protected function authorizeAccess(): void
+    {
+        Gate::authorize('view', $this->company);
+    }
+
+    public static function getSlug(): string
+    {
+        return '{company}/settings/company';
+    }
+
+    public static function getUrl(array $parameters = [], bool $isAbsolute = true): string
+    {
+        return route(static::getRouteName(), ['company' => Auth::user()->currentCompany], $isAbsolute);
+    }
+
+    protected function getBreadcrumbs(): array
+    {
+        return [
+            'company' => 'Company',
+        ];
+    }
+}

app/Filament/Pages/DefaultSetting.php

@@ -3,9 +3,14 @@
 namespace App\Filament\Pages;
 
 use Filament\Pages\Page;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Wallo\FilamentCompanies\FilamentCompanies;
 
 class DefaultSetting extends Page
 {
+    public mixed $company;
+
     protected static ?string $navigationIcon = 'heroicon-o-adjustments';
 
     protected static ?string $navigationLabel = 'Default';
@@ -14,7 +19,33 @@ class DefaultSetting extends Page
 
     protected static ?string $title = 'Default';
 
-    protected static ?string $slug = 'default';
-
     protected static string $view = 'filament.pages.default-setting';
+
+    public function mount($company): void
+    {
+        $this->company = FilamentCompanies::newCompanyModel()->findOrFail($company);
+        $this->authorizeAccess();
+    }
+
+    protected function authorizeAccess(): void
+    {
+        Gate::authorize('view', $this->company);
+    }
+
+    public static function getSlug(): string
+    {
+        return '{company}/settings/default';
+    }
+
+    public static function getUrl(array $parameters = [], bool $isAbsolute = true): string
+    {
+        return route(static::getRouteName(), ['company' => Auth::user()->currentCompany], $isAbsolute);
+    }
+
+    protected function getBreadcrumbs(): array
+    {
+        return [
+            'default' => 'Default',
+        ];
+    }
 }

app/Filament/Pages/Invoice.php

@@ -3,9 +3,14 @@
 namespace App\Filament\Pages;
 
 use Filament\Pages\Page;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Wallo\FilamentCompanies\FilamentCompanies;
 
 class Invoice extends Page
 {
+    public mixed $company;
+
     protected static ?string $navigationIcon = 'heroicon-o-document-text';
 
     protected static ?string $navigationLabel = 'Invoice';
@@ -14,7 +19,33 @@ class Invoice extends Page
 
     protected static ?string $title = 'Invoice';
 
-    protected static ?string $slug = 'invoice';
-
     protected static string $view = 'filament.pages.invoice';
+
+    public function mount($company): void
+    {
+        $this->company = FilamentCompanies::newCompanyModel()->findOrFail($company);
+        $this->authorizeAccess();
+    }
+
+    protected function authorizeAccess(): void
+    {
+        Gate::authorize('view', $this->company);
+    }
+
+    public static function getSlug(): string
+    {
+        return '{company}/settings/invoice';
+    }
+
+    public static function getUrl(array $parameters = [], bool $isAbsolute = true): string
+    {
+        return route(static::getRouteName(), ['company' => Auth::user()->currentCompany], $isAbsolute);
+    }
+
+    protected function getBreadcrumbs(): array
+    {
+        return [
+            'invoice' => 'Invoice',
+        ];
+    }
 }

app/Filament/Pages/Widgets/Companies/Charts/CompanyStatsOverview.php

@@ -3,7 +3,9 @@
 namespace App\Filament\Pages\Widgets\Companies\Charts;
 
 use App\Models\Company;
+use Exception;
 use Filament\Widgets\StatsOverviewWidget;
+use InvalidArgumentException;
 
 class CompanyStatsOverview extends StatsOverviewWidget
 {
@@ -11,9 +13,14 @@ class CompanyStatsOverview extends StatsOverviewWidget
 
     /**
      * Holt's Linear Trend Method
+     * @throws Exception
      */
     protected function holtLinearTrend($data, $alpha, $beta): array
     {
+        if (count($data) < 2 || array_filter($data, 'is_numeric') !== $data) {
+            throw new InvalidArgumentException('Insufficient or invalid data for Holt\'s Linear Trend calculation', 400);
+        }
+
         $level = $data[0];
         $trend = $data[1] - $data[0];
 
@@ -30,6 +37,7 @@ class CompanyStatsOverview extends StatsOverviewWidget
 
     /**
      * Adjusts the alpha and beta parameters based on the model's performance
+     * @throws Exception
      */
     protected function adjustTrendParameters($data, $alpha, $beta): array
     {
@@ -68,6 +76,7 @@ class CompanyStatsOverview extends StatsOverviewWidget
 
     /**
      * Chart Options
+     * @throws Exception
      */
     protected function getCards(): array
     {
@@ -106,16 +115,17 @@ class CompanyStatsOverview extends StatsOverviewWidget
         // Calculate new companies and percentage change per week
         $newCompanies = [0];
         $weeklyPercentageChange = [0];
+
         for ($i = 1, $iMax = count($totalCompanies); $i < $iMax; $i++) {
             $newCompanies[] = $totalCompanies[$i] - $totalCompanies[$i - 1];
-            $weeklyPercentageChange[] = ($newCompanies[$i] / $totalCompanies[$i - 1]) * 100;
+            $weeklyPercentageChange[] = $totalCompanies[$i - 1] !== 0 ? ($newCompanies[$i] / $totalCompanies[$i - 1]) * 100 : 0;
         }
 
-        // Calculate average weekly growth rate
-        $totalWeeks = $startOfYear->diffInWeeks($today);
-        $averageWeeklyGrowthRate = round(array_sum($weeklyPercentageChange) / $totalWeeks, 2);
-
+        // Ensure $weeklyDataArray contains at least two values and all values are numeric
         $weeklyDataArray = $weeklyData->values()->toArray();
+        if (count($weeklyDataArray) < 2 || array_filter($weeklyDataArray, 'is_numeric') !== $weeklyDataArray) {
+            throw new InvalidArgumentException('Insufficient or invalid data for Holt\'s Linear Trend calculation', 400);
+        }
 
         // Adjust alpha and beta parameters
         [$alpha, $beta] = $this->adjustTrendParameters($weeklyDataArray, $alpha, $beta);
@@ -124,6 +134,10 @@ class CompanyStatsOverview extends StatsOverviewWidget
         $holtForecast = $this->holtLinearTrend($weeklyDataArray, $alpha, $beta);
         $expectedNewCompanies = round(end($holtForecast));
 
+        // Calculate average weekly growth rate
+        $totalWeeks = $startOfYear->diffInWeeks($today);
+        $averageWeeklyGrowthRate = round(array_sum($weeklyPercentageChange) / $totalWeeks, 2);
+
         // Company Stats Overview Cards
         return [
             StatsOverviewWidget\Card::make("New Companies Forecast (Holt's Linear Trend)", $expectedNewCompanies),
@@ -131,4 +145,4 @@ class CompanyStatsOverview extends StatsOverviewWidget
             StatsOverviewWidget\Card::make('Personal Companies', Company::sum('personal_company')),
         ];
     }
-}
+}

app/Filament/Pages/Widgets/Companies/Charts/CumulativeGrowth.php

@@ -52,7 +52,7 @@ class CumulativeGrowth extends ApexChartWidget
 
         for ($i = 1, $iMax = count($totalCompanies); $i < $iMax; $i++) {
             $newCompanies[] = $totalCompanies[$i] - $totalCompanies[$i - 1];
-            $monthlyPercentageChange[] = ($newCompanies[$i] / $totalCompanies[$i - 1]) * 100;
+            $monthlyPercentageChange[] = $totalCompanies[$i - 1] !== 0 ? ($newCompanies[$i] / $totalCompanies[$i - 1]) * 100 : 0;
         }
 
         $labels = collect($months)->keys()->map(static function ($month) {
@@ -151,4 +151,4 @@ class CumulativeGrowth extends ApexChartWidget
             ],
         ];
     }
-}
+}

app/Filament/Pages/Widgets/Employees/Charts/CumulativeGrowth.php

@@ -50,7 +50,7 @@ class CumulativeGrowth extends ApexChartWidget
 
         for ($i = 1, $iMax = count($totalEmployees); $i < $iMax; $i++) {
             $newEmployees[] = $totalEmployees[$i] - $totalEmployees[$i - 1];
-            $monthlyPercentageChange[] = ($newEmployees[$i] / $totalEmployees[$i - 1]) * 100;
+            $monthlyPercentageChange[] = $totalEmployees[$i - 1] !== 0 ? ($newEmployees[$i] / $totalEmployees[$i - 1]) * 100 : 0;
         }
 
         $labels = collect($months)->keys()->map(static function ($month) {

app/Filament/Resources/AccountResource.php

@@ -4,7 +4,6 @@ namespace App\Filament\Resources;
 
 use App\Actions\OptionAction\CreateCurrency;
 use App\Filament\Resources\AccountResource\Pages;
-use App\Filament\Resources\AccountResource\RelationManagers;
 use App\Models\Banking\Account;
 use App\Models\Setting\Currency;
 use App\Services\CurrencyService;
@@ -77,6 +76,7 @@ class AccountResource extends Resource
                                     ->searchable()
                                     ->reactive()
                                     ->required()
+                                    ->saveRelationshipsUsing(null)
                                     ->createOptionForm([
                                         Forms\Components\Select::make('currency.code')
                                             ->label('Code')
@@ -258,8 +258,59 @@ class AccountResource extends Resource
                 //
             ])
             ->actions([
+                Tables\Actions\Action::make('update_balance')
+                    ->hidden(static fn (Account $record) => $record->currency_code === Currency::getDefaultCurrency())
+                    ->label('Update Balance')
+                    ->icon('heroicon-o-currency-dollar')
+                    ->requiresConfirmation()
+                    ->modalSubheading('Are you sure you want to update the balance with the latest exchange rate?')
+                    ->before(static function (Tables\Actions\Action $action, Account $record) {
+                        if ($record->currency_code !== Currency::getDefaultCurrency()) {
+                            $currencyService = app(CurrencyService::class);
+                            $defaultCurrency = Currency::getDefaultCurrency();
+                            $cachedExchangeRate = $currencyService->getCachedExchangeRate($defaultCurrency, $record->currency_code);
+                            $oldExchangeRate = $record->currency->rate;
+
+                            if ($cachedExchangeRate === $oldExchangeRate) {
+                                Notification::make()
+                                    ->warning()
+                                    ->title('Balance Already Up to Date')
+                                    ->body(__('The :name account balance is already up to date.', ['name' => $record->name]))
+                                    ->persistent()
+                                    ->send();
+
+                                $action->cancel();
+                            }
+                        }
+                    })
+                    ->action(static function (Account $record) {
+                        if ($record->currency_code !== Currency::getDefaultCurrency()) {
+                            $currencyService = app(CurrencyService::class);
+                            $defaultCurrency = Currency::getDefaultCurrency();
+                            $cachedExchangeRate = $currencyService->getCachedExchangeRate($defaultCurrency, $record->currency_code);
+                            $oldExchangeRate = $record->currency->rate;
+
+                            $originalBalanceInOriginalCurrency = $record->opening_balance / $oldExchangeRate;
+                            $currencyPrecision = $record->currency->precision;
+
+                            if ($cachedExchangeRate !== $oldExchangeRate) {
+                                $record->opening_balance = round($originalBalanceInOriginalCurrency * $cachedExchangeRate, $currencyPrecision);
+                                $record->currency->rate = $cachedExchangeRate;
+                                $record->currency->save();
+                                $record->save();
+                            }
+
+                            Notification::make()
+                                ->success()
+                                ->title('Balance Updated Successfully')
+                                ->body(__('The :name account balance has been updated to reflect the current exchange rate.', ['name' => $record->name]))
+                                ->send();
+                        }
+                    }),
                 Tables\Actions\EditAction::make(),
                 Tables\Actions\DeleteAction::make()
+                    ->modalHeading('Delete Account')
+                    ->requiresConfirmation()
                     ->before(static function (Tables\Actions\DeleteAction $action, Account $record) {
                         if ($record->enabled) {
                             Notification::make()
@@ -292,6 +343,21 @@ class AccountResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/banking/accounts';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+            'company' => Auth::user()->currentCompany,
+            'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/AccountResource/Pages/EditAccount.php

@@ -3,6 +3,8 @@
 namespace App\Filament\Resources\AccountResource\Pages;
 
 use App\Filament\Resources\AccountResource;
+use App\Models\Banking\Account;
+use App\Models\Setting\Currency;
 use App\Traits\HandlesResourceRecordUpdate;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -38,7 +40,7 @@ class EditAccount extends EditRecord
     /**
      * @throws Halt
      */
-    protected function handleRecordUpdate(Model $record, array $data): Model
+    protected function handleRecordUpdate(Model|Account $record, array $data): Model|Account
     {
         $user = Auth::user();
 
@@ -46,6 +48,19 @@ class EditAccount extends EditRecord
             throw new Halt('No authenticated user found.');
         }
 
-        return $this->handleRecordUpdateWithUniqueField($record, $data, $user);
+        $oldCurrency = $record->currency_code;
+        $newCurrency = $data['currency_code'];
+
+        if ($oldCurrency !== $newCurrency) {
+            $data['opening_balance'] = Currency::convertBalance(
+                $data['opening_balance'],
+                $oldCurrency,
+                $newCurrency
+            );
+        }
+
+        $this->handleRecordUpdateWithUniqueField($record, $data, $user);
+
+        return parent::handleRecordUpdate($record, $data);
     }
 }

app/Filament/Resources/CategoryResource.php

@@ -3,8 +3,6 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\CategoryResource\Pages;
-use App\Filament\Resources\CategoryResource\RelationManagers;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Wallo\FilamentSelectify\Components\ToggleButton;
 use App\Models\Setting\Category;
@@ -124,6 +122,21 @@ class CategoryResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/settings/categories';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+                'company' => Auth::user()->currentCompany,
+                'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/CategoryResource/Pages/ListCategories.php

@@ -3,8 +3,12 @@
 namespace App\Filament\Resources\CategoryResource\Pages;
 
 use App\Filament\Resources\CategoryResource;
+use Closure;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Wallo\FilamentCompanies\FilamentCompanies;
 
 class ListCategories extends ListRecords
 {

app/Filament/Resources/CurrencyResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\CurrencyResource\Pages;
-use App\Filament\Resources\CurrencyResource\RelationManagers;
 use App\Models\Banking\Account;
 use App\Models\Setting\Currency;
 use App\Services\CurrencyService;
@@ -15,7 +14,6 @@ use Filament\Resources\Form;
 use Filament\Resources\Resource;
 use Filament\Resources\Table;
 use Filament\Tables;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Wallo\FilamentSelectify\Components\ToggleButton;
@@ -220,6 +218,21 @@ class CurrencyResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/settings/currencies';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+            'company' => Auth::user()->currentCompany,
+            'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/CustomerResource.php

@@ -4,9 +4,9 @@ namespace App\Filament\Resources;
 
 use App\Actions\OptionAction\CreateCurrency;
 use App\Filament\Resources\CustomerResource\Pages;
-use App\Filament\Resources\CustomerResource\RelationManagers;
 use App\Models\Setting\Currency;
 use App\Services\CurrencyService;
+use Illuminate\Support\Facades\Auth;
 use Wallo\FilamentSelectify\Components\ButtonGroup;
 use App\Models\Contact;
 use Filament\Forms;
@@ -15,7 +15,6 @@ use Filament\Resources\Resource;
 use Filament\Resources\Table;
 use Filament\Tables;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 class CustomerResource extends Resource
@@ -221,6 +220,21 @@ class CustomerResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/sales/customers';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+            'company' => Auth::user()->currentCompany,
+            'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/DiscountResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\DiscountResource\Pages;
-use App\Filament\Resources\DiscountResource\RelationManagers;
 use App\Models\Setting\Discount;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput\Mask;
@@ -11,7 +10,6 @@ use Filament\Resources\Form;
 use Filament\Resources\Resource;
 use Filament\Resources\Table;
 use Filament\Tables;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Wallo\FilamentSelectify\Components\ToggleButton;
 
@@ -171,6 +169,21 @@ class DiscountResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/settings/discounts';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+            'company' => Auth::user()->currentCompany,
+            'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/InvoiceResource.php

@@ -5,6 +5,7 @@ namespace App\Filament\Resources;
 use App\Filament\Resources\InvoiceResource\Pages;
 use App\Filament\Resources\InvoiceResource\RelationManagers;
 use App\Models\Setting\Currency;
+use Illuminate\Support\Facades\Auth;
 use Wallo\FilamentSelectify\Components\ButtonGroup;
 use App\Models\Document\Document;
 use Filament\Forms;
@@ -13,8 +14,6 @@ use Filament\Resources\Resource;
 use Filament\Resources\Table;
 use Filament\Tables;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Facades\Auth;
 
 class InvoiceResource extends Resource
 {
@@ -120,6 +119,21 @@ class InvoiceResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/sales/invoices';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+            'company' => Auth::user()->currentCompany,
+            'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Filament/Resources/TaxResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\TaxResource\Pages;
-use App\Filament\Resources\TaxResource\RelationManagers;
 use App\Models\Setting\Tax;
 use Exception;
 use Filament\Forms;
@@ -13,7 +12,6 @@ use Filament\Resources\Form;
 use Filament\Resources\Resource;
 use Filament\Resources\Table;
 use Filament\Tables;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Wallo\FilamentSelectify\Components\ToggleButton;
@@ -177,6 +175,21 @@ class TaxResource extends Resource
             ]);
     }
 
+    public static function getSlug(): string
+    {
+        return '{company}/settings/taxes';
+    }
+
+    public static function getUrl($name = 'index', $params = [], $isAbsolute = true): string
+    {
+        $routeBaseName = static::getRouteBaseName();
+
+        return route("{$routeBaseName}.{$name}", [
+            'company' => Auth::user()->currentCompany,
+            'record' => $params['record'] ?? null,
+        ], $isAbsolute);
+    }
+
     public static function getRelations(): array
     {
         return [

app/Forms/Components/Invoice.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Forms\Components;
+
+use Filament\Forms\Components\Field;
+
+class Invoice extends Field
+{
+    protected string $view = 'forms.components.invoice';
+
+    protected ?string $companyName = null;
+
+    protected ?string $companyAddress = null;
+
+    protected ?string $companyCity = null;
+
+    protected ?string $companyState = null;
+
+    protected ?string $companyZip = null;
+
+    protected ?string $companyCountry = null;
+
+    protected ?string $documentNumberPrefix = null;
+
+    protected ?string $documentNumberDigits = null;
+}

app/Http/Livewire/CompanyDetails.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use App\Abstracts\Forms\EditFormRecord;
+use App\Models\Company;
+use Filament\Forms\ComponentContainer;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\TextInput;
+use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property ComponentContainer $form
+ */
+class CompanyDetails extends EditFormRecord
+{
+    public Company $company;
+
+    protected function getFormModel(): Model|string|null
+    {
+        return $this->company;
+    }
+
+    protected function getFormSchema(): array
+    {
+        return [
+            Section::make('General')
+                ->schema([
+                    Group::make()
+                        ->schema([
+                            TextInput::make('email')
+                                ->label('Email')
+                                ->email()
+                                ->nullable(),
+                            TextInput::make('phone')
+                                ->label('Phone')
+                                ->tel()
+                                ->maxLength(20),
+                        ])->columns(1),
+                    Group::make()
+                        ->schema([
+                            FileUpload::make('logo')
+                                ->label('Logo')
+                                ->disk('public')
+                                ->directory('logos/company')
+                                ->imageResizeMode('cover')
+                                ->imagePreviewHeight('150')
+                                ->imageCropAspectRatio('2:1')
+                                ->panelAspectRatio('2:1')
+                                ->reactive()
+                                ->enableOpen()
+                                ->preserveFilenames()
+                                ->visibility('public')
+                                ->image(),
+                        ])->columns(1),
+                ])->columns(),
+            Section::make('Address')
+                ->schema([
+                    TextInput::make('address')
+                        ->label('Address')
+                        ->maxLength(100)
+                        ->columnSpanFull()
+                        ->nullable(),
+                    TextInput::make('country')
+                        ->label('Country')
+                        ->nullable(),
+                    TextInput::make('state')
+                        ->label('Province/State')
+                        ->nullable(),
+                    TextInput::make('city')
+                        ->label('Town/City')
+                        ->maxLength(100)
+                        ->nullable(),
+                    TextInput::make('zip_code')
+                        ->label('Postal/Zip Code')
+                        ->maxLength(100)
+                        ->nullable(),
+                ])->columns(),
+        ];
+    }
+
+    public function render(): View
+    {
+        return view('livewire.company-details');
+    }
+}

app/Http/Livewire/DefaultSetting.php

@@ -15,6 +15,7 @@ use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Model;
 use Livewire\Component;
 
 /**
@@ -24,15 +25,13 @@ class DefaultSetting extends Component implements HasForms
 {
     use InteractsWithForms, HandlesDefaultSettingRecordUpdate;
 
-    public Defaults $defaultSetting;
-
     public $data;
 
-    public $record;
+    public Defaults $record;
 
     public function mount():void
     {
-        $this->defaultSetting = Defaults::firstOrNew();
+        $this->record = Defaults::firstOrNew();
 
         $this->form->fill([
             'account_id' => Defaults::getDefaultAccount(),
@@ -113,13 +112,16 @@ class DefaultSetting extends Component implements HasForms
     {
         $data = $this->form->getState();
 
-        $this->record = $this->handleRecordUpdate($data);
-
-        $this->form->model($this->record)->saveRelationships();
+        $this->handleRecordUpdate($this->getFormModel(), $data);
 
         $this->getSavedNotification()?->send();
     }
 
+    protected function getFormModel(): Model
+    {
+        return $this->record;
+    }
+
     protected function getRelatedEntities(): array
     {
         return [
@@ -134,12 +136,7 @@ class DefaultSetting extends Component implements HasForms
         ];
     }
 
-    protected function getFormModel(): string
-    {
-        return Defaults::class;
-    }
-
-    protected function getSavedNotification():?Notification
+    protected function getSavedNotification(): ?Notification
     {
         $title = $this->getSavedNotificationTitle();
 

app/Http/Livewire/Invoice.php

@@ -2,48 +2,49 @@
 
 namespace App\Http\Livewire;
 
+use App\Abstracts\Forms\EditFormRecord;
 use App\Models\Setting\DocumentDefault;
 use Filament\Forms\ComponentContainer;
+use Filament\Forms\Components\ColorPicker;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Radio;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Notifications\Notification;
+use Filament\Forms\Components\ViewField;
 use Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\Auth;
-use Livewire\Component;
-use Filament\Forms\Contracts\HasForms;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * @property ComponentContainer $form
  */
-class Invoice extends Component implements HasForms
+class Invoice extends EditFormRecord
 {
-    use InteractsWithForms;
-
     public DocumentDefault $invoice;
 
-    public $data;
+    protected function getFormModel(): Model|string|null
+    {
+        $this->invoice = DocumentDefault::where('type', 'invoice')->firstOrNew();
 
-    public $record;
+        return $this->invoice;
+    }
 
     public function mount(): void
     {
-        $this->invoice = DocumentDefault::where('type', 'invoice')->firstOrNew();
+        $this->fillForm();
+    }
 
-        $this->form->fill([
-            'document_number_prefix' => $this->invoice->document_number_prefix,
-            'document_number_digits' => $this->invoice->document_number_digits,
-            'document_number_next' => $this->invoice->document_number_next,
-            'payment_terms' => $this->invoice->payment_terms,
-            'template' => $this->invoice->template,
-            'title' => $this->invoice->title,
-            'subheading' => $this->invoice->subheading,
-            'notes' => $this->invoice->notes,
-            'footer' => $this->invoice->footer,
-            'terms' => $this->invoice->terms,
-        ]);
+    public function fillForm(): void
+    {
+        $data = $this->getFormModel()->attributesToArray();
+
+        unset($data['id']);
+
+        $data = $this->mutateFormDataBeforeFill($data);
+
+        $this->form->fill($data);
     }
 
     protected function getFormSchema(): array
@@ -51,110 +52,194 @@ class Invoice extends Component implements HasForms
         return [
             Section::make('General')
                 ->schema([
-                    TextInput::make('document_number_prefix')
+                    TextInput::make('number_prefix')
                         ->label('Number Prefix')
                         ->default('INV-')
+                        ->reactive()
                         ->required(),
-                    Select::make('document_number_digits')
+                    Select::make('number_digits')
                         ->label('Number Digits')
-                        ->options(DocumentDefault::getDocumentNumberDigits())
-                        ->default(DocumentDefault::getDefaultDocumentNumberDigits())
+                        ->options($this->invoice->getAvailableNumberDigits())
+                        ->default($this->invoice->getDefaultNumberDigits())
                         ->reactive()
-                        ->afterStateUpdated(static function (callable $set, $state) {
+                        ->afterStateUpdated(function (callable $set, $state) {
                             $numDigits = $state;
-                            $nextNumber = DocumentDefault::getDefaultDocumentNumberNext($numDigits);
+                            $nextNumber = $this->invoice->getNextDocumentNumber($numDigits);
 
-                            return $set('document_number_next', $nextNumber);
+                            return $set('number_next', $nextNumber);
                         })
-                        ->searchable()
-                        ->required(),
-                    TextInput::make('document_number_next')
+                        ->required()
+                        ->searchable(),
+                    TextInput::make('number_next')
                         ->label('Next Number')
-                        ->default(DocumentDefault::getDefaultDocumentNumberNext(DocumentDefault::getDefaultDocumentNumberDigits()))
-                        ->required(),
+                        ->reactive()
+                        ->required()
+                        ->default($this->invoice->getNextDocumentNumber($this->invoice->getDefaultNumberDigits())),
                     Select::make('payment_terms')
                         ->label('Payment Terms')
-                        ->options(DocumentDefault::getPaymentTerms())
-                        ->default(DocumentDefault::getDefaultPaymentTerms())
-                        ->searchable()
-                        ->required(),
-                ])->columns(),
-            Section::make('Template')
-                ->schema([
-                    Select::make('template')
-                        ->label('Template')
-                        ->options([
-                            'default' => 'Default',
-                            'simple' => 'Simple',
-                            'modern' => 'Modern',
-                        ])
-                        ->default('default')
+                        ->options($this->invoice->getPaymentTerms())
+                        ->default($this->invoice->getDefaultPaymentTerms())
                         ->searchable()
+                        ->reactive()
                         ->required(),
                 ])->columns(),
             Section::make('Content')
                 ->schema([
                     TextInput::make('title')
                         ->label('Title')
+                        ->reactive()
                         ->default('Invoice')
                         ->nullable(),
                     TextInput::make('subheading')
                         ->label('Subheading')
-                        ->nullable(),
-                    Textarea::make('notes')
-                        ->label('Notes')
+                        ->reactive()
                         ->nullable(),
                     Textarea::make('footer')
                         ->label('Footer')
+                        ->reactive()
                         ->nullable(),
                     Textarea::make('terms')
-                        ->label('Terms')
+                        ->label('Notes / Terms')
                         ->nullable()
-                        ->columnSpanFull(),
+                        ->reactive(),
                 ])->columns(),
+            Section::make('Template Settings')
+                ->description('Choose the template and edit the titles of the columns on your invoices.')
+                ->schema([
+                    Group::make()
+                        ->schema([
+                            FileUpload::make('document_logo')
+                                ->label('Logo')
+                                ->disk('public')
+                                ->directory('logos/documents')
+                                ->imageResizeMode('contain')
+                                ->imagePreviewHeight('250')
+                                ->imageCropAspectRatio('2:1')
+                                ->reactive()
+                                ->enableOpen()
+                                ->preserveFilenames()
+                                ->visibility('public')
+                                ->image(),
+                            ColorPicker::make('accent_color')
+                                ->label('Accent Color')
+                                ->reactive()
+                                ->default('#d9d9d9'),
+                            Select::make('template')
+                                ->label('Template')
+                                ->options([
+                                    'default' => 'Default',
+                                    'modern' => 'Modern',
+                                ])
+                                ->reactive()
+                                ->default('modern')
+                                ->required(),
+                            Radio::make('item_column')
+                                ->label('Items')
+                                ->options($this->invoice->getItemColumns())
+                                ->dehydrateStateUsing(static function (callable $get, $state) {
+                                    return $state === 'other' ? $get('custom_item_column') : $state;
+                                })
+                                ->afterStateHydrated(function (callable $set, callable $get, $state, Radio $component) {
+                                    if (isset($this->invoice->getItemColumns()[$state])) {
+                                        $component->state($state);
+                                    } else {
+                                        $component->state('other');
+                                        $set('custom_item_column', $state);
+                                    }
+                                })
+                                ->default($this->invoice->getDefaultItemColumn())
+                                ->reactive(),
+                            TextInput::make('custom_item_column')
+                                ->reactive()
+                                ->disableLabel()
+                                ->disabled(static fn (callable $get) => $get('item_column') !== 'other')
+                                ->nullable(),
+                            Radio::make('unit_column')
+                                ->label('Units')
+                                ->options(DocumentDefault::getUnitColumns())
+                                ->dehydrateStateUsing(static function (callable $get, $state) {
+                                    return $state === 'other' ? $get('custom_unit_column') : $state;
+                                })
+                                ->afterStateHydrated(function (callable $set, callable $get, $state, Radio $component) {
+                                    if (isset($this->invoice->getUnitColumns()[$state])) {
+                                        $component->state($state);
+                                    } else {
+                                        $component->state('other');
+                                        $set('custom_unit_column', $state);
+                                    }
+                                })
+                                ->default($this->invoice->getDefaultUnitColumn())
+                                ->reactive(),
+                            TextInput::make('custom_unit_column')
+                                ->reactive()
+                                ->disableLabel()
+                                ->disabled(static fn (callable $get) => $get('unit_column') !== 'other')
+                                ->nullable(),
+                            Radio::make('price_column')
+                                ->label('Price')
+                                ->options($this->invoice->getPriceColumns())
+                                ->dehydrateStateUsing(static function (callable $get, $state) {
+                                    return $state === 'other' ? $get('custom_price_column') : $state;
+                                })
+                                ->afterStateHydrated(function (callable $set, callable $get, $state, Radio $component) {
+                                    if (isset($this->invoice->getPriceColumns()[$state])) {
+                                        $component->state($state);
+                                    } else {
+                                        $component->state('other');
+                                        $set('custom_price_column', $state);
+                                    }
+                                })
+                                ->default($this->invoice->getDefaultPriceColumn())
+                                ->reactive(),
+                            TextInput::make('custom_price_column')
+                                ->reactive()
+                                ->disableLabel()
+                                ->disabled(static fn (callable $get) => $get('price_column') !== 'other')
+                                ->nullable(),
+                            Radio::make('amount_column')
+                                ->label('Amount')
+                                ->options($this->invoice->getAmountColumns())
+                                ->dehydrateStateUsing(static function (callable $get, $state) {
+                                    return $state === 'other' ? $get('custom_amount_column') : $state;
+                                })
+                                ->afterStateHydrated(function (callable $set, callable $get, $state, Radio $component) {
+                                    if (isset($this->invoice->getAmountColumns()[$state])) {
+                                        $component->state($state);
+                                    } else {
+                                        $component->state('other');
+                                        $set('custom_amount_column', $state);
+                                    }
+                                })
+                                ->default($this->invoice->getDefaultAmountColumn())
+                                ->reactive(),
+                            TextInput::make('custom_amount_column')
+                                ->reactive()
+                                ->disableLabel()
+                                ->disabled(static fn (callable $get) => $get('amount_column') !== 'other')
+                                ->nullable(),
+                        ])->columns(1),
+                    Group::make()
+                        ->schema([
+                            ViewField::make('preview.default')
+                                ->label('Preview')
+                                ->visible(static fn (callable $get) => $get('template') === 'default')
+                                ->view('components.invoice-layouts.default'),
+                            ViewField::make('preview.modern')
+                                ->label('Preview')
+                                ->visible(static fn (callable $get) => $get('template') === 'modern')
+                                ->view('components.invoice-layouts.modern'),
+                        ])->columnSpan(2),
+                ])->columns(3),
         ];
     }
 
-    public function save(): void
-    {
-        $data = $this->form->getState();
-
-        $data = $this->mutateFormDataBeforeSave($data);
-
-        $this->record = $this->invoice->update($data);
-
-        $this->form->model($this->record)->saveRelationships();
-
-        $this->getSavedNotification()?->send();
-    }
-
     protected function mutateFormDataBeforeSave(array $data): array
     {
-        $data['company_id'] = Auth::user()->currentCompany->id;
         $data['type'] = 'invoice';
 
         return $data;
     }
 
-    protected function getSavedNotification():?Notification
-    {
-        $title = $this->getSavedNotificationTitle();
-
-        if (blank($title)) {
-            return null;
-        }
-
-        return Notification::make()
-            ->success()
-            ->title($title);
-    }
-
-    protected function getSavedNotificationTitle(): ?string
-    {
-        return __('filament::resources/pages/edit-record.messages.saved');
-    }
-
-
     public function render(): View
     {
         return view('livewire.invoice');

app/Models/Banking/Account.php

@@ -2,7 +2,6 @@
 
 namespace App\Models\Banking;
 
-use App\Scopes\CurrentCompanyScope;
 use App\Models\Setting\Currency;
 use App\Models\Setting\DefaultSetting;
 use App\Traits\Blamable;
@@ -50,11 +49,6 @@ class Account extends Model
         'enabled' => 'boolean',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');

app/Models/Company.php

@@ -14,6 +14,8 @@ use App\Models\Setting\Tax;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Squire\Models\Country;
+use Squire\Models\Region;
 use Wallo\FilamentCompanies\Company as FilamentCompaniesCompany;
 use Wallo\FilamentCompanies\Events\CompanyCreated;
 use Wallo\FilamentCompanies\Events\CompanyDeleted;
@@ -40,6 +42,14 @@ class Company extends FilamentCompaniesCompany
     protected $fillable = [
         'name',
         'personal_company',
+        'logo',
+        'address',
+        'city',
+        'zip_code',
+        'state',
+        'country',
+        'phone',
+        'email',
     ];
 
     /**

app/Models/Contact.php

@@ -41,11 +41,6 @@ class Contact extends Model
         'updated_by',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');

app/Models/Setting/Category.php

@@ -4,7 +4,6 @@ namespace App\Models\Setting;
 
 use App\Models\Document\Document;
 use App\Models\Item;
-use App\Scopes\CurrentCompanyScope;
 use App\Traits\Blamable;
 use App\Traits\CompanyOwned;
 use Database\Factories\CategoryFactory;
@@ -36,11 +35,6 @@ class Category extends Model
         'enabled' => 'boolean',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public static function getCategoryTypes(): array
     {
         return [

app/Models/Setting/Currency.php

@@ -42,11 +42,6 @@ class Currency extends Model
         'symbol_first' => 'boolean',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');
@@ -93,6 +88,21 @@ class Currency extends Model
         return $defaultCurrency->code ?? null;
     }
 
+    public static function convertBalance($balance, $oldCurrency, $newCurrency): float|int
+    {
+        $currencies = self::whereIn('code', [$oldCurrency, $newCurrency])->get();
+        $oldCurrency = $currencies->firstWhere('code', $oldCurrency);
+        $newCurrency = $currencies->firstWhere('code', $newCurrency);
+
+        $oldRate = $oldCurrency?->rate;
+        $newRate = $newCurrency?->rate;
+        $precision = $newCurrency?->precision;
+
+        $baseBalance = $balance / $oldRate;
+
+        return round($baseBalance * $newRate, $precision);
+    }
+
     protected static function newFactory(): Factory
     {
         return CurrencyFactory::new();

app/Models/Setting/DefaultSetting.php

@@ -31,11 +31,6 @@ class DefaultSetting extends Model
         'updated_by',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');

app/Models/Setting/Discount.php

@@ -43,11 +43,6 @@ class Discount extends Model
         'end_date' => 'datetime',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');

app/Models/Setting/DocumentDefault.php

@@ -21,27 +21,26 @@ class DocumentDefault extends Model
     protected $table = 'document_defaults';
 
     protected $fillable = [
-        'company_id',
         'type',
-        'document_number_prefix',
-        'document_number_digits',
-        'document_number_next',
+        'document_logo',
+        'number_prefix',
+        'number_digits',
+        'number_next',
         'payment_terms',
-        'template',
         'title',
         'subheading',
-        'notes',
         'terms',
         'footer',
+        'accent_color',
+        'template',
+        'item_column',
+        'unit_column',
+        'price_column',
+        'amount_column',
         'created_by',
         'updated_by',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');
@@ -62,31 +61,20 @@ class DocumentDefault extends Model
         return $this->belongsTo(FilamentCompanies::userModel(), 'updated_by');
     }
 
-    public static function getDocumentNumberDigits(): array
+    public static function getAvailableNumberDigits(): array
     {
         return array_combine(range(1, 20), range(1, 20));
     }
 
-    public static function getDefaultDocumentNumberDigits(string $type = 'invoice'): int
+    public static function getDefaultNumberDigits(string $type = 'invoice'): int
     {
-        $documentNumberDigits = self::where('type', $type)->pluck('document_number_digits', 'id')->toArray();
-
-        return array_key_first($documentNumberDigits) ?? 5;
+        return static::where('type', $type)->value('number_digits') ?? 5;
     }
 
-    public static function getDefaultDocumentNumberNext(int|null $numDigits = null, string $type = 'invoice'): string
+    public static function getNextDocumentNumber(int|null $numDigits = null, string $type = 'invoice'): string
     {
-        // Fetch the latest document
         $latestDocument = Document::where('type', $type)->orderBy('id', 'desc')->first();
-
-        // If there are no documents yet, start from 1
-        if (!$latestDocument) {
-            $nextNumber = 1;
-        } else {
-            // Otherwise, increment the latest document's number
-            $nextNumber = (int)$latestDocument->document_number + 1;
-        }
-
+        $nextNumber = $latestDocument ? ((int)$latestDocument->number + 1) : 1;
         return str_pad($nextNumber, $numDigits, '0', STR_PAD_LEFT);
     }
 
@@ -105,9 +93,64 @@ class DocumentDefault extends Model
 
     public static function getDefaultPaymentTerms(string $type = 'invoice'): int
     {
-        $paymentTerms = self::where('type', $type)->pluck('payment_terms', 'id')->toArray();
+        return static::where('type', $type)->value('payment_terms') ?? 30;
+    }
+
+    public static function getItemColumns(): array
+    {
+        return [
+            'items' => 'Items',
+            'products' => 'Products',
+            'services' => 'Services',
+            'other' => 'Other',
+        ];
+    }
+
+    public static function getDefaultItemColumn(string $type = 'invoice'): string
+    {
+        return static::where('type', $type)->value('item_column') ?? 'items';
+    }
 
-        return array_key_first($paymentTerms) ?? 30;
+    public static function getUnitColumns(): array
+    {
+        return [
+            'quantity' => 'Quantity',
+            'hours' => 'Hours',
+            'other' => 'Other',
+        ];
+    }
+
+    public static function getDefaultUnitColumn(string $type = 'invoice'): string
+    {
+        return static::where('type', $type)->value('unit_column') ?? 'quantity';
+    }
+
+    public static function getPriceColumns(): array
+    {
+        return [
+            'price' => 'Price',
+            'rate' => 'Rate',
+            'other' => 'Other',
+        ];
+    }
+
+    public static function getDefaultPriceColumn(string $type = 'invoice'): string
+    {
+        return static::where('type', $type)->value('price_column') ?? 'price';
+    }
+
+    public static function getAmountColumns(): array
+    {
+        return [
+            'amount' => 'Amount',
+            'total' => 'Total',
+            'other' => 'Other',
+        ];
+    }
+
+    public static function getDefaultAmountColumn(string $type = 'invoice'): string
+    {
+        return static::where('type', $type)->value('amount_column') ?? 'amount';
     }
 
     public function getDocumentNumberAttribute(): string

app/Models/Setting/Tax.php

@@ -40,11 +40,6 @@ class Tax extends Model
         'enabled' => 'boolean',
     ];
 
-    protected static function booted(): void
-    {
-        static::addGlobalScope(new CurrentCompanyScope);
-    }
-
     public function company(): BelongsTo
     {
         return $this->belongsTo(Company::class, 'company_id');

app/Providers/SquireServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Models\Company;
 use App\Models\Contact;
 use Squire\Repository;
 use Illuminate\Support\ServiceProvider;
@@ -24,4 +25,4 @@ class SquireServiceProvider extends ServiceProvider
         Repository::registerSource(Contact::class, 'en', base_path('vendor/squirephp/regions-en/resources/data.csv'));
         Repository::registerSource(Contact::class, 'en', base_path('vendor/squirephp/countries-en/resources/data.csv'));
     }
-}
+}

app/Traits/CompanyOwned.php

@@ -2,6 +2,7 @@
 
 namespace App\Traits;
 
+use App\Scopes\CurrentCompanyScope;
 use Filament\Notifications\Notification;
 use Illuminate\Support\Facades\Auth;
 
@@ -10,16 +11,20 @@ trait CompanyOwned
     public static function bootCompanyOwned(): void
     {
         static::creating(static function ($model) {
-            if (Auth::check() && Auth::user()->currentCompany) {
-                $model->company_id = Auth::user()->currentCompany->id;
-            } else {
-                Notification::make()
-                    ->danger()
-                    ->title('Oops! Unable to Assign Company')
-                    ->body('We encountered an issue while creating the record. Please ensure you are logged in and have a valid company associated with your account.')
-                    ->persistent()
-                    ->send();
+            if (empty($model->company_id)) {
+                if (Auth::check() && Auth::user()->currentCompany) {
+                    $model->company_id = Auth::user()->currentCompany->id;
+                } else {
+                    Notification::make()
+                        ->danger()
+                        ->title('Oops! Unable to Assign Company')
+                        ->body('We encountered an issue while creating the record. Please ensure you are logged in and have a valid company associated with your account.')
+                        ->persistent()
+                        ->send();
+                }
             }
         });
+
+        static::addGlobalScope(new CurrentCompanyScope);
     }
 }

app/Traits/HandlesDefaultSettingRecordUpdate.php

@@ -8,34 +8,32 @@ use Illuminate\Support\Facades\Auth;
 trait HandlesDefaultSettingRecordUpdate
 {
     abstract protected function getRelatedEntities(): array;
-    abstract protected function getFormModel(): string;
 
-    protected function handleRecordUpdate(array $data): Model
+    protected function handleRecordUpdate(Model $record, array $data): Model
     {
         $relatedEntities = $this->getRelatedEntities();
-        $model = $this->getFormModel();
 
-        $existingRecord = $model::where('company_id', Auth::user()->currentCompany->id)
+        $existingRecord = $record::query()->where('company_id', Auth::user()->currentCompany->id)
             ->latest()
             ->first();
 
         foreach ($relatedEntities as $field => $params) {
-            [$class, $key, $type] = array_pad($params, 3, null);
+            [$modelClass, $key, $type] = array_pad($params, 3, null);
 
             if ($existingRecord === null || !isset($existingRecord->{$field})) {
                 continue;
             }
 
             if (isset($data[$field]) && $data[$field] !== $existingRecord->{$field}) {
-                $this->updateEnabledRecord($class, $key, $existingRecord->{$field}, $type, false);
-                $this->updateEnabledRecord($class, $key, $data[$field], $type, true);
+                $this->updateEnabledRecord(new $modelClass, $key, $existingRecord->{$field}, $type, false);
+                $this->updateEnabledRecord(new $modelClass, $key, $data[$field], $type);
             }
         }
 
-        $defaults = $model::where('company_id', Auth::user()->currentCompany->id)->first();
+        $defaults = $record::query()->where('company_id', Auth::user()->currentCompany->id)->first();
 
         if ($defaults === null) {
-            $defaults = $model::create($data);
+            $defaults = $record::query()->create($data);
         } else {
             $defaults->update($data);
         }
@@ -43,9 +41,9 @@ trait HandlesDefaultSettingRecordUpdate
         return $defaults;
     }
 
-    protected function updateEnabledRecord($class, $key, $value, $type = null, $enabled = true): void
+    protected function updateEnabledRecord(Model $record, string $key, mixed $value, ?string $type = null, bool $enabled = true): void
     {
-        $query = $class::where('company_id', Auth::user()->currentCompany->id)
+        $query = $record::query()->where('company_id', Auth::user()->currentCompany->id)
             ->where('enabled', !$enabled);
 
         if ($type !== null) {

app/View/Models/InvoiceViewModel.php

@@ -0,0 +1,173 @@
+<?php
+
+namespace App\View\Models;
+
+use App\Models\Setting\DocumentDefault;
+use Spatie\ViewModels\ViewModel;
+
+class InvoiceViewModel extends ViewModel
+{
+    public DocumentDefault $invoice;
+
+    public ?array $data = [];
+
+    public function __construct(DocumentDefault $invoice, ?array $data = null)
+    {
+        $this->invoice = $invoice;
+        $this->data = $data;
+    }
+
+    public function document_logo(): ?string
+    {
+        return $this->data['document_logo'] ?? $this->invoice->document_logo ?? $this->invoice->company->logo ?? null;
+    }
+
+    // Company related methods
+    public function company_name(): string
+    {
+        return $this->invoice->company->name;
+    }
+
+    public function company_address(): ?string
+    {
+        return $this->invoice->company->address ?? null;
+    }
+
+    public function company_phone(): ?string
+    {
+        return $this->invoice->company->phone ?? null;
+    }
+
+    public function company_city(): ?string
+    {
+        return $this->invoice->company->city ?? null;
+    }
+
+    public function company_state(): ?string
+    {
+        return $this->invoice->company->state ?? null;
+    }
+
+    public function company_zip(): ?string
+    {
+        return $this->invoice->company->zip_code ?? null;
+    }
+
+    // Invoice numbering related methods
+    public function number_prefix(): string
+    {
+        return $this->data['number_prefix'] ?? $this->invoice->number_prefix ?? 'INV-';
+    }
+
+    public function number_digits(): int
+    {
+        return $this->data['number_digits'] ?? $this->invoice->number_digits ?? $this->invoice->getDefaultNumberDigits();
+    }
+
+    public function number_next(): int
+    {
+        return $this->data['number_next'] ?? $this->invoice->number_next ?? $this->invoice->getNextDocumentNumber($this->number_digits());
+    }
+
+    public function invoice_number(): string
+    {
+        return $this->number_prefix() . str_pad($this->number_next(), $this->number_digits(), "0", STR_PAD_LEFT);
+    }
+
+    // Invoice date related methods
+    public function invoice_date(): string
+    {
+        return now()->format('M d, Y');
+    }
+
+    public function payment_terms(): string
+    {
+        return $this->data['payment_terms'] ?? $this->invoice->payment_terms ?? $this->invoice->getDefaultPaymentTerms();
+    }
+
+    public function invoice_due_date(): string
+    {
+        return now()->addDays($this->payment_terms())->format('M d, Y');
+    }
+
+    // Invoice header related methods
+    public function title(): string
+    {
+        return $this->data['title'] ?? $this->invoice->title ?? 'Invoice';
+    }
+
+    public function subheading(): ?string
+    {
+        return $this->data['subheading'] ?? $this->invoice->subheading ?? null;
+    }
+
+    // Invoice styling
+    public function accent_color(): string
+    {
+        return $this->data['accent_color'] ?? $this->invoice->accent_color ?? '#6366F1';
+    }
+
+    public function footer(): string
+    {
+        return $this->data['footer'] ?? $this->invoice->footer ?? 'Thank you for your business!';
+    }
+
+    public function terms(): string
+    {
+        return $this->data['terms'] ?? $this->invoice->terms ?? 'Payment is due within thirty (30) days from the date of invoice. Any discrepancies should be reported within fourteen (14) days of receipt.';
+    }
+
+    // Invoice column related methods
+    public function item_column(): string
+    {
+        $item_column = $this->data['item_column'] ?? $this->invoice->item_column ?? $this->invoice->getDefaultItemColumn();
+        return isset($this->invoice->getItemColumns()[$item_column]) ? ucfirst($item_column) : $item_column;
+    }
+
+    public function unit_column(): string
+    {
+        $unit_column = $this->data['unit_column'] ?? $this->invoice->unit_column ?? $this->invoice->getDefaultUnitColumn();
+        return isset($this->invoice->getUnitColumns()[$unit_column]) ? ucfirst($unit_column) : $unit_column;
+    }
+
+    public function price_column(): string
+    {
+        $price_column = $this->data['price_column'] ?? $this->invoice->price_column ?? $this->invoice->getDefaultPriceColumn();
+        return isset($this->invoice->getPriceColumns()[$price_column]) ? ucfirst($price_column) : $price_column;
+    }
+
+    public function amount_column(): string
+    {
+        $amount_column = $this->data['amount_column'] ?? $this->invoice->amount_column ?? $this->invoice->getDefaultAmountColumn();
+        return isset($this->invoice->getAmountColumns()[$amount_column]) ? ucfirst($amount_column) : $amount_column;
+    }
+
+    public function buildViewData(): array
+    {
+        return [
+            'document_logo' => $this->document_logo(),
+            'company_name' => $this->company_name(),
+            'company_address' => $this->company_address(),
+            'company_phone' => $this->company_phone(),
+            'company_city' => $this->company_city(),
+            'company_state' => $this->company_state(),
+            'company_zip' => $this->company_zip(),
+            'number_prefix' => $this->number_prefix(),
+            'number_digits' => $this->number_digits(),
+            'number_next' => $this->number_next(),
+            'invoice_number' => $this->invoice_number(),
+            'invoice_date' => $this->invoice_date(),
+            'payment_terms' => $this->payment_terms(),
+            'invoice_due_date' => $this->invoice_due_date(),
+            'title' => $this->title(),
+            'subheading' => $this->subheading(),
+            'accent_color' => $this->accent_color(),
+            'footer' => $this->footer(),
+            'terms' => $this->terms(),
+            'item_column' => $this->item_column(),
+            'unit_column' => $this->unit_column(),
+            'price_column' => $this->price_column(),
+            'amount_column' => $this->amount_column(),
+        ];
+    }
+}

composer.json

@@ -16,6 +16,7 @@
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.8",
         "leandrocfe/filament-apex-charts": "^1.0",
+        "spatie/laravel-view-models": "^1.5",
         "squirephp/countries-en": "^3.4",
         "squirephp/regions-en": "^3.4",
         "squirephp/repository": "^3.4"

config/filament.php

@@ -25,7 +25,7 @@ return [
     |
     */
 
-    'path' => env('FILAMENT_PATH', 'admin'),
+    'path' => env('FILAMENT_PATH', 'company'),
 
     /*
     |--------------------------------------------------------------------------

config/services.php

@@ -34,7 +34,7 @@ return [
     'github' => [
         'client_id' => env('GITHUB_CLIENT_ID'),
         'client_secret' => env('GITHUB_CLIENT_SECRET'),
-        'redirect' => 'https://erpsaas.test/oauth/github/callback',
+        'redirect' => 'http://erpsaas.test/oauth/github/callback',
     ],
 
 ];

database/factories/DocumentDefaultFactory.php

@@ -25,10 +25,15 @@ class DocumentDefaultFactory extends Factory
     public function definition(): array
     {
         return [
-            'document_number_digits' => '5',
-            'document_number_next' => '1',
+            'number_digits' => '5',
+            'number_next' => '1',
             'payment_terms' => '30',
+            'accent_color' => '#007BFF',
             'template' => 'default',
+            'item_column' => 'items',
+            'unit_column' => 'quantity',
+            'price_column' => 'price',
+            'amount_column' => 'amount',
         ];
     }
 
@@ -40,7 +45,7 @@ class DocumentDefaultFactory extends Factory
         return $this->state(function (array $attributes) {
             return [
                 'type' => 'invoice',
-                'document_number_prefix' => 'INV-',
+                'number_prefix' => 'INV-',
             ];
         });
     }
@@ -53,7 +58,7 @@ class DocumentDefaultFactory extends Factory
         return $this->state(function (array $attributes) {
             return [
                 'type' => 'bill',
-                'document_number_prefix' => 'BILL-',
+                'number_prefix' => 'BILL-',
             ];
         });
     }

database/migrations/2023_05_22_000100_create_document_defaults_table.php

@@ -15,16 +15,21 @@ return new class extends Migration
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->string('type');
-            $table->string('document_number_prefix')->nullable();
-            $table->string('document_number_digits')->default(5);
-            $table->string('document_number_next')->default(1);
+            $table->string('document_logo')->nullable();
+            $table->string('number_prefix')->nullable();
+            $table->unsignedTinyInteger('number_digits')->default(5); // Adjusted this
+            $table->unsignedBigInteger('number_next')->default(1);   // Adjusted this to allow larger invoice numbers
             $table->string('payment_terms')->nullable();
-            $table->string('template')->default('default');
             $table->string('title')->nullable();
             $table->string('subheading')->nullable();
-            $table->text('notes')->nullable();
             $table->text('terms')->nullable();
             $table->string('footer')->nullable();
+            $table->string('accent_color')->nullable();
+            $table->string('template')->default('default');
+            $table->string('item_column')->nullable();
+            $table->string('unit_column')->nullable();
+            $table->string('price_column')->nullable();
+            $table->string('amount_column')->nullable();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();

database/migrations/2023_08_07_144726_add_company_details_to_companies_table.php

@@ -0,0 +1,44 @@
+<?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::table('companies', function (Blueprint $table) {
+            $table->string('logo')->nullable();
+            $table->text('address')->nullable();
+            $table->string('city')->nullable();
+            $table->string('zip_code')->nullable();
+            $table->string('state')->nullable();
+            $table->string('country')->nullable();
+            $table->string('phone')->nullable();
+            $table->string('email')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->dropColumn([
+                'logo',
+                'address',
+                'city',
+                'zip_code',
+                'state',
+                'country',
+                'phone',
+                'email',
+            ]);
+        });
+    }
+};

package-lock.json

@@ -32,9 +32,9 @@
             }
         },
         "node_modules/@alpinejs/focus": {
-            "version": "3.12.2",
-            "resolved": "https://registry.npmjs.org/@alpinejs/focus/-/focus-3.12.2.tgz",
-            "integrity": "sha512-Uhu/0uSwgYSyzAeNT/kzrxiVKJQezwhUM1VxYwCpfOMT0OvKJ80Wl+M4R+5JJhsf+15B65rQnsE7no+TxpV5bg==",
+            "version": "3.12.3",
+            "resolved": "https://registry.npmjs.org/@alpinejs/focus/-/focus-3.12.3.tgz",
+            "integrity": "sha512-kIQwvvUPCfCO2REpceQ3uHNdN3oqDLvvvQNaHVgHoYqk+RrL3EcR6uOHyvHJUgOhaIjN5Uc3b7BaRNrKZbDGew==",
             "dev": true,
             "dependencies": {
                 "focus-trap": "^6.6.1"
@@ -47,9 +47,9 @@
             "dev": true
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
-            "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+            "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
             "cpu": [
                 "arm"
             ],
@@ -63,9 +63,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
-            "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+            "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
             "cpu": [
                 "arm64"
             ],
@@ -79,9 +79,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
-            "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+            "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
             "cpu": [
                 "x64"
             ],
@@ -95,9 +95,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
-            "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+            "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
             "cpu": [
                 "arm64"
             ],
@@ -111,9 +111,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
-            "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+            "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
             "cpu": [
                 "x64"
             ],
@@ -127,9 +127,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
-            "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+            "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
             "cpu": [
                 "arm64"
             ],
@@ -143,9 +143,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
-            "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+            "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
             "cpu": [
                 "x64"
             ],
@@ -159,9 +159,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
-            "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+            "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
             "cpu": [
                 "arm"
             ],
@@ -175,9 +175,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
-            "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+            "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
             "cpu": [
                 "arm64"
             ],
@@ -191,9 +191,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
-            "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+            "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
             "cpu": [
                 "ia32"
             ],
@@ -207,9 +207,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
-            "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+            "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
             "cpu": [
                 "loong64"
             ],
@@ -223,9 +223,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
-            "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+            "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
             "cpu": [
                 "mips64el"
             ],
@@ -239,9 +239,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
-            "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+            "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
             "cpu": [
                 "ppc64"
             ],
@@ -255,9 +255,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
-            "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+            "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
             "cpu": [
                 "riscv64"
             ],
@@ -271,9 +271,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
-            "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+            "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
             "cpu": [
                 "s390x"
             ],
@@ -287,9 +287,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
-            "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+            "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
             "cpu": [
                 "x64"
             ],
@@ -303,9 +303,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
-            "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+            "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
             "cpu": [
                 "x64"
             ],
@@ -319,9 +319,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
-            "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+            "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
             "cpu": [
                 "x64"
             ],
@@ -335,9 +335,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
-            "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+            "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
             "cpu": [
                 "x64"
             ],
@@ -351,9 +351,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
-            "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+            "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
             "cpu": [
                 "arm64"
             ],
@@ -367,9 +367,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
-            "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+            "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
             "cpu": [
                 "ia32"
             ],
@@ -383,9 +383,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
-            "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+            "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
             "cpu": [
                 "x64"
             ],
@@ -413,9 +413,9 @@
             }
         },
         "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+            "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
             "dev": true,
             "engines": {
                 "node": ">=6.0.0"
@@ -437,21 +437,15 @@
             "dev": true
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.18",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-            "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+            "version": "0.3.19",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+            "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
             "dev": true,
             "dependencies": {
-                "@jridgewell/resolve-uri": "3.1.0",
-                "@jridgewell/sourcemap-codec": "1.4.14"
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
-        "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.4.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-            "dev": true
-        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -498,9 +492,9 @@
             }
         },
         "node_modules/@tailwindcss/forms": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz",
-            "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==",
+            "version": "0.5.4",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.4.tgz",
+            "integrity": "sha512-YAm12D3R7/9Mh4jFbYSMnsd6jG++8KxogWgqs7hbdo/86aWjjlIEvL7+QYdVELmAI0InXTpZqFIg5e7aDVWI2Q==",
             "dev": true,
             "dependencies": {
                 "mini-svg-data-uri": "^1.2.3"
@@ -540,9 +534,9 @@
             "dev": true
         },
         "node_modules/alpinejs": {
-            "version": "3.12.2",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.12.2.tgz",
-            "integrity": "sha512-wrUZULm9w6DYwWcUtB/anFLgRaF4riSuPgIJ3gcPUS8st9luAJnAxoIgro/Al97d2McSSz/JypWg/NlmKFIJJA==",
+            "version": "3.12.3",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.12.3.tgz",
+            "integrity": "sha512-fLz2dfYQ3xCk7Ip8LiIpV2W+9brUyex2TAE7Z0BCvZdUDklJE+n+a8gCgLWzfZ0GzZNZu7HUP8Z0z6Xbm6fsSA==",
             "dev": true,
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
@@ -661,9 +655,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.21.9",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
-            "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+            "version": "4.21.10",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+            "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
             "dev": true,
             "funding": [
                 {
@@ -680,9 +674,9 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001503",
-                "electron-to-chromium": "^1.4.431",
-                "node-releases": "^2.0.12",
+                "caniuse-lite": "^1.0.30001517",
+                "electron-to-chromium": "^1.4.477",
+                "node-releases": "^2.0.13",
                 "update-browserslist-db": "^1.0.11"
             },
             "bin": {
@@ -702,9 +696,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001509",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz",
-            "integrity": "sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==",
+            "version": "1.0.30001519",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
+            "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==",
             "dev": true,
             "funding": [
                 {
@@ -821,15 +815,15 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.447",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.447.tgz",
-            "integrity": "sha512-sxX0LXh+uL41hSJsujAN86PjhrV/6c79XmpY0TvjZStV6VxIgarf8SRkUoUTuYmFcZQTemsoqo8qXOGw5npWfw==",
+            "version": "1.4.490",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz",
+            "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==",
             "dev": true
         },
         "node_modules/esbuild": {
-            "version": "0.17.19",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
-            "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+            "version": "0.18.20",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
+            "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
             "dev": true,
             "hasInstallScript": true,
             "bin": {
@@ -839,28 +833,28 @@
                 "node": ">=12"
             },
             "optionalDependencies": {
-                "@esbuild/android-arm": "0.17.19",
-                "@esbuild/android-arm64": "0.17.19",
-                "@esbuild/android-x64": "0.17.19",
-                "@esbuild/darwin-arm64": "0.17.19",
-                "@esbuild/darwin-x64": "0.17.19",
-                "@esbuild/freebsd-arm64": "0.17.19",
-                "@esbuild/freebsd-x64": "0.17.19",
-                "@esbuild/linux-arm": "0.17.19",
-                "@esbuild/linux-arm64": "0.17.19",
-                "@esbuild/linux-ia32": "0.17.19",
-                "@esbuild/linux-loong64": "0.17.19",
-                "@esbuild/linux-mips64el": "0.17.19",
-                "@esbuild/linux-ppc64": "0.17.19",
-                "@esbuild/linux-riscv64": "0.17.19",
-                "@esbuild/linux-s390x": "0.17.19",
-                "@esbuild/linux-x64": "0.17.19",
-                "@esbuild/netbsd-x64": "0.17.19",
-                "@esbuild/openbsd-x64": "0.17.19",
-                "@esbuild/sunos-x64": "0.17.19",
-                "@esbuild/win32-arm64": "0.17.19",
-                "@esbuild/win32-ia32": "0.17.19",
-                "@esbuild/win32-x64": "0.17.19"
+                "@esbuild/android-arm": "0.18.20",
+                "@esbuild/android-arm64": "0.18.20",
+                "@esbuild/android-x64": "0.18.20",
+                "@esbuild/darwin-arm64": "0.18.20",
+                "@esbuild/darwin-x64": "0.18.20",
+                "@esbuild/freebsd-arm64": "0.18.20",
+                "@esbuild/freebsd-x64": "0.18.20",
+                "@esbuild/linux-arm": "0.18.20",
+                "@esbuild/linux-arm64": "0.18.20",
+                "@esbuild/linux-ia32": "0.18.20",
+                "@esbuild/linux-loong64": "0.18.20",
+                "@esbuild/linux-mips64el": "0.18.20",
+                "@esbuild/linux-ppc64": "0.18.20",
+                "@esbuild/linux-riscv64": "0.18.20",
+                "@esbuild/linux-s390x": "0.18.20",
+                "@esbuild/linux-x64": "0.18.20",
+                "@esbuild/netbsd-x64": "0.18.20",
+                "@esbuild/openbsd-x64": "0.18.20",
+                "@esbuild/sunos-x64": "0.18.20",
+                "@esbuild/win32-arm64": "0.18.20",
+                "@esbuild/win32-ia32": "0.18.20",
+                "@esbuild/win32-x64": "0.18.20"
             }
         },
         "node_modules/escalade": {
@@ -873,9 +867,9 @@
             }
         },
         "node_modules/fast-glob": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
-            "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+            "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
             "dev": true,
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
@@ -1076,9 +1070,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.12.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-            "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+            "version": "2.13.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+            "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
             "dev": true,
             "dependencies": {
                 "has": "^1.0.3"
@@ -1118,9 +1112,9 @@
             }
         },
         "node_modules/jiti": {
-            "version": "1.18.2",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",
-            "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+            "version": "1.19.1",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.1.tgz",
+            "integrity": "sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==",
             "dev": true,
             "bin": {
                 "jiti": "bin/jiti.js"
@@ -1269,9 +1263,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.12",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz",
-            "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
+            "version": "2.0.13",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+            "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
             "dev": true
         },
         "node_modules/normalize-path": {
@@ -1371,9 +1365,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.24",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-            "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
+            "version": "8.4.27",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+            "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
             "dev": true,
             "funding": [
                 {
@@ -1562,12 +1556,12 @@
             }
         },
         "node_modules/resolve": {
-            "version": "1.22.2",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-            "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+            "version": "1.22.4",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+            "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
             "dev": true,
             "dependencies": {
-                "is-core-module": "^2.11.0",
+                "is-core-module": "^2.13.0",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
             },
@@ -1589,9 +1583,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "3.26.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.26.0.tgz",
-            "integrity": "sha512-YzJH0eunH2hr3knvF3i6IkLO/jTjAEwU4HoMUbQl4//Tnl3ou0e7P5SjxdDr8HQJdeUJShlbEHXrrnEHy1l7Yg==",
+            "version": "3.28.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.0.tgz",
+            "integrity": "sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==",
             "dev": true,
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -1637,9 +1631,9 @@
             }
         },
         "node_modules/sucrase": {
-            "version": "3.32.0",
-            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
-            "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
+            "version": "3.34.0",
+            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz",
+            "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/gen-mapping": "^0.3.2",
@@ -1677,9 +1671,9 @@
             "dev": true
         },
         "node_modules/tailwindcss": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz",
-            "integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz",
+            "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==",
             "dev": true,
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
@@ -1702,7 +1696,6 @@
                 "postcss-load-config": "^4.0.1",
                 "postcss-nested": "^6.0.1",
                 "postcss-selector-parser": "^6.0.11",
-                "postcss-value-parser": "^4.2.0",
                 "resolve": "^1.22.2",
                 "sucrase": "^3.32.0"
             },
@@ -1812,14 +1805,14 @@
             "dev": true
         },
         "node_modules/vite": {
-            "version": "4.3.9",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz",
-            "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==",
+            "version": "4.4.9",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz",
+            "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==",
             "dev": true,
             "dependencies": {
-                "esbuild": "^0.17.5",
-                "postcss": "^8.4.23",
-                "rollup": "^3.21.0"
+                "esbuild": "^0.18.10",
+                "postcss": "^8.4.27",
+                "rollup": "^3.27.1"
             },
             "bin": {
                 "vite": "bin/vite.js"
@@ -1827,12 +1820,16 @@
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
             },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
             "optionalDependencies": {
                 "fsevents": "~2.3.2"
             },
             "peerDependencies": {
                 "@types/node": ">= 14",
                 "less": "*",
+                "lightningcss": "^1.21.0",
                 "sass": "*",
                 "stylus": "*",
                 "sugarss": "*",
@@ -1845,6 +1842,9 @@
                 "less": {
                     "optional": true
                 },
+                "lightningcss": {
+                    "optional": true
+                },
                 "sass": {
                     "optional": true
                 },

resources/css/filament.css

@@ -30,6 +30,27 @@ select,
     @apply !shadow-none bg-moonlight;
 }
 
+[type="text"]:disabled,
+[type="email"]:disabled,
+[type="url"]:disabled,
+[type="password"]:disabled,
+[type="number"]:disabled,
+[type="date"]:disabled,
+[type="datetime-local"]:disabled,
+[type="month"]:disabled,
+[type="search"]:disabled,
+[type="tel"]:disabled,
+[type="time"]:disabled,
+[type="week"]:disabled,
+[multiple]:disabled,
+textarea:disabled,
+select:disabled,
+[type="checkbox"]:disabled,
+[type="radio"]:disabled,
+.filament-forms-repeater-component *:disabled {
+    @apply bg-gray-100 dark:bg-gray-700 text-gray-400 border-gray-300 opacity-[0.7];
+}
+
 div.p-2.space-y-2.bg-white.rounded-xl {
     @apply bg-moonlight dark:!bg-gray-800;
 }

resources/views/components/invoice-layouts/default.blade.php

@@ -0,0 +1,129 @@
+@php
+    $data = $this->form->getState();
+    $viewModel = new \App\View\Models\InvoiceViewModel($this->invoice, $data);
+    $viewSpecial = $viewModel->buildViewData();
+    extract($viewSpecial);
+@endphp
+
+<div class="print-template flex justify-center p-6">
+    <div class="paper bg-white dark:bg-gray-900 p-8 rounded-lg shadow-[0_0_10px_rgba(0,0,0,0.1)] w-[612px] h-[791px]">
+
+        <!-- Header: Logo on the left and Company details on the right -->
+        <div class="flex mb-4">
+            <div class="w-2/5">
+                @if($document_logo)
+                    <div class="text-left">
+                        <img src="{{ \Illuminate\Support\Facades\URL::asset($document_logo) }}" alt="logo" style="width: 120px; height: auto">
+                    </div>
+                @endif
+            </div>
+
+            <!-- Company Details -->
+            <div class="w-3/5">
+                <div class="text-xs text-gray-600 dark:text-gray-200 text-right space-y-1">
+                    <h2 class="text-xl font-bold text-gray-800 dark:text-white">{{ $company_name }}</h2>
+                    @if($company_address && $company_city && $company_state && $company_zip)
+                        <p>{{ $company_address }}</p>
+                        <p>{{ $company_city }}, {{ $company_state }} {{ $company_zip }}</p>
+                    @endif
+                </div>
+            </div>
+        </div>
+
+        <!-- Border Line -->
+        <div class="border-b-2 my-4" style="border-color: {{ $accent_color }}"></div>
+
+        <!-- Invoice Details -->
+        <div class="flex mb-4">
+            <div class="w-2/5">
+                <div class="text-left">
+                    <h1 class="text-3xl font-semibold text-gray-800 dark:text-white">{{ $title }}</h1>
+                    @if ($subheading)
+                        <p class="text-sm text-gray-600 dark:text-gray-100">{{ $subheading }}</p>
+                    @endif
+                </div>
+            </div>
+
+            <div class="w-3/5">
+                <div class="text-right">
+                    <p>
+                        <span class="text-xs font-semibold text-gray-500 dark:text-gray-100">No: </span>
+                        <span class="text-xs text-gray-700 dark:text-white">{{ $invoice_number }}</span>
+                    </p>
+                    <p>
+                        <span class="text-xs font-semibold text-gray-500 dark:text-gray-100">Date: </span>
+                        <span class="text-xs text-gray-500 dark:text-white">{{ $invoice_date }}</span>
+                    </p>
+                    <p>
+                        <span class="text-xs font-semibold text-gray-500 dark:text-gray-100">Due Date: </span>
+                        <span class="text-xs text-gray-500 dark:text-white">{{ $invoice_due_date }}</span>
+                    </p>
+                </div>
+            </div>
+        </div>
+
+        <!-- Billing Details -->
+        <div class="text-xs text-gray-600 dark:text-gray-200 mb-4">
+            <h3 class="text-base font-semibold text-gray-600 dark:text-gray-200 mb-2">BILL TO</h3>
+            <p class="text-sm text-gray-800 dark:text-white font-semibold">John Doe</p>
+            <p>123 Main Street</p>
+            <p>New York, NY 10001</p>
+        </div>
+
+        <!-- Line Items Table -->
+        <div class="mb-4">
+            <table class="w-full border-collapse text-sm">
+                <thead>
+                    <tr style="color: {{ $accent_color }}">
+                        <th class="text-left p-2 w-1/2">{{ $item_column }}</th>
+                        <th class="text-center p-2 w-1/6">{{ $unit_column }}</th>
+                        <th class="text-center p-2 w-1/6">{{ $price_column }}</th>
+                        <th class="text-center p-2 w-1/6">{{ $amount_column }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr class="bg-gray-200/75 dark:bg-gray-800">
+                        <td class="p-2">Item 1</td>
+                        <td class="p-2 text-center">2</td>
+                        <td class="p-2 text-center">$150.00</td>
+                        <td class="p-2 text-center">$300.00</td>
+                    </tr>
+                    <tr>
+                        <td class="p-2">Item 2</td>
+                        <td class="p-2 text-center">3</td>
+                        <td class="p-2 text-center">$200.00</td>
+                        <td class="p-2 text-center">$600.00</td>
+                    </tr>
+                    <tr class="bg-gray-200/75 dark:bg-gray-800">
+                        <td class="p-2">Item 3</td>
+                        <td class="p-2 text-center">1</td>
+                        <td class="p-2 text-center">$200.00</td>
+                        <td class="p-2 text-center">$200.00</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <!-- Total Amount -->
+        <div class="text-right mb-8">
+            <p class="text-sm text-gray-600 dark:text-gray-200">Subtotal: $1100.00</p>
+            <p class="text-sm text-gray-600 dark:text-gray-200">Tax: $110.00</p>
+            <p class="text-lg font-semibold text-gray-800 dark:text-white">Total: $1210.00</p>
+        </div>
+
+        <!-- Footer Notes -->
+        <div class="pt-6 text-gray-600 dark:text-gray-300 text-xs">
+            <p>{{ $footer }}</p>
+            <div class="mt-2 border-t-2 border-gray-300 py-2">
+                <h4 class="font-semibold text-gray-700 dark:text-gray-100 mb-2">Terms & Conditions:</h4>
+                <p>{{ $terms }}</p>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+
+
+
+

resources/views/components/invoice-layouts/modern.blade.php

@@ -0,0 +1,164 @@
+@php
+    $data = $this->form->getState();
+    $viewModel = new \App\View\Models\InvoiceViewModel($this->invoice, $data);
+    $viewSpecial = $viewModel->buildViewData();
+    extract($viewSpecial);
+@endphp
+
+<div class="print-template flex justify-center p-6">
+    <div class="paper bg-white dark:bg-gray-900 p-8 rounded-lg shadow-[0_0_10px_rgba(0,0,0,0.1)] w-[612px] h-[791px]">
+
+        <!-- Colored Header with Logo -->
+        <div class="flex">
+            <div class="text-white py-3 flex items-start justify-start bg-gray-800" style="height: 80px; width: 85%;">
+                @if($document_logo)
+                    <div class="text-left">
+                        <img src="{{ \Illuminate\Support\Facades\URL::asset($document_logo) }}" alt="logo" style="width: 120px; height: auto">
+                    </div>
+                @endif
+            </div>
+
+            <!-- Ribbon Container -->
+            <div class="text-white flex flex-col justify-end p-2" style="background: {{ $accent_color }}; width: 30%; height: 120px; margin-left: -15%;">
+                @if($title)
+                    <div class="text-center align-bottom">
+                        <h1 class="text-3xl font-bold">{{ $title }}</h1>
+                    </div>
+                @endif
+            </div>
+        </div>
+
+        <!-- Company Details -->
+        <div class="flex justify-between">
+            <div class="text-xs text-gray-600 dark:text-gray-200 space-y-1">
+                <h2 class="text-xl font-bold text-gray-800 dark:text-white">{{ $company_name }}</h2>
+                @if($company_address && $company_city && $company_state && $company_zip)
+                    <p>{{ $company_address }}</p>
+                    <p>{{ $company_city }}, {{ $company_state }} {{ $company_zip }}</p>
+                @endif
+            </div>
+
+            <table class="mt-6" style="width: 35%; height: 100px">
+                <thead class="border-b-2" style="border-color: {{ $accent_color }}">
+                <tr class="p-1">
+                    <th class="text-xs text text-gray-500 text-right">Total Due</th>
+                    <th class="text-xs text-gray-500 text-left">:</th>
+                    <th class="text-sm font-semibold text-gray-800 dark:text-white text-right">USD $1100.00</th>
+                </tr>
+                </thead>
+                <tr>
+                    <td colspan="3" class="py-1"></td>
+                </tr>
+                <tbody class="text-xs text-gray-500 dark:text-white">
+                <tr class="p-1">
+                    <td class="text-right">Invoice No</td>
+                    <td class="text-left">:</td>
+                    <td class="text-right">{{ $invoice_number }}</td>
+                </tr>
+                <tr class="p-1">
+                    <td class="text-right">Invoice Date</td>
+                    <td class="text-left">:</td>
+                    <td class="text-right">{{ $invoice_date }}</td>
+                </tr>
+                <tr class="p-1">
+                    <td class="text-right">Invoice Due</td>
+                    <td class="text-left">:</td>
+                    <td class="text-right">{{ $invoice_due_date }}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <!-- Billing Details -->
+        <div class="text-xs text-gray-600 dark:text-gray-200 mb-4">
+            <h3 class="text-base font-semibold text-gray-600 dark:text-gray-200 tracking-tight mb-2">BILL TO</h3>
+            <p class="text-lg font-semibold" style="color: {{ $accent_color }}">John Doe</p>
+            <p>123 Main Street</p>
+            <p>New York, NY 10001</p>
+        </div>
+
+        <!-- Line Items Table -->
+        <div class="mb-8">
+            <table class="w-full border-collapse text-sm">
+                <thead style="background: {{ $accent_color }};">
+                <tr class="text-white">
+                    <th class="text-left p-2 w-1/12">No</th>
+                    <th class="text-left p-2 w-7/12">{{ $item_column }}</th>
+                    <th class="text-left p-2 w-1/6">{{ $unit_column }}</th>
+                    <th class="text-left p-2 w-1/6">{{ $price_column }}</th>
+                    <th class="text-left p-2 w-1/6">{{ $amount_column }}</th>
+                </tr>
+                </thead>
+                <tbody class="text-xs">
+                <tr class="border-b border-gray-300">
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">01</td>
+                    <td class="p-2">Item 1</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">2</td>
+                    <td class="p-2">$150.00</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">$300.00</td>
+                </tr>
+                <tr class="border-b border-gray-300">
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">02</td>
+                    <td class="p-2">Item 2</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">3</td>
+                    <td class="p-2">$200.00</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">$600.00</td>
+                </tr>
+                <tr class="border-b border-gray-300">
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">03</td>
+                    <td class="p-2">Item 3</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">1</td>
+                    <td class="p-2">$180.00</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">$180.00</td>
+                </tr>
+                <tr>
+                    <td class="p-2"></td>
+                    <td class="p-2"></td>
+                    <td class="p-2"></td>
+                    <td class="p-2">Subtotal:</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">$1000.00</td>
+                </tr>
+                <tr>
+                    <td class="p-2"></td>
+                    <td class="p-2"></td>
+                    <td class="p-2"></td>
+                    <td class="p-2">Tax:</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">$100.00</td>
+                </tr>
+                <tr>
+                    <td class="p-2"></td>
+                    <td class="p-2"></td>
+                    <td class="p-2"></td>
+                    <td class="p-2">Total:</td>
+                    <td class="p-2 bg-gray-100 dark:bg-gray-800">$1100.00</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <!-- Footer Notes -->
+        <div class="text-gray-600 dark:text-gray-300 text-xs">
+            <h4 class="font-semibold text-gray-700 dark:text-gray-100 mb-2" style="color: {{ $accent_color }}">Terms & Conditions:</h4>
+            <div class="flex mt-2 justify-between py-2 border-t-2 border-gray-300">
+                <div class="w-1/2">
+                    <p>{{ $terms }}</p>
+                </div>
+                <div class="w-1/2 text-right">
+                    <p>{{ $footer }}</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+

resources/views/filament/pages/company-details.blade.php

@@ -0,0 +1,3 @@
+<x-filament::page>
+    @livewire('company-details', compact('company'))
+</x-filament::page>

resources/views/filament/pages/default-setting.blade.php

@@ -1,3 +1,3 @@
 <x-filament::page>
-    @livewire('default-setting')
+    @livewire('default-setting', compact('company'))
 </x-filament::page>

resources/views/filament/pages/invoice.blade.php

@@ -1,3 +1,3 @@
 <x-filament::page>
-    @livewire('invoice')
+    @livewire('invoice', compact('company'))
 </x-filament::page>

resources/views/livewire/company-details.blade.php

@@ -0,0 +1,9 @@
+<x-filament::form wire:submit.prevent="save">
+    {{ $this->form }}
+
+    <div class="flex flex-wrap items-center gap-4 justify-start">
+        <x-filament::button type="submit" tag="button" wire:target="save">
+            {{ __('Save Changes') }}
+        </x-filament::button>
+    </div>
+</x-filament::form>

resources/views/livewire/default-setting.blade.php

@@ -1,13 +1,9 @@
-<div>
-    <form wire:submit.prevent="save">
-        {{ $this->form }}
+<x-filament::form wire:submit.prevent="save">
+    {{ $this->form }}
 
-        <div class="mt-6">
-            <div class="flex flex-wrap items-center gap-4 justify-start">
-                <x-filament::button type="submit">
-                    {{ __('Save Changes') }}
-                </x-filament::button>
-            </div>
-        </div>
-    </form>
-</div>
+    <div class="flex flex-wrap items-center gap-4 justify-start">
+        <x-filament::button type="submit" tag="button" wire:target="save">
+            {{ __('Save Changes') }}
+        </x-filament::button>
+    </div>
+</x-filament::form>

resources/views/livewire/invoice.blade.php

@@ -1,13 +1,9 @@
-<div>
-    <form wire:submit.prevent="save">
-        {{ $this->form }}
+<x-filament::form wire:submit.prevent="save">
+    {{ $this->form }}
 
-        <div class="mt-6">
-            <div class="flex flex-wrap items-center gap-4 justify-start">
-                <x-filament::button type="submit">
-                    {{ __('Save Changes') }}
-                </x-filament::button>
-            </div>
-        </div>
-    </form>
-</div>
+    <div class="flex flex-wrap items-center gap-4 justify-start">
+        <x-filament::button type="submit" tag="button" wire:target="save">
+            {{ __('Save Changes') }}
+        </x-filament::button>
+    </div>
+</x-filament::form>

tailwind.config.js

@@ -16,8 +16,8 @@ module.exports = {
         primary: {
           50: '#F2F3FA',
           100: '#D8DBF5',
-          200: '#B4B9EB',
-          300: '#9297E1',
+          200: '#d3e8f0',
+          300: '#b8d2e6',
           400: '#7075D7',
           500: '#454DC8',
           600: '#27285C',