@revenexx/cover 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revenexx/cover",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "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/api/orders/index.post.ts

@@ -163,7 +163,10 @@ export default defineEventHandler(async (event) => {
 		// Live shipping: the chosen method must be a real rate for this
 		// buyer context; its price replaces the demo calculation's shipping
 		// line in the order totals and the amount the payment is created over.
-		let liveShippingAdjustment = 0;
+		// The chosen live shipping rate carries its own price AND tax_rate
+		// (resolved by the shipping app from markets.tax_classes). The order app
+		// taxes shipping with it — the BFF computes no tax itself.
+		let liveShippingRate: { price: number; tax_rate: number } | null = null;
 		if (liveShipping && body.deliveryMethod) {
 			const address = body.address as Record<string, unknown> | undefined;
 			try {
@@ -171,13 +174,12 @@ export default defineEventHandler(async (event) => {
 					orderValue: calculation.totals.find(row => row.key === "subtotal")?.amount
 						?? calculation.totals.find(row => row.key === "total")?.amount ?? 0,
 					country: String(address?.country ?? ""),
-				}) as unknown as { rates: Array<{ code: string; price: number }> };
+				}) as unknown as { rates: Array<{ code: string; price: number; tax_rate: number | null }> };
 				const rate = rates.find(r => r.code === body.deliveryMethod);
 				if (!rate) {
 					throw createError({ status: 422, message: `Delivery method '${body.deliveryMethod}' is not available for this order` });
 				}
-				const mockShipping = calculation.totals.find(row => row.key === "shipping")?.amount ?? 0;
-				liveShippingAdjustment = rate.price - mockShipping;
+				liveShippingRate = { price: rate.price, tax_rate: Number(rate.tax_rate ?? 0) };
 			}
 			catch (err) {
 				if (isError(err)) {
@@ -196,6 +198,9 @@ export default defineEventHandler(async (event) => {
 		// approvals domain is deliberately not part of OM phase 1.
 		const liveOrders = resolveOrderServiceKey(event) === "api" && blockingApprovals.length === 0;
 		let liveOrderUuid: string | null = null;
+		// The placed order's grand_total (orders app = source of truth) drives
+		// the payment amount, so payment and order can never diverge.
+		let liveOrderTotal: number | null = null;
 		if (liveOrders) {
 			const address = body.address as Record<string, unknown>;
 			const billing = address?.billingAddressSameAsShipping === false
@@ -213,6 +218,28 @@ export default defineEventHandler(async (event) => {
 				// order history, filtered strictly by contact_id).
 				const contactId = refs.contact_id ?? user?.contactId;
 				const organizationId = refs.organization_id ?? user?.organizationId;
+
+				// Per-item tax rate from the prices app (same resolve that prices
+				// the storefront), not a BFF constant — one bulk call. The orders
+				// app then taxes items + shipping and computes grand_total itself.
+				const orderItems = body.items as Array<Record<string, unknown>>;
+				const itemRate = new Map<string, number>();
+				try {
+					const { prices: resolved } = await useRevenexxSdk().prices.pricesResolve({
+						items: orderItems.map(it => ({ product_id: String(it.id), sku: it.sku ? String(it.sku) : undefined, quantity: Number(it.quantity) || 1 })) as Models.PriceResolveItem[],
+						...(contactId ? { contactId } : {}),
+						...(organizationId ? { organizationId } : {}),
+					}) as unknown as { prices: Array<{ product_id: string | null; sku: string | null; tax_rate: number | null }> };
+					for (const p of resolved) {
+						if (p.tax_rate == null) continue;
+						if (p.product_id) itemRate.set(p.product_id, p.tax_rate);
+						if (p.sku) itemRate.set(p.sku, p.tax_rate);
+					}
+				}
+				catch (rateErr) {
+					getLogService().error("Item tax-rate resolution failed", apiErrorContext(rateErr));
+				}
+
 				const placed = await useRevenexxSdk().orders.ordersPlace({
 					...(contactId ? { contactId } : {}),
 					...(organizationId ? { organizationId } : {}),
@@ -222,20 +249,21 @@ export default defineEventHandler(async (event) => {
 					billingAddress: (billing ?? null) as object,
 					shippingAddress: (address ?? null) as object,
 					payment: { method: payment.method },
+					// Shipping price + tax_rate from the shipping app; the orders
+					// app taxes it and computes grand_total — the BFF sends NO
+					// grand_total (orders is the single source of truth).
 					shipping: {
 						method: body.deliveryMethod ?? "standard",
-						price: Math.max(0, (shippingRow?.amount ?? 0) + liveShippingAdjustment),
+						price: Math.max(0, liveShippingRate?.price ?? shippingRow?.amount ?? 0),
+						tax_rate: liveShippingRate?.tax_rate ?? 0,
 					},
-					// The order carries what the customer saw (and the payment
-					// charges): the checkout calculation's total.
-					grandTotal: Math.max(0, Math.round(((totalRow?.amount ?? 0) + liveShippingAdjustment) * 100) / 100),
-					items: (body.items as Array<Record<string, unknown>>).map((item, index) => ({
+					items: orderItems.map((item, index) => ({
 						product_id: String(item.id),
 						sku: String(item.sku ?? "") || undefined,
 						name: String(item.name ?? item.sku ?? item.id),
 						quantity: calculation.lines[index]?.adjustedQuantity ?? Number(item.quantity),
 						unit_price: calculation.lines[index]?.unitPrice ?? Number(item.price ?? 0),
-						tax_rate: 19,
+						tax_rate: itemRate.get(String(item.id)) ?? itemRate.get(String(item.sku ?? "")) ?? 0,
 						product: {
 							...(item.image ? { image: String(item.image) } : {}),
 							...(item.categorySlug ? { categorySlug: String(item.categorySlug) } : {}),
@@ -248,9 +276,10 @@ export default defineEventHandler(async (event) => {
 						...(body.partialDelivery !== undefined ? { partial_delivery: body.partialDelivery } : {}),
 						...(body.requestedDate ? { requested_date: body.requestedDate } : {}),
 					},
-				}) as unknown as { id: string; number: string };
+				}) as unknown as { id: string; number: string; grand_total?: number };
 				orderId = placed.number;
 				liveOrderUuid = placed.id;
+				liveOrderTotal = typeof placed.grand_total === "number" ? placed.grand_total : null;
 			}
 			catch (err) {
 				if (err instanceof RevenexxException && (err.code === 400 || err.code === 422)) {
@@ -276,7 +305,8 @@ export default defineEventHandler(async (event) => {
 			try {
 				const created = await useRevenexxSdk().payments.paymentsCreate({
 					methodCode: payment.method,
-					amount: Math.max(0, Math.round(((totalRow?.amount ?? 0) + liveShippingAdjustment) * 100) / 100),
+					// Charge exactly what the orders app computed (incl. shipping tax).
+					amount: Math.max(0, Math.round((liveOrderTotal ?? totalRow?.amount ?? 0) * 100) / 100),
 					currency: calculation.currency,
 					country,
 					orderRef: orderId,