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

Remove period concept from PullPayment (#5963)

Browse Source
This commit is contained in:
Nicolas Dorier
2024-05-01 17:59:10 +09:00
committed by GitHub
parent 9db9c5e936
commit b4cd74056e
18 changed files with 66 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BTCPayServer/Models/ViewPullPaymentModel.cs
View File

@@ -35,17 +35,16 @@ namespace BTCPayServer.Models
ExpiryDate = data.EndDate is DateTimeOffset dt ? (DateTime?)dt.UtcDateTime : null;
Email = blob.View.Email;
MinimumClaim = blob.MinimumClaim;
IsPending = !data.IsExpired();
var period = data.GetPeriod(now);
IsPending = !data.IsExpired(now);
if (data.Archived)
{
Status = "Archived";
}
else if (data.IsExpired())
else if (data.IsExpired(now))
{
Status = "Expired";
}
else if (period is null)
else if (!data.HasStarted(now))
{
Status = "Not yet started";
}
@@ -54,13 +53,10 @@ namespace BTCPayServer.Models
Status = string.Empty;
}
ResetIn = string.Empty;
if (period?.End is DateTimeOffset pe)
EndsIn = string.Empty;
if (data.EndsIn(now) is TimeSpan e)
{
var resetIn = (pe - DateTimeOffset.UtcNow);
if (resetIn < TimeSpan.Zero)
resetIn = TimeSpan.Zero;
ResetIn = resetIn.TimeString();
EndsIn = e.TimeString();
}
}
@@ -76,7 +72,7 @@ namespace BTCPayServer.Models
public string ResetDeepLink { get; set; }
public string HubPath { get; set; }
public string ResetIn { get; set; }
public string EndsIn { get; set; }
public string Email { get; set; }
public string Status { get; set; }
public bool IsPending { get; set; }