wip

app/Events/CompanyGenerated.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Models\Company;
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class CompanyGenerated
-{
-    use Dispatchable;
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(
-        public User $user,
-        public Company $company,
-        public string $country,
-        public string $language = 'en',
-        public string $currency = 'USD'
-    ) {}
-}

app/Filament/Company/Pages/CreateCompany.php

@@ -3,16 +3,17 @@
 namespace App\Filament\Company\Pages;
 
 use App\Enums\Setting\EntityType;
-use App\Events\CompanyGenerated;
 use App\Models\Company;
 use App\Models\Locale\Country;
 use App\Models\Setting\Localization;
+use App\Services\CompanyDefaultService;
 use App\Utilities\Currency\CurrencyAccessor;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Wallo\FilamentCompanies\Events\AddingCompany;
 use Wallo\FilamentCompanies\FilamentCompanies;
@@ -69,26 +70,28 @@ class CreateCompany extends FilamentCreateCompany
 
         $personalCompany = $user?->personalCompany() === null;
 
-        /** @var Company $company */
-        $company = $user?->ownedCompanies()->create([
-            'name' => $data['name'],
-            'personal_company' => $personalCompany,
-        ]);
+        return DB::transaction(function () use ($user, $data, $personalCompany) {
+            /** @var Company $company */
+            $company = $user?->ownedCompanies()->create([
+                'name' => $data['name'],
+                'personal_company' => $personalCompany,
+            ]);
 
-        $company->profile()->create([
-            'email' => $data['profile']['email'],
-            'entity_type' => $data['profile']['entity_type'],
-            'country' => $data['profile']['country'],
-        ]);
+            $company->profile()->create([
+                'email' => $data['profile']['email'],
+                'entity_type' => $data['profile']['entity_type'],
+                'country' => $data['profile']['country'],
+            ]);
 
-        $user?->switchCompany($company);
+            $user?->switchCompany($company);
 
-        $name = $data['name'];
+            $companyDefaultService = app()->make(CompanyDefaultService::class);
+            $user = $company->owner ?? $user;
+            $companyDefaultService->createCompanyDefaults($company, $user, $data['currencies']['code'], $data['profile']['country'], $data['locale']['language']);
 
-        CompanyGenerated::dispatch($user ?? Auth::user(), $company, $data['profile']['country'], $data['locale']['language'], $data['currencies']['code']);
+            $this->companyCreated($data['name']);
 
-        $this->companyCreated($name);
-
-        return $company;
+            return $company;
+        });
     }
 }

app/Filament/Company/Pages/Reports/AccountTransactions.php

@@ -4,6 +4,7 @@ namespace App\Filament\Company\Pages\Reports;
 
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
+use App\Filament\Company\Pages\Accounting\Transactions;
 use App\Models\Accounting\Account;
 use App\Services\ExportService;
 use App\Services\ReportService;
@@ -13,9 +14,10 @@ use Filament\Forms\Components\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
+use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Collection;
-use Livewire\Attributes\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountTransactions extends BaseReportPage
@@ -30,7 +32,6 @@ class AccountTransactions extends BaseReportPage
 
     protected ExportService $exportService;
 
-    #[Session]
     public ?string $account_id = 'all';
 
     public function boot(ReportService $reportService, ExportService $exportService): void
@@ -122,4 +123,37 @@ class AccountTransactions extends BaseReportPage
     {
         return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
     }
