Manage basket addition from Alias #382

B2Bitcoin · Feb 22, 2024 · 8874d4e · 8874d4e
1 parent 891b255
commit 8874d4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/routes/(app)/cart/+page.svelte b/src/routes/(app)/cart/+page.svelte
@@ -15,7 +15,7 @@
 	import { oneMaxPerLine } from '$lib/types/Product.js';
 	import { UrlDependency } from '$lib/types/UrlDependency.js';
 	import CmsDesign from '$lib/components/CmsDesign.svelte';
-	import { POS_ROLE_ID, SUPER_ADMIN_ROLE_ID } from '$lib/types/User';
+	import { CUSTOMER_ROLE_ID } from '$lib/types/User';
 
 	export let data;
 
@@ -43,6 +43,7 @@
 	});
 	let alias = '';
 	let formAlias: HTMLFormElement;
+
 	const { t, locale, countryName } = useI18n();
 </script>
 
@@ -70,12 +71,13 @@
 	{/if}
 	<div class="w-full rounded-xl p-6 flex flex-col gap-6 body-mainPlan border-gray-300">
 		<h1 class="page-title body-title">{t('cart.items')}</h1>
-		{#if data.roleId === POS_ROLE_ID || data.roleId === SUPER_ADMIN_ROLE_ID}
+		{#if data.roleId && data.roleId !== CUSTOMER_ROLE_ID}
 			<form
 				action="/product/{alias}?/addToCart"
 				method="post"
 				class="flex flex-col gap-2"
 				bind:this={formAlias}
+				use:enhance
 			>
 				<div class="gap-4 flex flex-col md:flex-row">
 					<label class="form-label w-[20em]">

diff --git a/src/routes/(app)/product/[id]/+page.server.ts b/src/routes/(app)/product/[id]/+page.server.ts
@@ -150,21 +150,19 @@ async function addToCart({ params, request, locals }: RequestEvent) {
 			alias: formData.get('alias') || undefined
 		});
 	if (!product && alias) {
-		throw redirect(303, request.headers.get('referer') || 'cart');
-	}
-	if (product && product.availableDate && !product.preorder && product.availableDate > new Date()) {
-		throw redirect(303, request.headers.get('referer') || 'cart');
+		return { errorNotExistingAlias: true };
 	}
+
 	const cart = await getCartFromDb({ user: userIdentifier(locals) });
 	if (product) {
 		const availableAmount = await computeAvailableAmount(product, cart);
 		if (availableAmount <= 0) {
-			throw redirect(303, request.headers.get('referer') || 'cart');
+			return { errorOutOfStock: true };
 		}
 	}
 
 	if (product && product.availableDate && !product.preorder && product.availableDate > new Date()) {
-		throw redirect(303, request.headers.get('referer') || 'cart');
+		return { errorAvailableDate: true };
 	}
 	if (!product) {
 		throw error(404, 'Product not found');