From 7de4b0d2cd330674dcd02d2b007c1477fd48caaa Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 13 Jan 2023 23:49:59 -0800 Subject: payments migration --- src/routes/(app)/invoice/[id]/+layout.server.js | 5 ++--- src/routes/(app)/invoice/[id]/+page.svelte | 3 +-- src/routes/(app)/invoice/[id]/paid/+page.svelte | 3 +-- src/routes/(app)/invoice/[id]/tip/+page.svelte | 10 +--------- 4 files changed, 5 insertions(+), 16 deletions(-) (limited to 'src/routes/(app)/invoice') diff --git a/src/routes/(app)/invoice/[id]/+layout.server.js b/src/routes/(app)/invoice/[id]/+layout.server.js index adcea6df..78d8481e 100644 --- a/src/routes/(app)/invoice/[id]/+layout.server.js +++ b/src/routes/(app)/invoice/[id]/+layout.server.js @@ -7,14 +7,13 @@ export async function load({ depends, params, url }) { let { id } = params; let invoice = await get(`/invoice?id=${id}`); - let { amount, received, pending } = invoice; + let { amount, received } = invoice; amount = parseInt(amount); - let paid = (!amount && (received || pending)) || (amount > 0 && received + pending >= amount); + let paid = (!amount && received) || (amount > 0 && received >= amount); if (paid && !url.pathname.endsWith('paid')) throw redirect(307, `/invoice/${id}/paid`); let sm = Qr.drawImg(invoice.text, { size: 300 }); - // let lg = Qr.drawImg(invoice.text, { size: 1200 }); return { id, invoice, sm, lg: sm }; } diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index db491c66..28ff27c0 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -3,9 +3,8 @@ import { back, copy, f, get, sat, reverseFormat, s, sats } from '$lib/utils'; import { tick, onMount, onDestroy } from 'svelte'; import { browser } from '$app/environment'; - import { invoices, last } from '$lib/store'; + import { last } from '$lib/store'; import { Avatar, Icon, Heart, Image, Qr } from '$comp'; - import { goto } from '$app/navigation'; import { t } from '$lib/translations'; import screenfull from 'screenfull'; diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte index 2ce414e2..2ccbc971 100644 --- a/src/routes/(app)/invoice/[id]/paid/+page.svelte +++ b/src/routes/(app)/invoice/[id]/paid/+page.svelte @@ -6,7 +6,6 @@ import { t } from '$lib/translations'; import { f, s, sat, sats } from '$lib/utils'; import { goto } from '$app/navigation'; - import { invoices } from '$lib/store'; export let data; let amount, currency, rate, received, pending, tip, user, id; @@ -60,4 +59,4 @@
-
{$t('transactions.tapAnywhere')}
+
{$t('payments.tapAnywhere')}
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte index 625248a0..308720ab 100644 --- a/src/routes/(app)/invoice/[id]/tip/+page.svelte +++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte @@ -1,7 +1,7 @@