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

Excerpts from #971 (manual PR) (part1 ) (#1006)

Browse Source 
* Excerpts from #971

Relating to selenium tests + small renamings

* fix build
This commit is contained in:
Andrew Camilleri
2019-09-03 13:11:36 +02:00
committed by Nicolas Dorier
parent 8f464b0838
commit 7208e63155
9 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
View File

@@ -1,14 +1,7 @@
using BTCPayServer.Data;
using BTCPayServer.Services;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.Rates;
using BTCPayServer.Validation;
using Microsoft.AspNetCore.Mvc.Rendering;
using System;
using BTCPayServer.Validation;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Data;
namespace BTCPayServer.Models.StoreViewModels
{
@@ -22,7 +15,7 @@ namespace BTCPayServer.Models.StoreViewModels
public bool Enabled { get; set; }
}
public class ThirdPartyPaymentMethod
public class AdditionalPaymentMethod
{
public string Provider { get; set; }
public bool Enabled { get; set; }
@@ -58,8 +51,8 @@ namespace BTCPayServer.Models.StoreViewModels
public List<StoreViewModel.DerivationScheme> DerivationSchemes { get; set; } = new List<StoreViewModel.DerivationScheme>();
public List<ThirdPartyPaymentMethod> ThirdPartyPaymentMethods { get; set; } =
new List<ThirdPartyPaymentMethod>();
public List<AdditionalPaymentMethod> ThirdPartyPaymentMethods { get; set; } =
new List<AdditionalPaymentMethod>();
[Display(Name = "Invoice expires if the full amount has not been paid after ... minutes")]
[Range(1, 60 * 24 * 24)]