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

Development 3.x

README.md

@@ -26,10 +26,13 @@ The demo environment provides a complete experience of the application with the
 - **Login Credentials**: Pre-filled for convenience (email: admin@erpsaas.com, password: password)
 - **Multi-Company Setup**: 5 pre-configured companies with different currencies:
     - ERPSAAS (USD)
-    - European Retail GmbH (EUR)
-    - UK Services Ltd (GBP)
-    - Canadian Manufacturing Inc (CAD)
-    - Australian Hospitality Pty (AUD)
+    - British Crown Analytics (GBP)
+    - Swiss Precision Group (CHF)
+    - Tokyo Future Technologies (JPY)
+    - Sydney Harbor Systems (AUD)
+    - Mumbai Software Services (INR)
+    - Singapore Digital Hub (SGD)
+    - Dubai Business Consulting (AED)
 - **Feature Access**: Full accounting functionality with simplified user management
 - **Limitations**: Plaid, Live Currency, Profile customization, password reset, and registration are disabled
 

app/Casts/DocumentMoneyCast.php

@@ -33,14 +33,12 @@ class DocumentMoneyCast implements CastsAttributes
      */
     public function set(Model $model, string $key, mixed $value, array $attributes): mixed
     {
-        $currency_code = $attributes['currency_code'] ?? CurrencyAccessor::getDefaultCurrency();
-
         if (is_numeric($value)) {
             $value = (string) $value;
         } elseif (! is_string($value)) {
             throw new UnexpectedValueException('Expected string or numeric value for money cast');
         }
 
-        return CurrencyConverter::prepareForAccessor($value, $currency_code);
+        return CurrencyConverter::prepareForAccessor($value, 'USD');
     }
 }

app/Concerns/HandlePageRedirect.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Concerns;
+
+trait HandlePageRedirect
+{
+    protected function getRedirectUrl(): string
+    {
+        $resource = $this->getResource();
+
+        if ($resource::hasPage('view') && $this->record) {
+            return $resource::getUrl('view', ['record' => $this->record]);
+        }
+
+        return $resource::getUrl('index');
+    }
+}

app/Concerns/RedirectToListPage.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-trait RedirectToListPage
-{
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}

app/Concerns/RedirectToViewPage.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-trait RedirectToViewPage
-{
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('view', ['record' => $this->record]);
-    }
-}

app/Filament/Company/Clusters/Settings/Pages/CompanyProfile.php

@@ -201,7 +201,8 @@ class CompanyProfile extends Page
                 Hidden::make('type')
                     ->default('general'),
                 AddressFields::make()
-                    ->softRequired(),
+                    ->softRequired()
+                    ->disabledCountry(is_demo_environment()),
             ])
             ->columns(2);
     }

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -126,7 +126,7 @@ class Localization extends Page
                     ->softRequired()
                     ->localizeLabel()
                     ->options(LocalizationModel::getAllLanguages())
-                    ->disabled(app()->environment('demo'))
+                    ->disabled(is_demo_environment())
                     ->searchable(),
                 Select::make('timezone')
                     ->softRequired()

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/CreateAdjustment.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateAdjustment extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AdjustmentResource::class;
 }

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/EditAdjustment.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAdjustment extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AdjustmentResource::class;
 

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateCurrency extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = CurrencyResource::class;
 }

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditCurrency extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = CurrencyResource::class;
 

app/Filament/Company/Clusters/Settings/Resources/DocumentDefaultResource/Pages/EditDocumentDefault.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Contracts\Support\Htmlable;
 
 class EditDocumentDefault extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = DocumentDefaultResource::class;
 

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

@@ -227,7 +227,7 @@ abstract class BaseReportPage extends Page
                     ->action(fn () => $this->exportCSV()),
                 Action::make('exportPDF')
                     ->label('PDF')
-                    ->hidden(app()->environment('demo'))
+                    ->hidden(is_demo_environment())
                     ->action(fn () => $this->exportPDF()),
             ])
                 ->label('Export')

app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateAccount extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AccountResource::class;
 

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

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAccount extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = AccountResource::class;
 

app/Filament/Company/Resources/Common/OfferingResource/Pages/CreateOffering.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Resources\Common\OfferingResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Common\OfferingResource;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateOffering extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = OfferingResource::class;
 

app/Filament/Company/Resources/Common/OfferingResource/Pages/EditOffering.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Common\OfferingResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Common\OfferingResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditOffering extends EditRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = OfferingResource::class;
 

app/Filament/Company/Resources/Purchases/BillResource/Pages/CreateBill.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use App\Models\Common\Vendor;
@@ -14,8 +14,8 @@ use Livewire\Attributes\Url;
 
 class CreateBill extends CreateRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 

app/Filament/Company/Resources/Purchases/BillResource/Pages/EditBill.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditBill extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = BillResource::class;
 

app/Filament/Company/Resources/Purchases/VendorResource/Pages/CreateVendor.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Purchases\VendorResource;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
 
 class CreateVendor extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = VendorResource::class;
 

app/Filament/Company/Resources/Purchases/VendorResource/Pages/EditVendor.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
-use App\Concerns\RedirectToViewPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Purchases\VendorResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -10,7 +10,7 @@ use Filament\Support\Enums\MaxWidth;
 
 class EditVendor extends EditRecord
 {
-    use RedirectToViewPage;
+    use HandlePageRedirect;
 
     protected static string $resource = VendorResource::class;
 

app/Filament/Company/Resources/Sales/ClientResource/Pages/CreateClient.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
-use App\Concerns\RedirectToListPage;
+use App\Concerns\HandlePageRedirect;
 use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Address;
@@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class CreateClient extends CreateRecord
 {
-    use RedirectToListPage;
+    use HandlePageRedirect;
 
     protected static string $resource = ClientResource::class;
 

app/Filament/Company/Resources/Sales/ClientResource/Pages/EditClient.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
-use App\Concerns\RedirectToViewPage;
+use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Client;
 use Filament\Actions;
@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditClient extends EditRecord
 {
-    use RedirectToViewPage;
+    use HandlePageRedirect;
 
     protected static string $resource = ClientResource::class;
 

app/Filament/Company/Resources/Sales/EstimateResource/Pages/CreateEstimate.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
@@ -14,8 +14,8 @@ use Livewire\Attributes\Url;
 
 class CreateEstimate extends CreateRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToListPage;
 
     protected static string $resource = EstimateResource::class;
 

app/Filament/Company/Resources/Sales/EstimateResource/Pages/EditEstimate.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditEstimate extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = EstimateResource::class;
 

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/CreateInvoice.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use App\Models\Common\Client;
@@ -14,8 +14,8 @@ use Livewire\Attributes\Url;
 
 class CreateInvoice extends CreateRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/EditInvoice.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditInvoice extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = InvoiceResource::class;
 

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/EditRecurringInvoice.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
+use App\Concerns\HandlePageRedirect;
 use App\Concerns\ManagesLineItems;
-use App\Concerns\RedirectToViewPage;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use App\Models\Accounting\Estimate;
 use Filament\Actions;
@@ -13,8 +13,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class EditRecurringInvoice extends EditRecord
 {
+    use HandlePageRedirect;
     use ManagesLineItems;
-    use RedirectToViewPage;
 
     protected static string $resource = RecurringInvoiceResource::class;
 

app/Filament/Forms/Components/AddressFields.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Forms\Components;
 
+use Closure;
 use Filament\Forms\Components\Field;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\TextInput;
@@ -10,6 +11,8 @@ class AddressFields extends Grid
 {
     protected bool $isSoftRequired = false;
 
+    protected bool | Closure $isCountryDisabled = false;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -23,6 +26,7 @@ class AddressFields extends Grid
                 ->label('Address line 2')
                 ->maxLength(255),
             CountrySelect::make('country_code')
+                ->disabled(fn () => $this->isCountryDisabled())
                 ->clearStateField()
                 ->required(),
             StateSelect::make('state_id'),
@@ -55,4 +59,16 @@ class AddressFields extends Grid
             }
         }
     }
+
+    public function disabledCountry(bool | Closure $condition = true): static
+    {
+        $this->isCountryDisabled = $condition;
+
+        return $this;
+    }
+
+    public function isCountryDisabled(): bool
+    {
+        return $this->evaluate($this->isCountryDisabled);
+    }
 }

app/Filament/Forms/Components/CountrySelect.php

@@ -17,7 +17,6 @@ class CountrySelect extends Select
         $this
             ->localizeLabel('Country')
             ->searchable()
-            ->disabled(app()->environment('demo'))
             ->options($options = Country::getAvailableCountryOptions())
             ->getSearchResultsUsing(static fn (string $search): array => Country::getSearchResultsUsing($search))
             ->getOptionLabelUsing(static fn (string $value): ?string => $options[$value] ?? $value);

app/Filament/Pages/Auth/Login.php

@@ -10,7 +10,7 @@ class Login extends BaseLogin
     {
         parent::mount();
 
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             $this->form->fill([
                 'email' => 'admin@erpsaas.com',
                 'password' => 'password',

app/Filament/User/Clusters/Account.php

@@ -20,7 +20,7 @@ class Account extends Cluster
 
     public static function canAccess(): bool
     {
-        return ! app()->environment('demo');
+        return ! is_demo_environment();
     }
 
     /**

app/Helpers/format.php → app/Helpers/helpers.php

@@ -122,3 +122,10 @@ if (! function_exists('rateFormat')) {
         return null;
     }
 }
+
+if (! function_exists('is_demo_environment')) {
+    function is_demo_environment(): bool
+    {
+        return app()->environment('demo');
+    }
+}

app/Models/User.php

@@ -71,7 +71,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
 
     public function canAccessPanel(Panel $panel): bool
     {
-        if ($panel->getId() === 'user' && app()->environment('demo')) {
+        if ($panel->getId() === 'user' && is_demo_environment()) {
             return false;
         }
 

app/Policies/CompanyPolicy.php

@@ -31,7 +31,7 @@ class CompanyPolicy
      */
     public function create(User $user): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 
@@ -43,7 +43,7 @@ class CompanyPolicy
      */
     public function update(User $user, Company $company): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 
@@ -55,7 +55,7 @@ class CompanyPolicy
      */
     public function addCompanyEmployee(User $user, Company $company): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 
@@ -67,7 +67,7 @@ class CompanyPolicy
      */
     public function updateCompanyEmployee(User $user, Company $company): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 
@@ -79,7 +79,7 @@ class CompanyPolicy
      */
     public function removeCompanyEmployee(User $user, Company $company): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 
@@ -91,7 +91,7 @@ class CompanyPolicy
      */
     public function delete(User $user, Company $company): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 

app/Providers/Filament/CompanyPanelProvider.php

@@ -79,7 +79,7 @@ class CompanyPanelProvider extends PanelProvider
      */
     public function panel(Panel $panel): Panel
     {
-        $isDemoEnvironment = app()->environment('demo');
+        $isDemoEnvironment = is_demo_environment();
 
         return $panel
             ->default()

app/Services/CurrencyService.php

@@ -21,7 +21,7 @@ class CurrencyService implements CurrencyHandler
      */
     public function isEnabled(): bool
     {
-        if (app()->environment('demo')) {
+        if (is_demo_environment()) {
             return false;
         }
 

app/Services/PlaidService.php

@@ -63,7 +63,7 @@ class PlaidService
      */
     public function isEnabled(): bool
     {
-        if (app()->environment('demo') || empty($this->clientId) || empty($this->clientSecret)) {
+        if (is_demo_environment() || empty($this->clientId) || empty($this->clientSecret)) {
             return false;
         }
 

composer.json

@@ -48,7 +48,7 @@
             "Database\\Seeders\\": "database/seeders/"
         },
         "files": [
-            "app/Helpers/format.php"
+            "app/Helpers/helpers.php"
         ]
     },
     "autoload-dev": {

database/factories/Accounting/BillFactory.php

@@ -162,7 +162,7 @@ class BillFactory extends Factory
                     'posted_at' => $postedAt,
                     'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $bill->currency_code),
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
-                    'bank_account_id' => BankAccount::inRandomOrder()->value('id'),
+                    'bank_account_id' => BankAccount::where('company_id', $bill->company_id)->inRandomOrder()->value('id'),
                     'notes' => $this->faker->sentence,
                 ];
 
@@ -224,16 +224,18 @@ class BillFactory extends Factory
             return;
         }
 
-        $subtotal = $bill->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $bill->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $bill->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $bill->lineItems()->sum('subtotal');
+        $taxTotalCents = $bill->lineItems()->sum('tax_total');
+        $discountTotalCents = $bill->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $bill->currency_code;
 
         $bill->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/factories/Accounting/EstimateFactory.php

@@ -8,6 +8,7 @@ use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -204,16 +205,18 @@ class EstimateFactory extends Factory
             return;
         }
 
-        $subtotal = $estimate->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $estimate->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $estimate->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $estimate->lineItems()->sum('subtotal');
+        $taxTotalCents = $estimate->lineItems()->sum('tax_total');
+        $discountTotalCents = $estimate->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $estimate->currency_code;
 
         $estimate->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/factories/Accounting/InvoiceFactory.php

@@ -180,7 +180,7 @@ class InvoiceFactory extends Factory
                     'posted_at' => $postedAt,
                     'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $invoice->currency_code),
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
-                    'bank_account_id' => BankAccount::inRandomOrder()->value('id'),
+                    'bank_account_id' => BankAccount::where('company_id', $invoice->company_id)->inRandomOrder()->value('id'),
                     'notes' => $this->faker->sentence,
                 ];
 
@@ -249,16 +249,18 @@ class InvoiceFactory extends Factory
             return;
         }
 
-        $subtotal = $invoice->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $invoice->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $invoice->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $invoice->lineItems()->sum('subtotal');
+        $taxTotalCents = $invoice->lineItems()->sum('tax_total');
+        $discountTotalCents = $invoice->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $invoice->currency_code;
 
         $invoice->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -14,6 +14,7 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\RecurringInvoice;
 use App\Models\Common\Client;
 use App\Models\Company;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -298,16 +299,18 @@ class RecurringInvoiceFactory extends Factory
             return;
         }
 
-        $subtotal = $recurringInvoice->lineItems()->sum('subtotal') / 100;
-        $taxTotal = $recurringInvoice->lineItems()->sum('tax_total') / 100;
-        $discountTotal = $recurringInvoice->lineItems()->sum('discount_total') / 100;
-        $grandTotal = $subtotal + $taxTotal - $discountTotal;
+        $subtotalCents = $recurringInvoice->lineItems()->sum('subtotal');
+        $taxTotalCents = $recurringInvoice->lineItems()->sum('tax_total');
+        $discountTotalCents = $recurringInvoice->lineItems()->sum('discount_total');
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+        $currencyCode = $recurringInvoice->currency_code;
 
         $recurringInvoice->update([
-            'subtotal' => $subtotal,
-            'tax_total' => $taxTotal,
-            'discount_total' => $discountTotal,
-            'total' => $grandTotal,
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents, $currencyCode),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents, $currencyCode),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents, $currencyCode),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents, $currencyCode),
         ]);
     }
 }

