aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases 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
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 public enum PaymentStatus
{ {
Invalid, Invalid,
AwaitingConfirmation,
AwaitingCompletion, AwaitingCompletion,
Complete Complete
} }

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

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

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

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