From d2debaa84292282eea4cfbff2fe7b7aec0053e3d Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 28 Mar 2025 22:55:13 -0500
Subject: [PATCH 1/8] Adding Reference Number to Payment Requests

---
 .../Models/PaymentRequestBaseData.cs          |  2 ++
 .../Controllers/UIPaymentRequestController.cs |  1 +
 .../ListPaymentRequestsViewModel.cs           | 21 ++++++++++++-------
 .../EditPaymentRequest.cshtml                 |  5 +++++
 .../GetPaymentRequests.cshtml                 |  4 ++++
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/BTCPayServer.Client/Models/PaymentRequestBaseData.cs b/BTCPayServer.Client/Models/PaymentRequestBaseData.cs
index d425f61d0..8856e57b5 100644
--- a/BTCPayServer.Client/Models/PaymentRequestBaseData.cs
+++ b/BTCPayServer.Client/Models/PaymentRequestBaseData.cs
@@ -37,6 +37,8 @@ namespace BTCPayServer.Client.Models
         public string Title { get; set; }
         public string Description { get; set; }
         public string Email { get; set; }
+        // Allow payment requests to be linked to invoices outside BTCPay Server using Reference Number
+        public string ReferenceNumber { get; set; }
         public bool AllowCustomPaymentAmounts { get; set; }
 
         [JsonConverter(typeof(StringEnumConverter))]
diff --git a/BTCPayServer/Controllers/UIPaymentRequestController.cs b/BTCPayServer/Controllers/UIPaymentRequestController.cs
index 192347685..1ac3663cd 100644
--- a/BTCPayServer/Controllers/UIPaymentRequestController.cs
+++ b/BTCPayServer/Controllers/UIPaymentRequestController.cs
@@ -206,6 +206,7 @@ namespace BTCPayServer.Controllers
             data.Amount = viewModel.Amount;
             data.Currency = viewModel.Currency ?? store.GetStoreBlob().DefaultCurrency;
             data.Expiry = viewModel.ExpiryDate?.ToUniversalTime();
+            blob.ReferenceNumber = viewModel.ReferenceNumber;
             blob.AllowCustomPaymentAmounts = viewModel.AllowCustomPaymentAmounts;
             blob.FormId = viewModel.FormId;
 
diff --git a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
index c1c000c44..7600af000 100644
--- a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
+++ b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
@@ -48,6 +48,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             Description = blob.Description;
             ExpiryDate = data.Expiry?.UtcDateTime;
             Email = blob.Email;
+            ReferenceNumber = blob.ReferenceNumber;
             AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
             FormResponse = blob.FormResponse is null
                 ? null
@@ -84,6 +85,10 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
         [MailboxAddress]
         public string Email { get; set; }
         
+        [Display(Name = "Reference Number")]
+        [MaxLength(50)]
+        public string ReferenceNumber { get; set; }
+        
         [Display(Name = "Allow payee to create invoices with custom amounts")]
         public bool AllowCustomPaymentAmounts { get; set; }
 
@@ -106,6 +111,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             Description = blob.Description;
             ExpiryDate = data.Expiry?.UtcDateTime;
             Email = blob.Email;
+            ReferenceNumber = blob.ReferenceNumber;
             AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
             switch (data.Status)
             {
@@ -127,6 +133,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             }
         }
         public StoreBrandingViewModel StoreBranding { get; set; }
+        public string ReferenceNumber { get; set; }
         public bool AllowCustomPaymentAmounts { get; set; }
         public string Email { get; set; }
         public string Status { get; set; }
