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

remove creating state from payment requests

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

25
BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
View File

@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.PaymentRequests;
using BTCPayServer.Services.Rates;
using Microsoft.AspNetCore.Mvc.Rendering;
@@ -20,12 +18,6 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
public int Total { get; set; }
}
public class RemovePaymentRequestViewModel
{
public string Id { get; set; }
public string Title { get; set; }
}
public class UpdatePaymentRequestViewModel
{
public UpdatePaymentRequestViewModel()
@@ -66,7 +58,6 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
[Required] public string Title { get; set; }
public string Description { get; set; }
public string StatusMessage { get; set; }
public string Action { get; set; }
public SelectList Stores { get; set; }
[EmailAddress]
@@ -80,6 +71,8 @@ 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
@@ -99,18 +92,8 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts;
switch (data.Status)
{
case PaymentRequestData.PaymentRequestStatus.Creating:
Status = "Creating";
break;
case PaymentRequestData.PaymentRequestStatus.Pending:
if (ExpiryDate.HasValue)
{
Status = $"Expires on {ExpiryDate.Value:g}";
}
else
{
Status = "Pending";
}
Status = ExpiryDate.HasValue ? $"Expires on {ExpiryDate.Value:g}" : "Pending";
IsPending = true;
break;
case PaymentRequestData.PaymentRequestStatus.Completed:
@@ -124,6 +107,8 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
}
}
public bool Enabled { get; set; }
public bool AllowCustomPaymentAmounts { get; set; }