currency locale

2 files changed, 37 insertions, 26 deletions

diff --git a/src/routes/(app)/payments/[...page]/+page.server.ts b/src/routes/(app)/payments/[...page]/+page.server.ts
index 05ed2d64..6b9f47e2 100644
--- a/src/routes/(app)/payments/[...page]/+page.server.ts
+++ b/src/routes/(app)/payments/[...page]/+page.server.ts
@@ -1,6 +1,6 @@
-import { auth, get } from "$lib/utils";
+import { auth, get, str } from "$lib/utils";
 
-const limit = 25;
+const limit = 5;
 
 export async function load({ cookies, depends, params }) {
 	depends("app:payments");
@@ -17,15 +17,22 @@ export async function load({ cookies, depends, params }) {
 	if (!parseInt(page)) page = 1;
 
 	const offset = (page - 1) * limit;
-	if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
 
-	let url = `/payments?aid=${aid}&start=${
-		start * 1000
-	}&limit=${limit}&offset=${offset}`;
-	if (end) url += `&end=${end * 1000}`;
+	const q = new URLSearchParams();
+	q.set("limit", str(limit));
+	q.set("offset", str(offset));
+	if (aid) q.set("aid", aid);
+	if (start) q.set("start", str(start * 1000));
+	if (end) q.set("end", str(end * 1000));
 
-	const { count, payments, incoming, outgoing } = await get(url, auth(cookies));
+	const { count, payments, incoming, outgoing } = await get(
+		`/payments?${str(q)}`,
+		auth(cookies),
+	);
+
+	console.log("payments", payments.length);
 	const pages = new Array(Math.ceil(count / limit));
+	console.log("pages", pages);
 
 	return { payments, page, pages, start, end, incoming, outgoing };
 }
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte
index 146a286d..529c8c63 100644
--- a/src/routes/(app)/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/payments/[...page]/+page.svelte
@@ -5,14 +5,23 @@
   import { format } from "date-fns";
   import { newPayment } from "$lib/store";
   import { t } from "$lib/translations";
-  import { get, f, s, si, sat, sats, types } from "$lib/utils";
+  import { get, f, s, si, sat, loc, sats, types } from "$lib/utils";
   import { page } from "$app/stores";
   import { differenceInDays, getUnixTime, sub } from "date-fns";
   import { goto, invalidate } from "$app/navigation";
   import locales from "$lib/locales";
   let { data } = $props();
-  let { start, end, user, rates, payments, incoming, outgoing } =
-    $derived(data);
+  let {
+    start,
+    end,
+    user,
+    rates,
+    payments,
+    incoming,
+    outgoing,
+    pages,
+    page: p,
+  } = $derived(data);
 
   let locale = locales[user.language];
 
@@ -55,9 +64,6 @@
       : 0,
   );
 
-  let p = $state(),
-    pages = $state([]);
-
   $effect(() => {
     if ($newPayment) {
       $newPayment = false;
@@ -135,7 +141,8 @@
     }
   };
 
-  let showPage = $derived((i) => {
+  let showPage = (i) => {
+    console.log("SHOW", i);
     const currentPage = parseInt(p);
     const maxVisiblePages = 10;
 
@@ -153,13 +160,10 @@
     }
 
     return i >= start && i <= end;
-  });
+  };
 
-  let isEllipsis = $derived((i) => {
-    return (
-      (i === 1 && !showPage(i)) || (i === pages.length - 2 && !showPage(i))
-    );
-  });
+  let isEllipsis = (i) =>
+    (i === 1 && !showPage(i)) || (i === pages.length - 2 && !showPage(i));
 </script>
 
 <div class="space-y-5">
@@ -218,7 +222,7 @@
             </div>
 
             <div class="text-secondary flex items-center text-base">
-              {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+              {f(Math.abs(p.amount) * (p.rate / sats), p.currency, loc(user))}
 
               {#if p.tip}
                 <span class="text-sm text-secondary">
@@ -322,15 +326,15 @@
           >{$t("payments.income")}</span
         >
         <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> -->
-        <span><b>{tipsIn ? f(tipsIn, c) : "-"}</b></span>
-        <span><b>{totalIn ? f(totalIn, c) : "-"}</b></span>
+        <span><b>{tipsIn ? f(tipsIn, c, loc(user)) : "-"}</b></span>
+        <span><b>{totalIn ? f(totalIn, c, loc(user)) : "-"}</b></span>
 
         <span class="text-left text-base text-secondary"
           >{$t("payments.expenditure")}</span
         >
         <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> -->
-        <span><b>{tipsOut ? f(tipsOut, c) : "-"}</b></span>
-        <span><b>{totalOut ? f(totalOut, c) : "-"}</b></span>
+        <span><b>{tipsOut ? f(tipsOut, c, loc(user)) : "-"}</b></span>
+        <span><b>{totalOut ? f(totalOut, c, loc(user)) : "-"}</b></span>
       {/each}
     </div>
   </div>