@@ -147,11 +154,11 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
 #nullable enable
         public class InvoiceList : List<PaymentRequestInvoice>
         {
-            static HashSet<InvoiceState> stateAllowedToDisplay = new HashSet<InvoiceState>
-                {
-                    new InvoiceState(InvoiceStatus.New, InvoiceExceptionStatus.None),
-                    new InvoiceState(InvoiceStatus.New, InvoiceExceptionStatus.PaidPartial),
-                };
+            private static HashSet<InvoiceState> stateAllowedToDisplay =
+            [
+                new(InvoiceStatus.New, InvoiceExceptionStatus.None),
+                new(InvoiceStatus.New, InvoiceExceptionStatus.PaidPartial)
+            ];
             public InvoiceList()
             {
 
@@ -195,7 +202,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
 
         public class PaymentRequestInvoicePayment
         {
-            public static List<ViewPaymentRequestViewModel.PaymentRequestInvoicePayment>
+            public static List<PaymentRequestInvoicePayment>
                 GetViewModels(
                 InvoiceEntity invoice,
                 DisplayFormatter displayFormatter,
@@ -215,7 +222,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
 
                     string link = paymentMethodId is null ? null : txLinkProvider.GetTransactionLink(paymentMethodId, txId);
 
-                    return new ViewPaymentRequestViewModel.PaymentRequestInvoicePayment
+                    return new PaymentRequestInvoicePayment
                     {
                         Amount = paymentEntity.PaidAmount.Gross,
                         Paid = paymentEntity.InvoicePaidAmount.Net,
diff --git a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
index 0c56a10a7..1cf5fbc20 100644
--- a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
@@ -82,6 +82,11 @@
                 <label asp-for="AllowCustomPaymentAmounts" class="form-check-label"></label>
                 <span asp-validation-for="AllowCustomPaymentAmounts" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <label asp-for="ReferenceNumber" class="form-label"></label>
+                <input asp-for="ReferenceNumber" class="form-control" />
+                <span asp-validation-for="ReferenceNumber" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="ExpiryDate" class="form-label"></label>
                 <div class="input-group ">
diff --git a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
index afdfc41ce..2ca3f637d 100644
--- a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
@@ -91,6 +91,7 @@
                             </button>
                         </div>
                     </th>
+                    <th text-translate="true">Number</th>
                     <th text-translate="true">Status</th>
                     <th class="amount-col" text-translate="true">Amount</th>
                     <th></th>
@@ -106,6 +107,9 @@
                         <td class="date-col">
                             @(item.ExpiryDate?.ToBrowserDate() ?? new HtmlString("<span class=\"text-muted\">No Expiry</span>"))
                         </td>
+                        <td>
+                            @item.ReferenceNumber
+                        </td>
                         <td>
                             <span class="badge badge-@item.Status.ToLower() status-badge">@item.Status</span>
                         </td>

From fdde3096d0e48a8d932963702cafb5f0e8022e0e Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 28 Mar 2025 23:10:29 -0500
Subject: [PATCH 2/8] Allowing copying of Payment Request URL

---
 BTCPayServer/Services/CallbackGenerator.cs           | 12 ++++++++++++
 .../Views/UIPaymentRequest/GetPaymentRequests.cshtml |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/BTCPayServer/Services/CallbackGenerator.cs b/BTCPayServer/Services/CallbackGenerator.cs
index 015af6280..42ccbbb38 100644
--- a/BTCPayServer/Services/CallbackGenerator.cs
+++ b/BTCPayServer/Services/CallbackGenerator.cs
@@ -92,5 +92,17 @@ namespace BTCPayServer.Services
                 pathBase: request.PathBase
             ) ?? throw Bug();
         }
+        
+        public string PaymentRequestLink(string payReqId, HttpRequest request)
+        {
+            return LinkGenerator.GetUriByAction(
+                action: nameof(UIPaymentRequestController.ViewPaymentRequest),
+                controller: "UIPaymentRequest",
+                values: new { payReqId },
+                scheme: request.Scheme,
+                host: request.Host,
+                pathBase: request.PathBase
+            ) ?? throw Bug();
+        }
     }
 }
diff --git a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
index 2ca3f637d..b1e59a755 100644
--- a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
@@ -3,6 +3,9 @@
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @using BTCPayServer.Components
 @using BTCPayServer.Client
+@using BTCPayServer.Services
+@using BTCPayServer.TagHelpers
+@inject CallbackGenerator CallbackGenerator
 @model BTCPayServer.Models.PaymentRequestViewModels.ListPaymentRequestsViewModel
 @{
     Layout = "_Layout";
@@ -119,6 +122,11 @@
                         <td class="text-end">
                             <div class="d-inline-flex align-items-center gap-3">
                                 <a asp-action="ViewPaymentRequest" asp-route-payReqId="@item.Id" id="PaymentRequest-@item.Id" target="_blank" text-translate="true">View</a>
+                                <button type="button" class="btn btn-link p-0 clipboard-button" 
+                                        data-clipboard="@CallbackGenerator.PaymentRequestByIdLink(item.Id, this.Context.Request)"
+                                        title="Copy Link">
+                                    <vc:icon symbol="actions-copy" />
+                                </button>
                                 <div class="dropdown">
                                     <button class="btn btn-link dropdown-toggle p-0 dropdown-toggle-no-caret text-body" type="button" data-bs-toggle="dropdown" aria-expanded="false" id="ToggleActions-@item.Id">
                                         <vc:icon symbol="dots" />   

From 967ec3460e6d91a4d6f1ec6eb12ca6f8087639b5 Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 28 Mar 2025 23:51:25 -0500
Subject: [PATCH 3/8] Providing Payment Request completed webhook

---
 BTCPayServer.Client/Models/WebhookEventType.cs     |  1 +
 .../PaymentRequestWebhookDeliveryRequest.cs        |  3 ++-
 .../Webhooks/PaymentRequestWebhookProvider.cs      |  2 ++
 .../PaymentRequests/PaymentRequestRepository.cs    | 14 +++++++++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/BTCPayServer.Client/Models/WebhookEventType.cs b/BTCPayServer.Client/Models/WebhookEventType.cs
index ed2d431c4..b7c1e6bcb 100644
--- a/BTCPayServer.Client/Models/WebhookEventType.cs
+++ b/BTCPayServer.Client/Models/WebhookEventType.cs
@@ -17,5 +17,6 @@ public static class WebhookEventType
     public const string PaymentRequestCreated = nameof(PaymentRequestCreated);
     public const string PaymentRequestArchived = nameof(PaymentRequestArchived);
     public const string PaymentRequestStatusChanged = nameof(PaymentRequestStatusChanged);
+    public const string PaymentRequestCompleted = nameof(PaymentRequestCompleted);
     
 }
diff --git a/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs b/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
index 7130442d2..ef587f950 100644
--- a/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
+++ b/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
@@ -47,7 +47,8 @@ public class PaymentRequestWebhookDeliveryRequest : WebhookSender.WebhookDeliver
             .Replace("{PaymentRequest.Currency}", data.Currency)
             .Replace("{PaymentRequest.Title}", blob.Title)
             .Replace("{PaymentRequest.Description}", blob.Description)
-            .Replace("{PaymentRequest.Status}", data.Status.ToString());
+            .Replace("{PaymentRequest.ReferenceNumber}", blob.ReferenceNumber)
+            .Replace("{PaymentRequest.Status}", _evt.Data.Status.ToString());
 
         res = InterpolateJsonField(res, "PaymentRequest.FormResponse", blob.FormResponse);
         return res;
diff --git a/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookProvider.cs b/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookProvider.cs
index c018b3ea4..4df461544 100644
--- a/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookProvider.cs
+++ b/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookProvider.cs
@@ -22,6 +22,7 @@ public class PaymentRequestWebhookProvider: WebhookProvider<PaymentRequestEvent>
             {WebhookEventType.PaymentRequestUpdated, "Payment Request - Updated"},
             {WebhookEventType.PaymentRequestArchived, "Payment Request - Archived"},
             {WebhookEventType.PaymentRequestStatusChanged, "Payment Request - Status Changed"},
+            {WebhookEventType.PaymentRequestCompleted, "Payment Request - Completed"},
         };
     }
 
@@ -42,6 +43,7 @@ public class PaymentRequestWebhookProvider: WebhookProvider<PaymentRequestEvent>
             PaymentRequestEvent.Updated => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestUpdated, evt.Data.StoreDataId),
             PaymentRequestEvent.Archived => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestArchived, evt.Data.StoreDataId),
             PaymentRequestEvent.StatusChanged => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestStatusChanged, evt.Data.StoreDataId),
+            PaymentRequestEvent.Completed => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestCompleted, evt.Data.StoreDataId),
             _ => null
         };
     }
diff --git a/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs b/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
index a20271c82..f8fce82f8 100644
--- a/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
+++ b/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
@@ -15,6 +15,7 @@ namespace BTCPayServer.Services.PaymentRequests
         public const string Updated = nameof(Updated);
         public const string Archived = nameof(Archived);
         public const string StatusChanged = nameof(StatusChanged);
+        public const string Completed = nameof(Completed);
         public PaymentRequestData Data { get; set; }
         public string Type { get; set; }
     }
