style(shop): resolve merge conflict in license lookup placeholder
Some checks failed
Staging Build / build (push) Failing after 43s
Some checks failed
Staging Build / build (push) Failing after 43s
This commit is contained in:
@@ -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:
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user