Merge pull request #189 from andrewdwallo/development-3.x

Development 3.x

app/Concerns/HasJournalEntryActions.php

@@ -4,6 +4,7 @@ namespace App\Concerns;
 
 use App\Enums\Accounting\JournalEntryType;
 use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
 use Filament\Tables\Actions\Action;
 
 trait HasJournalEntryActions
@@ -14,7 +15,7 @@ trait HasJournalEntryActions
 
     private function formatMoney(int $amount): string
     {
-        return money($amount, CurrencyAccessor::getDefaultCurrency())->format();
+        return CurrencyConverter::formatCentsToMoney($amount, CurrencyAccessor::getDefaultCurrency());
     }
 
     /**
@@ -184,7 +185,7 @@ trait HasJournalEntryActions
             return '0';
         }
 
-        $currency = currency(CurrencyAccessor::getDefaultCurrency());
+        $currency = currency('USD');
         $decimal = $currency->getDecimalMark();
 
         if (substr($amount, -1) === $decimal) {
@@ -201,6 +202,6 @@ trait HasJournalEntryActions
      */
     protected function convertAmountToCents(string $amount): int
     {
-        return money($amount, CurrencyAccessor::getDefaultCurrency(), true)->getAmount();
+        return CurrencyConverter::convertToCents($amount, 'USD');
     }
 }

app/Concerns/HasTransactionAction.php

@@ -9,6 +9,7 @@ use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
 use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
@@ -251,20 +252,23 @@ trait HasTransactionAction
 
                         $hasDebit = false;
                         $hasCredit = false;
+                        $totalDebits = 0;
+                        $totalCredits = 0;
 
                         foreach ($value as $entry) {
-                            if (! isset($entry['type'])) {
+                            if (! isset($entry['type']) || ! isset($entry['amount'])) {
                                 continue;
                             }
 
-                            if (JournalEntryType::parse($entry['type'])->isDebit()) {
+                            $entryType = JournalEntryType::parse($entry['type']);
+                            $amount = CurrencyConverter::convertToCents($entry['amount'], 'USD');
+
+                            if ($entryType->isDebit()) {
                                 $hasDebit = true;
-                            } elseif (JournalEntryType::parse($entry['type'])->isCredit()) {
+                                $totalDebits += $amount;
+                            } elseif ($entryType->isCredit()) {
                                 $hasCredit = true;
-                            }
-
-                            if ($hasDebit && $hasCredit) {
-                                break;
+                                $totalCredits += $amount;
                             }
                         }
 
@@ -275,6 +279,12 @@ trait HasTransactionAction
                         if (! $hasCredit) {
                             $fail('At least one credit entry is required.');
                         }
+
+                        if ($totalDebits !== $totalCredits) {
+                            $debitFormatted = CurrencyConverter::formatCentsToMoney($totalDebits, CurrencyAccessor::getDefaultCurrency());
+                            $creditFormatted = CurrencyConverter::formatCentsToMoney($totalCredits, CurrencyAccessor::getDefaultCurrency());
+                            $fail("Total debits ({$debitFormatted}) must equal total credits ({$creditFormatted}).");
+                        }
                     };
                 },
             ])
@@ -326,7 +336,7 @@ trait HasTransactionAction
                 ->searchable(),
             Forms\Components\TextInput::make('amount')
                 ->label('Amount')
-                ->live()
+                ->live(onBlur: true)
                 ->money()
                 ->afterStateUpdated(function (Forms\Get $get, Forms\Set $set, ?string $state, ?string $old) {
                     $this->updateJournalEntryAmount(JournalEntryType::parse($get('type')), $state, $old);

app/Providers/Filament/CompanyPanelProvider.php

@@ -174,7 +174,7 @@ class CompanyPanelProvider extends PanelProvider
             })
             ->globalSearch(false)
             ->sidebarCollapsibleOnDesktop()
-            ->databaseNotifications()
+            ->databaseNotifications(isLazy: false)
             ->viteTheme('resources/css/filament/company/theme.css')
             ->brandLogo(static fn () => view('components.icons.logo'))
             ->tenant(Company::class)

resources/css/filament/company/top-navigation.css

@@ -18,3 +18,8 @@
 :is(.dark .fi-topbar > nav.topbar-scrolled, .dark .fi-sidebar-header.topbar-scrolled) {
     @apply bg-gray-900/50 !important;
 }
+
+/* Notification badge transparency */
+.fi-topbar .fi-icon-btn-badge-ctn {
+    @apply bg-transparent !important;
+}