New "Récurrences" section lets users define recurring depense/epargne models (name, category, default amount, day of month). Nothing is created automatically: from the day a recurrence is due, it appears as a pending proposal in Suivi (desktop + mobile) with an editable amount, so variable bills (electricity, etc.) can be adjusted before confirming. Dismissing a proposal skips it for the current month without creating a transaction, and it reappears the following month. - recurring_transactions table (household/category scoped, active flag, last_generated_year/month to prevent duplicate generation) - transactions.recurring_transaction_id nullable FK to trace origin - RecurringTransactionPolicy mirrors CategoryPolicy tenant scoping - 10 new Pest tests covering CRUD, tenant isolation, and the pending/confirm/dismiss lifecycle across month boundaries (travelTo) 58/58 tests pass, Pint clean, verified end-to-end against production data (test recurrence created and cleaned up). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
174 lines
5.6 KiB
PHP
174 lines
5.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Livewire\Suivi;
|
|
|
|
use App\Enums\CategoryType;
|
|
use App\Models\BudgetLine;
|
|
use App\Models\RecurringTransaction;
|
|
use App\Models\Transaction;
|
|
use Livewire\Attributes\Layout;
|
|
use Livewire\Component;
|
|
|
|
#[Layout('layouts.app')]
|
|
class Index extends Component
|
|
{
|
|
public string $date;
|
|
|
|
public string $dateEffective;
|
|
|
|
public ?int $categoryId = null;
|
|
|
|
public string $amount = '';
|
|
|
|
public string $details = '';
|
|
|
|
public function mount(): void
|
|
{
|
|
$this->date = now()->toDateString();
|
|
$this->dateEffective = now()->toDateString();
|
|
}
|
|
|
|
public function addTransaction(): void
|
|
{
|
|
$this->validate([
|
|
'date' => ['required', 'date'],
|
|
'dateEffective' => ['required', 'date'],
|
|
'categoryId' => ['required', 'exists:categories,id'],
|
|
'amount' => ['required', 'numeric'],
|
|
'details' => ['nullable', 'string', 'max:255'],
|
|
]);
|
|
|
|
$household = auth()->user()->currentHousehold;
|
|
$category = $household->categories()->findOrFail($this->categoryId);
|
|
|
|
$household->transactions()->create([
|
|
'category_id' => $category->id,
|
|
'user_id' => auth()->id(),
|
|
'date' => $this->date,
|
|
'date_effective' => $this->dateEffective,
|
|
'amount' => $this->amount,
|
|
'details' => $this->details,
|
|
]);
|
|
|
|
$this->reset(['categoryId', 'amount', 'details']);
|
|
$this->date = now()->toDateString();
|
|
$this->dateEffective = now()->toDateString();
|
|
|
|
$this->dispatch('transaction-added');
|
|
}
|
|
|
|
public function deleteTransaction(int $transactionId): void
|
|
{
|
|
$household = auth()->user()->currentHousehold;
|
|
$transaction = $household->transactions()->findOrFail($transactionId);
|
|
$transaction->delete();
|
|
}
|
|
|
|
public function confirmRecurrence(int $recurringId, string $amount): void
|
|
{
|
|
$household = auth()->user()->currentHousehold;
|
|
$recurring = $household->recurringTransactions()->findOrFail($recurringId);
|
|
|
|
$today = now();
|
|
|
|
if ($recurring->wasGeneratedFor((int) $today->year, (int) $today->month)) {
|
|
return;
|
|
}
|
|
|
|
$household->transactions()->create([
|
|
'category_id' => $recurring->category_id,
|
|
'recurring_transaction_id' => $recurring->id,
|
|
'user_id' => auth()->id(),
|
|
'date' => $today->toDateString(),
|
|
'date_effective' => $today->toDateString(),
|
|
'amount' => $amount,
|
|
'details' => $recurring->name,
|
|
]);
|
|
|
|
$recurring->update([
|
|
'last_generated_year' => $today->year,
|
|
'last_generated_month' => $today->month,
|
|
]);
|
|
|
|
$this->dispatch('transaction-added');
|
|
}
|
|
|
|
public function dismissRecurrence(int $recurringId): void
|
|
{
|
|
$household = auth()->user()->currentHousehold;
|
|
$recurring = $household->recurringTransactions()->findOrFail($recurringId);
|
|
|
|
$today = now();
|
|
|
|
$recurring->update([
|
|
'last_generated_year' => $today->year,
|
|
'last_generated_month' => $today->month,
|
|
]);
|
|
}
|
|
|
|
public function render()
|
|
{
|
|
$household = auth()->user()->currentHousehold;
|
|
|
|
$transactions = $household->transactions()
|
|
->with('category')
|
|
->orderByDesc('date')
|
|
->orderByDesc('id')
|
|
->get();
|
|
|
|
$chronological = $transactions->sortBy(['date', 'id'])->values();
|
|
|
|
$running = [];
|
|
$balance = 0.0;
|
|
foreach ($chronological as $t) {
|
|
$sign = $t->category->type === CategoryType::Revenu ? 1 : -1;
|
|
$balance += (float) $t->amount * $sign;
|
|
$running[$t->id] = $balance;
|
|
}
|
|
|
|
$year = (int) now()->year;
|
|
$month = (int) now()->month;
|
|
|
|
$revenueCategoryIds = $household->categories()->where('type', CategoryType::Revenu)->pluck('id');
|
|
|
|
$revenueBudget = (float) BudgetLine::whereIn('category_id', $revenueCategoryIds)
|
|
->where('year', $year)
|
|
->where(fn ($q) => $q->where('month', $month)->orWhereNull('month'))
|
|
->get()
|
|
->groupBy('category_id')
|
|
->map(fn ($lines) => $lines->firstWhere('month', $month)?->amount ?? $lines->firstWhere('month', null)?->amount ?? 0)
|
|
->sum();
|
|
|
|
$revenueTracked = (float) $household->transactions()
|
|
->whereHas('category', fn ($q) => $q->where('type', CategoryType::Revenu))
|
|
->whereYear('date_effective', $year)
|
|
->whereMonth('date_effective', $month)
|
|
->sum('amount');
|
|
|
|
$unaffected = max(0, $revenueBudget - $revenueTracked);
|
|
|
|
$today = now();
|
|
$pendingRecurrences = $household->recurringTransactions()
|
|
->with('category')
|
|
->where('active', true)
|
|
->where('day_of_month', '<=', $today->day)
|
|
->get()
|
|
->reject(fn (RecurringTransaction $r) => $r->wasGeneratedFor((int) $today->year, (int) $today->month))
|
|
->sortBy('day_of_month')
|
|
->values();
|
|
|
|
return view('livewire.suivi.index', [
|
|
'transactions' => $transactions,
|
|
'running' => $running,
|
|
'categories' => $household->categories()->orderBy('type')->orderBy('position')->get(),
|
|
'nbrThisYear' => $transactions->filter(fn (Transaction $t) => $t->date->year === $year)->count(),
|
|
'nbrTotal' => $transactions->count(),
|
|
'lastEntry' => $transactions->first(),
|
|
'unaffected' => $unaffected,
|
|
'pendingRecurrences' => $pendingRecurrences,
|
|
]);
|
|
}
|
|
}
|