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

Make sure that the invoice currency is normalized to uppercase (Fix #2146)

Browse Source
This commit is contained in:
nicolas.dorier
2021-01-07 22:30:57 +09:00
parent 56daf347b9
commit e2e37a0db4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Controllers/InvoiceController.cs
View File

@@ -98,8 +98,7 @@ namespace BTCPayServer.Controllers
{
throw new BitpayHttpException(400, "The expirationTime is set too soon");
}
invoice.Currency = invoice.Currency?.ToUpperInvariant() ?? "USD";
entity.Currency = invoice.Currency;
invoice.Currency = invoice.Currency?.Trim().ToUpperInvariant() ?? "USD";
entity.Metadata.OrderId = invoice.OrderId;
entity.Metadata.PosData = invoice.PosData;
entity.ServerUrl = serverUrl;
@@ -169,6 +168,7 @@ namespace BTCPayServer.Controllers
if (invoice.Metadata != null)
entity.Metadata = InvoiceMetadata.FromJObject(invoice.Metadata);
invoice.Checkout ??= new CreateInvoiceRequest.CheckoutOptions();
invoice.Currency = invoice.Currency?.Trim().ToUpperInvariant() ?? "USD";
entity.Currency = invoice.Currency;
entity.Price = invoice.Amount;
entity.SpeedPolicy = invoice.Checkout.SpeedPolicy ?? store.SpeedPolicy;

2
BTCPayServer/Services/Invoices/InvoiceEntity.cs
View File

@@ -569,7 +569,7 @@ namespace BTCPayServer.Services.Invoices
wellknown.OrderId = val2.Value<string>();
}
Metadata = wellknown;
Currency = productInformation.Currency;
Currency = productInformation.Currency?.Trim().ToUpperInvariant();
Price = productInformation.Price;
}
else