wip: Accounting Module

app/Filament/Resources/AccountResource.php

@@ -2,6 +2,8 @@
 
 namespace App\Filament\Resources;
 
+use Akaunting\Money\Currency;
+use Akaunting\Money\Money;
 use App\Actions\Banking\CreateCurrencyFromAccount;
 use App\Filament\Resources\AccountResource\Pages;
 use App\Filament\Resources\AccountResource\RelationManagers;

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

@@ -4,20 +4,20 @@ namespace App\Filament\Resources\AccountResource\Pages;
 
 use App\Filament\Resources\AccountResource;
 use App\Models\Banking\Account;
-use Filament\Notifications\Notification;
-use Filament\Pages\Actions;
+use App\Traits\HandlesResourceRecordCreation;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 
 class CreateAccount extends CreateRecord
 {
+    use  HandlesResourceRecordCreation;
+
     protected static string $resource = AccountResource::class;
 
     protected function getRedirectUrl(): string
     {
-        return self::getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array
@@ -31,54 +31,6 @@ class CreateAccount extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        return DB::transaction(function () use ($data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-
-            $enabled = (bool)($data['enabled'] ?? false); // Ensure $enabled is always a boolean
-
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId);
-            } else {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordCreation($data);
-        });
-    }
-
-    protected function disableExistingRecord($companyId): void
-    {
-        $existingEnabledRecord = Account::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->first();
-
-        if ($existingEnabledRecord !== null) {
-            $existingEnabledRecord->enabled = false;
-            $existingEnabledRecord->save();
-            $this->defaultAccountChanged();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled($companyId, &$enabled): void
-    {
-        $enabledAccountsCount = Account::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->count();
-
-        if ($enabledAccountsCount === 0) {
-            $enabled = true;
-        }
-    }
-
-    protected function defaultAccountChanged(): void
-    {
-        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->handleRecordCreationWithUniqueField($data, new Account());
     }
 }

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

@@ -4,19 +4,20 @@ namespace App\Filament\Resources\CategoryResource\Pages;
 
 use App\Filament\Resources\CategoryResource;
 use App\Models\Setting\Category;
-use Filament\Pages\Actions;
+use App\Traits\HandlesResourceRecordCreation;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 
 class CreateCategory extends CreateRecord
 {
+    use HandlesResourceRecordCreation;
+
     protected static string $resource = CategoryResource::class;
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array
@@ -30,45 +31,6 @@ class CreateCategory extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        return DB::transaction(function () use ($data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-            $type = $data['type'] ?? null;
-            $enabled = (bool)($data['enabled'] ?? false);
-
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId, $type);
-            } else {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $type, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordCreation($data);
-        });
-    }
-
-    protected function disableExistingRecord(int $companyId, string $type): void
-    {
-        $existingEnabledRecord = Category::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('type', $type)
-            ->first();
-
-        if ($existingEnabledRecord !== null) {
-            $existingEnabledRecord->enabled = false;
-            $existingEnabledRecord->save();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled(int $companyId, string $type, bool &$enabled): void
-    {
-        $otherEnabledRecords = Category::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('type', $type)
-            ->count();
-
-        if ($otherEnabledRecords === 0) {
-            $enabled = true;
-        }
+        return $this->handleRecordCreationWithUniqueField($data, new Category(), 'type');
     }
 }

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

@@ -4,6 +4,7 @@ namespace App\Filament\Resources\CurrencyResource\Pages;
 
 use App\Filament\Resources\CurrencyResource;
 use App\Models\Setting\Currency;
+use App\Traits\HandlesResourceRecordCreation;
 use Filament\Pages\Actions;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
@@ -12,11 +13,13 @@ use Illuminate\Support\Facades\DB;
 
 class CreateCurrency extends CreateRecord
 {
+    use HandlesResourceRecordCreation;
+
     protected static string $resource = CurrencyResource::class;
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array
@@ -30,43 +33,6 @@ class CreateCurrency extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        return DB::transaction(function () use ($data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-
-            $enabled = (bool)($data['enabled'] ?? false); // Ensure $enabled is always a boolean
-
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId);
-            } else {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordCreation($data);
-        });
-    }
-
-    protected function disableExistingRecord($companyId): void
-    {
-        $existingEnabledRecord = Currency::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->first();
-
-        if ($existingEnabledRecord !== null) {
-            $existingEnabledRecord->enabled = false;
-            $existingEnabledRecord->save();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled($companyId, &$enabled): void
-    {
-        $enabledAccountsCount = Currency::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->count();
-
-        if ($enabledAccountsCount === 0) {
-            $enabled = true;
-        }
+        return $this->handleRecordCreationWithUniqueField($data, new Currency());
     }
 }

app/Filament/Resources/DiscountResource.php

@@ -53,15 +53,7 @@ class DiscountResource extends Resource
                             ->normalizeZeros()
                             ->padFractionalZeros()
                         )
-                        ->suffix(static function (callable $get) {
-                            $computation = $get('computation');
-
-                            if ($computation === 'percentage') {
-                                return '%';
-                            }
-
-                            return null;
-                        })
+                        ->suffix(static fn (callable $get) => $get('computation') === 'percentage' ? '%' : null)
                         ->default(0.0000)
                         ->required(),
                     Forms\Components\Select::make('type')
@@ -76,17 +68,33 @@ class DiscountResource extends Resource
                         ->searchable(),
                     Forms\Components\DateTimePicker::make('start_date')
                         ->label('Start Date')
-                        ->minDate(now())
-                        ->maxDate(now()->addYear())
+                        ->minDate(static function ($context, Discount|null $record = null) {
+                            if ($context === 'create') {
+                                return today()->addDay();
+                            }
+
+                            return $record?->start_date->isFuture() ? today()->addDay() : $record?->start_date;
+                        })
+                        ->maxDate(static function (callable $get, Discount|null $record = null) {
+                            $end_date = $get('end_date') ?? $record?->end_date;
+
+                            return $end_date ?: today()->addYear();
+                        })
                         ->format('Y-m-d H:i:s')
                         ->displayFormat('F d, Y H:i')
                         ->withoutSeconds()
-                        ->disabled(static fn (Discount $record) => $record->start_date->isPast())
+                        ->reactive()
+                        ->disabled(static fn ($context, Discount|null $record = null) => $context === 'edit' && $record?->start_date->isPast())
                         ->helperText(static fn (Forms\Components\DateTimePicker $component) => $component->isDisabled() ? 'Start date cannot be changed after the discount has begun.' : null),
                     Forms\Components\DateTimePicker::make('end_date')
                         ->label('End Date')
-                        ->minDate(now())
-                        ->maxDate(now()->addYears(2))
+                        ->reactive()
+                        ->minDate(static function (callable $get, Discount|null $record = null) {
+                            $start_date = $get('start_date') ?? $record?->start_date;
+
+                            return $start_date ?: today()->addDay();
+                        })
+                        ->maxDate(today()->addYear())
                         ->format('Y-m-d H:i:s')
                         ->displayFormat('F d, Y H:i')
                         ->withoutSeconds(),

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

@@ -3,10 +3,34 @@
 namespace App\Filament\Resources\DiscountResource\Pages;
 
 use App\Filament\Resources\DiscountResource;
-use Filament\Pages\Actions;
+use App\Models\Setting\Discount;
+use App\Traits\HandlesResourceRecordCreation;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class CreateDiscount extends CreateRecord
 {
+    use HandlesResourceRecordCreation;
+
     protected static string $resource = DiscountResource::class;
+
+    protected function getRedirectUrl(): string
+    {
+        return $this->previousUrl;
+    }
+
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        $data['company_id'] = Auth::user()->currentCompany->id;
+        $data['enabled'] = (bool)($data['enabled']);
+        $data['created_by'] = Auth::id();
+
+        return $data;
+    }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        return $this->handleRecordCreationWithUniqueField($data, new Discount(), 'type');
+    }
 }

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

@@ -4,19 +4,20 @@ namespace App\Filament\Resources\TaxResource\Pages;
 
 use App\Filament\Resources\TaxResource;
 use App\Models\Setting\Tax;
-use Filament\Pages\Actions;
+use App\Traits\HandlesResourceRecordCreation;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 
 class CreateTax extends CreateRecord
 {
+    use HandlesResourceRecordCreation;
+
     protected static string $resource = TaxResource::class;
 
     protected function getRedirectUrl(): string
     {
-        return $this->getResource()::getUrl('index');
+        return $this->previousUrl;
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array
@@ -30,45 +31,6 @@ class CreateTax extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        return DB::transaction(function () use ($data) {
-            $currentCompanyId = auth()->user()->currentCompany->id;
-            $type = $data['type'] ?? null;
-            $enabled = (bool)($data['enabled'] ?? false);
-
-            if ($enabled === true) {
-                $this->disableExistingRecord($currentCompanyId, $type);
-            } else {
-                $this->ensureAtLeastOneEnabled($currentCompanyId, $type, $enabled);
-            }
-
-            $data['enabled'] = $enabled;
-
-            return parent::handleRecordCreation($data);
-        });
-    }
-
-    protected function disableExistingRecord(int $companyId, string $type): void
-    {
-        $existingEnabledRecord = Tax::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('type', $type)
-            ->first();
-
-        if ($existingEnabledRecord !== null) {
-            $existingEnabledRecord->enabled = false;
-            $existingEnabledRecord->save();
-        }
-    }
-
-    protected function ensureAtLeastOneEnabled(int $companyId, string $type, bool &$enabled): void
-    {
-        $otherEnabledRecords = Tax::where('company_id', $companyId)
-            ->where('enabled', true)
-            ->where('type', $type)
-            ->count();
-
-        if ($otherEnabledRecords === 0) {
-            $enabled = true;
-        }
+        return $this->handleRecordCreationWithUniqueField($data, new Tax(), 'type');
     }
 }

app/Http/Livewire/DefaultSetting.php

@@ -7,7 +7,7 @@ use App\Models\Setting\Category;
 use App\Models\Setting\Currency;
 use App\Models\Setting\DefaultSetting as Defaults;
 use App\Models\Setting\Tax;
