subscription_model -> subscription

frontend/src/routes/auth/admin/users/+page.server.js

@@ -87,10 +87,11 @@ export const actions = {
 	updateSubscription: async ({ request, fetch, cookies }) => {
 		let formData = await request.formData();
 
-		const rawData = formDataToObject(formData);
-		const processedData = processSubscriptionFormData(rawData);
+		const rawFormData = formDataToObject(formData);
+		const rawSubscription = /** @type {Partial<App.Types['subscription']>} */ (rawFormData.object);
+		const subscription = processSubscriptionFormData(rawSubscription);
 
-		const isCreating = !processedData.subscription.id || processedData.subscription.id === 0;
+		const isCreating = !subscription.id || subscription.id === 0;
 		console.log('Is creating: ', isCreating);
 		const apiURL = `${BASE_API_URI}/auth/subscriptions`;
 
@@ -102,7 +103,7 @@ export const actions = {
 				'Content-Type': 'application/json',
 				Cookie: `jwt=${cookies.get('jwt')}`
 			},
-			body: JSON.stringify(processedData.subscription)
+			body: JSON.stringify(subscription)
 		};
 
 		const res = await fetch(apiURL, requestOptions);

frontend/src/routes/auth/admin/users/+page.svelte

@@ -83,9 +83,7 @@
 				user.licence?.number?.toLowerCase()
 			].some((field) => field?.includes(term));
 
-			const subscriptionMatch = user.membership?.subscription_model?.name
-				?.toLowerCase()
-				.includes(term);
+			const subscriptionMatch = user.membership?.subscription?.name?.toLowerCase().includes(term);
 
 			const licenceCategoryMatch = user.licence?.categories?.some((cat) =>
 				cat.category.toLowerCase().includes(term)
@@ -277,8 +275,8 @@
 											<td>{user.email}</td>
 										</tr>
 										<tr>
-											<th>{$t('subscription.subscription')}</th>
-											<td>{user.membership?.subscription_model?.name}</td>
+											<th>{$t('subscriptions.subscription')}</th>
+											<td>{user.membership?.subscription?.name}</td>
 										</tr>
 										<tr>
 											<th>{$t('status')}</th>
@@ -462,7 +460,7 @@
 								<span class="nav-badge"
 									>{members.filter(
 										(/** @type{App.Locals['user']}*/ user) =>
-											user.membership?.subscription_model?.name === subscription.name
+											user.membership?.subscription?.name === subscription.name
 									).length}</span
 								>
 							</summary>
@@ -514,33 +512,20 @@
 											<i class="fas fa-edit"></i>
 											{$t('edit')}
 										</button>
-										{#if !members.some(/** @param{App.Locals['user']} user */ (user) => user.membership?.subscription_model?.id === subscription.id)}
-											<form
-												method="POST"
-												action="?/subscriptionDelete"
-												use:enhance={() => {
-													return async ({ result }) => {
-														if (result.type === 'success' || result.type === 'redirect') {
-															await applyAction(result);
-														} else {
-															document
-																.querySelector('.accordion-content')
-																?.scrollTo({ top: 0, behavior: 'smooth' });
-															await applyAction(result);
-														}
-													};
-												}}
-												on:submit|preventDefault={(/** @type {SubmitEvent} */ e) => {
-													if (
-														!confirm(
-															$t('dialog.subscription_deletion', {
-																values: {
-																	name: subscription.name || ''
-																}
-															})
-														)
-													) {
-														e.preventDefault(); // Cancel form submission if user declines
+									{/if}
+									{#if !members.some(/** @param{App.Locals['user']} user */ (user) => user.membership?.subscription?.id === subscription.id)}
+										<form
+											method="POST"
+											action="?/subscriptionDelete"
+											use:enhance={() => {
+												return async ({ result }) => {
+													if (result.type === 'success' || result.type === 'redirect') {
+														await applyAction(result);
+													} else {
+														document
+															.querySelector('.accordion-content')
+															?.scrollTo({ top: 0, behavior: 'smooth' });
+														await applyAction(result);
 													}
 												}}
 											>