Fix ticket billing system to work with actual database schema

o-psi · o-psi · commit 4d5dfdcf4500 · 2026-01-06T18:22:59.000Z
Major fixes:
- Use 'is_billed' column instead of non-existent 'invoice_id' on time entries
- Use 'subtotal', 'tax', 'total' columns instead of 'amount' on invoice items
- Add 'name' field (required) to invoice items
- Add 'category_id' (required) when creating invoices
- Fix getContractAssignment() to use contract relationship instead of
  non-existent schedule relationship
- Fix BillingAuditLog to pass company_id explicitly for queue jobs
- Cast invoice due days to int to fix Carbon type error
- Include soft-deleted invoices when calculating next invoice number
- Consolidate multiple tickets for same client into single draft invoice

ProcessPendingTicketBilling.php:
- Fix query to use client.contracts instead of contact.contractAssignments
- Use 'is_billed' instead of 'invoice_id' for time entry queries

TicketTimeEntry.php:
- Update scopeInvoiced/scopeUninvoiced to use is_billed column
- Remove invoice_id from fillable and casts (column doesn't exist)

This enables ticket billing to actually create invoices from billable
time entries on closed/resolved tickets.
diff --git a/app/Console/Commands/ProcessPendingTicketBilling.php b/app/Console/Commands/ProcessPendingTicketBilling.php
@@ -156,21 +156,18 @@ protected function buildPendingTicketsQuery()
             ->when(config('billing.ticket.include_unbilled_only', true), function ($query) {
                 // Additional check for time entries or contract rates
                 $query->where(function ($q) {
-                    // Has billable time entries
+                    // Has billable time entries that haven't been billed
                     $q->whereHas('timeEntries', function ($teQuery) {
                         $teQuery->where('billable', true)
-                            ->whereNull('invoice_id');
+                            ->where('is_billed', false);
                     })
-                    // OR has contact with active contract and per-ticket rate
-                    ->orWhereHas('contact.contractAssignments', function ($caQuery) {
-                        $caQuery->where('per_ticket_rate', '>', 0)
-                            ->whereHas('schedule', function ($schedQuery) {
-                                $schedQuery->where('is_active', true)
-                                    ->whereDate('start_date', '<=', now())
-                                    ->where(function ($dateQuery) {
-                                        $dateQuery->whereNull('end_date')
-                                            ->orWhereDate('end_date', '>=', now());
-                                    });
+                    // OR has client with active contract
+                    ->orWhereHas('client.contracts', function ($contractQuery) {
+                        $contractQuery->whereIn('status', ['active', 'signed'])
+                            ->whereDate('start_date', '<=', now())
+                            ->where(function ($dateQuery) {
+                                $dateQuery->whereNull('end_date')
+                                    ->orWhereDate('end_date', '>=', now());
                             });
                     });
                 });
@@ -189,12 +186,12 @@ protected function displayTicketTable($tickets): void
         foreach ($tickets as $ticket) {
             $timeEntries = $ticket->timeEntries()
                 ->where('billable', true)
-                ->whereNull('invoice_id')
+                ->where('is_billed', false)
                 ->count();
 
             $totalHours = $ticket->timeEntries()
                 ->where('billable', true)
-                ->whereNull('invoice_id')
+                ->where('is_billed', false)
                 ->sum('hours_worked');
 
             $rows[] = [
diff --git a/app/Domains/Financial/Services/TicketBillingService.php b/app/Domains/Financial/Services/TicketBillingService.php
@@ -4,6 +4,7 @@
 
 use App\Domains\Client\Models\Client;
 use App\Domains\Contract\Models\ContractContactAssignment;
+use App\Domains\Financial\Models\Category;
 use App\Domains\Financial\Models\Invoice;
 use App\Domains\Financial\Models\InvoiceItem;
 use App\Domains\Financial\Models\BillingAuditLog;
@@ -112,18 +113,24 @@ public function billTicket(Ticket $ticket, array $options = []): ?Invoice
                 $ticket->update(['invoice_id' => $invoice->id]);
 
                 // Log audit trail
-                BillingAuditLog::logBillingAction(
-                    action: BillingAuditLog::ACTION_INVOICE_GENERATED,
-                    ticketId: $ticket->id,
-                    invoiceId: $invoice->id,
-                    description: "Invoice #{$invoice->number} generated from ticket #{$ticket->number}",
-                    metadata: [
+                BillingAuditLog::create([
+                    'company_id' => $ticket->company_id,
+                    'user_id' => auth()->id(),
+                    'action' => BillingAuditLog::ACTION_INVOICE_GENERATED,
+                    'entity_type' => 'Ticket',
+                    'entity_id' => $ticket->id,
+                    'ticket_id' => $ticket->id,
+                    'invoice_id' => $invoice->id,
+                    'description' => "Invoice #{$invoice->number} generated from ticket #{$ticket->number}",
+                    'metadata' => [
                         'strategy' => $strategy,
-                        'amount' => $invoice->amount,
+                        'amount' => $invoice->total ?? 0,
                         'client_id' => $ticket->client_id,
                         'billable_hours' => $invoice->items->sum('quantity'),
-                    ]
-                );
+                    ],
+                    'ip_address' => request()->ip() ?? '127.0.0.1',
+                    'user_agent' => request()->userAgent() ?? 'CLI',
+                ]);
 
                 $this->log('Ticket billing completed', [
                     'ticket_id' => $ticket->id,
@@ -177,7 +184,7 @@ protected function billByTimeEntries(Ticket $ticket, Client $client, array $opti
     {
         $timeEntries = $ticket->timeEntries()
             ->where('billable', true)
-            ->whereNull('invoice_id')
+            ->where('is_billed', false)
             ->get();
 
         if ($timeEntries->isEmpty()) {
@@ -213,19 +220,25 @@ protected function billByTimeEntries(Ticket $ticket, Client $client, array $opti
         // Create invoice item
         $description = $this->buildTimeEntryDescription($ticket, $timeEntries, $billableHours);
         
+        $taxRate = $options['tax_rate'] ?? 0;
+        $tax = $amount * ($taxRate / 100);
+        
         InvoiceItem::create([
             'invoice_id' => $invoice->id,
             'company_id' => $invoice->company_id,
+            'name' => "Support - Ticket #{$ticket->number}",
             'description' => $description,
             'quantity' => $billableHours,
             'price' => $hourlyRate,
-            'amount' => $amount,
-            'tax_rate' => $options['tax_rate'] ?? 0,
+            'subtotal' => $amount,
+            'tax_rate' => $taxRate,
+            'tax' => $tax,
+            'total' => $amount + $tax,
         ]);
 
-        // Link time entries to invoice
+        // Mark time entries as billed
         $timeEntries->each(function ($entry) use ($invoice) {
-            $entry->update(['invoice_id' => $invoice->id]);
+            $entry->update(['is_billed' => true]);
         });
 
         $this->updateInvoiceTotals($invoice);
@@ -264,14 +277,20 @@ protected function billByTicketRate(Ticket $ticket, Client $client, array $optio
         $description .= "Priority: {$ticket->priority}\n";
         $description .= "Per-ticket flat rate";
 
+        $taxRate = $options['tax_rate'] ?? 0;
+        $tax = $perTicketRate * ($taxRate / 100);
+        
         InvoiceItem::create([
             'invoice_id' => $invoice->id,
             'company_id' => $invoice->company_id,
+            'name' => "Support - Ticket #{$ticket->number}",
             'description' => $description,
             'quantity' => 1,
             'price' => $perTicketRate,
-            'amount' => $perTicketRate,
-            'tax_rate' => $options['tax_rate'] ?? 0,
+            'subtotal' => $perTicketRate,
+            'tax_rate' => $taxRate,
+            'tax' => $tax,
+            'total' => $perTicketRate + $tax,
         ]);
 
         $this->updateInvoiceTotals($invoice);
@@ -286,7 +305,7 @@ protected function billMixed(Ticket $ticket, Client $client, array $options = []
     {
         $timeEntries = $ticket->timeEntries()
             ->where('billable', true)
-            ->whereNull('invoice_id')
+            ->where('is_billed', false)
             ->get();
 
         $contractAssignment = $this->getContractAssignment($ticket);
@@ -316,36 +335,47 @@ protected function billMixed(Ticket $ticket, Client $client, array $options = []
             'note' => $options['note'] ?? "Support ticket #{$ticket->number}: {$ticket->subject}",
         ]);
 
+        $taxRate = $options['tax_rate'] ?? 0;
+        
         // Add time entry item
         if ($timeAmount > 0) {
             $timeDescription = $this->buildTimeEntryDescription($ticket, $timeEntries, $billableHours);
+            $timeTax = $timeAmount * ($taxRate / 100);
             
             InvoiceItem::create([
                 'invoice_id' => $invoice->id,
                 'company_id' => $invoice->company_id,
+                'name' => "Support Time - Ticket #{$ticket->number}",
                 'description' => $timeDescription,
                 'quantity' => $billableHours,
                 'price' => $hourlyRate,
-                'amount' => $timeAmount,
-                'tax_rate' => $options['tax_rate'] ?? 0,
+                'subtotal' => $timeAmount,
+                'tax_rate' => $taxRate,
+                'tax' => $timeTax,
+                'total' => $timeAmount + $timeTax,
             ]);
 
-            // Link time entries
+            // Mark time entries as billed
             $timeEntries->each(function ($entry) use ($invoice) {
-                $entry->update(['invoice_id' => $invoice->id]);
+                $entry->update(['is_billed' => true]);
             });
         }
 
         // Add per-ticket rate item
         if ($perTicketRate > 0) {
+            $perTicketTax = $perTicketRate * ($taxRate / 100);
+            
             InvoiceItem::create([
                 'invoice_id' => $invoice->id,
                 'company_id' => $invoice->company_id,
+                'name' => "Support Fee - Ticket #{$ticket->number}",
                 'description' => "Support Ticket #{$ticket->number} - Flat Rate Fee",
                 'quantity' => 1,
                 'price' => $perTicketRate,
-                'amount' => $perTicketRate,
-                'tax_rate' => $options['tax_rate'] ?? 0,
+                'subtotal' => $perTicketRate,
+                'tax_rate' => $taxRate,
+                'tax' => $perTicketTax,
+                'total' => $perTicketRate + $perTicketTax,
             ]);
         }
 
@@ -355,32 +385,67 @@ protected function billMixed(Ticket $ticket, Client $client, array $options = []
     }
 
     /**
-     * Create invoice for ticket billing
+     * Get or create invoice for billing
+     * 
+     * This consolidates tickets for the same client into a single draft invoice
      */
     protected function createInvoice(Client $client, array $data = []): Invoice
     {
-        $lastInvoice = Invoice::where('company_id', $client->company_id)
+        // Check if we should consolidate into existing draft invoice
+        $consolidate = $data['consolidate'] ?? config('billing.ticket.consolidate_invoices', true);
+        
+        if ($consolidate) {
+            // Look for an existing draft invoice for this client created today (with lock to prevent race conditions)
+            $existingInvoice = Invoice::where('company_id', $client->company_id)
+                ->where('client_id', $client->id)
+                ->where('status', Invoice::STATUS_DRAFT)
+                ->whereDate('date', now()->toDateString())
+                ->lockForUpdate()
+                ->first();
+            
+            if ($existingInvoice) {
+                return $existingInvoice;
+            }
+        }
+
+        // Use a lock to prevent duplicate invoice numbers (include soft-deleted)
+        $lastInvoice = Invoice::withTrashed()
+            ->where('company_id', $client->company_id)
+            ->lockForUpdate()
             ->orderBy('number', 'desc')
             ->first();
 
         $dueDate = now()->addDays(
-            $data['due_days'] ?? config('billing.ticket.invoice_due_days', 30)
+            (int) ($data['due_days'] ?? config('billing.ticket.invoice_due_days', 30))
         );
 
         $status = config('billing.ticket.require_approval', true) 
             ? Invoice::STATUS_DRAFT 
             : Invoice::STATUS_SENT;
 
+        // Get or create a default category for ticket billing
+        $categoryId = $data['category_id'] ?? Category::where('company_id', $client->company_id)
+            ->where('name', 'like', '%Support%')
+            ->orWhere('name', 'like', '%Service%')
+            ->value('id');
+        
+        // Fallback to first category if none found
+        if (!$categoryId) {
+            $categoryId = Category::where('company_id', $client->company_id)->value('id')
+                ?? Category::first()?->id;
+        }
+
         $invoice = Invoice::create([
             'company_id' => $client->company_id,
             'client_id' => $client->id,
+            'category_id' => $categoryId,
             'prefix' => $data['prefix'] ?? 'INV',
             'number' => $lastInvoice ? $lastInvoice->number + 1 : 1001,
             'date' => $data['date'] ?? now(),
             'due_date' => $dueDate,
             'status' => $status,
             'currency_code' => $client->currency_code ?? 'USD',
-            'note' => $data['note'] ?? null,
+            'note' => $data['note'] ?? 'Support Services',
             'url_key' => \Illuminate\Support\Str::random(32),
         ]);
 
@@ -443,8 +508,9 @@ protected function getContractAssignment(Ticket $ticket): ?ContractContactAssign
         }
 
         return ContractContactAssignment::where('contact_id', $ticket->contact_id)
-            ->whereHas('schedule', function ($query) {
-                $query->where('is_active', true)
+            ->where('status', 'active')
+            ->whereHas('contract', function ($query) {
+                $query->whereIn('status', ['active', 'signed'])
                     ->whereDate('start_date', '<=', now())
                     ->where(function ($q) {
                         $q->whereNull('end_date')
@@ -459,14 +525,14 @@ protected function getContractAssignment(Ticket $ticket): ?ContractContactAssign
      */
     protected function updateInvoiceTotals(Invoice $invoice): void
     {
-        $subtotal = $invoice->items()->sum('amount');
-        $tax = $invoice->items()->sum(DB::raw('amount * (tax_rate / 100)'));
-        $total = $subtotal + $tax;
+        $subtotal = $invoice->items()->sum('subtotal');
+        $tax = $invoice->items()->sum('tax');
+        $total = $invoice->items()->sum('total');
 
         $invoice->update([
             'subtotal' => $subtotal,
             'tax' => $tax,
-            'amount' => $total,
+            'total' => $total,
         ]);
     }
 
@@ -476,7 +542,7 @@ protected function updateInvoiceTotals(Invoice $invoice): void
     public function previewBilling(Ticket $ticket): array
     {
         $strategy = $this->determineBillingStrategy($ticket, []);
-        $timeEntries = $ticket->timeEntries()->where('billable', true)->whereNull('invoice_id')->get();
+        $timeEntries = $ticket->timeEntries()->where('billable', true)->where('is_billed', false)->get();
         $contractAssignment = $this->getContractAssignment($ticket);
         
         $preview = [
@@ -629,7 +695,7 @@ public function canBillTicket(Ticket $ticket): bool
         }
 
         // Check if there's something to bill
-        $hasTimeEntries = $ticket->timeEntries()->where('billable', true)->whereNull('invoice_id')->exists();
+        $hasTimeEntries = $ticket->timeEntries()->where('billable', true)->where('is_billed', false)->exists();
         $contractAssignment = $this->getContractAssignment($ticket);
         $hasPerTicketRate = $contractAssignment && $contractAssignment->per_ticket_rate > 0;
 
@@ -703,7 +769,7 @@ public function shouldBillTicket(Ticket $ticket): array
 
         // Check prepaid hours (time-based billing)
         if ($contractAssignment->max_support_hours_per_month > 0) {
-            $timeEntries = $ticket->timeEntries()->where('billable', true)->whereNull('invoice_id')->get();
+            $timeEntries = $ticket->timeEntries()->where('billable', true)->where('is_billed', false)->get();
             $ticketHours = $timeEntries->sum('hours_worked');
             
             $hoursUsed = $contractAssignment->current_month_support_hours ?? 0;
diff --git a/app/Domains/Ticket/Models/TicketTimeEntry.php b/app/Domains/Ticket/Models/TicketTimeEntry.php
@@ -52,8 +52,6 @@ protected static function newFactory()
         'rejected_at',
         'rejected_by',
         'rejection_reason',
-        'invoice_id',
-        'invoiced_at',
         'metadata',
     ];
 
@@ -76,8 +74,6 @@ protected static function newFactory()
         'approved_by' => 'integer',
         'rejected_at' => 'datetime',
         'rejected_by' => 'integer',
-        'invoice_id' => 'integer',
-        'invoiced_at' => 'datetime',
         'metadata' => 'array',
     ];
 
@@ -336,12 +332,12 @@ public function scopeByEntryType($query, string $type)
 
     public function scopeInvoiced($query)
     {
-        return $query->whereNotNull('invoice_id');
+        return $query->where('is_billed', true);
     }
 
     public function scopeUninvoiced($query)
     {
-        return $query->whereNull('invoice_id');
+        return $query->where('is_billed', false);
     }
 
     public function scopeApproved($query)