@@ -99,9 +100,7 @@ namespace BTCPayServer.Services.PaymentRequests
         {
             await using var context = _ContextFactory.CreateContext();
             var paymentRequestData = await context.FindAsync<PaymentRequestData>(paymentRequestId);
-            if (paymentRequestData == null)
-                return;
-            if( paymentRequestData.Status ==  status)
+            if (paymentRequestData == null || paymentRequestData.Status == status)
                 return;
             paymentRequestData.Status = status;
             
@@ -112,6 +111,15 @@ namespace BTCPayServer.Services.PaymentRequests
                 Data = paymentRequestData,
                 Type = PaymentRequestEvent.StatusChanged
             });
+
+            if (status == Client.Models.PaymentRequestData.PaymentRequestStatus.Completed)
+            {
+                _eventAggregator.Publish(new PaymentRequestEvent()
+                {
+                    Data = paymentRequestData,
+                    Type = PaymentRequestEvent.Completed
+                }); 
+            }
         }
         public async Task<PaymentRequestData[]> GetExpirablePaymentRequests(CancellationToken cancellationToken = default)
         {

From 913509e3206c6a6c709b43b90c88ce951ac0b530 Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 28 Mar 2025 23:51:39 -0500
Subject: [PATCH 4/8] Fixing link to Email Rules

---
 BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
index 1cf5fbc20..25cbe1e85 100644
--- a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
@@ -1,6 +1,7 @@
 @using BTCPayServer.Services.PaymentRequests
 @using System.Globalization
 @using BTCPayServer.Client
+@using BTCPayServer.Controllers
 @using BTCPayServer.Forms
 @using BTCPayServer.TagHelpers
 @using Microsoft.AspNetCore.Mvc.TagHelpers
@@ -104,7 +105,8 @@
                 <input type="email" asp-for="Email" placeholder="@StringLocalizer["Firstname Lastname <email@example.com>"]" class="form-control" />
                 <span asp-validation-for="Email" class="text-danger"></span>
                 <div id="PaymentRequestEmailHelpBlock" class="form-text">
-                    @ViewLocalizer["This will send notification mails to the recipient, as configured by the {0}.", Html.ActionLink(StringLocalizer["email rules"], "StoreEmails", "UIStores", new { storeId = Model.StoreId })]
+                    @ViewLocalizer["This will send notification mails to the recipient, as configured by the {0}.", 
+                        Html.ActionLink(StringLocalizer["email rules"], nameof(UIStoresController.StoreEmailRulesList), "UIStores", new { storeId = Model.StoreId })]
                     @if (Model.HasEmailRules is not true)
                     {
                         <div class="info-note mt-1 text-warning" role="alert">

From cab6ed14cbc1de6878ed953c58250ba556395ceb Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 28 Mar 2025 23:52:02 -0500
Subject: [PATCH 5/8] Ensuring template for Payment Request Completed email
 rule

---
 BTCPayServer/Services/CallbackGenerator.cs    | 14 +++++++++-
 .../UIStores/StoreEmailRulesManage.cshtml     | 26 +++++++++++++------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/BTCPayServer/Services/CallbackGenerator.cs b/BTCPayServer/Services/CallbackGenerator.cs
index 42ccbbb38..f21e05c8b 100644
--- a/BTCPayServer/Services/CallbackGenerator.cs
+++ b/BTCPayServer/Services/CallbackGenerator.cs
@@ -93,7 +93,7 @@ namespace BTCPayServer.Services
             ) ?? throw Bug();
         }
         
-        public string PaymentRequestLink(string payReqId, HttpRequest request)
+        public string PaymentRequestByIdLink(string payReqId, HttpRequest request)
         {
             return LinkGenerator.GetUriByAction(
                 action: nameof(UIPaymentRequestController.ViewPaymentRequest),
@@ -104,5 +104,17 @@ namespace BTCPayServer.Services
                 pathBase: request.PathBase
             ) ?? throw Bug();
         }
+        
+        public string PaymentRequestListLink(string storeId, HttpRequest request)
+        {
+            return LinkGenerator.GetUriByAction(
+                action: nameof(UIPaymentRequestController.GetPaymentRequests),
+                controller: "UIPaymentRequest",
+                values: new { storeId },
+                scheme: request.Scheme,
+                host: request.Host,
+                pathBase: request.PathBase
+            ) ?? throw Bug();
+        }
     }
 }
diff --git a/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml b/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
index fc03cea1e..e7a9dc0b6 100644
--- a/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
+++ b/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
@@ -1,5 +1,8 @@
+@using BTCPayServer.Abstractions.TagHelpers
+@using BTCPayServer.Client.Models
 @using BTCPayServer.HostedServices.Webhooks
 @using BTCPayServer.Services
+@using BTCPayServer.TagHelpers
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model BTCPayServer.Controllers.UIStoresController.StoreEmailRule
 @inject WebhookSender WebhookSender
@@ -9,7 +12,6 @@
     var storeId = Context.GetStoreData().Id;
     bool isEdit = Model.Trigger != null;
     ViewData.SetActivePage(StoreNavPages.Emails, StringLocalizer[isEdit ? "Edit Email Rule" : "Create Email Rule"], storeId);
