chore(merge): integrate origin/staging into local staging

Resolved conflict in customer-accordion-list.tsx by keeping
the per-device flattening (DeviceCard) implementation.

shop/components/wizard/license-lookup-panel.tsx

@@ -242,7 +242,7 @@ export function LicenseLookupPanel({ onLicenseResolved }: LicenseLookupPanelProp
                         setNotFound(false)
                       }}
                       onKeyDown={handleKeyDown}
-                      placeholder="z. B. 995502-00"
+                      placeholder="z. B. 995500-00"
                       className="pl-9 pr-8 bg-white/5 border-white/10 text-white placeholder:text-slate-500
                                  focus:border-violet-500/60 focus:ring-violet-500/20 rounded-xl text-sm h-10"
                     />
@@ -287,7 +287,7 @@ export function LicenseLookupPanel({ onLicenseResolved }: LicenseLookupPanelProp
                     className="font-mono text-amber-400/80 cursor-pointer hover:text-amber-400 transition-colors"
                     onClick={() => setLicenseKey('995501-00')}
                   >
-                    995500-00
+                    995501-00 (abgelaufen)
                   </span>
                 </p>
               </div>

shop/components/wizard/step-customer.tsx

@@ -177,7 +177,7 @@ export function StepCustomer({
               <div className="relative flex-1">
                 <Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-slate-400" />
                 <Input
-                  placeholder="Partner suchen nach Name oder ID..."
+                  placeholder="Partner suchen..."
                   value={partnerSearchTerm}
                   onChange={(e) => setPartnerSearchTerm(e.target.value)}
                   className="pl-9 bg-white/5 border-white/10 text-white placeholder:text-slate-500 focus:border-primary text-sm h-9"
@@ -202,7 +202,10 @@ export function StepCustomer({
             <div className="space-y-2 max-h-72 overflow-y-auto pr-1">
               {/* Reserved Fixed Card: Alle Partner */}
               <div
-                onClick={() => setSelectedCompanyId('all')}
+                onClick={() => {
+                  setSelectedCompanyId('all')
+                  setSelectedEndCustomerId(null)
+                }}
                 className={`flex items-center justify-between p-3.5 rounded-xl border-2 cursor-pointer transition-all select-none ${
                   selectedCompanyId === 'all' || !selectedCompanyId
                     ? 'border-primary bg-primary/10 shadow-lg shadow-primary/5'
@@ -240,7 +243,10 @@ export function StepCustomer({
                 return (
                   <div
                     key={c.id}
-                    onClick={() => setSelectedCompanyId(c.id)}
+                    onClick={() => {
+                      setSelectedCompanyId(c.id)
+                      setSelectedEndCustomerId(null)
+                    }}
                     className={`flex items-center justify-between p-3.5 rounded-xl border-2 cursor-pointer transition-all select-none ${
                       isSelected
                         ? 'border-primary bg-primary/10 shadow-lg shadow-primary/5'
@@ -253,7 +259,11 @@ export function StepCustomer({
                       </div>
                       <div>
                         <p className="font-semibold text-white text-sm">{c.name}</p>
-                        <p className="text-xs text-slate-500 font-mono">ID: {c.id}</p>
+                        {(c.street || c.zip || c.city) && (
+                          <p className="text-xs text-slate-400 mt-0.5">
+                            {[c.street, [c.zip, c.city].filter(Boolean).join(' ')].filter(Boolean).join(', ')}
+                          </p>
+                        )}
                       </div>
                     </div>
 
@@ -592,9 +602,7 @@ export function StepCustomer({
           onClick={nextStep}
           disabled={
             customerMode === 'create' ||
-            (customerMode === 'select' &&
-              customersByCompany.length > 0 &&
-              !selectedEndCustomerId)
+            !selectedEndCustomerId
           }
         >
           Weiter zum Abrechnungsmodell <ChevronRight className="ml-2 w-4 h-4" />

shop/components/wizard/step-summary.tsx

@@ -28,6 +28,7 @@ interface StepSummaryProps {
   isSubmitting: boolean
   initialOrder: any
   prevStep: () => void
+  linkedFeeProducts?: Product[]
 }
 
 function CategoryIcon({ icon, className }: { icon?: string | null; className?: string }) {
@@ -56,6 +57,7 @@ export function StepSummary({
   isSubmitting,
   initialOrder,
   prevStep,
+  linkedFeeProducts = [],
 }: StepSummaryProps) {
   return (
     <Card className="glass-dark border-primary/30 max-w-2xl mx-auto shadow-primary/10 shadow-2xl">
@@ -142,6 +144,24 @@ export function StepSummary({
               })}
             </div>
           ))}
+          {linkedFeeProducts && linkedFeeProducts.length > 0 && (
+            <div className="space-y-3 border-b border-white/10 pb-4 last:border-0 last:pb-0">
+              <div className="flex justify-between items-center bg-white/5 p-2 rounded">
+                <span className="text-white font-bold text-sm">Backoffice</span>
+              </div>
+              {linkedFeeProducts.map(p => (
+                <div key={p.id} className="pl-2 space-y-1">
+                  <div className="flex justify-between font-semibold text-sm text-white pl-3">
+                    <span>{p.name}</span>
+                    <span>
+                      {new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(p.base_price)}
+                      {' '}<span className="text-slate-400 text-[10px] font-normal">{p.billing_interval === 'monthly' ? '/ mtl.' : 'einmalig'}</span>
+                    </span>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
           <Separator className="bg-white/10" />
           <div className="text-sm text-slate-300 space-y-1">
             {selectedEndCustomer ? (