+
+    public function getEmptyStateHeading(): string | Htmlable
+    {
+        return 'No Transactions Found';
+    }
+
+    public function getEmptyStateDescription(): string | Htmlable | null
+    {
+        return 'Adjust the account or date range, or start by creating a transaction.';
+    }
+
+    public function getEmptyStateIcon(): string
+    {
+        return 'heroicon-o-x-mark';
+    }
+
+    public function getEmptyStateActions(): array
+    {
+        return [
+            Action::make('createTransaction')
+                ->label('Create Transaction')
+                ->url(Transactions::getUrl()),
+        ];
+    }
+
+    public function tableHasEmptyState(): bool
+    {
+        if ($this->report) {
+            return empty($this->report->getCategories());
+        } else {
+            return true;
+        }
+    }
 }

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -26,13 +26,10 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
 {
-    #[Session]
     public string $startDate = '';
 
-    #[Session]
     public string $endDate = '';
 
-    #[Session]
     public string $dateRange = '';
 
     public string $fiscalYearStartDate = '';

app/Listeners/ConfigureChartOfAccounts.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\CompanyGenerated;
-use App\Services\ChartOfAccountsService;
-
-class ConfigureChartOfAccounts
-{
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     */
-    public function handle(CompanyGenerated $event): void
-    {
-        $company = $event->company;
-
-        $chartOfAccountsService = new ChartOfAccountsService();
-
-        $chartOfAccountsService->createChartOfAccounts($company);
-    }
-}

app/Listeners/CreateCompanyDefaults.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\CompanyGenerated;
-use App\Services\CompanyDefaultService;
-
-class CreateCompanyDefaults
-{
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Handle the event.
-     */
-    public function handle(CompanyGenerated $event): void
-    {
-        $company = $event->company;
-        $countryCode = $event->country;
-        $languageCode = $event->language;
-        $currency = $event->currency;
-
-        $user = $company->owner;
-
-        $companyDefaultService = new CompanyDefaultService();
-        $companyDefaultService->createCompanyDefaults($company, $user, $currency, $countryCode, $languageCode);
-    }
-}

app/Services/ChartOfAccountsService.php

@@ -81,4 +81,9 @@ class ChartOfAccountsService
             'updated_by' => $company->owner->id,
         ]);
     }
+
+    public function getDefaultBankAccount(Company $company): ?BankAccount
+    {
+        return $company->bankAccounts()->where('enabled', true)->first();
+    }
 }

app/Services/CompanyDefaultService.php

@@ -3,12 +3,7 @@
 namespace App\Services;
 
 use App\Models\Company;
