Daniel/webshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add unique license number check for devices

Browse Source
This commit is contained in:
DanielS
2026-08-10 23:37:09 +02:00
parent 60b9bd89ef
commit af261ce923
5 changed files with 103 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shop/app/actions/checkout.ts
View File

@@ -262,7 +262,8 @@ export async function checkoutAction(params: {
);
const itemsWithDevice = itemSnapshot.items.map(i => ({
...i,
device_name: item.deviceName
device_name: item.deviceName,
license_number: item.licenseNumber
}));
orderItemsList.push(...itemsWithDevice);
total += itemSnapshot.total;

3
shop/app/api/orders/checkout/route.ts
View File

@@ -90,7 +90,8 @@ export async function POST(request: Request) {
);
const itemsWithDevice = itemSnapshot.items.map(i => ({
...i,
device_name: item.deviceName
device_name: item.deviceName,
license_number: item.licenseNumber
}));
orderItemsList.push(...itemsWithDevice);
total += itemSnapshot.total;

57
shop/components/order-wizard.tsx
View File

@@ -6,6 +6,7 @@ import { AnimatePresence, motion } from 'framer-motion'
import { Product, ProductModule, Profile, EndCustomer, Order } from '@/lib/types'
import { submitOrder, updateOrder } from '@/lib/actions/orders'
import { createEndCustomer } from '@/lib/actions/end-customers'
import { isLicenseNumberTaken } from '@/lib/actions/queries'
import { Category } from '@/lib/types'
import { Check } from 'lucide-react'
@@ -166,6 +167,7 @@ export function OrderWizard({
if (upgradeMode && lockedDeviceId) return `${lockedDeviceId} – Upgrade`
return ''
})
const [licenseNumber, setLicenseNumber] = useState<string>('')
const [editingIdx, setEditingIdx] = useState<number | null>(null)
const [orderNotes, setOrderNotes] = useState<string>('')
const [toast, setToast] = useState<{ message: string; type: 'error' | 'success' } | null>(null)
@@ -593,9 +595,27 @@ export function OrderWizard({
}
}
const addToBasket = () => {
const addToBasket = async () => {
const normLicense = licenseNumber.trim().toUpperCase()
if (normLicense) {
const isDuplicateInBasket = basketItems.some(
(item, idx) => idx !== editingIdx && item.licenseNumber?.toUpperCase().trim() === normLicense
)
if (isDuplicateInBasket) {
setToast({ message: `Lizenznummer "${licenseNumber}" ist bereits im aktuellen Warenkorb vorhanden.`, type: 'error' })
return
}
const isTaken = await isLicenseNumberTaken(normLicense, initialOrder?.id)
if (isTaken) {
setToast({ message: `Lizenznummer "${licenseNumber}" wird bereits von einer anderen Bestellung verwendet.`, type: 'error' })
return
}
}
const currentItem = {
deviceName: deviceName || (editingIdx !== null ? basketItems[editingIdx]?.deviceName : `Kasse ${basketItems.length + 1}`),
licenseNumber: normLicense,
selections: JSON.parse(JSON.stringify(selections)),
moduleQuantities: { ...moduleQuantities },
billingInterval: selectedBillingInterval,
@@ -614,6 +634,7 @@ export function OrderWizard({
// Reset current form config
setDeviceName('')
setLicenseNumber('')
setModuleQuantities({})
const resetSels: Record<string, CategorySelection> = {}
categories.forEach(cat => {
@@ -636,6 +657,7 @@ export function OrderWizard({
setSelections(item.selections)
setModuleQuantities(item.moduleQuantities)
setDeviceName(item.deviceName)
setLicenseNumber(item.licenseNumber || '')
setSelectedBillingInterval(item.billingInterval)
}
@@ -644,6 +666,7 @@ export function OrderWizard({
setEditingIdx(null)
setModuleQuantities({})
setDeviceName('')
setLicenseNumber('')
const resetSels: Record<string, CategorySelection> = {}
categories.forEach(cat => {
@@ -668,8 +691,24 @@ export function OrderWizard({
try {
let finalItems = [...basketItems]
if (hasActiveSelection && allCategoriesFilled && productValidationErrors.length === 0) {
const normLicense = licenseNumber.trim().toUpperCase()
if (normLicense) {
const isDuplicateInBasket = basketItems.some(
(item, idx) => idx !== editingIdx && item.licenseNumber?.toUpperCase().trim() === normLicense
)
if (isDuplicateInBasket) {
throw new Error(`Lizenznummer "${licenseNumber}" ist bereits im aktuellen Warenkorb vorhanden.`)
}
const isTaken = await isLicenseNumberTaken(normLicense, initialOrder?.id)
if (isTaken) {
throw new Error(`Lizenznummer "${licenseNumber}" wird bereits von einer anderen Bestellung verwendet.`)
}
}
const currentItem = {
deviceName: deviceName || (editingIdx !== null ? basketItems[editingIdx]?.deviceName : `Kasse ${basketItems.length + 1}`),
licenseNumber: normLicense,
selections: JSON.parse(JSON.stringify(selections)),
moduleQuantities: { ...moduleQuantities },
billingInterval: selectedBillingInterval,
@@ -685,6 +724,20 @@ export function OrderWizard({
throw new Error('Bitte konfigurieren Sie mindestens eine Kasse.')
}
// Check all license numbers in finalItems for duplicates
const licenseNumbers = finalItems.map(item => item.licenseNumber?.toUpperCase().trim()).filter(Boolean)
const uniqueLicenses = new Set(licenseNumbers)
if (uniqueLicenses.size !== licenseNumbers.length) {
throw new Error('Eine Lizenznummer darf im Warenkorb nicht mehrfach verwendet werden.')
}
for (const lic of uniqueLicenses) {
const isTaken = await isLicenseNumberTaken(lic, initialOrder?.id)
if (isTaken) {
throw new Error(`Die Lizenznummer "${lic}" wird bereits von einer anderen Bestellung verwendet.`)
}
}
const res = await fetch('/api/orders/checkout', {
method: 'POST',
headers: {
@@ -1002,6 +1055,8 @@ export function OrderWizard({
deleteBasketItem={deleteBasketItem}
deviceName={deviceName}
setDeviceName={setDeviceName}
licenseNumber={licenseNumber}
setLicenseNumber={setLicenseNumber}
addToBasket={addToBasket}
isNextStepDisabled={isNextStepDisabled}
hasActiveSelection={hasActiveSelection}

19
shop/components/wizard/summary-sidebar.tsx
View File

@@ -32,6 +32,8 @@ interface SummarySidebarProps {
deleteBasketItem: (idx: number) => void
deviceName: string
setDeviceName: (name: string) => void
licenseNumber: string
setLicenseNumber: (num: string) => void
addToBasket: () => void
isNextStepDisabled: boolean
hasActiveSelection: boolean
@@ -62,6 +64,8 @@ export function SummarySidebar({
deleteBasketItem,
deviceName,
setDeviceName,
licenseNumber,
setLicenseNumber,
addToBasket,
isNextStepDisabled,
hasActiveSelection,
@@ -231,7 +235,10 @@ export function SummarySidebar({
<div key={idx} className={`flex justify-between items-center text-xs bg-white/5 p-2 rounded border transition-all duration-300 ${idx === editingIdx ? 'border-blue-500/50 shadow-[0_0_10px_rgba(59,130,246,0.3)]' : 'border-white/10'}`}>
<div className="flex flex-col">
<span className="text-white font-medium">{item.deviceName}</span>
<span className="text-[10px] text-slate-400 capitalize">{item.billingInterval === 'one_time' ? 'Kauf' : 'Abo'}</span>
<span className="text-[10px] text-slate-400 capitalize">
{item.billingInterval === 'one_time' ? 'Kauf' : 'Abo'}
{item.licenseNumber ? ` · Lizenz: ${item.licenseNumber}` : ''}
</span>
</div>
<div className="flex items-center gap-1.5">
<Button
@@ -272,6 +279,16 @@ export function SummarySidebar({
className="bg-white/5 border-white/10 text-white text-xs h-9 rounded-lg"
/>
</div>
<div className="w-full space-y-2">
<Label htmlFor="license-number" className="text-xs text-slate-400">Lizenznummer (optional)</Label>
<Input
id="license-number"
placeholder="z.B. LIZ-12345"
value={licenseNumber}
onChange={e => setLicenseNumber(e.target.value)}
className="bg-white/5 border-white/10 text-white text-xs h-9 rounded-lg"
/>
</div>
<Button
type="button"
variant="outline"

25
shop/lib/actions/queries.ts
View File

@@ -260,4 +260,29 @@ export async function getCustomersForWizard(
}
}
/**
* Checks if a license number is already taken by any active order.
*/
export async function isLicenseNumberTaken(licenseNumber: string, excludeOrderId?: string): Promise<boolean> {
const normalized = licenseNumber?.trim().toUpperCase()
if (!normalized) return false
const supabase = await createClient()
let query = supabase
.from('orders')
.select('id')
.contains('order_snapshot', { items: [{ license_number: normalized }] })
if (excludeOrderId) {
query = query.neq('id', excludeOrderId)
}
const { data, error } = await query
if (error) {
console.error('Error checking license number:', error)
return false
}
return !!(data && data.length > 0)
}