M19 restructure: add Phase 4 Visual Identity Polish; reopen 19.1 for verification pass; renumber phases

app/Http/Controllers/InvoiceController.php

@@ -224,12 +224,26 @@ public function show(\Illuminate\Http\Request $request, \App\Models\Invoice $inv
             allowFallback: $btcForUri !== null
         );
 
+        $includeSelf = $request->boolean('include_self');
+        $issuerEmail = (string) ($invoice->user?->email ?? '');
+        $visibleDeliveries = $invoice->deliveries
+            ->where('status', '!=', 'skipped')
+            ->when(
+                !$includeSelf && $issuerEmail !== '',
+                fn ($collection) => $collection->filter(
+                    fn ($delivery) => strcasecmp((string) $delivery->recipient, $issuerEmail) !== 0
+                )
+            )
+            ->values();
+
         return view('invoices.show', [
             'invoice'           => $invoice,
             'rate'              => $rate,
             'paymentSummary'    => $summary,
             'paymentHistory'    => $paymentHistory,
             'reattributeDestinations' => $reattributeDestinations,
+            'includeSelf'       => $includeSelf,
+            'visibleDeliveries' => $visibleDeliveries,
             'gettingStartedStrip' => $request->boolean('getting_started')
                 ? (static function () use ($gettingStartedFlow, $request, $invoice): array {
                     $snapshot = $gettingStartedFlow->snapshot($request->user());

app/Jobs/DeliverInvoiceMail.php

@@ -14,8 +14,6 @@
 use App\Mail\InvoiceUnderpaymentIssuerMail;
 use App\Mail\InvoiceIssuerPaidNoticeMail;
 use App\Models\Invoice;
-use App\Mail\InvoicePartialWarningClientMail;
-use App\Mail\InvoicePartialWarningIssuerMail;
 use App\Models\InvoiceDelivery;
 use App\Models\InvoicePayment;
 use App\Services\InvoiceDeliveryService;
@@ -140,8 +138,6 @@ public function handle(MailAlias $mailAlias, InvoiceDeliveryService $deliveries)
             'issuer_overpay_alert' => new InvoiceOverpaymentIssuerMail($invoice, $delivery),
             'client_underpay_alert' => new InvoiceUnderpaymentClientMail($invoice, $delivery),
             'issuer_underpay_alert' => new InvoiceUnderpaymentIssuerMail($invoice, $delivery),
-            'client_partial_warning' => new InvoicePartialWarningClientMail($invoice, $delivery),
-            'issuer_partial_warning' => new InvoicePartialWarningIssuerMail($invoice, $delivery),
             default => new InvoiceReadyMail($invoice, $delivery),
         };
 
@@ -288,11 +284,6 @@ private function shouldSkipDelivery(
             return 'Underpayment resolved before send.';
         }
 
-        $partialTypes = ['client_partial_warning', 'issuer_partial_warning'];
-        if (in_array($delivery->type, $partialTypes, true) && !$invoice->shouldWarnAboutPartialPayments()) {
-            return 'Partial-payment warning no longer applicable.';
-        }
-
         $pastDueTypes = ['past_due_issuer', 'past_due_client'];
         if (in_array($delivery->type, $pastDueTypes, true) && in_array($invoice->status, ['paid', 'void'], true)) {
             return 'Invoice settled before past-due alert.';

app/Mail/InvoiceIssuerPaidNoticeMail.php

@@ -30,6 +30,12 @@ public function content(): Content
             markdown: 'mail.invoice-issuer-paid',
             with: [
                 'invoice' => $this->invoice,
+                'settlementPayments' => $this->invoice->payments()
+                    ->whereNotNull('confirmed_at')
+                    ->whereNull('ignored_at')
+                    ->where('is_adjustment', false)
+                    ->orderBy('confirmed_at')
+                    ->get(),
             ],
         );
     }

app/Mail/InvoiceOverpaymentClientMail.php

@@ -21,7 +21,7 @@ public function __construct(public Invoice $invoice, public InvoiceDelivery $del
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Invoice ' . ($this->invoice->number ?? $this->invoice->id) . ' was overpaid',
+            subject: 'Payment confirmed — Invoice ' . ($this->invoice->number ?? $this->invoice->id) . ' overpaid',
             replyTo: [new Address($this->invoice->user->email, $this->invoice->user->name)],
         );
     }

app/Mail/InvoiceOverpaymentIssuerMail.php

@@ -20,7 +20,7 @@ public function __construct(public Invoice $invoice, public InvoiceDelivery $del
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Client overpaid invoice ' . ($this->invoice->number ?? $this->invoice->id),
+            subject: 'Payment confirmed — client overpaid Invoice ' . ($this->invoice->number ?? $this->invoice->id),
         );
     }
 