-    var bitcoinWalletTransactions = CallbackGenerator.WalletTransactionsLink(new (storeId, "BTC"), this.Context.Request);
 }
 
 @section PageHeadContent {
@@ -94,6 +96,7 @@
                         <code>{PaymentRequest.Currency}</code>,
                         <code>{PaymentRequest.Title}</code>,
                         <code>{PaymentRequest.Description}</code>,
+                        <code>{PaymentRequest.ReferenceNumber}</code>,
                         <code>{PaymentRequest.Status}</code>
                         <code>{PaymentRequest.FormResponse}*</code>
                     </td>
@@ -132,34 +135,41 @@
     <script>
         document.addEventListener('DOMContentLoaded', () => {
             const templates = {
-                InvoiceCreated: {
+                @WebhookEventType.InvoiceCreated: {
                     subject: 'Invoice {Invoice.Id} created',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) created.'
                 },
-                InvoiceReceivedPayment: {
+                @WebhookEventType.InvoiceReceivedPayment: {
                     subject: 'Invoice {Invoice.Id} received payment',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) received payment.'
                 },
-                InvoiceProcessing: {
+                @WebhookEventType.InvoiceProcessing: {
                     subject: 'Invoice {Invoice.Id} processing',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) is processing.'
                 },
-                InvoiceExpired: {
+                @WebhookEventType.InvoiceExpired: {
                     subject: 'Invoice {Invoice.Id} expired',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) expired.'
                 },
-                InvoiceSettled: {
+                @WebhookEventType.InvoiceSettled: {
                     subject: 'Invoice {Invoice.Id} settled',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) is settled.'
                 },
-                InvoiceInvalid: {
+                @WebhookEventType.InvoiceInvalid: {
                     subject: 'Invoice {Invoice.Id} invalid',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) invalid.'
                 },
-                InvoicePaymentSettled: {
+                @WebhookEventType.InvoicePaymentSettled: {
                     subject: 'Invoice {Invoice.Id} payment settled',
                     body: 'Invoice {Invoice.Id} (Order Id: {Invoice.OrderId}) payment settled.'
                 },
+                @{ var paymentRequestsLink = CallbackGenerator.PaymentRequestListLink(storeId, this.Context.Request); }
+                @WebhookEventType.PaymentRequestCompleted: {
+                    subject: 'Payment Request {PaymentRequest.Title} {PaymentRequest.ReferenceNumber} Completed',
+                    body: 'The total of {PaymentRequest.Amount} {PaymentRequest.Currency} has been received and Payment Request {PaymentRequest.Id} is completed. ' +
+                    '\nReview the payment requests: ' + @Safe.Json(paymentRequestsLink)
+                },
+                @{ var bitcoinWalletTransactions = CallbackGenerator.WalletTransactionsLink(new (storeId, "BTC"), this.Context.Request); }
                 @PendingTransactionWebhookProvider.PendingTransactionCreated : {
                     subject: 'Pending Transaction {PendingTransaction.TrimmedId} Created',
 					body: 'Review the transaction {PendingTransaction.Id} and sign it on: ' + @Safe.Json(bitcoinWalletTransactions)

From 6af8c865c710335e7bb8c1d00c1b3e51bd372eb1 Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Sat, 29 Mar 2025 00:46:22 -0500
Subject: [PATCH 6/8] Filtering by Title and Reference number

---
 .../Controllers/UIPaymentRequestController.cs |  3 +-
 .../PaymentRequestRepository.cs               | 54 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/BTCPayServer/Controllers/UIPaymentRequestController.cs b/BTCPayServer/Controllers/UIPaymentRequestController.cs
index 1ac3663cd..7a66e394e 100644
--- a/BTCPayServer/Controllers/UIPaymentRequestController.cs
+++ b/BTCPayServer/Controllers/UIPaymentRequestController.cs
@@ -99,7 +99,8 @@ namespace BTCPayServer.Controllers
                 Skip = model.Skip,
                 Count = model.Count,
                 Status = fs.GetFilterArray("status")?.Select(s => Enum.Parse<Client.Models.PaymentRequestStatus>(s, true)).ToArray(),
-                IncludeArchived = fs.GetFilterBool("includearchived") ?? false
+                IncludeArchived = fs.GetFilterBool("includearchived") ?? false,
+                SearchText = model.SearchText
             });
             
             model.Search = fs;
diff --git a/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs b/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
index f8fce82f8..d73ed4d3d 100644
--- a/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
+++ b/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Linq;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
+using BTCPayServer.Lightning.Eclair;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.PaymentRequests
 {
@@ -134,48 +137,50 @@ namespace BTCPayServer.Services.PaymentRequests
         }
         public async Task<PaymentRequestData[]> FindPaymentRequests(PaymentRequestQuery query, CancellationToken cancellationToken = default)
         {
-            using var context = _ContextFactory.CreateContext();
-            var queryable = context.PaymentRequests.Include(data => data.StoreData).AsQueryable();
+            await using var context = _ContextFactory.CreateContext();
+            IQueryable<PaymentRequestData> queryable;
+
+            if (!string.IsNullOrEmpty(query.SearchText))
+            {
+                var searchText = query.SearchText;
+
+                queryable = context.PaymentRequests.FromSqlInterpolated($@"
+                    SELECT * FROM public.""PaymentRequests""
+                    WHERE ""Blob2"" ->> 'referenceNumber' = {searchText}
+                       OR ""Blob2"" ->> 'title' ILIKE {'%' + searchText + '%'}
+                ");
+            }
+            else
+            {
+                queryable = context.PaymentRequests.AsQueryable();
+            }
+
+            queryable = queryable.Include(data => data.StoreData);
 
             if (!query.IncludeArchived)
-            {
                 queryable = queryable.Where(data => !data.Archived);
-            }
+            
             if (!string.IsNullOrEmpty(query.StoreId))
-            {
-                queryable = queryable.Where(data =>
-                   data.StoreDataId == query.StoreId);
-            }
+                queryable = queryable.Where(data => data.StoreDataId == query.StoreId);
 
             if (query.Status != null && query.Status.Any())
-            {
-                queryable = queryable.Where(data =>
-                    query.Status.Contains(data.Status));
-            }
+                queryable = queryable.Where(data => query.Status.Contains(data.Status));
 
             if (query.Ids != null && query.Ids.Any())
-            {
-                queryable = queryable.Where(data =>
-                    query.Ids.Contains(data.Id));
-            }
+                queryable = queryable.Where(data => query.Ids.Contains(data.Id));
 
             if (!string.IsNullOrEmpty(query.UserId))
-            {
-                queryable = queryable.Where(i =>
-                    i.StoreData != null && i.StoreData.UserStores.Any(u => u.ApplicationUserId == query.UserId));
-            }
+                queryable = queryable.Where(data =>
+                    data.StoreData != null && data.StoreData.UserStores.Any(u => u.ApplicationUserId == query.UserId));
 
             queryable = queryable.OrderByDescending(u => u.Created);
 
             if (query.Skip.HasValue)
-            {
                 queryable = queryable.Skip(query.Skip.Value);
-            }
 
             if (query.Count.HasValue)
-            {
                 queryable = queryable.Take(query.Count.Value);
-            }
+            
             var items = await queryable.ToArrayAsync(cancellationToken);
             return items;
         }
@@ -229,5 +234,6 @@ namespace BTCPayServer.Services.PaymentRequests
         public int? Skip { get; set; }
         public int? Count { get; set; }
         public string[] Ids { get; set; }
+        public string SearchText { get; set; }
     }
 }

From 586a9524808f0e3de29ab897ed85694a77c9f0bb Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Wed, 2 Apr 2025 16:06:52 +0900
Subject: [PATCH 7/8] Index the paymentRequest's reference number in invoice
 search

---
 BTCPayServer/Controllers/UIInvoiceController.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/BTCPayServer/Controllers/UIInvoiceController.cs b/BTCPayServer/Controllers/UIInvoiceController.cs
index 30dd5d40f..a57adc844 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.cs
@@ -145,7 +145,7 @@ namespace BTCPayServer.Controllers
                 amount = amountDue;
             var redirectUrl = _linkGenerator.PaymentRequestLink(id, request.Scheme, request.Host, request.PathBase);
 
-            JObject invoiceMetadata = prData.GetBlob()?.FormResponse ?? new JObject();
+            JObject invoiceMetadata = prBlob.FormResponse ?? new JObject();
             invoiceMetadata.Merge(new InvoiceMetadata
             {
                 OrderId = PaymentRequestRepository.GetOrderIdForPaymentRequest(id),
@@ -163,7 +163,8 @@ namespace BTCPayServer.Controllers
                     Checkout = { RedirectURL = redirectUrl },
                     Receipt = new InvoiceDataBase.ReceiptOptions { Enabled = false }
                 };
-
+            if (prBlob.ReferenceNumber is not null or "")
+                invoiceRequest.AdditionalSearchTerms = new[] { prBlob.ReferenceNumber };
             var additionalTags = new List<string> { PaymentRequestRepository.GetInternalTag(id) };
             return await CreateInvoiceCoreRaw(invoiceRequest, storeData, request.GetAbsoluteRoot(), additionalTags, cancellationToken);
         }

From c3998fdf34cf8ece4f652864eba2b39aaab5939b Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Thu, 3 Apr 2025 23:00:58 -0500
Subject: [PATCH 8/8] Addressing PR review issues

---
 .../Models/PaymentRequestBaseData.cs          |  6 ++--
 BTCPayServer.Data/Data/PaymentRequestData.cs  |  6 ++++
 ...35643_AddingReferenceIdToPaymentRequest.cs | 34 +++++++++++++++++++
 .../ApplicationDbContextModelSnapshot.cs      |  5 ++-
 BTCPayServer.Tests/GreenfieldAPITests.cs      |  5 ++-
 BTCPayServer.Tests/PaymentRequestTests.cs     | 17 +++++++++-
 .../GreenfieldPaymentRequestsController.cs    |  7 ++--
 .../Controllers/UIInvoiceController.cs        |  4 +--
 .../Controllers/UIPaymentRequestController.cs |  2 +-
 .../PaymentRequestWebhookDeliveryRequest.cs   |  2 +-
 .../ListPaymentRequestsViewModel.cs           | 13 ++++---
 BTCPayServer/Services/CallbackGenerator.cs    |  4 +--
 .../PaymentRequestRepository.cs               | 34 +++++++------------
 .../EditPaymentRequest.cshtml                 |  6 ++--
 .../GetPaymentRequests.cshtml                 |  6 ++--
 .../UIStores/StoreEmailRulesManage.cshtml     |  4 +--
 .../v1/swagger.template.payment-requests.json |  6 ++++
 17 files changed, 112 insertions(+), 49 deletions(-)
 create mode 100644 BTCPayServer.Data/Migrations/20250415235643_AddingReferenceIdToPaymentRequest.cs

diff --git a/BTCPayServer.Client/Models/PaymentRequestBaseData.cs b/BTCPayServer.Client/Models/PaymentRequestBaseData.cs
index 8856e57b5..6803d7833 100644
--- a/BTCPayServer.Client/Models/PaymentRequestBaseData.cs
+++ b/BTCPayServer.Client/Models/PaymentRequestBaseData.cs
@@ -37,8 +37,10 @@ namespace BTCPayServer.Client.Models
         public string Title { get; set; }
         public string Description { get; set; }
         public string Email { get; set; }
-        // Allow payment requests to be linked to invoices outside BTCPay Server using Reference Number
-        public string ReferenceNumber { get; set; }
+        /// <summary>
+        /// Linking to invoices outside BTCPay Server using & user defined ids
+        /// </summary>
+        public string ReferenceId { get; set; }
         public bool AllowCustomPaymentAmounts { get; set; }
 
         [JsonConverter(typeof(StringEnumConverter))]
diff --git a/BTCPayServer.Data/Data/PaymentRequestData.cs b/BTCPayServer.Data/Data/PaymentRequestData.cs
index da4c3df27..943e64dc2 100644
--- a/BTCPayServer.Data/Data/PaymentRequestData.cs
+++ b/BTCPayServer.Data/Data/PaymentRequestData.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using BTCPayServer.Client.Models;
 using Microsoft.EntityFrameworkCore;
@@ -16,6 +17,11 @@ namespace BTCPayServer.Data
         public string Currency { get; set; }
         public decimal Amount { get; set; }
 
+        /// <summary>
+        /// Linking to invoices outside BTCPay Server using & user defined ids
+        /// </summary>
+        public string ReferenceId { get; set; }
+
         public StoreData StoreData { get; set; }
 
         public Client.Models.PaymentRequestStatus Status { get; set; }
diff --git a/BTCPayServer.Data/Migrations/20250415235643_AddingReferenceIdToPaymentRequest.cs b/BTCPayServer.Data/Migrations/20250415235643_AddingReferenceIdToPaymentRequest.cs
new file mode 100644
index 000000000..f32b26812
--- /dev/null
+++ b/BTCPayServer.Data/Migrations/20250415235643_AddingReferenceIdToPaymentRequest.cs
@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BTCPayServer.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250407133937_AddingReferenceIdToPaymentRequest")]
+    public partial class AddingReferenceIdToPaymentRequest : Migration
+    {
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ReferenceId",
+                table: "PaymentRequests",
+                type: "TEXT",
+                nullable: true);
+            migrationBuilder.Sql("""
+                CREATE UNIQUE INDEX IX_PaymentRequests_StoreDataId_ReferenceId
+                ON "PaymentRequests" ("StoreDataId", "ReferenceId")
+                WHERE "ReferenceId" IS NOT NULL;
+                """);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ReferenceId",
+                table: "PaymentRequests");
+        }
+    }
+}
diff --git a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
index 00fa37212..45746b1c2 100644
--- a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 using System;
 using System.Collections.Generic;
 using BTCPayServer.Data;
