Marco
43944d8cc8
Bug fixes:
- Navbar login/logout state now updates immediately (custom ep-auth-changed
event) instead of requiring a hard reload
- Status-change email links were broken by an un-encoded "#" in the order
number; fixed for all 4 status emails
- Cart discount code: manual input field restored (was removed entirely)
- Quote-label underline now scales with the label's actual text width
- Number Ranges admin list now shows the invoice prefix/counter columns
Pricing & VAT:
- Prices show the real per-product VAT rate ("inkl. X% MwSt.") instead of
a generic disclosure
- Cart/checkout/confirmation totals show the actual € amount of VAT
included, broken down per rate when a cart spans more than one
(new lib/taxBreakdown.ts, shared with the invoice PDF's own math)
- Account order pages gained product thumbnails and the same VAT breakdown
Low-stock warning: a "Nur noch wenige verfügbar" badge/hint across the
shop grid, spotlight, and add-to-cart variant pickers, driven by the
existing lowStockThreshold field (still never exposes raw stock counts).
Invoice PDFs: product thumbnails on every line item, a plain "Netto"
label (rate was redundant, already stated on the MwSt. line below), no
more duplicate USt-IdNr. in the header, and — for a Stornorechnung
specifically — an explicit "Versand" line that was previously only
folded silently into the tax totals.
Checkout:
- Optional deviating shipping address (separate from the billing address
used for the invoice), with its own toggle + address form
- Full checkout draft persistence (name/address/shipping/payment
selections) survives navigating away and back, via localStorage
- Invoice PDF shows a third "Lieferadresse" block when the shipping
address differs from billing
Mobile navigation: fullscreen panel with a circular reveal animation from
the hamburger's corner, replacing the old in-flow accordion drawer; no
login CTA inside it (redundant with the always-visible header icon).
Admin-facing (Payload backend, mirrored where the frontend has a ported
copy of the same renderer): dashboard rebuilt as individual cards, split
into 3 task queues (received/processing/returns) instead of 2, revenue
and order counts now exclude cancelled/returned orders immediately, and
the low-stock alert links to the specific affected product(s) instead of
the unfiltered list. A new immediate email notifies the shop owner the
moment an order comes in, instead of only via the daily digest.
Testimonials admin list now groups by page instead of interleaving all
three grids' entries. ~45 English admin field descriptions translated to
German for consistency.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
37 lines
1.7 KiB
TypeScript
37 lines
1.7 KiB
TypeScript
// Previously duplicated as groupByTaxRate() independently inside
|
|
// invoicePdf.tsx and correctionInvoicePdf.tsx (and, on the Payload backend,
|
|
// their own copies) — pulled out so the storefront's own MwSt. breakdowns
|
|
// (checkout summary, order confirmation page/email, account order pages)
|
|
// can share the exact same math instead of a fourth hand-rolled version
|
|
// drifting out of sync with what the actual invoices say.
|
|
|
|
export type TaxBreakdownLine = { quantity: number; unitPrice: number; taxRatePercent: number };
|
|
export type TaxBreakdownGroup = { rate: number; net: number; tax: number; gross: number };
|
|
|
|
// Groups line items by their effective VAT rate, then scales each group's
|
|
// gross total by however much shipping/discount moved the grand total away
|
|
// from the raw item subtotal — proportional to that group's own share of
|
|
// the subtotal, not a flat split. Passing discountAmount=0 and
|
|
// shippingCost=0 (e.g. a Gutschrift, which excludes both) collapses `scale`
|
|
// to 1, i.e. no adjustment at all.
|
|
export function computeTaxBreakdown(
|
|
items: TaxBreakdownLine[],
|
|
subtotal: number,
|
|
discountAmount: number,
|
|
shippingCost: number,
|
|
): TaxBreakdownGroup[] {
|
|
const groups = new Map<number, number>();
|
|
for (const item of items) {
|
|
const lineGross = item.quantity * item.unitPrice;
|
|
groups.set(item.taxRatePercent, (groups.get(item.taxRatePercent) ?? 0) + lineGross);
|
|
}
|
|
const scale = subtotal > 0 ? (subtotal - discountAmount + shippingCost) / subtotal : 1;
|
|
return Array.from(groups.entries())
|
|
.map(([rate, lineGross]) => {
|
|
const gross = lineGross * scale;
|
|
const net = gross / (1 + rate / 100);
|
|
return { rate, net, tax: gross - net, gross };
|
|
})
|
|
.sort((a, b) => b.rate - a.rate);
|
|
}
|