mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 06:21:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove AwaitingConfirmation

Browse source
This commit is contained in:
Kukks 2020-10-27 09:49:35 +01:00
parent abc9d07977
commit 1d82c3779b
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BTCPayServer.Client/Models/InvoicePaymentMethodDataModel.cs
View file

@ -53,7 +53,6 @@ namespace BTCPayServer.Client.Models
public enum PaymentStatus
{
Invalid,
AwaitingConfirmation,
AwaitingCompletion,
Complete
}

9
BTCPayServer/Controllers/GreenField/InvoiceController.cs
View file

@ -265,13 +265,10 @@ namespace BTCPayServer.Controllers.GreenField
Id = data.GetPaymentId(),
Status = !paymentEntity.Accounted
? InvoicePaymentMethodDataModel.Payment.PaymentStatus.Invalid
: data.PaymentCompleted(paymentEntity)
: data.PaymentConfirmed(paymentEntity, entity.SpeedPolicy) ||
data.PaymentCompleted(paymentEntity)
? InvoicePaymentMethodDataModel.Payment.PaymentStatus.Complete
: data.PaymentConfirmed(paymentEntity, entity.SpeedPolicy)
? InvoicePaymentMethodDataModel.Payment.PaymentStatus
.AwaitingCompletion
: InvoicePaymentMethodDataModel.Payment.PaymentStatus
.AwaitingConfirmation,
: InvoicePaymentMethodDataModel.Payment.PaymentStatus.AwaitingCompletion,
Fee = paymentEntity.NetworkFee,
Value = data.GetValue(),
ReceivedDate = paymentEntity.ReceivedTime.DateTime

2
BTCPayServer/wwwroot/swagger/v1/swagger.template.invoices.json
View file

@ -778,13 +778,11 @@
"description": "",
"x-enumNames": [
"Invalid",
"AwaitingConfirmation",
"AwaitingCompletion",
"Complete"
],
"enum": [
"Invalid",
"AwaitingConfirmation",
"AwaitingCompletion",
"Complete"
]