From 249b8abf03f781046adfe6a984249706f7b02c28 Mon Sep 17 00:00:00 2001 From: Kukks Date: Sun, 24 Feb 2019 09:53:56 +0100 Subject: [PATCH] deduct network from contributions + removed unsued Enabled properties --- .../PaymentRequestViewModels/ListPaymentRequestsViewModel.cs | 4 ---- BTCPayServer/Services/Apps/AppService.cs | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs index a6987f9b3..e825d9bbc 100644 --- a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs +++ b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs @@ -71,8 +71,6 @@ namespace BTCPayServer.Models.PaymentRequestViewModels public string EmbeddedCSS { get; set; } [Display(Name = "Allow payee to create invoices in their own denomination")] public bool AllowCustomPaymentAmounts { get; set; } - - public bool Enabled { get; set; } } public class ViewPaymentRequestViewModel @@ -107,8 +105,6 @@ namespace BTCPayServer.Models.PaymentRequestViewModels } } - public bool Enabled { get; set; } - public bool AllowCustomPaymentAmounts { get; set; } diff --git a/BTCPayServer/Services/Apps/AppService.cs b/BTCPayServer/Services/Apps/AppService.cs index e0a66bb20..5eb5089e6 100644 --- a/BTCPayServer/Services/Apps/AppService.cs +++ b/BTCPayServer/Services/Apps/AppService.cs @@ -346,7 +346,7 @@ namespace BTCPayServer.Services.Apps // Else, we just sum the payments return payments - .Select(pay => (Key: pay.GetPaymentMethodId().ToString(), Value: pay.GetCryptoPaymentData().GetValue())) + .Select(pay => (Key: pay.GetPaymentMethodId().ToString(), Value: pay.GetCryptoPaymentData().GetValue() - pay.NetworkFee)) .ToArray(); }) .GroupBy(p => p.Key)