app/Mail/InvoicePaidReceiptMail.php

@@ -41,6 +41,12 @@ public function content(): Content
                 'delivery' => $this->delivery,
                 'client' => $this->invoice->client,
                 'publicUrl' => $this->invoice->public_url,
+                'settlementPayments' => $this->invoice->payments()
+                    ->whereNotNull('confirmed_at')
+                    ->whereNull('ignored_at')
+                    ->where('is_adjustment', false)
+                    ->orderBy('confirmed_at')
+                    ->get(),
             ],
         );
     }

app/Mail/InvoicePastDueClientMail.php

@@ -20,8 +20,15 @@ public function __construct(public Invoice $invoice, public InvoiceDelivery $del
 
     public function envelope(): Envelope
     {
+        $number = $this->invoice->number ?? $this->invoice->id;
+        $subject = match ($this->slot()) {
+            2 => "2nd past-due notice — invoice {$number} is 1 week overdue",
+            3 => "3rd past-due notice — invoice {$number} is 2 weeks overdue",
+            default => "Reminder: invoice {$number} is past due",
+        };
+
         return new Envelope(
-            subject: 'Reminder: invoice ' . ($this->invoice->number ?? $this->invoice->id) . ' is past due',
+            subject: $subject,
             replyTo: [new Address($this->invoice->user->email, $this->invoice->user->name)],
         );
     }
@@ -32,6 +39,7 @@ public function content(): Content
             markdown: 'mail.invoice-past-due-client',
             with: [
                 'invoice' => $this->invoice,
+                'slot' => $this->slot(),
             ],
         );
     }
@@ -40,4 +48,13 @@ public function attachments(): array
     {
         return [];
     }
+
+    private function slot(): int
+    {
+        if (preg_match('/^past_due_(\d+)$/', (string) ($this->delivery->context_key ?? ''), $m)) {
+            return (int) $m[1];
+        }
+
+        return 1;
+    }
 }

app/Mail/InvoicePastDueIssuerMail.php

@@ -19,8 +19,15 @@ public function __construct(public Invoice $invoice, public InvoiceDelivery $del
 
     public function envelope(): Envelope
     {
+        $number = $this->invoice->number ?? $this->invoice->id;
+        $subject = match ($this->slot()) {
+            2 => "2nd past-due notice sent — invoice {$number} 1 week overdue",
+            3 => "3rd past-due notice sent — invoice {$number} 2 weeks overdue",
+            default => "Reminder sent: invoice {$number} past due",
+        };
+
         return new Envelope(
-            subject: 'Invoice ' . ($this->invoice->number ?? $this->invoice->id) . ' is past due',
+            subject: $subject,
         );
     }
 
@@ -30,6 +37,7 @@ public function content(): Content
             markdown: 'mail.invoice-past-due-issuer',
             with: [
                 'invoice' => $this->invoice,
+                'slot' => $this->slot(),
             ],
         );
     }
@@ -38,4 +46,13 @@ public function attachments(): array
     {
         return [];
     }
+
+    private function slot(): int
+    {
+        if (preg_match('/^past_due_(\d+)$/', (string) ($this->delivery->context_key ?? ''), $m)) {
+            return (int) $m[1];
+        }
+
+        return 1;
+    }
 }

app/Mail/InvoicePaymentAcknowledgmentIssuerMail.php

@@ -24,7 +24,7 @@ public function __construct(
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Review detected payment for Invoice ' . ($this->invoice->number ?? $this->invoice->id),
+            subject: 'Review payment activity on Invoice ' . ($this->invoice->number ?? $this->invoice->id),
         );
     }
 

app/Mail/InvoiceUnderpaymentClientMail.php

