feat: time tracking + billing — hourly rates, time entries, invoices (P1)
Database: time_entries, billing_rates, invoices tables with RLS.
Backend: CRUD services+handlers for time entries, billing rates, invoices.
- Time entries: list/create/update/delete, summary by case/user/month
- Billing rates: upsert with auto-close previous, current rate lookup
- Invoices: create with auto-number (RE-YYYY-NNN), status transitions
(draft->sent->paid, cancellation), link time entries on invoice create
API: 11 new endpoints under /api/time-entries, /api/billing-rates, /api/invoices
Frontend: Zeiterfassung tab on case detail, /abrechnung overview with filters,
/abrechnung/rechnungen list+detail with status actions, billing rates settings
Also: resolved merge conflicts between audit-trail and role-based branches,
added missing types (Notification, AuditLogResponse, NotificationPreferences)
This commit is contained in:
18
backend/internal/models/billing_rate.go
Normal file
18
backend/internal/models/billing_rate.go
Normal file
@@ -0,0 +1,18 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type BillingRate struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
||||
UserID *uuid.UUID `db:"user_id" json:"user_id,omitempty"`
|
||||
Rate float64 `db:"rate" json:"rate"`
|
||||
Currency string `db:"currency" json:"currency"`
|
||||
ValidFrom string `db:"valid_from" json:"valid_from"`
|
||||
ValidTo *string `db:"valid_to" json:"valid_to,omitempty"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
}
|
||||
38
backend/internal/models/invoice.go
Normal file
38
backend/internal/models/invoice.go
Normal file
@@ -0,0 +1,38 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type Invoice struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
||||
CaseID uuid.UUID `db:"case_id" json:"case_id"`
|
||||
InvoiceNumber string `db:"invoice_number" json:"invoice_number"`
|
||||
ClientName string `db:"client_name" json:"client_name"`
|
||||
ClientAddress *string `db:"client_address" json:"client_address,omitempty"`
|
||||
Items json.RawMessage `db:"items" json:"items"`
|
||||
Subtotal float64 `db:"subtotal" json:"subtotal"`
|
||||
TaxRate float64 `db:"tax_rate" json:"tax_rate"`
|
||||
TaxAmount float64 `db:"tax_amount" json:"tax_amount"`
|
||||
Total float64 `db:"total" json:"total"`
|
||||
Status string `db:"status" json:"status"`
|
||||
IssuedAt *string `db:"issued_at" json:"issued_at,omitempty"`
|
||||
DueAt *string `db:"due_at" json:"due_at,omitempty"`
|
||||
PaidAt *time.Time `db:"paid_at" json:"paid_at,omitempty"`
|
||||
Notes *string `db:"notes" json:"notes,omitempty"`
|
||||
CreatedBy uuid.UUID `db:"created_by" json:"created_by"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
|
||||
}
|
||||
|
||||
type InvoiceItem struct {
|
||||
Description string `json:"description"`
|
||||
DurationMinutes int `json:"duration_minutes,omitempty"`
|
||||
HourlyRate float64 `json:"hourly_rate,omitempty"`
|
||||
Amount float64 `json:"amount"`
|
||||
TimeEntryID *string `json:"time_entry_id,omitempty"`
|
||||
}
|
||||
24
backend/internal/models/time_entry.go
Normal file
24
backend/internal/models/time_entry.go
Normal file
@@ -0,0 +1,24 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
type TimeEntry struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
||||
CaseID uuid.UUID `db:"case_id" json:"case_id"`
|
||||
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
||||
Date string `db:"date" json:"date"`
|
||||
DurationMinutes int `db:"duration_minutes" json:"duration_minutes"`
|
||||
Description string `db:"description" json:"description"`
|
||||
Activity *string `db:"activity" json:"activity,omitempty"`
|
||||
Billable bool `db:"billable" json:"billable"`
|
||||
Billed bool `db:"billed" json:"billed"`
|
||||
InvoiceID *uuid.UUID `db:"invoice_id" json:"invoice_id,omitempty"`
|
||||
HourlyRate *float64 `db:"hourly_rate" json:"hourly_rate,omitempty"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
|
||||
}
|
||||
Reference in New Issue
Block a user