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

Fix expiration message on checkout page

Browse Source
This commit is contained in:
nicolas.dorier
2018-01-20 00:33:37 +09:00
parent 579dcb5af8
commit db2a2a2b6c
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BTCPayServer/Controllers/InvoiceController.UI.cs
View File

@@ -162,6 +162,7 @@ namespace BTCPayServer.Controllers
CustomerEmail = invoice.RefundMail, CustomerEmail = invoice.RefundMail,
ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds), ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds, MaxTimeSeconds = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalSeconds,
MaxTimeMinutes = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalMinutes,
ItemDesc = invoice.ProductInformation.ItemDesc, ItemDesc = invoice.ProductInformation.ItemDesc,
Rate = FormatCurrency(cryptoData), Rate = FormatCurrency(cryptoData),
MerchantRefLink = invoice.RedirectURL ?? "/", MerchantRefLink = invoice.RedirectURL ?? "/",

1
BTCPayServer/Models/InvoicingModels/PaymentModel.cs
View File

@@ -39,5 +39,6 @@ namespace BTCPayServer.Models.InvoicingModels
public string OrderId { get; set; } public string OrderId { get; set; }
public string CryptoImage { get; set; } public string CryptoImage { get; set; }
public string NetworkFeeDescription { get; internal set; } public string NetworkFeeDescription { get; internal set; }
public int MaxTimeMinutes { get; internal set; }
} }
} }

4
BTCPayServer/Views/Invoice/Checkout.cshtml
View File

@@ -492,7 +492,7 @@
<div> <div>
<div class="expired__body"> <div class="expired__body">
<div class="expired__header" i18n="">What happened?</div> <div class="expired__header" i18n="">What happened?</div>
<div class="expired__text" i18n="">This invoice has expired. An invoice is only valid for 15 minutes. You can <div class="expired__text__link i18n-return-to-merchant">return to {{srvModel.storeName}}</div> if you would like to submit your payment again.</div> <div class="expired__text" i18n="">This invoice has expired. An invoice is only valid for @Model.MaxTimeMinutes minutes. You can <div class="expired__text__link i18n-return-to-merchant">return to {{srvModel.storeName}}</div> if you would like to submit your payment again.</div>
<div class="expired__text" i18n="">If you tried to send a payment, it has not yet been accepted by the Bitcoin network. We have not yet received your funds.</div> <div class="expired__text" i18n="">If you tried to send a payment, it has not yet been accepted by the Bitcoin network. We have not yet received your funds.</div>
<div class="expired__text" i18n=""> <div class="expired__text" i18n="">
If the transaction If the transaction
@@ -504,7 +504,7 @@
<span class="expired__text__bullet" i18n="">Invoice ID:</span> {{srvModel.invoiceId}}<br> <span class="expired__text__bullet" i18n="">Invoice ID:</span> {{srvModel.invoiceId}}<br>
<!----> <!---->
<span> <span>
<span class="expired__text__bullet" i18n="">Order ID:</span> {{srvModel.OrderId}} <span class="expired__text__bullet" i18n="">Order ID:</span> {{srvModel.orderId}}
</span> </span>
</div> </div>
</div> </div>