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

Fix: DateTime passed to bitpay API weren't assumed UTC, remove DateTime.Now references (#3206)

Browse Source
This commit is contained in:
Nicolas Dorier
2021-12-17 15:31:06 +09:00
committed by GitHub
parent 6de4f6a3ac
commit 163d1a195d
12 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Controllers/AppsPublicController.cs
View File

@@ -308,8 +308,8 @@ namespace BTCPayServer.Controllers
var info = await GetAppInfo(appId);
if (!isAdmin &&
((settings.StartDate.HasValue && DateTime.Now < settings.StartDate) ||
(settings.EndDate.HasValue && DateTime.Now > settings.EndDate) ||
((settings.StartDate.HasValue && DateTime.UtcNow < settings.StartDate) ||
(settings.EndDate.HasValue && DateTime.UtcNow > settings.EndDate) ||
(settings.EnforceTargetAmount &&
(info.Info.PendingProgressPercentage.GetValueOrDefault(0) +
info.Info.ProgressPercentage.GetValueOrDefault(0)) >= 100)))

3
BTCPayServer/Controllers/InvoiceController.API.cs
View File

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using BTCPayServer.Abstractions.Constants;
using BTCPayServer.Client;
using BTCPayServer.Filters;
using BTCPayServer.ModelBinders;
using BTCPayServer.Models;
using BTCPayServer.Security;
using BTCPayServer.Services.Invoices;
@@ -54,7 +55,9 @@ namespace BTCPayServer.Controllers
[Route("invoices")]
public async Task<IActionResult> GetInvoices(
string token,
[ModelBinder(typeof(BitpayDateTimeOffsetModelBinder))]
DateTimeOffset? dateStart = null,
[ModelBinder(typeof(BitpayDateTimeOffsetModelBinder))]
DateTimeOffset? dateEnd = null,
string orderId = null,
string itemCode = null,

2
BTCPayServer/Controllers/PaymentRequestController.cs
View File

@@ -201,7 +201,7 @@ namespace BTCPayServer.Controllers
return BadRequest("Payment Request has already been settled.");
}
if (result.ExpiryDate.HasValue && DateTime.Now >= result.ExpiryDate)
if (result.ExpiryDate.HasValue && DateTime.UtcNow >= result.ExpiryDate)
{
if (redirectToInvoice)
{

2
BTCPayServer/Controllers/PullPaymentController.cs
View File

@@ -75,7 +75,7 @@ namespace BTCPayServer.Controllers
AmountDueFormatted = _currencyNameTable.FormatCurrency(amountDue, blob.Currency),
CurrencyData = cd,
StartDate = pp.StartDate,
LastRefreshed = DateTime.Now,
LastRefreshed = DateTime.UtcNow,
Payouts = payouts
.Select(entity => new ViewPullPaymentModel.PayoutLine
{