database/seeders/DatabaseSeeder.php

@@ -21,14 +21,14 @@ class DatabaseSeeder extends Seeder
                     ->state([
                         'name' => 'ERPSAAS',
                     ])
-                    ->withTransactions()
+                    ->withTransactions(250)
                     ->withOfferings()
                     ->withClients()
                     ->withVendors()
-                    ->withInvoices(50)
+                    ->withInvoices(30)
                     ->withRecurringInvoices()
-                    ->withEstimates(50)
-                    ->withBills(50);
+                    ->withEstimates(30)
+                    ->withBills(30);
             })
             ->create([
                 'name' => 'Admin',
@@ -37,11 +37,15 @@ class DatabaseSeeder extends Seeder
                 'current_company_id' => 1,  // Assuming this will be the ID of the created company
             ]);
 
+        // Only use en locale for now
         $additionalCompanies = [
-            ['name' => 'European Retail GmbH', 'country' => 'DE', 'currency' => 'EUR', 'locale' => 'en'],
-            ['name' => 'UK Services Ltd', 'country' => 'GB', 'currency' => 'GBP', 'locale' => 'en'],
-            ['name' => 'Canadian Manufacturing Inc', 'country' => 'CA', 'currency' => 'CAD', 'locale' => 'en'],
-            ['name' => 'Australian Hospitality Pty', 'country' => 'AU', 'currency' => 'AUD', 'locale' => 'en'],
+            ['name' => 'British Crown Analytics', 'country' => 'GB', 'currency' => 'GBP', 'locale' => 'en'],
+            ['name' => 'Swiss Precision Group', 'country' => 'CH', 'currency' => 'CHF', 'locale' => 'en'],
+            ['name' => 'Tokyo Future Technologies', 'country' => 'JP', 'currency' => 'JPY', 'locale' => 'en'],
+            ['name' => 'Sydney Harbor Systems', 'country' => 'AU', 'currency' => 'AUD', 'locale' => 'en'],
+            ['name' => 'Mumbai Software Services', 'country' => 'IN', 'currency' => 'INR', 'locale' => 'en'],
+            ['name' => 'Singapore Digital Hub', 'country' => 'SG', 'currency' => 'SGD', 'locale' => 'en'],
+            ['name' => 'Dubai Business Consulting', 'country' => 'AE', 'currency' => 'AED', 'locale' => 'en'],
         ];
 
         foreach ($additionalCompanies as $companyData) {
@@ -57,7 +61,7 @@ class DatabaseSeeder extends Seeder
                 ->withOfferings()
                 ->withClients()
                 ->withVendors()
-                ->withInvoices(20)
+                ->withInvoices(15)
                 ->withRecurringInvoices()
                 ->withEstimates(15)
                 ->withBills(15)

tests/TestCase.php

@@ -51,9 +51,7 @@ abstract class TestCase extends BaseTestCase
     {
         Offering::factory()
             ->for($this->testCompany)
-            ->sellable()
             ->withSalesAdjustments()
-            ->purchasable()
             ->withPurchaseAdjustments()
             ->create();