wip: Accounting Module

app/Filament/Resources/AccountResource.php

@@ -17,7 +17,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 Illuminate\Support\Facades\DB;

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

@@ -4,6 +4,7 @@ namespace App\Filament\Resources\AccountResource\Pages;
 
 use App\Filament\Resources\AccountResource;
 use App\Models\Banking\Account;
+use App\Traits\HandlesResourceRecordUpdate;
 use Filament\Notifications\Notification;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
@@ -13,6 +14,8 @@ use Illuminate\Support\Facades\DB;
 
 class EditAccount extends EditRecord
 {
+    use HandlesResourceRecordUpdate;
+
     protected static string $resource = AccountResource::class;
 
     protected function getActions(): array
@@ -24,7 +27,7 @@ class EditAccount extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeSave(array $data): array
@@ -36,61 +39,8 @@ class EditAccount extends EditRecord
         return $data;
     }
 
-    protected function handleRecordUpdate(Model|Account $record, array $data): Model|Account
-    {
-        return DB::transaction(function () use ($record, $data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-            $recordId = $record->id;
-            $enabled = (bool)($data['enabled'] ?? false);
-
-            // If the record is enabled, disable all other records for the same company
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId, $recordId);
-            }
-            // If the record is disabled, ensure at least one record remains enabled
-            elseif ($enabled === false) {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $recordId, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordUpdate($record, $data);
-        });
-    }
-
-    protected function disableExistingRecord(int $companyId, int $recordId): void
-    {
-        $existingEnabledAccount = Account::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('id', '!=', $recordId)
-            ->first();
-
-        if ($existingEnabledAccount !== null) {
-            $existingEnabledAccount->enabled = false;
-            $existingEnabledAccount->save();
-            $this->defaultAccountChanged();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled(int $companyId, int $recordId, bool &$enabled): void
-    {
-        $enabledAccountsCount = Account::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('id', '!=', $recordId)
-            ->count();
-
-        if ($enabledAccountsCount === 0) {
-            $enabled = true;
-        }
-    }
-
-    protected function defaultAccountChanged(): void
+    protected function handleRecordUpdate(Model $record, array $data): Model
     {
-        Notification::make()
-            ->warning()
-            ->title('Default account updated')
-            ->body('Your default account has been updated. Please check your account settings to review this change and ensure it is correct.')
-            ->persistent()
-            ->send();
+        return $this->handleRecordUpdateWithUniqueField($record, $data);
     }
 }

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

@@ -3,15 +3,16 @@
 namespace App\Filament\Resources\CategoryResource\Pages;
 
 use App\Filament\Resources\CategoryResource;
-use App\Models\Setting\Category;
+use App\Traits\HandlesResourceRecordUpdate;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 
 class EditCategory extends EditRecord
 {
+    use HandlesResourceRecordUpdate;
+
     protected static string $resource = CategoryResource::class;
 
     protected function getActions(): array
@@ -23,7 +24,7 @@ class EditCategory extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeSave(array $data): array
@@ -35,70 +36,8 @@ class EditCategory extends EditRecord
         return $data;
     }
 
-    protected function handleRecordUpdate(Model|Category $record, array $data): Model|Category
-    {
-        return DB::transaction(function () use ($record, $data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-            $recordId = $record->id;
-            $oldType = $record->type;
-            $newType = $data['type'];
-            $enabled = (bool)($data['enabled'] ?? false);
-
-            // If the record type has changed and it was previously enabled
-            if ($oldType !== $newType && $record->enabled) {
-                $this->changeRecordType($currentCompanyId, $recordId, $oldType);
-            }
-
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId, $recordId, $newType);
-            } elseif ($enabled === false) {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $recordId, $newType, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordUpdate($record, $data);
-        });
-    }
-
-    protected function changeRecordType(int $companyId, int $recordId, string $oldType): void
-    {
-        $oldTypeRecord = $this->getCompanyRecord($companyId, $oldType, $recordId);
-
-        if ($oldTypeRecord) {
-            $oldTypeRecord->enabled = true;
-            $oldTypeRecord->save();
-        }
-    }
-
-    protected function disableExistingRecord(int $companyId, int $recordId, string $newType): void
-    {
-        $existingEnabledRecord = $this->getCompanyRecord($companyId, $newType, $recordId);
-
-        if ($existingEnabledRecord !== null) {
-            $existingEnabledRecord->enabled = false;
-            $existingEnabledRecord->save();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled(int $companyId, int $recordId, string $newType, bool &$enabled): void
-    {
-        $otherEnabledRecords = Category::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('type', $newType)
-            ->where('id', '!=', $recordId)
-            ->count();
-
-        if ($otherEnabledRecords === 0) {
-            $enabled = true;
-        }
-    }
-
-    protected function getCompanyRecord(int $companyId, string $type, int $recordId): ?Category
+    protected function handleRecordUpdate(Model $record, array $data): Model
     {
-        return Category::where('company_id', $companyId)
-            ->where('type', $type)
-            ->where('id', '!=', $recordId)
-            ->first();
+        return $this->handleRecordUpdateWithUniqueField($record, $data, 'type');
     }
 }

app/Filament/Resources/CurrencyResource/Pages/EditCurrency.php

@@ -5,6 +5,7 @@ namespace App\Filament\Resources\CurrencyResource\Pages;
 use App\Filament\Resources\CurrencyResource;
 use App\Models\Banking\Account;
 use App\Models\Setting\Currency;
+use App\Traits\HandlesResourceRecordUpdate;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Database\Eloquent\Model;
@@ -13,6 +14,8 @@ use Illuminate\Support\Facades\DB;
 
 class EditCurrency extends EditRecord
 {
+    use HandlesResourceRecordUpdate;
+
     protected static string $resource = CurrencyResource::class;
 
     protected function getActions(): array
@@ -24,7 +27,7 @@ class EditCurrency extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeSave(array $data): array
@@ -38,48 +41,7 @@ class EditCurrency extends EditRecord
 
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
-        return DB::transaction(function () use ($record, $data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-            $recordId = $record->id;
-            $enabled = (bool)($data['enabled'] ?? false);
-
-            // If the record is enabled, disable all other records for the same company
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId, $recordId);
-            }
-            // If the record is disabled, ensure at least one record remains enabled
-            elseif ($enabled === false) {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $recordId, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordUpdate($record, $data);
-        });
+        return $this->handleRecordUpdateWithUniqueField($record, $data);
     }
 
-    protected function disableExistingRecord(int $companyId, int $recordId): void
-    {
-        $existingEnabledAccount = Currency::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('id', '!=', $recordId)
-            ->first();
-
-        if ($existingEnabledAccount !== null) {
-            $existingEnabledAccount->enabled = false;
-            $existingEnabledAccount->save();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled(int $companyId, int $recordId, bool &$enabled): void
-    {
-        $enabledAccountsCount = Currency::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('id', '!=', $recordId)
-            ->count();
-
-        if ($enabledAccountsCount === 0) {
-            $enabled = true;
-        }
-    }
 }

app/Filament/Resources/CustomerResource/Pages/CreateCustomer.php

@@ -14,7 +14,7 @@ class CreateCustomer extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Filament/Resources/DiscountResource/Pages/EditDiscount.php

@@ -3,11 +3,15 @@
 namespace App\Filament\Resources\DiscountResource\Pages;
 
 use App\Filament\Resources\DiscountResource;
+use App\Traits\HandlesResourceRecordUpdate;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Illuminate\Database\Eloquent\Model;
 
 class EditDiscount extends EditRecord
 {
+    use HandlesResourceRecordUpdate;
+
     protected static string $resource = DiscountResource::class;
 
     protected function getActions(): array
@@ -16,4 +20,14 @@ class EditDiscount extends EditRecord
             Actions\DeleteAction::make(),
         ];
     }
+
+    protected function getRedirectUrl(): string
+    {
+        return $this->previousUrl;
+    }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        return $this->handleRecordUpdateWithUniqueField($record, $data, 'type');
+    }
 }

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

