Compare commits

...

10 Commits

10 changed files with 505 additions and 185 deletions

View File

@@ -104,6 +104,13 @@ export default function CustomerDetailPage({ params }: { params: Promise<{ id: s
Kunden-ID: <span className="font-mono">{customer.id.slice(0, 8)}</span> Kunden-ID: <span className="font-mono">{customer.id.slice(0, 8)}</span>
</p> </p>
</div> </div>
{!customer.is_anonymized && (
<Link href={`/order?customer_id=${customer.id}`} className="ml-auto">
<Button size="sm" className="bg-primary hover:bg-primary/90 text-white font-bold gap-2 shadow-[0_0_15px_rgba(59,130,246,0.3)] text-xs">
<ShoppingBag className="w-4 h-4" /> Kunde updaten / bestellen
</Button>
</Link>
)}
{customer.is_anonymized && ( {customer.is_anonymized && (
<Badge className="bg-red-500/10 text-red-400 border-red-500/20 gap-1 ml-auto"> <Badge className="bg-red-500/10 text-red-400 border-red-500/20 gap-1 ml-auto">
<AlertTriangle className="w-3 h-3" /> Anonymisiert <AlertTriangle className="w-3 h-3" /> Anonymisiert

View File

@@ -0,0 +1,346 @@
'use client'
import React, { useState, useMemo } from 'react'
import Link from 'next/link'
import { Download, ExternalLink, ShoppingBag, ArrowLeft, Package, Search, ChevronLeft, ChevronRight, Building2, Monitor, RefreshCw, FileText } from 'lucide-react'
import { Button } from '@/components/ui/button'
import { Card, CardContent } from '@/components/ui/card'
import { Badge } from '@/components/ui/badge'
import { Input } from '@/components/ui/input'
import type { Order } from '@/lib/types'
const statusLabel: Record<string, string> = {
pending: 'Eingegangen',
active: 'In Bearbeitung',
completed: 'Abgeschlossen',
cancelled: 'Storniert',
rejected: 'Abgelehnt',
}
const statusClass: Record<string, string> = {
pending: 'bg-amber-500/20 text-amber-400 border-amber-500/30',
active: 'bg-green-500/20 text-green-400 border-green-500/30',
completed: 'bg-blue-500/20 text-blue-400 border-blue-500/30',
cancelled: 'bg-red-500/20 text-red-400 border-red-500/30',
rejected: 'bg-rose-500/20 text-rose-400 border-rose-500/30',
}
interface MyOrdersClientProps {
orders: Order[]
error: string | null
}
export function MyOrdersClient({ orders, error }: MyOrdersClientProps) {
const [searchTerm, setSearchTerm] = useState('')
const [currentPage, setCurrentPage] = useState(1)
const pageSize = 10
const fmt = (val: number) => new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(val)
// Volltextsuche filtern
const filteredOrders = useMemo(() => {
const term = searchTerm.toLowerCase().trim()
if (!term) return orders
return orders.filter(o => {
// Anfragenummer
if (o.order_number?.toString().toLowerCase().includes(term)) return true
// Status
const label = statusLabel[o.status] || o.status
if (label.toLowerCase().includes(term) || o.status.toLowerCase().includes(term)) return true
// Datum
const dateStr = new Date(o.created_at).toLocaleDateString('de-DE')
if (dateStr.includes(term)) return true
// Endkunde (Firma / Name)
const customer = (o as any).end_customer_data || o.order_data?.end_customer
if (customer) {
if (customer.company_name?.toLowerCase().includes(term)) return true
if (customer.first_name?.toLowerCase().includes(term)) return true
if (customer.last_name?.toLowerCase().includes(term)) return true
if (customer.customer_number?.toLowerCase().includes(term)) return true
}
// Notizen
if (o.notes?.toLowerCase().includes(term)) return true
// Kassen & Module
const items = o.order_data?.items ?? []
for (const item of items) {
if (item.device_name?.toLowerCase().includes(term)) return true
if (item.product_name?.toLowerCase().includes(term)) return true
if (item.license_number?.toLowerCase().includes(term)) return true
for (const mod of item.selected_modules ?? []) {
if (mod.module_name?.toLowerCase().includes(term)) return true
}
}
return false
})
}, [orders, searchTerm])
// Paginierung berechnen
const totalPages = Math.ceil(filteredOrders.length / pageSize) || 1
const paginatedOrders = useMemo(() => {
const start = (currentPage - 1) * pageSize
return filteredOrders.slice(start, start + pageSize)
}, [filteredOrders, currentPage, pageSize])
const handleSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setSearchTerm(e.target.value)
setCurrentPage(1)
}
return (
<div className="min-h-screen bg-[#020617] text-white px-4 py-12">
<div className="max-w-5xl mx-auto space-y-8">
{/* Header */}
<div className="flex items-center justify-between gap-4 flex-wrap">
<div className="flex items-center gap-4">
<Link href="/">
<Button variant="ghost" size="sm" className="text-slate-400 hover:text-white">
<ArrowLeft className="w-4 h-4 mr-2" /> Startseite
</Button>
</Link>
<div>
<h1 className="text-3xl font-extrabold tracking-tight flex items-center gap-3">
<ShoppingBag className="w-8 h-8 text-primary" />
Meine Anfragen
</h1>
<p className="text-slate-400 text-sm mt-1">
Alle Ihre Bestellungen und Konfigurationen auf einen Blick.
</p>
</div>
</div>
<Link href="/order">
<Button className="bg-primary hover:bg-primary/90 text-white font-bold gap-2 shadow-[0_0_20px_rgba(59,130,246,0.3)]">
+ Neue Anfrage erstellen
</Button>
</Link>
</div>
{/* Suche & Statistik */}
<div className="flex flex-col sm:flex-row gap-4 justify-between items-stretch sm:items-center">
<div className="relative flex-1">
<Search className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-slate-400" />
<Input
type="text"
placeholder="Suchen nach Anfragenr., Kunde, Kasse, Produkt, Lizenz..."
value={searchTerm}
onChange={handleSearchChange}
className="pl-10 bg-slate-900/80 border-white/10 text-white placeholder:text-slate-500 rounded-xl h-11 text-sm focus:border-primary"
/>
</div>
<div className="text-xs text-slate-400 bg-slate-900/50 px-4 py-2.5 rounded-xl border border-white/10 shrink-0 text-center flex items-center justify-center gap-2">
<span>Anfragen:</span>
<span className="text-white font-bold text-sm">{filteredOrders.length}</span>
{searchTerm && <span className="text-slate-500">(gefiltert aus {orders.length})</span>}
</div>
</div>
{/* Fehler */}
{error && (
<div className="bg-red-500/10 border border-red-500/20 text-red-400 rounded-xl p-4 text-sm">
Fehler beim Laden der Anfragen: {error}
</div>
)}
{/* Keine Anfragen (aus DB) */}
{!error && orders.length === 0 && (
<Card className="glass-dark border-white/10">
<CardContent className="flex flex-col items-center justify-center py-16 gap-4">
<Package className="w-12 h-12 text-slate-600" />
<p className="text-slate-400 text-lg">Sie haben noch keine Anfragen aufgegeben.</p>
<Link href="/order">
<Button>Jetzt konfigurieren</Button>
</Link>
</CardContent>
</Card>
)}
{/* Keine Treffer nach Suche */}
{!error && orders.length > 0 && filteredOrders.length === 0 && (
<Card className="glass-dark border-white/10">
<CardContent className="flex flex-col items-center justify-center py-12 gap-3 text-center">
<Search className="w-10 h-10 text-slate-600" />
<p className="text-slate-300 font-medium">Keine Anfragen für &quot;{searchTerm}&quot; gefunden.</p>
<Button variant="outline" size="sm" onClick={() => setSearchTerm('')} className="border-white/10 text-xs">
Filter zurücksetzen
</Button>
</CardContent>
</Card>
)}
{/* Anfragenliste */}
{paginatedOrders.length > 0 && (
<div className="space-y-4">
{paginatedOrders.map((o) => {
const items = o.order_data?.items ?? []
const customer = (o as any).end_customer_data || o.order_data?.end_customer
return (
<Card key={o.id} className="glass-dark border-white/10 hover:border-white/20 transition-all duration-300 rounded-2xl overflow-hidden shadow-xl">
<CardContent className="p-6 space-y-5">
{/* Header-Zeile der Karte */}
<div className="flex items-start justify-between gap-4 flex-wrap pb-4 border-b border-white/5">
<div className="space-y-1">
<div className="flex items-center gap-2">
<span className="text-xs text-slate-500 uppercase tracking-wider font-semibold">Anfragenummer</span>
<Badge className={statusClass[o.status] ?? 'bg-slate-500/20 text-slate-300'}>
{statusLabel[o.status] ?? o.status}
</Badge>
</div>
<p className="font-mono font-extrabold text-primary text-xl">#{o.order_number}</p>
</div>
{/* Endkunde Details (falls vorhanden) */}
{customer && (
<div className="bg-white/5 border border-white/10 rounded-xl p-2.5 px-3 flex items-center gap-3">
<Building2 className="w-4 h-4 text-sky-400 shrink-0" />
<div className="text-xs">
<p className="text-white font-bold">{customer.company_name || `${customer.first_name} ${customer.last_name}`}</p>
{(customer.first_name || customer.city) && (
<p className="text-slate-400 text-[11px]">
{[customer.first_name && customer.last_name ? `${customer.first_name} ${customer.last_name}` : null, customer.city].filter(Boolean).join(' · ')}
</p>
)}
</div>
</div>
)}
<div className="space-y-1 text-right ml-auto">
<p className="text-xs text-slate-500 uppercase tracking-wider font-semibold">Datum & Preis</p>
<p className="text-slate-300 text-xs">
{new Date(o.created_at).toLocaleDateString('de-DE', {
day: '2-digit', month: '2-digit', year: 'numeric',
})}
</p>
<p className="font-extrabold text-white text-lg">
{fmt(o.total_price)}
</p>
</div>
</div>
{/* Kassen & Produkte Detail-Übersicht */}
{items.length > 0 && (
<div className="space-y-2">
<p className="text-[11px] font-bold uppercase tracking-wider text-slate-400 flex items-center gap-1.5">
<Monitor className="w-3.5 h-3.5 text-primary" />
Enthaltene Kassen ({items.length}):
</p>
<div className="grid grid-cols-1 md:grid-cols-2 gap-2.5">
{items.map((item, idx) => (
<div
key={idx}
className="bg-slate-900/60 border border-white/10 rounded-xl p-3 space-y-1.5 text-xs"
>
<div className="flex items-center justify-between gap-2">
<span className="font-bold text-white flex items-center gap-1.5">
<Monitor className="w-3.5 h-3.5 text-sky-400 shrink-0" />
{item.device_name || `Kasse ${idx + 1}`}
</span>
<span className={`text-[9px] px-1.5 py-0.2 rounded border ${item.billing_interval === 'one_time' ? 'border-amber-500/30 text-amber-400 bg-amber-500/10' : 'border-emerald-500/30 text-emerald-400 bg-emerald-500/10'} font-semibold uppercase`}>
{item.billing_interval === 'one_time' ? 'Kauf' : 'Abo'}
</span>
</div>
<p className="text-slate-300 font-medium">{item.product_name}</p>
{item.license_number && (
<p className="text-[10px] text-slate-400 font-mono">Lizenz: {item.license_number}</p>
)}
{item.selected_modules && item.selected_modules.length > 0 && (
<div className="pt-1 border-t border-white/5 flex flex-wrap gap-1">
{item.selected_modules.map((mod: any, mIdx: number) => (
<span key={mIdx} className="text-[10px] bg-white/5 text-slate-400 px-1.5 py-0.5 rounded border border-white/5">
+ {mod.module_name || mod.name} {mod.quantity > 1 ? `(${mod.quantity}x)` : ''}
</span>
))}
</div>
)}
</div>
))}
</div>
</div>
)}
{/* Notizen (falls vorhanden) */}
{o.notes && (
<div className="bg-slate-900/40 p-2.5 rounded-xl border border-white/5 text-xs text-slate-400 flex items-start gap-2">
<FileText className="w-3.5 h-3.5 text-slate-500 shrink-0 mt-0.5" />
<p><span className="font-semibold text-slate-300">Anmerkungen:</span> {o.notes}</p>
</div>
)}
{/* Aktionsleiste */}
<div className="flex gap-2 flex-wrap pt-2 border-t border-white/5 items-center justify-between">
<div className="flex gap-2 flex-wrap">
<Link href={`/order/success?id=${o.id}`}>
<Button variant="outline" size="sm" className="border-white/10 hover:bg-white/10 text-xs font-bold rounded-xl h-8">
Details ansehen
</Button>
</Link>
{o.status !== 'completed' && (
<Link href={`/order?id=${o.id}`}>
<Button variant="outline" size="sm" className="border-amber-500/30 hover:bg-amber-500/10 hover:border-amber-500/50 text-amber-400 text-xs font-bold gap-1 rounded-xl h-8">
<RefreshCw className="w-3 h-3" /> Konfiguration bearbeiten
</Button>
</Link>
)}
</div>
{o.pdf_url && (
<div className="flex gap-1">
<Button variant="ghost" size="sm" asChild className="text-xs text-slate-400 hover:text-white h-8">
<a href={`/api/orders/${o.id}/download?inline=true`} target="_blank" rel="noopener noreferrer">
<ExternalLink className="w-3.5 h-3.5 mr-1" /> PDF Ansehen
</a>
</Button>
<Button variant="ghost" size="sm" asChild className="text-xs text-slate-400 hover:text-white h-8">
<a href={`/api/orders/${o.id}/download`} download>
<Download className="w-3.5 h-3.5 mr-1" /> Download
</a>
</Button>
</div>
)}
</div>
</CardContent>
</Card>
)
})}
</div>
)}
{/* Paginierung (10 pro Seite) */}
{totalPages > 1 && (
<div className="flex items-center justify-between pt-4 border-t border-white/10">
<span className="text-xs text-slate-400">
Seite <span className="text-white font-bold">{currentPage}</span> von <span className="text-white font-bold">{totalPages}</span>
</span>
<div className="flex items-center gap-2">
<Button
variant="outline"
size="sm"
onClick={() => setCurrentPage(p => Math.max(1, p - 1))}
disabled={currentPage === 1}
className="border-white/10 text-xs gap-1 rounded-xl"
>
<ChevronLeft className="w-4 h-4" /> Vorherige
</Button>
<Button
variant="outline"
size="sm"
onClick={() => setCurrentPage(p => Math.min(totalPages, p + 1))}
disabled={currentPage === totalPages}
className="border-white/10 text-xs gap-1 rounded-xl"
>
Nächste <ChevronRight className="w-4 h-4" />
</Button>
</div>
</div>
)}
</div>
</div>
)
}

View File

@@ -1,27 +1,7 @@
import { createClient } from '@/lib/supabase/server' import { createClient } from '@/lib/supabase/server'
import { redirect } from 'next/navigation' import { redirect } from 'next/navigation'
import Link from 'next/link'
import { Download, ExternalLink, ShoppingBag, ArrowLeft, Package } from 'lucide-react'
import { Button } from '@/components/ui/button'
import { Card, CardContent } from '@/components/ui/card'
import { Badge } from '@/components/ui/badge'
import type { Order } from '@/lib/types' import type { Order } from '@/lib/types'
import { MyOrdersClient } from './MyOrdersClient'
const statusLabel: Record<string, string> = {
pending: 'Eingegangen',
active: 'In Bearbeitung',
completed: 'Abgeschlossen',
cancelled: 'Storniert',
rejected: 'Abgelehnt',
}
const statusClass: Record<string, string> = {
pending: 'bg-amber-500/20 text-amber-400 border-amber-500/30',
active: 'bg-green-500/20 text-green-400 border-green-500/30',
completed: 'bg-blue-500/20 text-blue-400 border-blue-500/30',
cancelled: 'bg-red-500/20 text-red-400 border-red-500/30',
rejected: 'bg-rose-500/20 text-rose-400 border-rose-500/30',
}
export default async function MyOrdersPage() { export default async function MyOrdersPage() {
const supabase = await createClient() const supabase = await createClient()
@@ -47,137 +27,9 @@ export default async function MyOrdersPage() {
const { data: orders, error } = await query.order('created_at', { ascending: false }) const { data: orders, error } = await query.order('created_at', { ascending: false })
return ( return (
<div className="min-h-screen bg-[#020617] text-white px-4 py-12"> <MyOrdersClient
<div className="max-w-4xl mx-auto space-y-8"> orders={(orders as Order[]) || []}
{/* Header */} error={error ? error.message : null}
<div className="flex items-center gap-4"> />
<Link href="/">
<Button variant="ghost" size="sm" className="text-slate-400 hover:text-white">
<ArrowLeft className="w-4 h-4 mr-2" /> Startseite
</Button>
</Link>
<div>
<h1 className="text-3xl font-extrabold tracking-tight flex items-center gap-3">
<ShoppingBag className="w-8 h-8 text-primary" />
Meine Anfragen
</h1>
<p className="text-slate-400 text-sm mt-1">
Alle Ihre Anfragen auf einen Blick inkl. aktuellem Status.
</p>
</div>
</div>
{/* Fehler */}
{error && (
<div className="bg-red-500/10 border border-red-500/20 text-red-400 rounded-xl p-4 text-sm">
Fehler beim Laden der Anfragen: {error.message}
</div>
)}
{/* Keine Anfragen */}
{!error && (!orders || orders.length === 0) && (
<Card className="glass-dark border-white/10">
<CardContent className="flex flex-col items-center justify-center py-16 gap-4">
<Package className="w-12 h-12 text-slate-600" />
<p className="text-slate-400 text-lg">Sie haben noch keine Anfragen aufgegeben.</p>
<Link href="/order">
<Button>Jetzt konfigurieren</Button>
</Link>
</CardContent>
</Card>
)}
{/* Anfragenliste */}
<div className="space-y-4">
{(orders ?? []).map((order) => {
const o = order as Order
const items = o.order_data?.items ?? []
return (
<Card key={o.id} className="glass-dark border-white/10 hover:border-white/20 transition-colors">
<CardContent className="p-6 space-y-4">
{/* Kopfzeile */}
<div className="flex items-start justify-between gap-4 flex-wrap">
<div className="space-y-1">
<p className="text-xs text-slate-500 uppercase tracking-wider">Anfragenummer</p>
<p className="font-mono font-bold text-primary text-lg">#{o.order_number}</p>
</div>
<div className="space-y-1 text-right">
<p className="text-xs text-slate-500 uppercase tracking-wider">Datum</p>
<p className="text-white text-sm">
{new Date(o.created_at).toLocaleDateString('de-DE', {
day: '2-digit', month: '2-digit', year: 'numeric',
})}
</p>
</div>
<div className="space-y-1">
<p className="text-xs text-slate-500 uppercase tracking-wider">Status</p>
<Badge className={statusClass[o.status] ?? 'bg-slate-500/20 text-slate-300'}>
{statusLabel[o.status] ?? o.status}
</Badge>
</div>
<div className="space-y-1 text-right">
<p className="text-xs text-slate-500 uppercase tracking-wider">Gesamt</p>
<p className="font-bold text-white text-lg">
{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(o.total_price)}
</p>
</div>
</div>
{/* Produkte kurz */}
{items.length > 0 && (
<div className="flex flex-wrap gap-2">
{items.map((item, idx) => (
<span
key={idx}
className="text-xs bg-white/5 border border-white/10 rounded-xl px-3 py-1.5 text-slate-300"
>
<span className="font-semibold text-white mr-1">{item.device_name || 'Kasse'}:</span>
{item.product_name}
{item.selected_modules.length > 0 && (
<span className="text-slate-500 ml-1">
(+{item.selected_modules.length} {item.selected_modules.length === 1 ? 'Modul' : 'Module'})
</span>
)}
</span>
))}
</div>
)}
{/* Aktionen */}
<div className="flex gap-2 flex-wrap pt-1">
<Link href={`/order/success?id=${o.id}`}>
<Button variant="outline" size="sm" className="border-white/10 hover:bg-white/10 text-xs">
Details ansehen
</Button>
</Link>
{o.status !== 'completed' && (
<Link href={`/order?id=${o.id}`}>
<Button variant="outline" size="sm" className="border-amber-500/20 hover:bg-amber-500/10 hover:border-amber-500/40 text-amber-400 text-xs">
Bearbeiten
</Button>
</Link>
)}
{o.pdf_url && (
<>
<Button variant="ghost" size="sm" asChild className="text-xs text-slate-400 hover:text-white">
<a href={`/api/orders/${o.id}/download?inline=true`} target="_blank" rel="noopener noreferrer">
<ExternalLink className="w-3 h-3 mr-1" /> Anfrage ansehen
</a>
</Button>
<Button variant="ghost" size="sm" asChild className="text-xs text-slate-400 hover:text-white">
<a href={`/api/orders/${o.id}/download`} download>
<Download className="w-3 h-3 mr-1" /> PDF
</a>
</Button>
</>
)}
</div>
</CardContent>
</Card>
)
})}
</div>
</div>
</div>
) )
} }

View File

@@ -138,6 +138,10 @@ async function OrderDataWrapper({
companies = await getCompanies().catch(() => []) companies = await getCompanies().catch(() => [])
} }
const initialLastLicenseDate = initialOrder
? (initialOrder.order_data?.last_license_date || (initialOrder.created_at ? new Date(initialOrder.created_at).toISOString().split('T')[0] : ''))
: ''
return ( return (
<OrderWizard <OrderWizard
products={products} products={products}
@@ -150,6 +154,7 @@ async function OrderDataWrapper({
upgradeMode={mode === 'upgrade'} upgradeMode={mode === 'upgrade'}
initialEndCustomerId={customerId || null} initialEndCustomerId={customerId || null}
lockedDeviceId={deviceId ? decodeURIComponent(deviceId) : null} lockedDeviceId={deviceId ? decodeURIComponent(deviceId) : null}
initialLastLicenseDate={initialLastLicenseDate}
/> />
) )
} }

View File

@@ -120,14 +120,15 @@ function DeviceCard({
</p> </p>
</div> </div>
{/* Upgrade / Abo Button */} {/* Update / Upgrade Button für Kasse */}
<Link href={upgradeUrl}> <Link href={upgradeUrl}>
<Button <Button
size="sm" size="sm"
className="bg-primary/20 hover:bg-primary/30 text-primary border border-primary/30 text-xs font-semibold gap-1.5" className="bg-sky-500/20 hover:bg-sky-500/30 text-sky-300 border border-sky-500/40 text-xs font-bold gap-1.5 shadow-[0_0_12px_rgba(56,189,248,0.2)]"
title="Kasse updaten oder upgraden (Erstelldatum wird für den Update-Rabatt genutzt)"
> >
<Sparkles className="w-3.5 h-3.5" /> <Sparkles className="w-3.5 h-3.5 text-sky-400" />
Upgrade / Abo Update / Upgrade
</Button> </Button>
</Link> </Link>
@@ -272,6 +273,18 @@ export function CustomerAccordionList({ customers }: CustomerAccordionListProps)
</Badge> </Badge>
{!customer.is_anonymized && ( {!customer.is_anonymized && (
<>
<Link
href={`/order?customer_id=${customer.id}`}
onClick={(e) => e.stopPropagation()}
>
<Button
size="sm"
className="bg-primary/20 hover:bg-primary/30 text-primary border border-primary/40 gap-1.5 text-xs font-bold shadow-[0_0_10px_rgba(59,130,246,0.2)]"
>
<Sparkles className="w-3.5 h-3.5" /> Kunde updaten / bestellen
</Button>
</Link>
<Link <Link
href={`/my-customers/${customer.id}`} href={`/my-customers/${customer.id}`}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
@@ -284,6 +297,7 @@ export function CustomerAccordionList({ customers }: CustomerAccordionListProps)
<Edit2 className="w-3.5 h-3.5" /> Bearbeiten <Edit2 className="w-3.5 h-3.5" /> Bearbeiten
</Button> </Button>
</Link> </Link>
</>
)} )}
<Button <Button

View File

@@ -94,7 +94,14 @@ const styles = StyleSheet.create({
} }
}); });
export const InvoicePDF = ({ order, orderSnapshot, customer }: any) => { export const InvoicePDF = ({
order,
orderSnapshot,
customer,
partnerCompanyName,
partnerUserName,
partnerUserEmail,
}: any) => {
const items = orderSnapshot?.items ?? []; const items = orderSnapshot?.items ?? [];
const taxRate = orderSnapshot?.tax_rate ?? 19; const taxRate = orderSnapshot?.tax_rate ?? 19;
const isSubscription = order?.type === 'subscription' || orderSnapshot?.billing_cycle === 'monthly'; const isSubscription = order?.type === 'subscription' || orderSnapshot?.billing_cycle === 'monthly';
@@ -112,7 +119,6 @@ export const InvoicePDF = ({ order, orderSnapshot, customer }: any) => {
item.selected_modules?.forEach((mod: any) => { item.selected_modules?.forEach((mod: any) => {
const qty = mod.quantity || 1; const qty = mod.quantity || 1;
const price = mod.total_price ?? (mod.price * qty); const price = mod.total_price ?? (mod.price * qty);
// Module sind monatliche wiederkehrende Beträge (Abo/Miete)
monthlyNet += price; monthlyNet += price;
}); });
}); });
@@ -135,6 +141,10 @@ export const InvoicePDF = ({ order, orderSnapshot, customer }: any) => {
groupedItems[devName].push(item); groupedItems[devName].push(item);
}); });
const displayPartnerName = partnerCompanyName || order?.partner_company_name;
const displayUserName = partnerUserName || order?.partner_user_name;
const displayUserEmail = partnerUserEmail || order?.partner_user_email;
return ( return (
<Document> <Document>
<Page size="A4" style={styles.page}> <Page size="A4" style={styles.page}>
@@ -155,20 +165,31 @@ export const InvoicePDF = ({ order, orderSnapshot, customer }: any) => {
Anfragebestätigung: {order.order_number || order.id} Anfragebestätigung: {order.order_number || order.id}
</Text> </Text>
<View style={styles.section}> <View style={{ flexDirection: 'row', justifyContent: 'space-between', marginBottom: 15 }}>
<Text style={styles.label}>Kunde</Text> <View style={{ width: '48%' }}>
<Text>{customer.company_name}</Text> <Text style={styles.label}>Endkunde</Text>
<Text>{customer.first_name} {customer.last_name}</Text> <Text style={{ fontWeight: 'bold' }}>{customer.company_name}</Text>
<Text>{customer.address}</Text> {customer.first_name || customer.last_name ? <Text>{customer.first_name} {customer.last_name}</Text> : null}
<Text>{customer.zip_code} {customer.city}</Text> {customer.address ? <Text>{customer.address}</Text> : null}
<Text>USt-IdNr: {customer.vat_id}</Text> {customer.zip_code || customer.city ? <Text>{customer.zip_code} {customer.city}</Text> : null}
{customer.vat_id ? <Text>USt-IdNr: {customer.vat_id}</Text> : null}
</View> </View>
<View style={styles.section}> <View style={{ width: '48%' }}>
<Text style={styles.label}>Bestelldetails</Text> <Text style={styles.label}>Bestelldetails</Text>
<Text>Bestellnummer: {order.order_number || order.id}</Text> <Text>Bestellnummer: {order.order_number || order.id}</Text>
<Text>Zahlungsart: {isSubscription ? 'SEPA-Lastschrift' : 'Rechnung'}</Text> <Text>Zahlungsart: {isSubscription ? 'SEPA-Lastschrift' : 'Rechnung'}</Text>
<Text>Datum: {new Date(order.created_at || Date.now()).toLocaleDateString('de-DE')}</Text> <Text>Datum: {new Date(order.created_at || Date.now()).toLocaleDateString('de-DE')}</Text>
{(displayPartnerName || displayUserName || displayUserEmail) && (
<View style={{ marginTop: 6, paddingTop: 6, borderTopWidth: 1, borderColor: '#eee' }}>
<Text style={styles.label}>Erstellt durch Partner / User</Text>
{displayPartnerName ? <Text style={{ fontWeight: 'bold' }}>Partner: {displayPartnerName}</Text> : null}
{displayUserName ? <Text>Erstellt von: {displayUserName}</Text> : null}
{displayUserEmail ? <Text>E-Mail: {displayUserEmail}</Text> : null}
</View>
)}
</View>
</View> </View>
<View style={{ marginTop: 10, marginBottom: 15 }}> <View style={{ marginTop: 10, marginBottom: 15 }}>

View File

@@ -79,6 +79,7 @@ export function OrderWizard({
upgradeMode = false, upgradeMode = false,
initialEndCustomerId = null, initialEndCustomerId = null,
lockedDeviceId = null, lockedDeviceId = null,
initialLastLicenseDate = '',
}: { }: {
products: Product[] products: Product[]
categories: Category[] categories: Category[]
@@ -90,6 +91,7 @@ export function OrderWizard({
upgradeMode?: boolean upgradeMode?: boolean
initialEndCustomerId?: string | null initialEndCustomerId?: string | null
lockedDeviceId?: string | null lockedDeviceId?: string | null
initialLastLicenseDate?: string
}) { }) {
const router = useRouter() const router = useRouter()
// Upgrade-Mode: starte direkt bei Schritt 3 (Software) // Upgrade-Mode: starte direkt bei Schritt 3 (Software)
@@ -214,7 +216,7 @@ export function OrderWizard({
// Falls "one_time" (Kauf) gewählt: optionales Datum der letzten CASPOS-Lizenzierung // Falls "one_time" (Kauf) gewählt: optionales Datum der letzten CASPOS-Lizenzierung
const [lastLicenseDate, setLastLicenseDate] = useState<string>( const [lastLicenseDate, setLastLicenseDate] = useState<string>(
initialOrder?.order_data?.last_license_date || '' initialLastLicenseDate || initialOrder?.order_data?.last_license_date || ''
) )
// Aktive Auswahllisten initialisieren // Aktive Auswahllisten initialisieren
@@ -718,13 +720,19 @@ export function OrderWizard({
resetSels[cat.id] = { productId: first?.id ?? null, productIds: first ? [first.id] : [], moduleIds: [] } resetSels[cat.id] = { productId: first?.id ?? null, productIds: first ? [first.id] : [], moduleIds: [] }
} }
}) })
setSelections(resetSels)
} else if (editingIdx !== null && idx < editingIdx) { } else if (editingIdx !== null && idx < editingIdx) {
setEditingIdx(editingIdx - 1) setEditingIdx(editingIdx - 1)
} }
setBasketItems(prev => prev.filter((_, i) => i !== idx)) setBasketItems(prev => prev.filter((_, i) => i !== idx))
} }
const handleDeleteFromSummary = (idx: number) => {
deleteBasketItem(idx)
if (basketItems.length - 1 <= 0) {
router.push('/')
}
}
const handleSubmit = async () => { const handleSubmit = async () => {
if (isSubmitting) return if (isSubmitting) return
setIsSubmitting(true) setIsSubmitting(true)
@@ -796,6 +804,14 @@ export function OrderWizard({
const result = await res.json() const result = await res.json()
if (result.error) throw new Error(result.error) if (result.error) throw new Error(result.error)
// Warenkorb & Konfigurations-State vollständig leeren
setBasketItems([])
setEditingIdx(null)
setDeviceName('')
setLicenseNumber('')
setOrderNotes('')
setModuleQuantities({})
const firstOrderId = result.orders?.[0]?.id const firstOrderId = result.orders?.[0]?.id
if (firstOrderId) { if (firstOrderId) {
router.push(`/order/success?id=${firstOrderId}`) router.push(`/order/success?id=${firstOrderId}`)
@@ -1129,6 +1145,7 @@ export function OrderWizard({
setOrderNotes={setOrderNotes} setOrderNotes={setOrderNotes}
onEditBasketItem={handleEditFromSummary} onEditBasketItem={handleEditFromSummary}
onAddNewBasketItem={handleAddAnotherFromSummary} onAddNewBasketItem={handleAddAnotherFromSummary}
onDeleteBasketItem={handleDeleteFromSummary}
/> />
</motion.div> </motion.div>
)} )}

View File

@@ -34,6 +34,7 @@ interface StepSummaryProps {
setOrderNotes: (notes: string) => void setOrderNotes: (notes: string) => void
onEditBasketItem?: (idx: number) => void onEditBasketItem?: (idx: number) => void
onAddNewBasketItem?: () => void onAddNewBasketItem?: () => void
onDeleteBasketItem?: (idx: number) => void
} }
function CategoryIcon({ icon, className }: { icon?: string | null; className?: string }) { function CategoryIcon({ icon, className }: { icon?: string | null; className?: string }) {
@@ -67,6 +68,7 @@ export function StepSummary({
setOrderNotes, setOrderNotes,
onEditBasketItem, onEditBasketItem,
onAddNewBasketItem, onAddNewBasketItem,
onDeleteBasketItem,
}: StepSummaryProps) { }: StepSummaryProps) {
return ( return (
<div className="grid grid-cols-1 lg:grid-cols-12 gap-6 h-full items-stretch text-left"> <div className="grid grid-cols-1 lg:grid-cols-12 gap-6 h-full items-stretch text-left">
@@ -206,6 +208,21 @@ export function StepSummary({
<Icons.Pencil className="w-3 h-3" /> Bearbeiten <Icons.Pencil className="w-3 h-3" /> Bearbeiten
</Button> </Button>
)} )}
{onDeleteBasketItem && (
<Button
type="button"
variant="ghost"
size="sm"
onClick={(e) => {
e.stopPropagation()
onDeleteBasketItem(itemIdx)
}}
className="h-7 px-2 text-xs text-slate-400 hover:text-red-400 hover:bg-red-500/20 gap-1 rounded-lg"
title="Kasse löschen"
>
<Icons.Trash2 className="w-3 h-3" /> Löschen
</Button>
)}
</div> </div>
</div> </div>

View File

@@ -16,6 +16,30 @@ import { getOrderEmailTemplate, getStatusEmailTemplate, buildEmailItemsSection }
// ─── Hilfsfunktionen ───────────────────────────────────────────────────────── // ─── Hilfsfunktionen ─────────────────────────────────────────────────────────
async function fetchOrderPartnerInfo(adminClient: any, companyId: string | null, userId: string | null) {
let partnerCompanyName = ''
let partnerUserName = ''
let partnerUserEmail = ''
if (companyId) {
const { data: comp } = await adminClient.from('companies').select('name').eq('id', companyId).single()
if (comp) partnerCompanyName = comp.name
}
if (userId) {
const { data: dbUser } = await adminClient.from('users').select('first_name, last_name, email, role').eq('id', userId).single()
if (dbUser) {
partnerUserName = [dbUser.first_name, dbUser.last_name].filter(Boolean).join(' ')
partnerUserEmail = dbUser.email || ''
if (!partnerCompanyName && (dbUser.role === 'admin' || dbUser.role === 'verwaltung')) {
partnerCompanyName = 'Administrator / Direktbestellung'
}
}
}
return { partnerCompanyName, partnerUserName, partnerUserEmail }
}
/** /**
@@ -164,6 +188,9 @@ export async function submitOrder(params: {
order, order,
customer: customerSnapshot, customer: customerSnapshot,
orderSnapshot, orderSnapshot,
partnerCompanyName,
partnerUserName,
partnerUserEmail,
}) })
) )
@@ -382,6 +409,8 @@ export async function updateOrderStatus(
throw new Error(`Fehler beim Aktualisieren des Status: ${updateError?.message || 'Unbekannt'}`) throw new Error(`Fehler beim Aktualisieren des Status: ${updateError?.message || 'Unbekannt'}`)
} }
const partnerInfo = await fetchOrderPartnerInfo(admin, updatedOrder.company_id, updatedOrder.user_id)
// 3. Wenn Status auf 'active' oder 'approved' wechselt, generiere PDF und lade es hoch (pdf-invoice-generator) // 3. Wenn Status auf 'active' oder 'approved' wechselt, generiere PDF und lade es hoch (pdf-invoice-generator)
let attachmentBuffer: Buffer | null = null let attachmentBuffer: Buffer | null = null
if (newStatus === 'active' || newStatus === 'approved') { if (newStatus === 'active' || newStatus === 'approved') {
@@ -394,6 +423,9 @@ export async function updateOrderStatus(
order: updatedOrder, order: updatedOrder,
customer: customerSnapshot, customer: customerSnapshot,
orderSnapshot, orderSnapshot,
partnerCompanyName: partnerInfo.partnerCompanyName,
partnerUserName: partnerInfo.partnerUserName,
partnerUserEmail: partnerInfo.partnerUserEmail,
}) })
) )
attachmentBuffer = buffer attachmentBuffer = buffer
@@ -751,6 +783,8 @@ export async function updateOrder(
if (orderError || !order) throw orderError || new Error('Fehler beim Aktualisieren der Bestellung.') if (orderError || !order) throw orderError || new Error('Fehler beim Aktualisieren der Bestellung.')
const partnerInfo = await fetchOrderPartnerInfo(admin, order.company_id, order.user_id)
// 3. PDF generieren und überschreiben // 3. PDF generieren und überschreiben
try { try {
const buffer = await renderToBuffer( const buffer = await renderToBuffer(
@@ -758,6 +792,9 @@ export async function updateOrder(
order, order,
customer: customerSnapshot, customer: customerSnapshot,
orderSnapshot, orderSnapshot,
partnerCompanyName: partnerInfo.partnerCompanyName,
partnerUserName: partnerInfo.partnerUserName,
partnerUserEmail: partnerInfo.partnerUserEmail,
}) })
) )

View File

@@ -137,6 +137,7 @@ export type OrderItem = {
selected_modules: OrderModuleSnapshot[] selected_modules: OrderModuleSnapshot[]
item_total: number item_total: number
device_name?: string device_name?: string
license_number?: string
} }
/** /**
@@ -152,6 +153,7 @@ export type OrderSnapshot = {
total: number total: number
last_license_date?: string | null last_license_date?: string | null
price_multiplier?: number | null price_multiplier?: number | null
end_customer?: any
} }
// ─── DB-Zeile (orders-Tabelle) ──────────────────────────────────────────────── // ─── DB-Zeile (orders-Tabelle) ────────────────────────────────────────────────
@@ -169,6 +171,8 @@ export type Order = {
pdf_url: string | null pdf_url: string | null
status: 'pending' | 'active' | 'completed' | 'cancelled' | 'rejected' status: 'pending' | 'active' | 'completed' | 'cancelled' | 'rejected'
created_at: string created_at: string
end_customer_data?: any
notes?: string | null
} }
export type OrderWithRegisterName = Order & { export type OrderWithRegisterName = Order & {