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

style(shop): resolve merge conflict in license lookup placeholder
Some checks failed
Staging Build / build (push) Failing after 43s
Details

Browse Source
This commit is contained in:
DanielS
2026-07-22 15:10:56 +02:00
parent 1c31918768 086a893e19
commit c386fa03d4
4 changed files with 150 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
shop/components/wizard/license-lookup-panel.tsx
View File

@@ -25,12 +25,21 @@ import { lookupLicenseFromLicServer } from '@/lib/actions/licserver-config'
// ─── MOCK DATA (until real LicServer API is wired up) ───────────────────────
const MOCK_LICENSES: Record<string, LicenseInfo> = {
<<<<<<< HEAD
'995500-0005': {
licenseKey: '995500-0005',
status: 'active',
product: 'CASPOS DEMO',
edition: 'Professional',
version: '14.1.2',
=======
'995502-00': {
licenseKey: '995502-00',
status: 'active',
product: 'CASPOS',
edition: 'GASTRO',
version: '4.8.6',
>>>>>>> 086a893e19593863f6b2044374187220cc3e392d
seats: 10,
customer: 'Mustermann GmbH',
contact: 'Max Mustermann',
@@ -39,6 +48,7 @@ const MOCK_LICENSES: Record<string, LicenseInfo> = {
maintenanceUntil: '2025-03-31',
modules: ['CRM', 'ERP-Link', 'Mobile Client', 'Web Client'],
},
<<<<<<< HEAD
'CAS-2020-STD-00456': {
licenseKey: 'CAS-2020-STD-00456',
status: 'expired',
@@ -66,6 +76,35 @@ const MOCK_LICENSES: Record<string, LicenseInfo> = {
expiresAt: '2026-12-31',
maintenanceUntil: '2026-12-31',
modules: ['CRM', 'ERP-Link', 'Mobile Client', 'Web Client', 'AI Assistant', 'Analytics Pro'],
=======
'995501-00': {
licenseKey: '995501-00',
status: 'expired',
product: 'CASPOS Handel',
edition: 'Standard',
version: '3.12.1',
seats: 1,
customer: 'Beispiel AG',
contact: 'Erika Muster',
issuedAt: '2016-03-14',
expiresAt: '2017-03-14',
maintenanceUntil: '2017-03-14',
modules: ['CASPOS Handel'],
},
'995500-00': {
licenseKey: '995500-00',
status: 'active',
product: 'CASPOS Handel',
edition: 'Standard',
version: '4.11.2',
seats: 2,
customer: 'Tech Solutions GmbH & Co. KG',
contact: 'Julia Schneider',
issuedAt: '2026-01-01',
expiresAt: '2027-12-31',
maintenanceUntil: '2027-12-31',
modules: ['CASPOS Handel'],
>>>>>>> 086a893e19593863f6b2044374187220cc3e392d
},
}
@@ -224,7 +263,7 @@ export function LicenseLookupPanel({ onLicenseResolved }: LicenseLookupPanelProp
{/* ── Input + Search Button ──────────────────────────────── */}
<div className="pt-4">
<p className="text-xs text-slate-400 mb-2 leading-relaxed">
Geben Sie Ihre bisherige CAS-Lizenznummer ein,
Geben Sie Ihre bisherige CASPOS-Lizenznummer ein,
um Lizenzinformationen automatisch abzurufen.
</p>
@@ -278,16 +317,28 @@ export function LicenseLookupPanel({ onLicenseResolved }: LicenseLookupPanelProp
Demo:&nbsp;
<span
className="font-mono text-violet-400/80 cursor-pointer hover:text-violet-400 transition-colors"
<<<<<<< HEAD
onClick={() => setLicenseKey('995500-00')}
>
995500-00
=======
onClick={() => setLicenseKey('995502-00')}
>
995502-00
>>>>>>> 086a893e19593863f6b2044374187220cc3e392d
</span>
{' · '}
<span
className="font-mono text-amber-400/80 cursor-pointer hover:text-amber-400 transition-colors"
<<<<<<< HEAD
onClick={() => setLicenseKey('995500-01')}
>
995500-01
=======
onClick={() => setLicenseKey('995501-00')}
>
995500-00
>>>>>>> 086a893e19593863f6b2044374187220cc3e392d
</span>
</p>
</div>

12
shop/components/wizard/step-billing.tsx
View File

@@ -44,11 +44,10 @@ export function StepBilling({
{/* Option 1: Kauf */}
<div
onClick={() => handleBillingIntervalChange('one_time')}
className={`relative p-6 rounded-2xl border-2 cursor-pointer transition-all duration-300 flex flex-col justify-between h-48 hover:shadow-[0_0_20px_rgba(255,255,255,0.05)] ${
selectedBillingInterval === 'one_time'
className={`relative p-6 rounded-2xl border-2 cursor-pointer transition-all duration-300 flex flex-col justify-between h-48 hover:shadow-[0_0_20px_rgba(255,255,255,0.05)] ${selectedBillingInterval === 'one_time'
? 'border-primary bg-primary/10 shadow-[0_0_25px_rgba(59,130,246,0.2)]'
: 'border-white/5 bg-white/5 hover:border-white/20'
}`}
}`}
>
<div>
<div className="flex items-center gap-3 mb-3">
@@ -71,11 +70,10 @@ export function StepBilling({
{/* Option 2: Abo */}
<div
onClick={() => handleBillingIntervalChange('monthly')}
className={`relative p-6 rounded-2xl border-2 cursor-pointer transition-all duration-300 flex flex-col justify-between h-48 hover:shadow-[0_0_20px_rgba(255,255,255,0.05)] ${
selectedBillingInterval === 'monthly'
className={`relative p-6 rounded-2xl border-2 cursor-pointer transition-all duration-300 flex flex-col justify-between h-48 hover:shadow-[0_0_20px_rgba(255,255,255,0.05)] ${selectedBillingInterval === 'monthly'
? 'border-primary bg-primary/10 shadow-[0_0_25px_rgba(59,130,246,0.2)]'
: 'border-white/5 bg-white/5 hover:border-white/20'
}`}
}`}
>
<div>
<div className="flex items-center gap-3 mb-3">
@@ -99,7 +97,7 @@ export function StepBilling({
<div className="p-4 rounded-xl bg-white/5 border border-white/10 space-y-3 mt-6 max-w-md animate-in fade-in slide-in-from-top-2 duration-300">
<Label htmlFor="last-license-date" className="text-white font-medium flex items-center gap-2">
<Calendar className="w-4 h-4 text-primary" />
Datum der letzten CAS-Lizenz (falls vorhanden)
Datum der letzten CASPOS-Lizenz (falls vorhanden)
</Label>
<Input
id="last-license-date"