feat: add unique license number check for devices
This commit is contained in:
@@ -262,7 +262,8 @@ export async function checkoutAction(params: {
|
|||||||
);
|
);
|
||||||
const itemsWithDevice = itemSnapshot.items.map(i => ({
|
const itemsWithDevice = itemSnapshot.items.map(i => ({
|
||||||
...i,
|
...i,
|
||||||
device_name: item.deviceName
|
device_name: item.deviceName,
|
||||||
|
license_number: item.licenseNumber
|
||||||
}));
|
}));
|
||||||
orderItemsList.push(...itemsWithDevice);
|
orderItemsList.push(...itemsWithDevice);
|
||||||
total += itemSnapshot.total;
|
total += itemSnapshot.total;
|
||||||
|
|||||||
@@ -90,7 +90,8 @@ export async function POST(request: Request) {
|
|||||||
);
|
);
|
||||||
const itemsWithDevice = itemSnapshot.items.map(i => ({
|
const itemsWithDevice = itemSnapshot.items.map(i => ({
|
||||||
...i,
|
...i,
|
||||||
device_name: item.deviceName
|
device_name: item.deviceName,
|
||||||
|
license_number: item.licenseNumber
|
||||||
}));
|
}));
|
||||||
orderItemsList.push(...itemsWithDevice);
|
orderItemsList.push(...itemsWithDevice);
|
||||||
total += itemSnapshot.total;
|
total += itemSnapshot.total;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { AnimatePresence, motion } from 'framer-motion'
|
|||||||
import { Product, ProductModule, Profile, EndCustomer, Order } from '@/lib/types'
|
import { Product, ProductModule, Profile, EndCustomer, Order } from '@/lib/types'
|
||||||
import { submitOrder, updateOrder } from '@/lib/actions/orders'
|
import { submitOrder, updateOrder } from '@/lib/actions/orders'
|
||||||
import { createEndCustomer } from '@/lib/actions/end-customers'
|
import { createEndCustomer } from '@/lib/actions/end-customers'
|
||||||
|
import { isLicenseNumberTaken } from '@/lib/actions/queries'
|
||||||
import { Category } from '@/lib/types'
|
import { Category } from '@/lib/types'
|
||||||
import { Check } from 'lucide-react'
|
import { Check } from 'lucide-react'
|
||||||
|
|
||||||
@@ -166,6 +167,7 @@ export function OrderWizard({
|
|||||||
if (upgradeMode && lockedDeviceId) return `${lockedDeviceId} – Upgrade`
|
if (upgradeMode && lockedDeviceId) return `${lockedDeviceId} – Upgrade`
|
||||||
return ''
|
return ''
|
||||||
})
|
})
|
||||||
|
const [licenseNumber, setLicenseNumber] = useState<string>('')
|
||||||
const [editingIdx, setEditingIdx] = useState<number | null>(null)
|
const [editingIdx, setEditingIdx] = useState<number | null>(null)
|
||||||
const [orderNotes, setOrderNotes] = useState<string>('')
|
const [orderNotes, setOrderNotes] = useState<string>('')
|
||||||
const [toast, setToast] = useState<{ message: string; type: 'error' | 'success' } | null>(null)
|
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 = {
|
const currentItem = {
|
||||||
deviceName: deviceName || (editingIdx !== null ? basketItems[editingIdx]?.deviceName : `Kasse ${basketItems.length + 1}`),
|
deviceName: deviceName || (editingIdx !== null ? basketItems[editingIdx]?.deviceName : `Kasse ${basketItems.length + 1}`),
|
||||||
|
licenseNumber: normLicense,
|
||||||
selections: JSON.parse(JSON.stringify(selections)),
|
selections: JSON.parse(JSON.stringify(selections)),
|
||||||
moduleQuantities: { ...moduleQuantities },
|
moduleQuantities: { ...moduleQuantities },
|
||||||
billingInterval: selectedBillingInterval,
|
billingInterval: selectedBillingInterval,
|
||||||
@@ -614,6 +634,7 @@ export function OrderWizard({
|
|||||||
|
|
||||||
// Reset current form config
|
// Reset current form config
|
||||||
setDeviceName('')
|
setDeviceName('')
|
||||||
|
setLicenseNumber('')
|
||||||
setModuleQuantities({})
|
setModuleQuantities({})
|
||||||
const resetSels: Record<string, CategorySelection> = {}
|
const resetSels: Record<string, CategorySelection> = {}
|
||||||
categories.forEach(cat => {
|
categories.forEach(cat => {
|
||||||
@@ -636,6 +657,7 @@ export function OrderWizard({
|
|||||||
setSelections(item.selections)
|
setSelections(item.selections)
|
||||||
setModuleQuantities(item.moduleQuantities)
|
setModuleQuantities(item.moduleQuantities)
|
||||||
setDeviceName(item.deviceName)
|
setDeviceName(item.deviceName)
|
||||||
|
setLicenseNumber(item.licenseNumber || '')
|
||||||
setSelectedBillingInterval(item.billingInterval)
|
setSelectedBillingInterval(item.billingInterval)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -644,6 +666,7 @@ export function OrderWizard({
|
|||||||
setEditingIdx(null)
|
setEditingIdx(null)
|
||||||
setModuleQuantities({})
|
setModuleQuantities({})
|
||||||
setDeviceName('')
|
setDeviceName('')
|
||||||
|
setLicenseNumber('')
|
||||||
|
|
||||||
const resetSels: Record<string, CategorySelection> = {}
|
const resetSels: Record<string, CategorySelection> = {}
|
||||||
categories.forEach(cat => {
|
categories.forEach(cat => {
|
||||||
@@ -668,8 +691,24 @@ export function OrderWizard({
|
|||||||
try {
|
try {
|
||||||
let finalItems = [...basketItems]
|
let finalItems = [...basketItems]
|
||||||
if (hasActiveSelection && allCategoriesFilled && productValidationErrors.length === 0) {
|
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 = {
|
const currentItem = {
|
||||||
deviceName: deviceName || (editingIdx !== null ? basketItems[editingIdx]?.deviceName : `Kasse ${basketItems.length + 1}`),
|
deviceName: deviceName || (editingIdx !== null ? basketItems[editingIdx]?.deviceName : `Kasse ${basketItems.length + 1}`),
|
||||||
|
licenseNumber: normLicense,
|
||||||
selections: JSON.parse(JSON.stringify(selections)),
|
selections: JSON.parse(JSON.stringify(selections)),
|
||||||
moduleQuantities: { ...moduleQuantities },
|
moduleQuantities: { ...moduleQuantities },
|
||||||
billingInterval: selectedBillingInterval,
|
billingInterval: selectedBillingInterval,
|
||||||
@@ -685,6 +724,20 @@ export function OrderWizard({
|
|||||||
throw new Error('Bitte konfigurieren Sie mindestens eine Kasse.')
|
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', {
|
const res = await fetch('/api/orders/checkout', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
@@ -1002,6 +1055,8 @@ export function OrderWizard({
|
|||||||
deleteBasketItem={deleteBasketItem}
|
deleteBasketItem={deleteBasketItem}
|
||||||
deviceName={deviceName}
|
deviceName={deviceName}
|
||||||
setDeviceName={setDeviceName}
|
setDeviceName={setDeviceName}
|
||||||
|
licenseNumber={licenseNumber}
|
||||||
|
setLicenseNumber={setLicenseNumber}
|
||||||
addToBasket={addToBasket}
|
addToBasket={addToBasket}
|
||||||
isNextStepDisabled={isNextStepDisabled}
|
isNextStepDisabled={isNextStepDisabled}
|
||||||
hasActiveSelection={hasActiveSelection}
|
hasActiveSelection={hasActiveSelection}
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ interface SummarySidebarProps {
|
|||||||
deleteBasketItem: (idx: number) => void
|
deleteBasketItem: (idx: number) => void
|
||||||
deviceName: string
|
deviceName: string
|
||||||
setDeviceName: (name: string) => void
|
setDeviceName: (name: string) => void
|
||||||
|
licenseNumber: string
|
||||||
|
setLicenseNumber: (num: string) => void
|
||||||
addToBasket: () => void
|
addToBasket: () => void
|
||||||
isNextStepDisabled: boolean
|
isNextStepDisabled: boolean
|
||||||
hasActiveSelection: boolean
|
hasActiveSelection: boolean
|
||||||
@@ -62,6 +64,8 @@ export function SummarySidebar({
|
|||||||
deleteBasketItem,
|
deleteBasketItem,
|
||||||
deviceName,
|
deviceName,
|
||||||
setDeviceName,
|
setDeviceName,
|
||||||
|
licenseNumber,
|
||||||
|
setLicenseNumber,
|
||||||
addToBasket,
|
addToBasket,
|
||||||
isNextStepDisabled,
|
isNextStepDisabled,
|
||||||
hasActiveSelection,
|
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 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">
|
<div className="flex flex-col">
|
||||||
<span className="text-white font-medium">{item.deviceName}</span>
|
<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>
|
||||||
<div className="flex items-center gap-1.5">
|
<div className="flex items-center gap-1.5">
|
||||||
<Button
|
<Button
|
||||||
@@ -272,6 +279,16 @@ export function SummarySidebar({
|
|||||||
className="bg-white/5 border-white/10 text-white text-xs h-9 rounded-lg"
|
className="bg-white/5 border-white/10 text-white text-xs h-9 rounded-lg"
|
||||||
/>
|
/>
|
||||||
</div>
|
</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
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="outline"
|
variant="outline"
|
||||||
|
|||||||
@@ -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)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user