aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Providing Payment Request completed webhook

Browse Source
This commit is contained in:
rockstardev
2025-03-28 23:51:25 -05:00
committed by nicolas.dorier
parent fdde3096d0
commit 967ec3460e
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BTCPayServer.Client/Models/WebhookEventType.cs
View File

@@ -17,5 +17,6 @@ public static class WebhookEventType
public const string PaymentRequestCreated = nameof(PaymentRequestCreated); public const string PaymentRequestCreated = nameof(PaymentRequestCreated);
public const string PaymentRequestArchived = nameof(PaymentRequestArchived); public const string PaymentRequestArchived = nameof(PaymentRequestArchived);
public const string PaymentRequestStatusChanged = nameof(PaymentRequestStatusChanged); public const string PaymentRequestStatusChanged = nameof(PaymentRequestStatusChanged);
public const string PaymentRequestCompleted = nameof(PaymentRequestCompleted);
} }

3
BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookDeliveryRequest.cs
View File

@@ -47,7 +47,8 @@ public class PaymentRequestWebhookDeliveryRequest : WebhookSender.WebhookDeliver
.Replace("{PaymentRequest.Currency}", data.Currency) .Replace("{PaymentRequest.Currency}", data.Currency)
.Replace("{PaymentRequest.Title}", blob.Title) .Replace("{PaymentRequest.Title}", blob.Title)
.Replace("{PaymentRequest.Description}", blob.Description) .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); res = InterpolateJsonField(res, "PaymentRequest.FormResponse", blob.FormResponse);
return res; return res;

2
BTCPayServer/HostedServices/Webhooks/PaymentRequestWebhookProvider.cs
View File

@@ -22,6 +22,7 @@ public class PaymentRequestWebhookProvider: WebhookProvider<PaymentRequestEvent>
{WebhookEventType.PaymentRequestUpdated, "Payment Request - Updated"}, {WebhookEventType.PaymentRequestUpdated, "Payment Request - Updated"},
{WebhookEventType.PaymentRequestArchived, "Payment Request - Archived"}, {WebhookEventType.PaymentRequestArchived, "Payment Request - Archived"},
{WebhookEventType.PaymentRequestStatusChanged, "Payment Request - Status Changed"}, {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.Updated => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestUpdated, evt.Data.StoreDataId),
PaymentRequestEvent.Archived => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestArchived, evt.Data.StoreDataId), PaymentRequestEvent.Archived => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestArchived, evt.Data.StoreDataId),
PaymentRequestEvent.StatusChanged => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestStatusChanged, evt.Data.StoreDataId), PaymentRequestEvent.StatusChanged => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestStatusChanged, evt.Data.StoreDataId),
PaymentRequestEvent.Completed => new WebhookPaymentRequestEvent(WebhookEventType.PaymentRequestCompleted, evt.Data.StoreDataId),
_ => null _ => null
}; };
} }

14
BTCPayServer/Services/PaymentRequests/PaymentRequestRepository.cs
View File

@@ -15,6 +15,7 @@ namespace BTCPayServer.Services.PaymentRequests
public const string Updated = nameof(Updated); public const string Updated = nameof(Updated);
public const string Archived = nameof(Archived); public const string Archived = nameof(Archived);
public const string StatusChanged = nameof(StatusChanged); public const string StatusChanged = nameof(StatusChanged);
public const string Completed = nameof(Completed);
public PaymentRequestData Data { get; set; } public PaymentRequestData Data { get; set; }
public string Type { get; set; } public string Type { get; set; }
} }
@@ -99,9 +100,7 @@ namespace BTCPayServer.Services.PaymentRequests
{ {
await using var context = _ContextFactory.CreateContext(); await using var context = _ContextFactory.CreateContext();
var paymentRequestData = await context.FindAsync<PaymentRequestData>(paymentRequestId); var paymentRequestData = await context.FindAsync<PaymentRequestData>(paymentRequestId);
if (paymentRequestData == null) if (paymentRequestData == null || paymentRequestData.Status == status)
return;
if( paymentRequestData.Status == status)
return; return;
paymentRequestData.Status = status; paymentRequestData.Status = status;
@@ -112,6 +111,15 @@ namespace BTCPayServer.Services.PaymentRequests
Data = paymentRequestData, Data = paymentRequestData,
Type = PaymentRequestEvent.StatusChanged 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) public async Task<PaymentRequestData[]> GetExpirablePaymentRequests(CancellationToken cancellationToken = default)
{ {