diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Numpad.svelte | 1 | ||||
| -rw-r--r-- | src/routes/(app)/invoice/[id]/+layout.server.ts | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte index 0290b9e2..c321e0bc 100644 --- a/src/components/Numpad.svelte +++ b/src/components/Numpad.svelte @@ -63,7 +63,6 @@ return `${whole}${dec}${cents}`; } - // --- NEW: normalize sats to remove leading zeros but keep single "0" function normalizeSats(str) { const digits = (str ?? "").replace(/[^\d]/g, ""); const noLead = digits.replace(/^0+(?=\d)/, ""); diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts index df8693be..ab41dddc 100644 --- a/src/routes/(app)/invoice/[id]/+layout.server.ts +++ b/src/routes/(app)/invoice/[id]/+layout.server.ts @@ -19,9 +19,7 @@ export async function load({ cookies, depends, params, url, parent }) { (!amount && (pending || received)) || (amount > 0 && (pending >= amount || received >= amount)); if (paid && !url.pathname.endsWith("paid")) { - if (invoice.uid === user?.id) - redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : "")); - else redirect(307, `/pay/${subject.username}/${invoice.amount}`); + redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : "")); } subject = invoice.user; @@ -34,7 +32,9 @@ export async function load({ cookies, depends, params, url, parent }) { ) { if (invoice.prompt && invoice.tip === null) redirect(307, `/invoice/${id}/tip`); - else redirect(307, `/send/invoice/${id}`); + else { + redirect(307, `/send/invoice/${id}`); + } } } |