@@ -544,6 +544,9 @@ namespace BTCPayServer.Migrations
                     b.Property<DateTimeOffset?>("Expiry")
                         .HasColumnType("timestamp with time zone");
 
+                    b.Property<string>("ReferenceId")
+                        .HasColumnType("text");
+
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasColumnType("text");
diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs
index e70a17210..f559d91a3 100644
--- a/BTCPayServer.Tests/GreenfieldAPITests.cs
+++ b/BTCPayServer.Tests/GreenfieldAPITests.cs
@@ -2048,7 +2048,7 @@ namespace BTCPayServer.Tests
                     new() { Title = "A", Currency = "helloinvalid", Amount = 1 });
             });
             var newPaymentRequest = await client.CreatePaymentRequest(user.StoreId,
-                new() { Title = "A", Currency = "USD", Amount = 1 });
+                new() { Title = "A", Currency = "USD", Amount = 1, ReferenceId = "1234"});
 
             //list payment request
             var paymentRequests = await viewOnly.GetPaymentRequests(user.StoreId);
@@ -2061,10 +2061,12 @@ namespace BTCPayServer.Tests
             var paymentRequest = await viewOnly.GetPaymentRequest(user.StoreId, newPaymentRequest.Id);
             Assert.Equal(newPaymentRequest.Title, paymentRequest.Title);
             Assert.Equal(newPaymentRequest.StoreId, user.StoreId);