-use App\Models\Setting\Appearance;
-use App\Models\Setting\Currency;
-use App\Models\Setting\Discount;
-use App\Models\Setting\DocumentDefault;
-use App\Models\Setting\Localization;
-use App\Models\Setting\Tax;
+use App\Models\Setting\CompanyDefault;
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
@@ -16,93 +11,23 @@ class CompanyDefaultService
 {
     public function createCompanyDefaults(Company $company, User $user, string $currencyCode, string $countryCode, string $language): void
     {
-        DB::transaction(function () use ($company, $user, $currencyCode, $countryCode, $language) {
-            $this->createCurrency($company, $user, $currencyCode);
-            $this->createSalesTax($company, $user);
-            $this->createPurchaseTax($company, $user);
-            $this->createSalesDiscount($company, $user);
-            $this->createPurchaseDiscount($company, $user);
-            $this->createAppearance($company, $user);
-            $this->createDocumentDefaults($company, $user);
-            $this->createLocalization($company, $user, $countryCode, $language);
-        }, 5);
-    }
-
-    private function createCurrency(Company $company, User $user, string $currencyCode): void
-    {
-        Currency::factory()->forCurrency($currencyCode)->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
+        DB::transaction(function () use ($user, $company, $currencyCode, $countryCode, $language) {
+            // Create the company defaults
+            $companyDefaultFactory = CompanyDefault::factory()->withDefault($user, $company, $currencyCode, $countryCode, $language);
+            $companyDefaults = $companyDefaultFactory->make()->toArray();
 
-    private function createSalesTax(Company $company, User $user): void
-    {
-        Tax::factory()->salesTax()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
+            $companyDefault = CompanyDefault::create($companyDefaults);
 
-    private function createPurchaseTax(Company $company, User $user): void
-    {
-        Tax::factory()->purchaseTax()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
+            // Create Chart of Accounts
+            $chartOfAccountsService = app()->make(ChartOfAccountsService::class);
+            $chartOfAccountsService->createChartOfAccounts($company);
 
-    private function createSalesDiscount(Company $company, User $user): void
-    {
-        Discount::factory()->salesDiscount()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
+            // Get the default bank account and update the company default record
+            $defaultBankAccount = $chartOfAccountsService->getDefaultBankAccount($company);
 
-    private function createPurchaseDiscount(Company $company, User $user): void
-    {
-        Discount::factory()->purchaseDiscount()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
-    private function createAppearance(Company $company, User $user): void
-    {
-        Appearance::factory()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
-    private function createDocumentDefaults(Company $company, User $user): void
-    {
-        DocumentDefault::factory()->invoice()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-
-        DocumentDefault::factory()->bill()->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
-    private function createLocalization(Company $company, User $user, string $countryCode, string $language): void
-    {
-        Localization::factory()->withCountry($countryCode, $language)->create([
-            'company_id' => $company->id,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
+            $companyDefault->update([
+                'bank_account_id' => $defaultBankAccount?->id,
+            ]);
+        }, 5);
     }
 }

database/factories/Setting/CompanyDefaultFactory.php

@@ -37,12 +37,13 @@ class CompanyDefaultFactory extends Factory
         ];
     }
 
-    public function withDefault(User $user, Company $company, string $country, string $language = 'en'): static
+    public function withDefault(User $user, Company $company, ?string $currencyCode, string $countryCode, string $language = 'en'): static
     {
-        /** @var CurrencyCode $currencyFaker */
-        $currencyFaker = $this->faker;
-
-        $currencyCode = $currencyFaker->currencyCode($country);
+        if ($currencyCode === null) {
+            /** @var CurrencyCode $currencyFaker */
+            $currencyFaker = $this->faker;
+            $currencyCode = $currencyFaker->currencyCode($countryCode);
+        }
 
         $currency = $this->createCurrency($company, $user, $currencyCode);
         $salesTax = $this->createSalesTax($company, $user);
@@ -51,7 +52,7 @@ class CompanyDefaultFactory extends Factory
         $purchaseDiscount = $this->createPurchaseDiscount($company, $user);
         $this->createAppearance($company, $user);
         $this->createDocumentDefaults($company, $user);
-        $this->createLocalization($company, $user, $country, $language);
+        $this->createLocalization($company, $user, $countryCode, $language);
 
         $companyDefaults = [
             'company_id' => $company->id,
@@ -67,7 +68,7 @@ class CompanyDefaultFactory extends Factory
         return $this->state($companyDefaults);
     }
 
-    private function createCurrency(Company $company, User $user, string $currencyCode)
+    private function createCurrency(Company $company, User $user, string $currencyCode): Currency
     {
         return Currency::factory()->forCurrency($currencyCode)->create([
             'company_id' => $company->id,

database/factories/UserFactory.php

@@ -5,7 +5,6 @@ namespace Database\Factories;
 use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use App\Models\User;
-use App\Services\ChartOfAccountsService;
 use App\Services\CompanyDefaultService;
 use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -75,26 +74,7 @@ class UserFactory extends Factory
                         $companyDefaultService = app()->make(CompanyDefaultService::class);
                         $companyDefaultService->createCompanyDefaults($company, $user, 'USD', $countryCode, 'en');
 
-                        $chartOfAccountsService = app()->make(ChartOfAccountsService::class);
-                        $chartOfAccountsService->createChartOfAccounts($company);
-
-                        $defaultBankAccount = $company->bankAccounts()->where('enabled', true)->first();
-                        $defaultCurrency = $company->currencies()->where('enabled', true)->first();
-                        $defaultSalesTax = $company->taxes()->where('type', 'sales')->where('enabled', true)->first();
-                        $defaultPurchaseTax = $company->taxes()->where('type', 'purchase')->where('enabled', true)->first();
-                        $defaultSalesDiscount = $company->discounts()->where('type', 'sales')->where('enabled', true)->first();
-                        $defaultPurchaseDiscount = $company->discounts()->where('type', 'purchase')->where('enabled', true)->first();
-
-                        $company->default()->create([
-                            'bank_account_id' => $defaultBankAccount?->id,
-                            'currency_code' => $defaultCurrency?->code,
-                            'sales_tax_id' => $defaultSalesTax?->id,
-                            'purchase_tax_id' => $defaultPurchaseTax?->id,
-                            'sales_discount_id' => $defaultSalesDiscount?->id,
-                            'purchase_discount_id' => $defaultPurchaseDiscount?->id,
-                            'created_by' => $user->id,
-                            'updated_by' => $user->id,
-                        ]);
+                        $defaultBankAccount = $company->default->bankAccount;
 
                         TransactionFactory::new()
                             ->forCompanyAndBankAccount($company, $defaultBankAccount)

resources/views/filament/company/pages/reports/account-transactions.blade.php

@@ -3,18 +3,27 @@
         <form wire:submit="loadReportData" class="p-6">
             {{ $this->form }}
         </form>
-        <div class="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
-            <div wire:init="loadReportData" class="flex items-center justify-center">
-                <div wire:loading.delay wire:target="loadReportData">
+        <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="loadReportData">
                     <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
                 </div>
             </div>
 
-            <div wire:loading.remove wire:target="loadReportData">
-                @if($this->report)
-                    <x-company.tables.reports.account-transactions :report="$this->report" />
-                @endif
-            </div>
+            @if($this->reportLoaded)
+                <div wire:loading.remove wire:target="loadReportData">
+                    @if($this->report && !$this->tableHasEmptyState())
+                        <x-company.tables.reports.account-transactions :report="$this->report" />
+                    @else
+                        <x-filament-tables::empty-state
+                            :actions="$this->getEmptyStateActions()"
+                            :description="$this->getEmptyStateDescription()"
+                            :heading="$this->getEmptyStateHeading()"
+                            :icon="$this->getEmptyStateIcon()"
+                        />
+                    @endif
+                </div>
+            @endif
         </div>
         <div class="es-table__footer-ctn border-t border-gray-200"></div>
     </x-filament-tables::container>

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -1,33 +1,33 @@
 <x-filament-panels::page>
     <x-filament-tables::container>
-        <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
-            <form wire:submit="loadReportData">
-                <div class="flex flex-col md:flex-row items-start md:items-center justify-center gap-4 md:gap-12">
-                    {{ $this->form }}
-                    @if($this->hasToggleableColumns())
-                        <x-filament-tables::column-toggle.dropdown
-                            :form="$this->toggleTableColumnForm"
-                            :trigger-action="$this->toggleColumnsAction"
-                        />
-                    @endif
-                    <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
-                        Update Report
-                    </x-filament::button>
-                </div>
-            </form>
-        </div>
-        <div class="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
-            <div wire:init="loadReportData" class="flex items-center justify-center">
-                <div wire:loading.delay wire:target="loadReportData">
+        <form wire:submit="loadReportData" class="p-6">
+            <div class="flex flex-col md:flex-row items-start md:items-center justify-center gap-4 md:gap-12">
+                {{ $this->form }}
+                @if($this->hasToggleableColumns())
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->toggleTableColumnForm"
+                        :trigger-action="$this->toggleColumnsAction"
+                    />
+                @endif
+                <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
+                    Update Report
+                </x-filament::button>
+            </div>
+        </form>
+        <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="loadReportData">
                     <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
                 </div>
             </div>
 
-            <div wire:loading.remove wire:target="loadReportData">
-                @if($this->report)
-                    <x-company.tables.reports.detailed-report :report="$this->report" />
-                @endif
-            </div>
+            @if($this->reportLoaded)
+                <div wire:loading.remove wire:target="loadReportData">
+                    @if($this->report)
+                        <x-company.tables.reports.detailed-report :report="$this->report" />
+                    @endif
+                </div>
+            @endif
         </div>
         <div class="es-table__footer-ctn border-t border-gray-200"></div>
     </x-filament-tables::container>