Merge pull request #175 from andrewdwallo/development-3.x

Development 3.x

app/DTO/DocumentDTO.php

@@ -33,7 +33,7 @@ readonly class DocumentDTO
         public string $total,
         public ?string $amountDue,
         public CompanyDTO $company,
-        public ClientDTO $client,
+        public ?ClientDTO $client,
         public iterable $lineItems,
         public DocumentLabelDTO $label,
         public DocumentColumnLabelDTO $columnLabel,
@@ -84,7 +84,7 @@ readonly class DocumentDTO
             total: self::formatToMoney($document->total, $currencyCode),
             amountDue: $amountDue,
             company: CompanyDTO::fromModel($document->company),
-            client: ClientDTO::fromModel($document->client),
+            client: $document->client ? ClientDTO::fromModel($document->client) : null,
             lineItems: $document->lineItems->map(fn ($item) => LineItemDTO::fromModel($item)),
             label: $document::documentType()->getLabels(),
             columnLabel: DocumentColumnLabelDTO::fromModel($settings),

app/Filament/Company/Resources/Accounting/TransactionResource/Pages/ViewTransaction.php

@@ -123,7 +123,7 @@ class ViewTransaction extends ViewRecord
                             ->label('Payee')
                             ->hidden(static fn (Transaction $record): bool => ! $record->payeeable_type)
                             ->url(static function (Transaction $record): ?string {
-                                if (! $record->payeeable_type) {
+                                if (! $record->payeeable_type || ! $record->payeeable_id) {
                                     return null;
                                 }
 

app/Filament/Company/Resources/Purchases/BillResource/Pages/ViewBill.php

@@ -54,7 +54,7 @@ class ViewBill extends ViewRecord
                             ->badge(),
                         TextEntry::make('vendor.name')
                             ->label('Vendor')
-                            ->url(static fn (Bill $record) => VendorResource::getUrl('view', ['record' => $record->vendor_id]))
+                            ->url(static fn (Bill $record) => $record->vendor_id ? VendorResource::getUrl('view', ['record' => $record->vendor_id]) : null)
                             ->link(),
                         TextEntry::make('total')
                             ->label('Total')

app/Filament/Company/Resources/Sales/EstimateResource/Pages/ViewEstimate.php

@@ -92,7 +92,7 @@ class ViewEstimate extends ViewRecord
                                     ->badge(),
                                 TextEntry::make('client.name')
                                     ->label('Client')
-                                    ->url(static fn (Estimate $record) => ClientResource::getUrl('view', ['record' => $record->client_id]))
+                                    ->url(static fn (Estimate $record) => $record->client_id ? ClientResource::getUrl('view', ['record' => $record->client_id]) : null)
                                     ->link(),
                                 TextEntry::make('expiration_date')
                                     ->label('Expiration date')

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/ViewInvoice.php

@@ -89,7 +89,7 @@ class ViewInvoice extends ViewRecord
                                     ->badge(),
                                 TextEntry::make('client.name')
                                     ->label('Client')
-                                    ->url(static fn (Invoice $record) => ClientResource::getUrl('view', ['record' => $record->client_id]))
+                                    ->url(static fn (Invoice $record) => $record->client_id ? ClientResource::getUrl('view', ['record' => $record->client_id]) : null)
                                     ->link(),
                                 TextEntry::make('amount_due')
                                     ->label('Amount due')

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ViewRecurringInvoice.php

@@ -108,7 +108,7 @@ class ViewRecurringInvoice extends ViewRecord
                                     ->label('Client')
                                     ->color('primary')
                                     ->weight(FontWeight::SemiBold)
-                                    ->url(static fn (RecurringInvoice $record) => ClientResource::getUrl('view', ['record' => $record->client_id]))
+                                    ->url(static fn (RecurringInvoice $record) => $record->client_id ? ClientResource::getUrl('view', ['record' => $record->client_id]) : null)
                                     ->link(),
                                 TextEntry::make('last_date')
                                     ->label('Last invoice')

app/Models/Accounting/Invoice.php

@@ -227,6 +227,10 @@ class Invoice extends Document
 
     public function canRecordPayment(): bool
     {
+        if (! $this->client_id) {
+            return false;
+        }
+
         return ! in_array($this->status, [
             InvoiceStatus::Draft,
             InvoiceStatus::Paid,
@@ -236,12 +240,16 @@ class Invoice extends Document
 
     public function canBulkRecordPayment(): bool
     {
+        if (! $this->client_id || $this->currency_code !== CurrencyAccessor::getDefaultCurrency()) {
+            return false;
+        }
+
         return ! in_array($this->status, [
             InvoiceStatus::Draft,
             InvoiceStatus::Paid,
             InvoiceStatus::Void,
             InvoiceStatus::Overpaid,
-        ]) && $this->currency_code === CurrencyAccessor::getDefaultCurrency();
+        ]);
     }
 
     public function canBeOverdue(): bool

resources/views/filament/company/components/document-templates/classic.blade.php

@@ -35,8 +35,8 @@
             <!-- Billing Details -->
             <div class="text-sm">
                 <h3 class="text-gray-600 font-medium mb-1">BILL TO</h3>
-                <p class="text-sm font-bold">{{ $document->client->name }}</p>
-                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                <p class="text-sm font-bold">{{ $document->client?->name ?? 'Client Not Found' }}</p>
+                @if($document->client && ($formattedAddress = $document->client->getFormattedAddressHtml()))
                     {!! $formattedAddress !!}
                 @endif
             </div>

resources/views/filament/company/components/document-templates/default.blade.php

@@ -30,8 +30,8 @@
             <!-- Billing Details -->
             <div class="text-sm">
                 <h3 class="text-gray-600 font-medium mb-1">BILL TO</h3>
-                <p class="text-sm font-bold">{{ $document->client->name }}</p>
-                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                <p class="text-sm font-bold">{{ $document->client?->name ?? 'Client Not Found' }}</p>
+                @if($document->client && ($formattedAddress = $document->client->getFormattedAddressHtml()))
                     {!! $formattedAddress !!}
                 @endif
             </div>

resources/views/filament/company/components/document-templates/modern.blade.php

@@ -31,9 +31,9 @@
             <div class="text-sm">
                 <h3 class="text-gray-600 font-medium mb-1">BILL TO</h3>
                 <p class="text-sm font-bold"
-                   style="color: {{ $document->accentColor }}">{{ $document->client->name }}</p>
+                   style="color: {{ $document->accentColor }}">{{ $document->client?->name ?? 'Client Not Found' }}</p>
 
-                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                @if($document->client && ($formattedAddress = $document->client->getFormattedAddressHtml()))
                     {!! $formattedAddress !!}
                 @endif
             </div>