+            Assert.Equal(newPaymentRequest.ReferenceId, paymentRequest.ReferenceId);
 
             //update payment request
             var updateRequest = paymentRequest;
             updateRequest.Title = "B";
+            updateRequest.ReferenceId = "EmperorNicolasGeneralRockstar";
             await AssertHttpError(403, async () =>
             {
                 await viewOnly.UpdatePaymentRequest(user.StoreId, paymentRequest.Id, updateRequest);
@@ -2072,6 +2074,7 @@ namespace BTCPayServer.Tests
             await client.UpdatePaymentRequest(user.StoreId, paymentRequest.Id, updateRequest);
             paymentRequest = await client.GetPaymentRequest(user.StoreId, newPaymentRequest.Id);
             Assert.Equal(updateRequest.Title, paymentRequest.Title);
+            Assert.Equal(updateRequest.ReferenceId, paymentRequest.ReferenceId);
 
             //archive payment request
             await AssertHttpError(403, async () =>
diff --git a/BTCPayServer.Tests/PaymentRequestTests.cs b/BTCPayServer.Tests/PaymentRequestTests.cs
index 98fa378cd..2a7322881 100644
--- a/BTCPayServer.Tests/PaymentRequestTests.cs
+++ b/BTCPayServer.Tests/PaymentRequestTests.cs
@@ -43,12 +43,20 @@ namespace BTCPayServer.Tests
                 Currency = "BTC",
                 Amount = 1,
                 StoreId = user.StoreId,
-                Description = "description"
+                Description = "description",
+                ReferenceId = "custom-id-1"
             };
             var id = Assert
                 .IsType<RedirectToActionResult>(await paymentRequestController.EditPaymentRequest(null, request))
                 .RouteValues.Values.Last().ToString();
 
+            // Assert initial Title and ReferenceId
+            var repo = tester.PayTester.GetService<PaymentRequestRepository>();
+            var prData = await repo.FindPaymentRequest(id, user.UserId);
+            Assert.NotNull(prData);
+            Assert.Equal("original juice", prData.GetBlob().Title);
+            Assert.Equal("custom-id-1", prData.ReferenceId);
+
             paymentRequestController.HttpContext.SetPaymentRequestData(new PaymentRequestData { Id = id, StoreDataId = request.StoreId });
 
             // Permission guard for guests editing 
@@ -56,8 +64,15 @@ namespace BTCPayServer.Tests
                 .IsType<NotFoundResult>(await guestpaymentRequestController.EditPaymentRequest(user.StoreId, id));
 
             request.Title = "update";
+            request.ReferenceId = "custom-id-2";
             Assert.IsType<RedirectToActionResult>(await paymentRequestController.EditPaymentRequest(id, request));
 
+            // Assert updated Title and ReferenceId
+            prData = await repo.FindPaymentRequest(id, user.UserId);
+            Assert.NotNull(prData);
+            Assert.Equal("update", prData.GetBlob().Title);
+            Assert.Equal("custom-id-2", prData.ReferenceId);
+
             Assert.Equal(request.Title,
                 Assert.IsType<ViewPaymentRequestViewModel>(Assert
                     .IsType<ViewResult>(await paymentRequestController.ViewPaymentRequest(id)).Model).Title);
diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs
index 102493cae..b61deb1b6 100644
--- a/BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs
+++ b/BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs
@@ -205,7 +205,7 @@ namespace BTCPayServer.Controllers.Greenfield
 				pr = new PaymentRequestData()
 				{
 					StoreDataId = storeId,
-					Status = Client.Models.PaymentRequestStatus.Pending,
+					Status = PaymentRequestStatus.Pending,
 					Created = DateTimeOffset.UtcNow,
 					Amount = request.Amount,
 					Currency = request.Currency ?? StoreData.GetStoreBlob().DefaultCurrency,
@@ -213,17 +213,19 @@ namespace BTCPayServer.Controllers.Greenfield
 				};
 			}
 
+			pr.ReferenceId = string.IsNullOrEmpty(request.ReferenceId) ? null : request.ReferenceId;
+
 			if (!ModelState.IsValid)
 				return this.CreateValidationError(ModelState);
 
 			var blob = pr.GetBlob();
 			pr.SetBlob(new()
 			{
+				Title = request.Title,
 				AllowCustomPaymentAmounts = request.AllowCustomPaymentAmounts,
 				Description = request.Description,
 				Email = request.Email,
 				FormId = request.FormId,
-				Title = request.Title,
 				FormResponse = blob.FormId != request.FormId ? null : blob.FormResponse
 			});
 			pr = await _paymentRequestRepository.CreateOrUpdatePaymentRequest(pr);
@@ -251,6 +253,7 @@ namespace BTCPayServer.Controllers.Greenfield
 				Title = blob.Title,
 				ExpiryDate = data.Expiry,
 				Email = blob.Email,
+				ReferenceId = data.ReferenceId,
 				AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts,
 				FormResponse = blob.FormResponse,
 				FormId = blob.FormId
diff --git a/BTCPayServer/Controllers/UIInvoiceController.cs b/BTCPayServer/Controllers/UIInvoiceController.cs
index a57adc844..80d39df45 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.cs
@@ -163,8 +163,8 @@ namespace BTCPayServer.Controllers
                     Checkout = { RedirectURL = redirectUrl },
                     Receipt = new InvoiceDataBase.ReceiptOptions { Enabled = false }
                 };
