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

Can apply tax rates to PoS items (#6724)

Browse Source
This commit is contained in:
Nicolas Dorier
2025-05-19 10:35:46 +09:00
committed by GitHub
parent 80d6ba3e5b
commit 932d313dee
36 changed files with 1224 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BTCPayServer/Controllers/UIInvoiceController.UI.cs
View File

@@ -238,16 +238,15 @@ namespace BTCPayServer.Controllers
if (additionalData.TryGetValue("receiptData", out object? combinedReceiptData))
{
var receiptData = new Dictionary<string, object>((Dictionary<string, object>)combinedReceiptData, StringComparer.OrdinalIgnoreCase);
string[] cartKeys = ["cart", "subtotal", "discount", "tip", "total"];
// extract cart data and lowercase keys to handle data uniformly in PosData partial
if (receiptData.Keys.Any(key => cartKeys.Contains(key.ToLowerInvariant())))
if (receiptData.Keys.Any(WellKnownPosData.IsWellKnown))
{
vm.CartData = new Dictionary<string, object>();
foreach (var key in cartKeys)
foreach (var key in receiptData.Keys.Where(WellKnownPosData.IsWellKnown))
{
if (!receiptData.ContainsKey(key)) continue;
if (!receiptData.TryGetValue(key, out object? value)) continue;
// add it to cart data and remove it from the general data
vm.CartData.Add(key.ToLowerInvariant(), receiptData[key]);
vm.CartData.Add(key.ToLowerInvariant(), value);
receiptData.Remove(key);
}
}
@@ -261,6 +260,7 @@ namespace BTCPayServer.Controllers
}
var payments = ViewPaymentRequestViewModel.PaymentRequestInvoicePayment.GetViewModels(i, _displayFormatter, _transactionLinkProviders, _handlers);
vm.TaxIncluded = i.Metadata?.TaxIncluded ?? 0.0m;
vm.Amount = i.PaidAmount.Net;
vm.Payments = receipt.ShowPayments is false ? null : payments;
@@ -929,6 +929,12 @@ namespace BTCPayServer.Controllers
model.PaymentMethodId = paymentMethodId.ToString();
model.OrderAmountFiat = OrderAmountFromInvoice(model.PaymentMethodCurrency, invoice, DisplayFormatter.CurrencyFormat.Symbol);
model.TaxIncluded = new();
if (invoice.Metadata.TaxIncluded is { } t)
{
model.TaxIncluded.Formatted = _displayFormatter.Currency(t, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol);
model.TaxIncluded.Value = t;
}
if (storeBlob.PlaySoundOnPayment)
{