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

Add tip and subtotal to report

Browse Source
This commit is contained in:
nicolas.dorier
2025-05-23 19:39:28 +09:00
parent 291ac888e9
commit 8a43386909
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BTCPayServer/Services/Invoices/PosAppData.cs
View File

@@ -19,6 +19,17 @@ public class PosAppData
}
return null;
}
public static PosAppData TryParse(JObject posData)
{
try
{
return posData.ToObject<PosAppData>();
}
catch
{
}
return null;
}
[JsonProperty(PropertyName = "cart")]
public PosAppCartItem[] Cart { get; set; }

15
BTCPayServer/Services/Reporting/LegacyInvoiceExportReportProvider.cs
View File

@@ -49,6 +49,8 @@ public class LegacyInvoiceExportReportProvider : ReportProvider
new("InvoiceDue", "number"),
new("InvoicePrice", "number"),
new("InvoiceTaxIncluded", "number"),
new("InvoiceTip", "number"),
new("InvoiceSubtotal", "number"),
new("InvoiceItemCode", "text"),
new("InvoiceItemDesc", "text"),
new("InvoiceFullStatus", "text"),
@@ -93,6 +95,17 @@ public class LegacyInvoiceExportReportProvider : ReportProvider
data.Add(Math.Round(invoiceDue, currency.NumberDecimalDigits));
data.Add(invoiceEntity.Price);
data.Add(invoiceEntity.Metadata.TaxIncluded ?? 0.0m);
if (invoiceEntity.Metadata.PosData != null &&
PosAppData.TryParse(invoiceEntity.Metadata.PosData) is { } posData)
{
data.Add(posData.Tip);
data.Add(posData.Subtotal);
}
else
{
data.Add(0m);
data.Add(0m);
}
data.Add(invoiceEntity.Metadata.ItemCode);
data.Add(invoiceEntity.Metadata.ItemDesc);
data.Add(invoiceEntity.GetInvoiceState().ToString());
@@ -128,6 +141,8 @@ public class LegacyInvoiceExportReportProvider : ReportProvider
data.Add(Math.Round(invoiceDue, currency.NumberDecimalDigits)); // InvoiceDue
data.Add(invoiceEntity.Price);
data.Add(invoiceEntity.Metadata.TaxIncluded ?? 0.0m);
data.Add(0m); // Tip
data.Add(0m); // Subtotal
data.Add(invoiceEntity.Metadata.ItemCode);
data.Add(invoiceEntity.Metadata.ItemDesc);
data.Add(invoiceEntity.GetInvoiceState().ToString());