@@ -21,7 +21,7 @@ public function __construct(public Invoice $invoice, public InvoiceDelivery $del
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Invoice ' . ($this->invoice->number ?? $this->invoice->id) . ' has a balance due',
+            subject: 'Payment confirmed — balance still due on Invoice ' . ($this->invoice->number ?? $this->invoice->id),
             replyTo: [new Address($this->invoice->user->email, $this->invoice->user->name)],
         );
     }

app/Mail/InvoiceUnderpaymentIssuerMail.php

@@ -20,7 +20,7 @@ public function __construct(public Invoice $invoice, public InvoiceDelivery $del
     public function envelope(): Envelope
     {
         return new Envelope(
-            subject: 'Client underpayment alert for invoice ' . ($this->invoice->number ?? $this->invoice->id),
+            subject: 'Payment confirmed — client underpaid Invoice ' . ($this->invoice->number ?? $this->invoice->id),
         );
     }
 

app/Models/Invoice.php

@@ -29,7 +29,6 @@ class Invoice extends Model
         'billing_address_override','invoice_footer_note_override','branding_heading_override',
         'last_overpayment_alert_at','last_underpayment_alert_at',
         'last_past_due_issuer_alert_at','last_past_due_client_alert_at',
-        'last_partial_warning_sent_at',
     ];
 
     protected $casts = [
@@ -58,7 +57,6 @@ class Invoice extends Model
         'last_underpayment_alert_at' => 'datetime',
         'last_past_due_issuer_alert_at' => 'datetime',
         'last_past_due_client_alert_at' => 'datetime',
-        'last_partial_warning_sent_at' => 'datetime',
     ];
     public const SATS_PER_BTC = 100_000_000;
     public const PAYMENT_SAT_TOLERANCE = 100;
@@ -690,22 +688,6 @@ public function getPublicUrlAttribute(): ?string
         return $base . $path;
     }
 
-    public function shouldWarnAboutPartialPayments(): bool
-    {
-        if (in_array($this->status, ['paid','void'])) {
-            return false;
-        }
-
-        $outstanding = $this->outstanding_sats;
-        if ($outstanding === null || $outstanding <= 0) {
-            return false;
-        }
-
-        $payments = $this->activePayments();
-
-        return $payments->count() >= 2;
-    }
-
     public function sumPaymentsUsd(bool $confirmedOnly = false): float
     {
         $payments = $this->activePayments();

app/Models/InvoiceDelivery.php

@@ -58,8 +58,6 @@ public function typeLabel(): string
             'issuer_overpay_alert' => 'Overpayment alert (issuer)',
             'client_underpay_alert' => 'Underpayment alert (client)',
             'issuer_underpay_alert' => 'Underpayment alert (issuer)',
-            'client_partial_warning' => 'Partial payment warning (client)',
-            'issuer_partial_warning' => 'Partial payment warning (issuer)',
             default => Str::of($this->type)->replace('_', ' ')->headline()->toString(),
         };
     }

app/Services/InvoiceAlertService.php

@@ -64,6 +64,10 @@ public function sendDetectedPaymentAcknowledgments(Invoice $invoice, InvoicePaym
 
     public function checkPaymentThresholds(Invoice $invoice): void
     {
+        if ($invoice->status === 'void') {
+            return;
+        }
+
         if ($invoice->requiresClientOverpayAlert()) {
             $this->maybeSendOverpayAlert($invoice);
         }
@@ -98,14 +102,6 @@ public function skipInvalidQueuedDeliveries(Invoice $invoice, string $reasonPref
                 "{$reasonPrefix} Overpayment alert no longer applies."
             );
         }
-
-        if (! $invoice->shouldWarnAboutPartialPayments()) {
-            $this->skipQueuedDeliveries(
-                $invoice,
-                ['client_partial_warning', 'issuer_partial_warning'],
-                "{$reasonPrefix} Partial-payment warning no longer applies."
-            );
-        }
     }
 
     public function sendPastDueAlerts(Invoice $invoice): void

database/migrations/2026_05_23_140808_drop_last_partial_warning_sent_at_and_clean_partial_warning_deliveries.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        DB::table('invoice_deliveries')
+            ->whereIn('type', ['client_partial_warning', 'issuer_partial_warning'])
+            ->delete();
+
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->dropColumn('last_partial_warning_sent_at');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->timestamp('last_partial_warning_sent_at')->nullable();
+        });
+    }
+};