remove creating state from payment requests

This commit is contained in:
Kukks
2019-02-24 09:26:37 +01:00
committed by nicolas.dorier
parent f5d366cf7f
commit c134277514
10 changed files with 36 additions and 103 deletions

View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Threading.Tasks;
@@ -36,10 +35,6 @@ namespace BTCPayServer.PaymentRequest
public async Task UpdatePaymentRequestStateIfNeeded(string id)
{
var pr = await _PaymentRequestRepository.FindPaymentRequest(id, null);
if (pr == null || pr.Status == PaymentRequestData.PaymentRequestStatus.Creating)
{
return;
}
await UpdatePaymentRequestStateIfNeeded(pr);
}
@@ -66,7 +61,7 @@ namespace BTCPayServer.PaymentRequest
}
}
if (pr.Status != PaymentRequestData.PaymentRequestStatus.Creating && currentStatus != pr.Status)
if (currentStatus != pr.Status)
{
pr.Status = currentStatus;
await _PaymentRequestRepository.UpdatePaymentRequestStatus(pr.Id, currentStatus);
@@ -81,12 +76,6 @@ namespace BTCPayServer.PaymentRequest
return null;
}
if (pr.Status == PaymentRequestData.PaymentRequestStatus.Creating &&
!await _PaymentRequestRepository.IsPaymentRequestAdmin(id, userId))
{
return null;
}
var blob = pr.GetBlob();
var rateRules = pr.StoreData.GetStoreBlob().GetRateRules(_BtcPayNetworkProvider);