@@ -11,6 +11,11 @@ class CreateInvoice extends CreateRecord
 {
     protected static string $resource = InvoiceResource::class;
 
+    protected function getRedirectUrl(): string
+    {
+        return $this->previousUrl;
+    }
+
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $data['company_id'] = Auth::user()->currentCompany->id;

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

@@ -20,7 +20,7 @@ class EditInvoice extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

app/Filament/Resources/TaxResource/Pages/EditTax.php

@@ -4,6 +4,7 @@ namespace App\Filament\Resources\TaxResource\Pages;
 
 use App\Filament\Resources\TaxResource;
 use App\Models\Setting\Tax;
+use App\Traits\HandlesResourceRecordUpdate;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Database\Eloquent\Model;
@@ -12,6 +13,8 @@ use Illuminate\Support\Facades\DB;
 
 class EditTax extends EditRecord
 {
+    use HandlesResourceRecordUpdate;
+
     protected static string $resource = TaxResource::class;
 
     protected function getActions(): array
@@ -23,7 +26,7 @@ class EditTax extends EditRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeUpdate(array $data): array
@@ -35,72 +38,8 @@ class EditTax extends EditRecord
         return $data;
     }
 
-    protected function handleRecordUpdate(Model|Tax $record, array $data): Model|Tax
-    {
-        return DB::transaction(function () use ($record, $data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-            $recordId = $record->id;
-            $oldType = $record->type;
-            $newType = $data['type'];
-            $enabled = (bool)($data['enabled'] ?? false);
-
-            // If the record type has changed and it was previously enabled
-            if ($oldType !== $newType && $record->enabled) {
-                $this->changeRecordType($currentCompanyId, $recordId, $oldType);
-            }
-
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId, $recordId, $newType);
-            } elseif ($enabled === false) {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $recordId, $newType, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordUpdate($record, $data);
-        });
-    }
-
-    protected function changeRecordType(int $companyId, int $recordId, string $oldType): void
-    {
-        $oldTypeRecord = $this->getCompanyCategoryRecord($companyId, $oldType, $recordId);
-
-        if ($oldTypeRecord) {
-            $oldTypeRecord->enabled = true;
-            $oldTypeRecord->save();
-        }
-    }
-
-    protected function disableExistingRecord(int $companyId, int $recordId, string $newType): void
-    {
-        $existingEnabledRecord = $this->getCompanyCategoryRecord($companyId, $newType, $recordId);
-
-        if ($existingEnabledRecord !== null) {
-            $existingEnabledRecord->enabled = false;
-            $existingEnabledRecord->save();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled(int $companyId, int $recordId, string $newType, bool &$enabled): void
+    protected function handleRecordUpdate(Model $record, array $data): Model
     {
-        $otherEnabledRecords = Tax::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('type', $newType)
-            ->where('id', '!=', $recordId)
-            ->count();
-
-        if ($otherEnabledRecords === 0) {
-            $enabled = true;
-        }
+        return $this->handleRecordUpdateWithUniqueField($record, $data, 'type');
     }
-
-    protected function getCompanyCategoryRecord(int $companyId, string $type, int $recordId): ?Tax
-    {
-        return Tax::where('company_id', $companyId)
-            ->where('type', $type)
-            ->where('id', '!=', $recordId)
-            ->first();
-    }
-
-
 }

app/Observers/CompanyObserver.php

@@ -3,12 +3,11 @@
 namespace App\Observers;
 
 use App\Models\Company;
+use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\Discount;
 use App\Models\Setting\DocumentDefault;
 use App\Models\Setting\Tax;
-use Database\Factories\CategoryFactory;
-use Illuminate\Support\Carbon;
 
 class CompanyObserver
 {
@@ -17,6 +16,36 @@ class CompanyObserver
      */
     public function created(Company $company): void
     {
+        $incomeCategories = ['Salary', 'Bonus', 'Interest', 'Dividends', 'Rentals'];
+        $expenseCategories = ['Rent', 'Utilities', 'Food', 'Transportation', 'Entertainment'];
+
+        $shuffledCategories = [
+            ...array_map(static fn ($name) => ['name' => $name, 'type' => 'income'], $incomeCategories),
+            ...array_map(static fn ($name) => ['name' => $name, 'type' => 'expense'], $expenseCategories),
+        ];
+
+        shuffle($shuffledCategories);
+
+        $incomeEnabled = $expenseEnabled = false;
+
+        foreach ($shuffledCategories as $category) {
+            $enabled = false;
+            if (!$incomeEnabled && $category['type'] === 'income') {
+                $enabled = $incomeEnabled = true;
+            } elseif (!$expenseEnabled && $category['type'] === 'expense') {
+                $enabled = $expenseEnabled = true;
+            }
+
+            Category::factory()->create([
+                'company_id' => $company->id,
+                'name' => $category['name'],
+                'type' => $category['type'],
+                'enabled' => $enabled,
+                'created_by' => $company->user_id,
+            ]);
+        }
+
+
         DocumentDefault::factory()->invoice()->create([
             'company_id' => $company->id,
         ]);

app/Traits/HandlesResourceRecordUpdate.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Traits;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+
+trait HandlesResourceRecordUpdate
+{
+    protected function handleRecordUpdateWithUniqueField(Model $record, array $data, string|null $uniqueField = null): Model
+    {
+        return DB::transaction(function () use ($uniqueField, $record, $data) {
+            $companyId = Auth::user()->currentCompany->id;
+            $oldValue = $uniqueField ? $record->{$uniqueField} : null;
+            $newValue = $uniqueField ? $data[$uniqueField] : null;
+            $enabled = (bool)($data['enabled'] ?? false);
+
+            if ($oldValue !== $newValue && $record->enabled) {
+                $this->enableAnotherOfSameValue($companyId, $record, $uniqueField, $oldValue);
+            }
+
+            if ($enabled === true) {
+                $this->disableOthersOfSameValue($companyId, $record, $uniqueField, $newValue);
+            } elseif ($enabled === false) {
+                $this->ensureAtLeastOneEnabled($companyId, $record, $uniqueField, $newValue, $enabled);
+            }
+
+            $data['enabled'] = $enabled;
+
+            return tap($record)->update($data);
+        });
+    }
+
+    protected function enableAnotherOfSameValue(int $companyId, Model $record, ?string $uniqueField, $value): void
+    {
+        $query = $record::where('company_id', $companyId)
+            ->where('id', '!=', $record->id)
+            ->where('enabled', false);
+
+        if($uniqueField){
+            $query->where($uniqueField, $value);
+        }
+
+        $otherRecord = $query->first();
+
+        if ($otherRecord) {
+            $otherRecord->enabled = true;
+            $otherRecord->save();
+        }
+    }
+
+    protected function disableOthersOfSameValue(int $companyId, Model $record, ?string $uniqueField, $value): void
+    {
+        $query = $record::where('company_id', $companyId)
+            ->where('id', '!=', $record->id)
+            ->where('enabled', true);
+
+        if($uniqueField){
+            $query->where($uniqueField, $value);
+        }
+
+        $query->update(['enabled' => false]);
+    }
+
+    protected function ensureAtLeastOneEnabled(int $companyId, Model $record, ?string $uniqueField, $value, bool &$enabled): void
+    {
+        $query = $record::where('company_id', $companyId)
+            ->where('id', '!=', $record->id)
+            ->where('enabled', true);
+
+        if($uniqueField){
+            $query->where($uniqueField, $value);
+        }
+
+        $enabledCount = $query->count();
+
+        if ($enabledCount === 0) {
+            $enabled = true;
+        }
+    }
+}

composer.lock

@@ -4379,16 +4379,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.11.18",
+            "version": "v0.11.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec"
+                "reference": "1724ceff278daeeac5a006744633bacbb2dc4706"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
-                "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1724ceff278daeeac5a006744633bacbb2dc4706",
+                "reference": "1724ceff278daeeac5a006744633bacbb2dc4706",
                 "shasum": ""
             },
             "require": {
@@ -4449,9 +4449,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.18"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.19"
             },
-            "time": "2023-05-23T02:31:11+00:00"
+            "time": "2023-07-15T19:42:19+00:00"
         },
         {
             "name": "ralouphie/getallheaders",

database/factories/CategoryFactory.php

@@ -25,19 +25,21 @@ class CategoryFactory extends Factory
     public function definition(): array
     {
         return [
+            'name' => $this->faker->word,
+            'type' => $this->faker->randomElement(['income', 'expense']),
             'color' => $this->faker->hexColor,
+            'enabled' => false,
         ];
     }
 
     /**
      * Indicate that the category is of income type.
-     *
-     * @return Factory<Category>
      */
-    public function income(): Factory
+    public function incomeCategory(string $name): self
     {
-        return $this->state(function (array $attributes) {
+        return $this->state(function (array $attributes) use ($name) {
             return [
+                'name' => $name,
                 'type' => 'income',
             ];
         });
@@ -45,13 +47,12 @@ class CategoryFactory extends Factory
 
     /**
      * Indicate that the category is of expense type.
-     *
-     * @return Factory<Category>
      */
-    public function expense(): Factory
+    public function expenseCategory(string $name): self
     {
-        return $this->state(function (array $attributes) {
+        return $this->state(function (array $attributes) use ($name) {
             return [
+                'name' => $name,
                 'type' => 'expense',
             ];
         });

database/seeders/DatabaseSeeder.php

@@ -103,7 +103,7 @@ class DatabaseSeeder extends Seeder
 
         $this->call([
             //CurrencySeeder::class,
-            CategorySeeder::class,
+            //CategorySeeder::class,
             //TaxSeeder::class,
             //DiscountSeeder::class,
         ]);