wip

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

@@ -14,6 +14,7 @@ use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Support\Collection;
+use Livewire\Attributes\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountTransactions extends BaseReportPage
@@ -28,6 +29,7 @@ class AccountTransactions extends BaseReportPage
 
     protected ExportService $exportService;
 
+    #[Session]
     public ?string $account_id = 'all';
 
     public function boot(ReportService $reportService, ExportService $exportService): void
@@ -69,8 +71,8 @@ class AccountTransactions extends BaseReportPage
                 Select::make('account_id')
                     ->label('Account')
                     ->options($this->getAccountOptions())
-                    ->searchable()
-                    ->required(),
+                    ->selectablePlaceholder(false)
+                    ->searchable(),
                 $this->getDateRangeFormComponent(),
                 Cluster::make([
                     $this->getStartDateFormComponent(),

app/Listeners/ConfigureChartOfAccounts.php

@@ -2,14 +2,8 @@
 
 namespace App\Listeners;
 
-use App\Enums\Accounting\AccountType;
-use App\Enums\Banking\BankAccountType;
 use App\Events\CompanyGenerated;
-use App\Models\Accounting\Account;
-use App\Models\Accounting\AccountSubtype;
-use App\Models\Banking\BankAccount;
-use App\Models\Company;
-use App\Utilities\Currency\CurrencyAccessor;
+use App\Services\ChartOfAccountsService;
 
 class ConfigureChartOfAccounts
 {
@@ -28,76 +22,8 @@ class ConfigureChartOfAccounts
     {
         $company = $event->company;
 
-        $this->createChartOfAccounts($company);
-    }
-
-    public function createChartOfAccounts(Company $company): void
-    {
-        $chartOfAccounts = config('chart-of-accounts.default');
-
-        foreach ($chartOfAccounts as $type => $subtypes) {
-            foreach ($subtypes as $subtypeName => $subtypeConfig) {
-                $subtype = AccountSubtype::create([
-                    'company_id' => $company->id,
-                    'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
-                    'category' => AccountType::from($type)->getCategory()->value,
-                    'type' => $type,
-                    'name' => $subtypeName,
-                    'description' => $subtypeConfig['description'] ?? 'No description available.',
-                ]);
-
-                $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
-            }
-        }
-    }
-
-    private function createDefaultAccounts(Company $company, AccountSubtype $subtype, array $subtypeConfig): void
-    {
-        if (isset($subtypeConfig['accounts']) && is_array($subtypeConfig['accounts'])) {
-            $baseCode = $subtypeConfig['base_code'];
-
-            foreach ($subtypeConfig['accounts'] as $accountName => $accountDetails) {
-                $bankAccount = null;
-
-                if ($subtypeConfig['multi_currency'] && isset($subtypeConfig['bank_account_type'])) {
-                    $bankAccount = $this->createBankAccountForMultiCurrency($company, $subtypeConfig['bank_account_type']);
-                }
-
-                $account = Account::create([
-                    'company_id' => $company->id,
-                    'subtype_id' => $subtype->id,
-                    'category' => $subtype->type->getCategory()->value,
-                    'type' => $subtype->type->value,
-                    'code' => $baseCode++,
-                    'name' => $accountName,
-                    'currency_code' => CurrencyAccessor::getDefaultCurrency(),
-                    'description' => $accountDetails['description'] ?? 'No description available.',
-                    'default' => true,
-                    'created_by' => $company->owner->id,
-                    'updated_by' => $company->owner->id,
-                ]);
-
-                if ($bankAccount) {
-                    $account->bankAccount()->associate($bankAccount);
-                }
-
-                $account->save();
-            }
-        }
-    }
-
-    private function createBankAccountForMultiCurrency(Company $company, string $bankAccountType): BankAccount
-    {
-        $bankAccountType = BankAccountType::from($bankAccountType) ?? BankAccountType::Other;
+        $chartOfAccountsService = new ChartOfAccountsService();
 
-        return BankAccount::create([
-            'company_id' => $company->id,
-            'institution_id' => null,
-            'type' => $bankAccountType,
-            'number' => null,
-            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
-            'created_by' => $company->owner->id,
-            'updated_by' => $company->owner->id,
-        ]);
+        $chartOfAccountsService->createChartOfAccounts($company);
     }
 }

app/Services/ChartOfAccountsService.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Services;
+
+use App\Enums\Accounting\AccountType;
+use App\Enums\Banking\BankAccountType;
+use App\Models\Accounting\Account;
+use App\Models\Accounting\AccountSubtype;
+use App\Models\Banking\BankAccount;
+use App\Models\Company;
+use App\Utilities\Currency\CurrencyAccessor;
+
+class ChartOfAccountsService
+{
+    public function createChartOfAccounts(Company $company): void
+    {
+        $chartOfAccounts = config('chart-of-accounts.default');
+
+        foreach ($chartOfAccounts as $type => $subtypes) {
+            foreach ($subtypes as $subtypeName => $subtypeConfig) {
+                $subtype = AccountSubtype::create([
+                    'company_id' => $company->id,
+                    'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
+                    'category' => AccountType::from($type)->getCategory()->value,
+                    'type' => $type,
+                    'name' => $subtypeName,
+                    'description' => $subtypeConfig['description'] ?? 'No description available.',
+                ]);
+
+                $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
+            }
+        }
+    }
+
+    private function createDefaultAccounts(Company $company, AccountSubtype $subtype, array $subtypeConfig): void
+    {
+        if (isset($subtypeConfig['accounts']) && is_array($subtypeConfig['accounts'])) {
+            $baseCode = $subtypeConfig['base_code'];
+
+            foreach ($subtypeConfig['accounts'] as $accountName => $accountDetails) {
+                $bankAccount = null;
+
+                if ($subtypeConfig['multi_currency'] && isset($subtypeConfig['bank_account_type'])) {
+                    $bankAccount = $this->createBankAccountForMultiCurrency($company, $subtypeConfig['bank_account_type']);
+                }
+
+                $account = Account::create([
+                    'company_id' => $company->id,
+                    'subtype_id' => $subtype->id,
+                    'category' => $subtype->type->getCategory()->value,
+                    'type' => $subtype->type->value,
+                    'code' => $baseCode++,
+                    'name' => $accountName,
+                    'currency_code' => CurrencyAccessor::getDefaultCurrency(),
+                    'description' => $accountDetails['description'] ?? 'No description available.',
+                    'default' => true,
+                    'created_by' => $company->owner->id,
+                    'updated_by' => $company->owner->id,
+                ]);
+
+                if ($bankAccount) {
+                    $account->bankAccount()->associate($bankAccount);
+                }
+
+                $account->save();
+            }
+        }
+    }
+
+    private function createBankAccountForMultiCurrency(Company $company, string $bankAccountType): BankAccount
+    {
+        $bankAccountType = BankAccountType::from($bankAccountType) ?? BankAccountType::Other;
+
+        return BankAccount::create([
+            'company_id' => $company->id,
+            'institution_id' => null,
+            'type' => $bankAccountType,
+            'number' => null,
+            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
+            'created_by' => $company->owner->id,
+            'updated_by' => $company->owner->id,
+        ]);
+    }
+}

app/Services/ReportService.php

@@ -146,7 +146,6 @@ class ReportService
                 $totalDebit += $journalEntry->total_debit;
                 $totalCredit += $journalEntry->total_credit;
 
-                // Adjust balance
                 $currentBalance += $journalEntry->total_debit;
                 $currentBalance -= $journalEntry->total_credit;
 

app/Utilities/Currency/CurrencyAccessor.php

@@ -53,9 +53,13 @@ class CurrencyAccessor
 
     public static function getDefaultCurrency(): ?string
     {
-        $companyId = auth()->user()->currentCompany->id;
+        $companyId = auth()->user()?->currentCompany?->id;
         $cacheKey = "default_currency_{$companyId}";
 
+        if ($companyId === null) {
+            return 'USD';
+        }
+
         return Cache::rememberForever($cacheKey, function () {
             return Currency::query()
                 ->where('enabled', true)

composer.lock

@@ -77,16 +77,16 @@
         },
         {
             "name": "andrewdwallo/filament-companies",
-            "version": "v4.0.2",
+            "version": "v4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/andrewdwallo/filament-companies.git",
-                "reference": "2320fe95d32f90c09e17dd23aba6e99086d609e1"
+                "reference": "47d74b9930b7f55d3c70bafbe5351b450ed5292a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/andrewdwallo/filament-companies/zipball/2320fe95d32f90c09e17dd23aba6e99086d609e1",
-                "reference": "2320fe95d32f90c09e17dd23aba6e99086d609e1",
+                "url": "https://api.github.com/repos/andrewdwallo/filament-companies/zipball/47d74b9930b7f55d3c70bafbe5351b450ed5292a",
+                "reference": "47d74b9930b7f55d3c70bafbe5351b450ed5292a",
                 "shasum": ""
             },
             "require": {
@@ -150,9 +150,9 @@
             ],
             "support": {
                 "issues": "https://github.com/andrewdwallo/filament-companies/issues",
-                "source": "https://github.com/andrewdwallo/filament-companies/tree/v4.0.2"
+                "source": "https://github.com/andrewdwallo/filament-companies/tree/v4.0.3"
             },
-            "time": "2024-04-05T21:36:19+00:00"
+            "time": "2024-07-05T19:09:23+00:00"
         },
         {
             "name": "andrewdwallo/filament-selectify",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.315.5",
+            "version": "3.315.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "3e6d619d45d8e1a8681dd58de61ddfe90e8341e6"
+                "reference": "69e19f7b083c5b5a06677b026e23dae517825c8b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3e6d619d45d8e1a8681dd58de61ddfe90e8341e6",
-                "reference": "3e6d619d45d8e1a8681dd58de61ddfe90e8341e6",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/69e19f7b083c5b5a06677b026e23dae517825c8b",
+                "reference": "69e19f7b083c5b5a06677b026e23dae517825c8b",
                 "shasum": ""
             },
             "require": {
@@ -586,9 +586,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.315.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.315.6"
             },
-            "time": "2024-07-03T18:12:51+00:00"
+            "time": "2024-07-05T18:07:22+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",

config/snappy.php

@@ -39,7 +39,6 @@ return [
         'timeout' => false,
         'options' => [
             'no-pdf-compression' => true,
-            'disable-smart-shrinking' => true,
             'disable-javascript' => true,
             'margin-top' => '10mm',
             'margin-right' => '7.5mm',

database/factories/Accounting/TransactionFactory.php

@@ -2,7 +2,10 @@
 
 namespace Database\Factories\Accounting;
 
+use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
+use App\Models\Banking\BankAccount;
+use App\Models\Company;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -10,6 +13,11 @@ use Illuminate\Database\Eloquent\Factories\Factory;
  */
 class TransactionFactory extends Factory
 {
+    /**
+     * The name of the factory's corresponding model.
+     */
+    protected $model = Transaction::class;
+
     /**
      * Define the model's default state.
      *
@@ -19,8 +27,8 @@ class TransactionFactory extends Factory
     {
         return [
             'company_id' => 1,
-            'account_id' => $this->faker->numberBetween(1, 30),
             'bank_account_id' => 1,
+            'account_id' => $this->faker->numberBetween(2, 30),
             'type' => $this->faker->randomElement(['deposit', 'withdrawal', 'journal']),
             'payment_channel' => $this->faker->randomElement(['online', 'in store', 'other']),
             'description' => $this->faker->sentence,
@@ -69,4 +77,32 @@ class TransactionFactory extends Factory
             ]);
         });
     }
+
+    public function forCompanyAndBankAccount(Company $company, BankAccount $bankAccount): static
+    {
+        return $this->state(function (array $attributes) use ($bankAccount, $company) {
+            $type = $this->faker->randomElement(['deposit', 'withdrawal', 'journal']);
+
+            $associatedAccountTypes = match ($type) {
+                'deposit' => ['asset', 'liability', 'equity', 'revenue'],
+                'withdrawal' => ['asset', 'liability', 'equity', 'expense'],
+                default => ['asset', 'liability', 'equity', 'revenue', 'expense'],
+            };
+
+            $accountIdForBankAccount = $bankAccount->account->id;
+
+            $account = Account::where('category', $this->faker->randomElement($associatedAccountTypes))
+                ->where('company_id', $company->id)
+                ->where('id', '<>', $accountIdForBankAccount)
+                ->inRandomOrder()
+                ->firstOrFail();
+
+            return [
+                'company_id' => $company->id,
+                'bank_account_id' => $bankAccount->id,
+                'account_id' => $account->id,
+                'type' => $type,
+            ];
+        });
+    }
 }

database/factories/UserFactory.php

@@ -2,12 +2,14 @@
 
 namespace Database\Factories;
 
-use App\Events\CompanyGenerated;
 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;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Wallo\FilamentCompanies\FilamentCompanies;
@@ -69,34 +71,39 @@ class UserFactory extends Factory
             Company::factory()
                 ->has(CompanyProfile::factory()->withCountry($countryCode), 'profile')
                 ->afterCreating(function (Company $company) use ($user, $countryCode) {
-                    CompanyGenerated::dispatch($user, $company, $countryCode);
+                    DB::transaction(function () use ($company, $user, $countryCode) {
+                        $companyDefaultService = app()->make(CompanyDefaultService::class);
+                        $companyDefaultService->createCompanyDefaults($company, $user, 'USD', $countryCode, 'en');
 
-                    $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();
+                        $chartOfAccountsService = app()->make(ChartOfAccountsService::class);
+                        $chartOfAccountsService->createChartOfAccounts($company);
 
-                    $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->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();
 
-                    TransactionFactory::new()
-                        ->count(2000)
-                        ->createQuietly([
-                            'company_id' => $company->id,
+                        $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,
                         ]);
+
+                        TransactionFactory::new()
+                            ->forCompanyAndBankAccount($company, $defaultBankAccount)
+                            ->count(2000)
+                            ->createQuietly([
+                                'created_by' => $user->id,
+                                'updated_by' => $user->id,
+                            ]);
+                    });
                 })
                 ->create([
                     'name' => $user->name . '\'s Company',

package-lock.json

@@ -1079,9 +1079,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.816",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.816.tgz",
-            "integrity": "sha512-EKH5X5oqC6hLmiS7/vYtZHZFTNdhsYG5NVPRN6Yn0kQHNBlT59+xSM8HBy66P5fxWpKgZbPqb+diC64ng295Jw==",
+            "version": "1.4.817",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.817.tgz",
+            "integrity": "sha512-3znu+lZMIbTe8ZOs360OMJvVroVF2NpNI8T5jfLnDetVvj0uNmIucZzQVYMSJfsu9f47Ssox1Gt46PR+R+1JUg==",
             "dev": true
         },
         "node_modules/emoji-regex": {

resources/views/components/company/reports/account-transactions-report-pdf.blade.php

@@ -5,11 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
-        @page {
-            size: auto;
-            margin: 10mm 7.5mm;
-        }
-
         .header {
             color: #374151;
             margin-bottom: 1rem;
@@ -66,6 +61,14 @@
             border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
         }
 
+        .whitespace-normal {
+            white-space: normal;
+        }
+
+        .whitespace-nowrap {
+            white-space: nowrap;
+        }
+
         .category-header-row > td {
             background-color: #f3f4f6; /* Gray background for category names */
             font-weight: 600;
@@ -125,7 +128,7 @@
                     'category-header-row' => $loop->first || $loop->last || $loop->remaining === 1,
                 ])>
                 @foreach($transaction as $cellIndex => $cell)
-                    <td class="{{ $report->getAlignmentClass($cellIndex) }}">
+                    <td class="{{ $report->getAlignmentClass($cellIndex) }} {{ $cellIndex === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
                         {{ $cell }}
                     </td>
                 @endforeach

resources/views/components/company/tables/reports/account-transactions.blade.php

@@ -33,14 +33,22 @@
                 <tr wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}"
                     @class([
                         'bg-gray-50 dark:bg-white/5' => $loop->first || $loop->last || $loop->remaining === 1,
-                    ])>
+                    ])
+                >
                     @foreach($transaction as $cellIndex => $cell)
-                        <x-filament-tables::cell wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}-cell-{{ $cellIndex }}" class="{{ $report->getAlignmentClass($cellIndex) }}">
+                        <x-filament-tables::cell
+                            wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}-cell-{{ $cellIndex }}"
+                             @class([
+                                $report->getAlignmentClass($cellIndex),
+                                'whitespace-normal' => $cellIndex === 1,
+                            ])
+                        >
                             <div
                                 @class([
                                     'px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white',
                                     'font-semibold' => $loop->parent->first || $loop->parent->last || $loop->parent->remaining === 1,
-                                ])>
+                                ])
+                            >
                                 {{ $cell }}
                             </div>
                         </x-filament-tables::cell>