-            if (prBlob.ReferenceNumber is not null or "")
-                invoiceRequest.AdditionalSearchTerms = new[] { prBlob.ReferenceNumber };
+            if (prData.ReferenceId is not null or "")
+                invoiceRequest.AdditionalSearchTerms = [prData.ReferenceId];
             var additionalTags = new List<string> { PaymentRequestRepository.GetInternalTag(id) };
             return await CreateInvoiceCoreRaw(invoiceRequest, storeData, request.GetAbsoluteRoot(), additionalTags, cancellationToken);
         }
diff --git a/BTCPayServer/Controllers/UIPaymentRequestController.cs b/BTCPayServer/Controllers/UIPaymentRequestController.cs
index 7a66e394e..42a406910 100644
--- a/BTCPayServer/Controllers/UIPaymentRequestController.cs
+++ b/BTCPayServer/Controllers/UIPaymentRequestController.cs
@@ -207,7 +207,7 @@ namespace BTCPayServer.Controllers
             data.Amount = viewModel.Amount;
             data.Currency = viewModel.Currency ?? store.GetStoreBlob().DefaultCurrency;
             data.Expiry = viewModel.ExpiryDate?.ToUniversalTime();
-            blob.ReferenceNumber = viewModel.ReferenceNumber;
+            data.ReferenceId = viewModel.ReferenceId;
             blob.AllowCustomPaymentAmounts = viewModel.AllowCustomPaymentAmounts;
             blob.FormId = viewModel.FormId;
 
diff --git a/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs b/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
index ef587f950..24c7d7fc1 100644
--- a/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
+++ b/BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
@@ -47,7 +47,7 @@ public class PaymentRequestWebhookDeliveryRequest : WebhookSender.WebhookDeliver
             .Replace("{PaymentRequest.Currency}", data.Currency)
             .Replace("{PaymentRequest.Title}", blob.Title)
             .Replace("{PaymentRequest.Description}", blob.Description)
-            .Replace("{PaymentRequest.ReferenceNumber}", blob.ReferenceNumber)
+            .Replace("{PaymentRequest.ReferenceId}", data.ReferenceId)
             .Replace("{PaymentRequest.Status}", _evt.Data.Status.ToString());
 
         res = InterpolateJsonField(res, "PaymentRequest.FormResponse", blob.FormResponse);
diff --git a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
index 7600af000..0108c530d 100644
--- a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
+++ b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
@@ -48,7 +48,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             Description = blob.Description;
             ExpiryDate = data.Expiry?.UtcDateTime;
             Email = blob.Email;
-            ReferenceNumber = blob.ReferenceNumber;
+            ReferenceId = data.ReferenceId;
             AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
             FormResponse = blob.FormResponse is null
                 ? null
@@ -85,10 +85,9 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
         [MailboxAddress]
         public string Email { get; set; }
         
-        [Display(Name = "Reference Number")]
-        [MaxLength(50)]
-        public string ReferenceNumber { get; set; }
-        
+        [Display(Name = "Reference Id")]
+        public string ReferenceId { get; set; }
+
         [Display(Name = "Allow payee to create invoices with custom amounts")]
         public bool AllowCustomPaymentAmounts { get; set; }
 
@@ -111,7 +110,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             Description = blob.Description;
             ExpiryDate = data.Expiry?.UtcDateTime;
             Email = blob.Email;
-            ReferenceNumber = blob.ReferenceNumber;
+            ReferenceId = data.ReferenceId;
             AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
             switch (data.Status)
             {
@@ -133,7 +132,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             }
         }
         public StoreBrandingViewModel StoreBranding { get; set; }
-        public string ReferenceNumber { get; set; }
+        public string ReferenceId { get; set; }
         public bool AllowCustomPaymentAmounts { get; set; }
         public string Email { get; set; }
         public string Status { get; set; }
diff --git a/BTCPayServer/Services/CallbackGenerator.cs b/BTCPayServer/Services/CallbackGenerator.cs
index f21e05c8b..3b0bb9f71 100644
--- a/BTCPayServer/Services/CallbackGenerator.cs
+++ b/BTCPayServer/Services/CallbackGenerator.cs
@@ -92,7 +92,7 @@ namespace BTCPayServer.Services
                 pathBase: request.PathBase
             ) ?? throw Bug();
         }
-        
+
         public string PaymentRequestByIdLink(string payReqId, HttpRequest request)
         {
             return LinkGenerator.GetUriByAction(
@@ -104,7 +104,7 @@ namespace BTCPayServer.Services
                 pathBase: request.PathBase
             ) ?? throw Bug();
         }
-        
+
         public string PaymentRequestListLink(string storeId, HttpRequest request)
         {
             return LinkGenerator.GetUriByAction(
diff --git a/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs b/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
index d73ed4d3d..652235c79 100644
--- a/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
+++ b/BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
-using BTCPayServer.Lightning.Eclair;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
 using Microsoft.EntityFrameworkCore;
@@ -115,13 +114,13 @@ namespace BTCPayServer.Services.PaymentRequests
                 Type = PaymentRequestEvent.StatusChanged
             });
 
-            if (status == Client.Models.PaymentRequestData.PaymentRequestStatus.Completed)
+            if (status == PaymentRequestStatus.Completed)
             {
                 _eventAggregator.Publish(new PaymentRequestEvent()
                 {
                     Data = paymentRequestData,
                     Type = PaymentRequestEvent.Completed
-                }); 
+                });
             }
         }
         public async Task<PaymentRequestData[]> GetExpirablePaymentRequests(CancellationToken cancellationToken = default)