-use App\Traits\HandlesRecordCreation;
+use App\Traits\HandlesDefaultSettingRecordCreation;
 use Filament\Forms\ComponentContainer;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -23,7 +23,7 @@ use Livewire\Component;
  */
 class DefaultSetting extends Component implements HasForms
 {
-    use InteractsWithForms, HandlesRecordCreation;
+    use InteractsWithForms, HandlesDefaultSettingRecordCreation;
 
     public Defaults $defaultSetting;
 

app/Models/Setting/Discount.php

@@ -20,6 +20,7 @@ class Discount extends Model
     protected $table = 'discounts';
 
     protected $fillable = [
+        'company_id',
         'name',
         'description',
         'rate',
@@ -39,6 +40,11 @@ class Discount extends Model
         'end_date' => 'datetime',
     ];
 
+    public function company(): BelongsTo
+    {
+        return $this->belongsTo(FilamentCompanies::companyModel(), 'company_id');
+    }
+
     public function createdBy(): BelongsTo
     {
         return $this->belongsTo(FilamentCompanies::userModel(), 'created_by');

app/Traits/HandlesRecordCreation.php → app/Traits/HandlesDefaultSettingRecordCreation.php

@@ -5,7 +5,7 @@ namespace App\Traits;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
-trait HandlesRecordCreation
+trait HandlesDefaultSettingRecordCreation
 {
     abstract protected function getRelatedEntities(): array;
     abstract protected function getFormModel(): string;

app/Traits/HandlesResourceRecordCreation.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Traits;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+
+trait HandlesResourceRecordCreation
+{
+    protected function handleRecordCreationWithUniqueField(array $data, Model $model, string|null $uniqueField = null): Model
+    {
+        return DB::transaction(function () use ($data, $uniqueField, $model) {
+            $currentCompanyId = Auth::user()->currentCompany->id;
+            $uniqueFieldValue = $data[$uniqueField] ?? null;
+            $enabled = (bool)($data['enabled'] ?? false);
+
+            if ($enabled === true) {
+                $this->disableExistingRecord($currentCompanyId, $model, $uniqueField, $uniqueFieldValue);
+            } else {
+                $this->ensureAtLeastOneEnabled($currentCompanyId, $model, $enabled, $uniqueField, $uniqueFieldValue);
+            }
+
+            $data['enabled'] = $enabled;
+
+            return $model::create($data);
+        });
+    }
+
+    protected function disableExistingRecord(int $companyId, Model $model, string|null $uniqueField = null, string|null $uniqueFieldValue = null): void
+    {
+        $query = $model::where('company_id', $companyId)
+            ->where('enabled', true);
+
+        if($uniqueField && $uniqueFieldValue){
+            $query->where($uniqueField, $uniqueFieldValue);
+        }
+
+        $existingEnabledRecord = $query->first();
+
+        if ($existingEnabledRecord !== null) {
+            $existingEnabledRecord->enabled = false;
+            $existingEnabledRecord->save();
+        }
+    }
+
+    protected function ensureAtLeastOneEnabled(int $companyId, Model $model, bool &$enabled, string|null $uniqueField = null, string|null $uniqueFieldValue = null): void
+    {
+        $query = $model::where('company_id', $companyId)
+            ->where('enabled', true);
+
+        if($uniqueField && $uniqueFieldValue){
+            $query->where($uniqueField, $uniqueFieldValue);
+        }
+
+        $otherEnabledRecords = $query->count();
+
+        if ($otherEnabledRecords === 0) {
+            $enabled = true;
+        }
+    }
+}

composer.lock

@@ -10495,16 +10495,16 @@
         },
         {
             "name": "spatie/flare-client-php",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/flare-client-php.git",
-                "reference": "82138174d5fe2829a7f085a6bdb2a06f6def9f7a"
+                "reference": "943894c6a6b00501365ac0b91ae0dce56f2226fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/82138174d5fe2829a7f085a6bdb2a06f6def9f7a",
-                "reference": "82138174d5fe2829a7f085a6bdb2a06f6def9f7a",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/943894c6a6b00501365ac0b91ae0dce56f2226fa",
+                "reference": "943894c6a6b00501365ac0b91ae0dce56f2226fa",
                 "shasum": ""
             },
             "require": {
@@ -10553,7 +10553,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/flare-client-php/issues",
-                "source": "https://github.com/spatie/flare-client-php/tree/1.4.0"
+                "source": "https://github.com/spatie/flare-client-php/tree/1.4.1"
             },
             "funding": [
                 {
@@ -10561,7 +10561,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-06-28T11:08:09+00:00"
+            "time": "2023-07-06T09:29:49+00:00"
         },
         {
             "name": "spatie/ignition",

database/migrations/2023_05_11_044321_create_accounts_table.php

@@ -18,7 +18,7 @@ return new class extends Migration
             $table->string('name', 100)->index();
             $table->string('number', 20);
             $table->string('currency_code')->default('USD');
-            $table->decimal('opening_balance', 15, 4)->default(0.0000);
+            $table->double('opening_balance', 15, 4)->default(0.00);
             $table->string('description')->nullable();
             $table->text('notes')->nullable();
             $table->string('status')->default('open');