fix voucher redemption

3 files changed, 31 insertions, 13 deletions

diff --git a/src/routes/(app)/voucher/[code]/+page.server.js b/src/routes/(app)/voucher/[code]/+page.server.js
deleted file mode 100644
index 62270af4..00000000
--- a/src/routes/(app)/voucher/[code]/+page.server.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { get } from '$lib/utils';
-import Qr from 'qrcode-base64';
-export let load = async ({ params: { code }, url }) => {
-	let payment = await get(`/payment/${code}`);
-
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { payment, src };
-};
diff --git a/src/routes/(app)/voucher/[redeemcode]/+page.server.js b/src/routes/(app)/voucher/[redeemcode]/+page.server.js
new file mode 100644
index 00000000..22959e4d
--- /dev/null
+++ b/src/routes/(app)/voucher/[redeemcode]/+page.server.js
@@ -0,0 +1,23 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, get, post } from '$lib/utils';
+import Qr from 'qrcode-base64';
+
+export let load = async ({ params: { redeemcode }, url }) => {
+	let payment = await get(`/payment/${redeemcode}`);
+
+	let src = Qr.drawImg(url.href, { size: 300 });
+	return { payment, src };
+};
+
+export const actions = {
+	default: async ({ cookies, locals, params, request }) => {
+		let { user } = locals;
+
+		if (user) {
+			await post('/redeem', params, auth(cookies));
+			throw redirect(307, `/${user.username}/transactions`);
+		}
+
+		throw redirect(307, '/login');
+	}
+};
diff --git a/src/routes/(app)/voucher/[code]/+page.svelte b/src/routes/(app)/voucher/[redeemcode]/+page.svelte
index b25c6c49..cfc6c8a8 100644
--- a/src/routes/(app)/voucher/[code]/+page.svelte
+++ b/src/routes/(app)/voucher/[redeemcode]/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+	import { enhance } from '$app/forms';
 	import { page } from '$app/stores';
 	import { Icon } from '$comp';
 	import { toast } from '@zerodevx/svelte-toast';
@@ -41,18 +42,20 @@
 				</h3>
 			</div>
 			<div class="mx-auto my-auto flex gap-2 justify-center" data-sveltekit-prefetch="off">
-				<a
-					href={`/redeem/${redeemcode}`}
-					on:click={() => ($loginRedirect = `/redeem/${redeemcode}`)}
+				<form
+					method="POST"
+					use:enhance
+					on:submit={() => ($loginRedirect = `/redeem/${redeemcode}`)}
 				>
 					<button
+						type="submit"
 						class="text-lg rounded-full border py-3 px-7 font-bold hover:opacity-80"
 						class:bg-gray-200={redeemed}
-						disabled={redeemed}
+						disabled={redeemed || $loginRedirect}
 					>
 						{redeemed ? 'Redeemed' : 'Redeem'}
 					</button>
-				</a>
+				</form>
 			</div>
 		</div>
 	</div>