@@ -138,30 +137,23 @@ namespace BTCPayServer.Services.PaymentRequests
         public async Task<PaymentRequestData[]> FindPaymentRequests(PaymentRequestQuery query, CancellationToken cancellationToken = default)
         {
             await using var context = _ContextFactory.CreateContext();
-            IQueryable<PaymentRequestData> queryable;
+            IQueryable<PaymentRequestData> queryable = context.PaymentRequests.AsQueryable();
+
+            if (!string.IsNullOrEmpty(query.StoreId))
+                queryable = queryable.Where(data => data.StoreDataId == query.StoreId);
 
             if (!string.IsNullOrEmpty(query.SearchText))
             {
-                var searchText = query.SearchText;
-
-                queryable = context.PaymentRequests.FromSqlInterpolated($@"
-                    SELECT * FROM public.""PaymentRequests""
-                    WHERE ""Blob2"" ->> 'referenceNumber' = {searchText}
-                       OR ""Blob2"" ->> 'title' ILIKE {'%' + searchText + '%'}
-                ");
-            }
-            else
-            {
-                queryable = context.PaymentRequests.AsQueryable();
+                if (string.IsNullOrEmpty(query.StoreId))
+                    throw new InvalidOperationException("PaymentRequestQuery.StoreId should be specified");
+                // We are repeating the StoreId on purpose here, so Postgres can use the index
+                queryable = context.PaymentRequests.Where(p => (p.StoreDataId == query.StoreId && p.ReferenceId == query.SearchText) || p.Id == query.SearchText);
             }
 
             queryable = queryable.Include(data => data.StoreData);
 
             if (!query.IncludeArchived)
                 queryable = queryable.Where(data => !data.Archived);
-            
-            if (!string.IsNullOrEmpty(query.StoreId))
-                queryable = queryable.Where(data => data.StoreDataId == query.StoreId);
 
             if (query.Status != null && query.Status.Any())
                 queryable = queryable.Where(data => query.Status.Contains(data.Status));
@@ -171,7 +163,7 @@ namespace BTCPayServer.Services.PaymentRequests
 
             if (!string.IsNullOrEmpty(query.UserId))
                 queryable = queryable.Where(data =>
-                    data.StoreData != null && data.StoreData.UserStores.Any(u => u.ApplicationUserId == query.UserId));
+                    data.StoreData.UserStores.Any(u => u.ApplicationUserId == query.UserId));
 
             queryable = queryable.OrderByDescending(u => u.Created);
 
@@ -180,7 +172,7 @@ namespace BTCPayServer.Services.PaymentRequests
 
             if (query.Count.HasValue)
                 queryable = queryable.Take(query.Count.Value);
-            
+
             var items = await queryable.ToArrayAsync(cancellationToken);
             return items;
         }
diff --git a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
index 25cbe1e85..591236f24 100644
--- a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml
@@ -84,9 +84,9 @@
                 <span asp-validation-for="AllowCustomPaymentAmounts" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <label asp-for="ReferenceNumber" class="form-label"></label>
-                <input asp-for="ReferenceNumber" class="form-control" />
-                <span asp-validation-for="ReferenceNumber" class="text-danger"></span>
+                <label asp-for="ReferenceId" class="form-label"></label>
+                <input asp-for="ReferenceId" class="form-control" />
+                <span asp-validation-for="ReferenceId" class="text-danger"></span>
             </div>
             <div class="form-group">
                 <label asp-for="ExpiryDate" class="form-label"></label>
diff --git a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
index b1e59a755..f729817fc 100644
--- a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
@@ -57,7 +57,7 @@
     <input type="hidden" asp-for="Count" />
     <input type="hidden" asp-for="TimezoneOffset" />
     <input asp-for="SearchTerm" type="hidden" value="@Model.Search.WithoutSearchText()"/>
-    <input asp-for="SearchText" class="form-control" placeholder="@StringLocalizer["Search…"]" />
+    <input asp-for="SearchText" class="form-control" placeholder="@StringLocalizer["Search by Id..."]" />
     <div class="dropdown">
         <button id="StatusOptionsToggle" class="btn btn-secondary dropdown-toggle dropdown-toggle-custom-caret" type="button" data-bs-toggle="dropdown" aria-expanded="false">
             @if (statusFilterCount > 0)
@@ -94,7 +94,7 @@
                             </button>
                         </div>
                     </th>
-                    <th text-translate="true">Number</th>
+                    <th text-translate="true">Reference Id</th>
                     <th text-translate="true">Status</th>
                     <th class="amount-col" text-translate="true">Amount</th>
                     <th></th>
@@ -111,7 +111,7 @@
                             @(item.ExpiryDate?.ToBrowserDate() ?? new HtmlString("<span class=\"text-muted\">No Expiry</span>"))
                         </td>
                         <td>
-                            @item.ReferenceNumber
+                            @item.ReferenceId
                         </td>
                         <td>
                             <span class="badge badge-@item.Status.ToLower() status-badge">@item.Status</span>
diff --git a/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml b/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
index e7a9dc0b6..c5d453552 100644
--- a/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
+++ b/BTCPayServer/Views/UIStores/StoreEmailRulesManage.cshtml
@@ -96,7 +96,7 @@
                         <code>{PaymentRequest.Currency}</code>,
                         <code>{PaymentRequest.Title}</code>,
                         <code>{PaymentRequest.Description}</code>,
-                        <code>{PaymentRequest.ReferenceNumber}</code>,
+                        <code>{PaymentRequest.ReferenceId}</code>,
                         <code>{PaymentRequest.Status}</code>
                         <code>{PaymentRequest.FormResponse}*</code>
                     </td>
@@ -165,7 +165,7 @@
                 },
                 @{ var paymentRequestsLink = CallbackGenerator.PaymentRequestListLink(storeId, this.Context.Request); }
                 @WebhookEventType.PaymentRequestCompleted: {
-                    subject: 'Payment Request {PaymentRequest.Title} {PaymentRequest.ReferenceNumber} Completed',
+                    subject: 'Payment Request {PaymentRequest.Title} {PaymentRequest.ReferenceId} Completed',
                     body: 'The total of {PaymentRequest.Amount} {PaymentRequest.Currency} has been received and Payment Request {PaymentRequest.Id} is completed. ' +
                     '\nReview the payment requests: ' + @Safe.Json(paymentRequestsLink)
                 },
diff --git a/BTCPayServer/wwwroot/swagger/v1/swagger.template.payment-requests.json b/BTCPayServer/wwwroot/swagger/v1/swagger.template.payment-requests.json
index 7b2a3ba27..e9d85c68d 100644
--- a/BTCPayServer/wwwroot/swagger/v1/swagger.template.payment-requests.json
+++ b/BTCPayServer/wwwroot/swagger/v1/swagger.template.payment-requests.json
@@ -461,6 +461,12 @@
                             }
                         ]
                     },
+                    "referenceId": {
+                        "type": "string",
+                        "description": "An optional user-defined identifier for this payment request.",
+                        "nullable": true,
+                        "example": "INV-123493"
+                    },
                     "allowCustomPaymentAmounts": {
                         "type": "boolean",
                         "description": "Whether to allow users to create invoices that partially pay the payment request ",