From 9a80922548964488cef66acf96e8ab70c97dabc9 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 15 Jan 2025 22:13:10 -0800 Subject: fix tip sign in report --- src/routes/(app)/payments/[...page]/+page.svelte | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte index bde01193..d0efc6d8 100644 --- a/src/routes/(app)/payments/[...page]/+page.svelte +++ b/src/routes/(app)/payments/[...page]/+page.svelte @@ -81,8 +81,9 @@ payments = payments.map((p) => ({ ...p, + tip: p.amount > 0 ? p.tip : -p.tip, created: new Date(p.created), - total: p.amount + (p.tip || 0), + total: p.amount + ((p.amount > 0 ? p.tip : -p.tip) || 0), platform_fee: p.ourfee, amount_fiat: f((p.amount * p.rate) / sats, p.currency), fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null, @@ -90,7 +91,10 @@ ? f((p.ourfee * p.rate) / sats, p.currency) : null, tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null, - total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency), + total_fiat: f( + ((p.amount + ((p.amount > 0 ? p.tip : -p.tip) || 0)) * p.rate) / sats, + p.currency, + ), })); let keys = [ @@ -201,7 +205,7 @@ {/if} - +
{#each Object.keys(incoming) as c} -- cgit v1.2.3