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

Fix: PaymentRequests created via API never expires (#6657)

Browse Source
This commit is contained in:
Nicolas Dorier
2025-04-08 14:17:31 +09:00
committed by GitHub
parent c373f1e08f
commit ce83e4d96d
28 changed files with 730 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
View File

@@ -43,10 +43,10 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
var blob = data.GetBlob();
FormId = blob.FormId;
Title = blob.Title;
Amount = blob.Amount;
Currency = blob.Currency;
Amount = data.Amount;
Currency = data.Currency;
Description = blob.Description;
ExpiryDate = blob.ExpiryDate?.UtcDateTime;
ExpiryDate = data.Expiry?.UtcDateTime;
Email = blob.Email;
AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
FormResponse = blob.FormResponse is null
@@ -101,25 +101,25 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
var blob = data.GetBlob();
Archived = data.Archived;
Title = blob.Title;
Amount = blob.Amount;
Currency = blob.Currency;
Amount = data.Amount;
Currency = data.Currency;
Description = blob.Description;
ExpiryDate = blob.ExpiryDate?.UtcDateTime;
ExpiryDate = data.Expiry?.UtcDateTime;
Email = blob.Email;
AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
switch (data.Status)
{
case Client.Models.PaymentRequestData.PaymentRequestStatus.Pending:
case Client.Models.PaymentRequestStatus.Pending:
Status = "Pending";
IsPending = true;
break;
case Client.Models.PaymentRequestData.PaymentRequestStatus.Processing:
case Client.Models.PaymentRequestStatus.Processing:
Status = "Processing";
break;
case Client.Models.PaymentRequestData.PaymentRequestStatus.Completed:
case Client.Models.PaymentRequestStatus.Completed:
Status = "Settled";
break;
case Client.Models.PaymentRequestData.PaymentRequestStatus.Expired:
case Client.Models.PaymentRequestStatus.Expired:
Status = "Expired";
break;
default: