@revenexx/cover 0.1.15 → 0.1.17

package/app/components/account/orders/AccountOrderDetail.vue

@@ -296,12 +296,35 @@ async function orderAgain(): Promise<void> {
 						</span>
 					</li>
 				</ul>
-				<div
-					class="flex justify-between px-4 sm:px-5 py-3 border-t border-(--ui-border)
-					text-sm font-semibold text-highlighted"
-				>
-					<span>{{ t('orders.card.total') }}</span>
-					<span class="tabular-nums">{{ formatCurrency(order.total) }}</span>
+				<div class="px-4 sm:px-5 py-3 border-t border-(--ui-border) text-sm">
+					<div
+						v-if="order.subtotal !== undefined"
+						class="flex justify-between py-0.5 text-highlighted"
+					>
+						<span>{{ t('orders.card.subtotal') }}</span>
+						<span class="tabular-nums">{{ formatCurrency(order.subtotal) }}</span>
+					</div>
+					<div
+						v-if="order.shipping !== undefined"
+						class="flex justify-between py-0.5 text-highlighted"
+					>
+						<span>{{ t('orders.card.shipping') }}</span>
+						<span class="tabular-nums">{{ formatCurrency(order.shipping) }}</span>
+					</div>
+					<div
+						v-if="order.tax !== undefined"
+						class="flex justify-between py-0.5 text-muted"
+					>
+						<span>{{ t('orders.card.tax') }}</span>
+						<span class="tabular-nums">{{ formatCurrency(order.tax) }}</span>
+					</div>
+					<div
+						class="flex justify-between pt-2 mt-1 border-t border-(--ui-border)
+						font-semibold text-highlighted"
+					>
+						<span>{{ t('orders.card.total') }}</span>
+						<span class="tabular-nums">{{ formatCurrency(order.total) }}</span>
+					</div>
 				</div>
 			</section>
 

package/app/interfaces/account/order-list.ts

@@ -24,7 +24,13 @@ export interface AccountOrder {
 	readonly date: string;
 	readonly status: AccountOrderStatus;
 	readonly paymentStatus: AccountOrderPaymentStatus;
-	/** Net order total. */
+	/** Net goods subtotal (excl. shipping and tax). Live orders only. */
+	readonly subtotal?: number;
+	/** Shipping cost (net). Live orders only. */
+	readonly shipping?: number;
+	/** Tax amount included in the total. Live orders only. */
+	readonly tax?: number;
+	/** Gross order total (incl. shipping and tax) — the amount charged. */
 	readonly total: number;
 	readonly currency: string;
 	/** Customer's own order/PO number from the checkout. */

package/app/middleware/account-auth.global.ts

@@ -0,0 +1,24 @@
+export default defineNuxtRouteMiddleware(async (to) => {
+	const routeName = typeof to.name === "string" ? to.name : "";
+	const isAccountRoute = routeName.startsWith("account");
+
+	if (!isAccountRoute) {
+		return;
+	}
+
+	// Resolve the session against the BFF like guest-only and checkout-guard
+	// do. The auth store's user is not hydrated during SSR, so store-based
+	// checks would bounce signed-in users to /login — and guest-only would
+	// bounce them straight back, looping the request.
+	const headers = useRequestHeaders(["cookie"]);
+	const user = await $fetch<{ $id: string } | null>("/api/auth/me", { headers }).catch(() => null);
+	if (user) {
+		return;
+	}
+
+	const localePath = useLocalePath();
+	return navigateTo(localePath({
+		path: "/login",
+		query: { redirect: to.fullPath },
+	}));
+});

package/app/middleware/checkout-guard.ts

@@ -0,0 +1,11 @@
+export default defineNuxtRouteMiddleware(() => {
+	const localePath = useLocalePath();
+
+	// Authentication is handled on the page itself (checkout gate with
+	// login + guest ordering per organization flags) — the guard only
+	// ensures there is something to check out.
+	const cartHasItems = useCookie("cover-cart-has-items");
+	if (!cartHasItems.value) {
+		return navigateTo(localePath("cart"));
+	}
+});

package/app/middleware/guest-only.ts

@@ -0,0 +1,9 @@
+export default defineNuxtRouteMiddleware(async () => {
+	const localePath = useLocalePath();
+
+	const headers = useRequestHeaders(["cookie"]);
+	const user = await $fetch<{ $id: string } | null>("/api/auth/me", { headers }).catch(() => null);
+	if (user) {
+		return navigateTo(localePath("/account"));
+	}
+});

package/app/plugins/safari-keyboard-nav.client.ts

@@ -0,0 +1,10 @@
+export default defineNuxtPlugin((nuxtApp) => {
+	const patch = () => {
+		void nextTick(() => {
+			document.querySelectorAll("[data-slot=\"link\"]:not([tabindex]), button[role=\"combobox\"]:not([tabindex])").forEach((el) => {
+				el.setAttribute("tabindex", "0");
+			});
+		});
+	};
+	nuxtApp.hook("page:finish", patch);
+});

package/i18n/locales/de/account.json

@@ -67,8 +67,11 @@
 			"date": "Datum",
 			"shippingStatus": "Versandstatus",
 			"paymentStatus": "Zahlungsstatus",
-			"total": "Summe (netto)",
-			"yourOrderNumber": "Ihre Bestellnummer"
+			"total": "Gesamtbetrag",
+			"yourOrderNumber": "Ihre Bestellnummer",
+			"subtotal": "Warenwert",
+			"shipping": "Versandkosten",
+			"tax": "MwSt."
 		},
 		"status": {
 			"processing": "In Bearbeitung",
@@ -113,7 +116,7 @@
 			"id": "Bestellung",
 			"date": "Datum",
 			"positions": "Positionen",
-			"total": "Summe (netto)",
+			"total": "Gesamtbetrag",
 			"status": "Status",
 			"payment": "Zahlung"
 		}

package/i18n/locales/en/account.json

@@ -67,8 +67,11 @@
 			"date": "Date",
 			"shippingStatus": "Shipping status",
 			"paymentStatus": "Payment status",
-			"total": "Total (net)",
-			"yourOrderNumber": "Your order number"
+			"total": "Total",
+			"yourOrderNumber": "Your order number",
+			"subtotal": "Subtotal",
+			"shipping": "Shipping",
+			"tax": "VAT"
 		},
 		"status": {
 			"processing": "Processing",
@@ -113,7 +116,7 @@
 			"id": "Order",
 			"date": "Date",
 			"positions": "Items",
-			"total": "Total (net)",
+			"total": "Total",
 			"status": "Status",
 			"payment": "Payment"
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revenexx/cover",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Cover \u2014 revenexx design system for Nuxt. Distributed as a Nuxt layer: generic UI components, theming tokens and stores shared by the demo shop, custom storefronts and the Blokkli theme.",
   "type": "module",
   "main": "./nuxt.config.ts",

package/server/utils/liveOrders.ts

@@ -29,6 +29,9 @@ export interface LiveOrder {
 	payment_status: string;
 	fulfillment_status: string;
 	currency: string;
+	subtotal: number;
+	shipping_total: number;
+	tax_total: number;
 	grand_total: number;
 	billing_address: Record<string, unknown> | null;
 	shipping_address: Record<string, unknown> | null;
@@ -113,6 +116,9 @@ export function mapLiveOrderToAccount(order: LiveOrder): AccountOrder {
 		date: day(placed),
 		status: mapStatus(order),
 		paymentStatus: mapPaymentStatus(order.payment_status),
+		subtotal: Number(order.subtotal),
+		shipping: Number(order.shipping_total),
+		tax: Number(order.tax_total),
 		total: Number(order.grand_total),
 		currency: order.currency,
 		...(order.customer_order_number ? { orderNumber: order.customer_order_number } : {}),