From 7803a12f524294f45870cb72fa731edf640b053f Mon Sep 17 00:00:00 2001
From: Kevin Adametz <kevin.adametz@me.com>
Date: Thu, 2 Jul 2026 10:43:05 +0000
Subject: [PATCH] 5.2: User-Formular-Feldraster in Blade-Components
 (role/billing) extrahiert

role- und billing-Feldgrids aus create+edit in <x-portal.user-role-fields> und <x-portal.user-billing-fields> gezogen (nur das innere Grid; Panel-/Card-Wrapper bleiben pro Seite). Nebenbei-Bugfix: create zeigt jetzt den billing.name-Validierungsfehler (Feld wurde via userBillingRules() schon validiert, Fehler aber nie gerendert). company-link-picker + contact-fields bleiben bewusst inline (divergiert bzw. nur in edit).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../portal/user-billing-fields.blade.php      | 59 ++++++++++++++++++
 .../portal/user-role-fields.blade.php         | 14 +++++
 .../livewire/admin/users/create.blade.php     | 60 +-----------------
 .../views/livewire/admin/users/edit.blade.php | 61 +------------------
 4 files changed, 77 insertions(+), 117 deletions(-)
 create mode 100644 resources/views/components/portal/user-billing-fields.blade.php
 create mode 100644 resources/views/components/portal/user-role-fields.blade.php

diff --git a/resources/views/components/portal/user-billing-fields.blade.php b/resources/views/components/portal/user-billing-fields.blade.php
new file mode 100644
index 00000000..b4a07491
--- /dev/null
+++ b/resources/views/components/portal/user-billing-fields.blade.php
@@ -0,0 +1,59 @@
+@props(['salutations', 'countries'])
+
+{{--
+    Rechnungsadress-Feldraster für die User-Formulare (create/edit).
+    Rendert nur das innere Grid – der umgebende Panel-/Card-Wrapper samt
+    Überschrift bleibt bewusst in der jeweiligen Seite.
+--}}
+<div class="grid gap-3 sm:grid-cols-2">
+    <flux:field>
+        <flux:label>{{ __('Anrede') }}</flux:label>
+        <flux:select wire:model="billing.salutation_key">
+            <option value="">{{ __('Bitte wählen') }}</option>
+            @foreach($salutations as $key => $labels)
+                <option value="{{ $key }}">{{ $labels['de'] ?? $key }}</option>
+            @endforeach
+        </flux:select>
+    </flux:field>
+
+    <flux:field>
+        <flux:label>{{ __('Titel') }}</flux:label>
+        <flux:input wire:model="billing.title" />
+    </flux:field>
+
+    <flux:field class="sm:col-span-2">
+        <flux:label>{{ __('Rechnungsname') }}</flux:label>
+        <flux:input wire:model="billing.name" />
+        <flux:error name="billing.name" />
+    </flux:field>
+
+    <flux:field class="sm:col-span-2">
+        <flux:label>{{ __('Adresse Zeile 1') }}</flux:label>
+        <flux:input wire:model="billing.address1" />
+    </flux:field>
+
+    <flux:field class="sm:col-span-2">
+        <flux:label>{{ __('Adresse Zeile 2') }}</flux:label>
+        <flux:input wire:model="billing.address2" />
+    </flux:field>
+
+    <flux:field>
+        <flux:label>{{ __('PLZ') }}</flux:label>
+        <flux:input wire:model="billing.postal_code" />
+    </flux:field>
+
+    <flux:field>
+        <flux:label>{{ __('Stadt') }}</flux:label>
+        <flux:input wire:model="billing.city" />
+    </flux:field>
+
+    <flux:field>
+        <flux:label>{{ __('Land') }}</flux:label>
+        <flux:select wire:model="billing.country_code">
+            <option value="">{{ __('Bitte wählen') }}</option>
+            @foreach ($countries as $countryCode => $countryName)
+                <option value="{{ $countryCode }}">{{ $countryName }}</option>
+            @endforeach
+        </flux:select>
+    </flux:field>
+</div>
diff --git a/resources/views/components/portal/user-role-fields.blade.php b/resources/views/components/portal/user-role-fields.blade.php
new file mode 100644
index 00000000..020a0bb4
--- /dev/null
+++ b/resources/views/components/portal/user-role-fields.blade.php
@@ -0,0 +1,14 @@
+@props(['roles'])
+
+{{--
+    Rollenzuweisungs-Grid für die User-Formulare (create/edit).
+    Rendert nur das innere Grid – der umgebende Panel-/Card-Wrapper bleibt
+    bewusst in der jeweiligen Seite (create nutzt das Portal-„panel"-Design,
+    edit das Flux-„card"-Design).
+--}}
+<div class="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
+    @foreach ($roles as $role)
+        <flux:checkbox wire:model="selectedRoles" value="{{ $role->name }}" label="{{ $role->name }}" />
+    @endforeach
+</div>
+<flux:error name="selectedRoles" class="mt-4" />
diff --git a/resources/views/livewire/admin/users/create.blade.php b/resources/views/livewire/admin/users/create.blade.php
index eb02d490..3e1ff920 100644
--- a/resources/views/livewire/admin/users/create.blade.php
+++ b/resources/views/livewire/admin/users/create.blade.php
@@ -269,12 +269,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer anlegen')] class extends
             <span class="section-eyebrow">{{ __('Rollenzuweisung') }}</span>
         </div>
         <div class="p-5">
-            <div class="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
-                @foreach ($availableRoles as $role)
-                    <flux:checkbox wire:model="selectedRoles" value="{{ $role->name }}" label="{{ $role->name }}" />
-                @endforeach
-            </div>
-            <flux:error name="selectedRoles" class="mt-4" />
+            <x-portal.user-role-fields :roles="$availableRoles" />
         </div>
     </article>
 
@@ -347,58 +342,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer anlegen')] class extends
             <span class="section-eyebrow">{{ __('Rechnungsadresse (optional)') }}</span>
         </div>
         <div class="p-5">
-
-        <div class="grid gap-3 sm:grid-cols-2">
-            <flux:field>
-                <flux:label>{{ __('Anrede') }}</flux:label>
-                <flux:select wire:model="billing.salutation_key">
-                    <option value="">{{ __('Bitte wählen') }}</option>
-                    @foreach($salutations as $key => $labels)
-                        <option value="{{ $key }}">{{ $labels['de'] ?? $key }}</option>
-                    @endforeach
-                </flux:select>
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('Titel') }}</flux:label>
-                <flux:input wire:model="billing.title" />
-            </flux:field>
-
-            <flux:field class="sm:col-span-2">
-                <flux:label>{{ __('Rechnungsname') }}</flux:label>
-                <flux:input wire:model="billing.name" />
-            </flux:field>
-
-            <flux:field class="sm:col-span-2">
-                <flux:label>{{ __('Adresse Zeile 1') }}</flux:label>
-                <flux:input wire:model="billing.address1" />
-            </flux:field>
-
-            <flux:field class="sm:col-span-2">
-                <flux:label>{{ __('Adresse Zeile 2') }}</flux:label>
-                <flux:input wire:model="billing.address2" />
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('PLZ') }}</flux:label>
-                <flux:input wire:model="billing.postal_code" />
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('Stadt') }}</flux:label>
-                <flux:input wire:model="billing.city" />
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('Land') }}</flux:label>
-                <flux:select wire:model="billing.country_code">
-                    <option value="">{{ __('Bitte wählen') }}</option>
-                    @foreach ($countries as $countryCode => $countryName)
-                        <option value="{{ $countryCode }}">{{ $countryName }}</option>
-                    @endforeach
-                </flux:select>
-            </flux:field>
-        </div>
+            <x-portal.user-billing-fields :salutations="$salutations" :countries="$countries" />
         </div>
     </article>
 
diff --git a/resources/views/livewire/admin/users/edit.blade.php b/resources/views/livewire/admin/users/edit.blade.php
index 1c602efb..35976bb0 100644
--- a/resources/views/livewire/admin/users/edit.blade.php
+++ b/resources/views/livewire/admin/users/edit.blade.php
@@ -952,13 +952,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer bearbeiten')] class exte
     <flux:card id="roles">
         <flux:heading size="lg" class="mb-4">{{ __('Rollenzuweisung') }}</flux:heading>
 
-        <div class="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
-            @foreach($availableRoles as $role)
-                <flux:checkbox wire:model="selectedRoles" value="{{ $role->name }}" label="{{ $role->name }}" />
-            @endforeach
-        </div>
-
-        <flux:error name="selectedRoles" class="mt-4" />
+        <x-portal.user-role-fields :roles="$availableRoles" />
     </flux:card>
 
     <flux:card id="company-links">
@@ -1141,58 +1135,7 @@ new #[Layout('components.layouts.app'), Title('Benutzer bearbeiten')] class exte
     <flux:card id="billing-address">
         <flux:heading size="lg" class="mb-4">{{ __('Rechnungsadresse') }}</flux:heading>
 
-        <div class="grid gap-3 sm:grid-cols-2">
-            <flux:field>
-                <flux:label>{{ __('Anrede') }}</flux:label>
-                <flux:select wire:model="billing.salutation_key">
-                    <option value="">{{ __('Bitte wählen') }}</option>
-                    @foreach($salutations as $key => $labels)
-                        <option value="{{ $key }}">{{ $labels['de'] ?? $key }}</option>
-                    @endforeach
-                </flux:select>
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('Titel') }}</flux:label>
-                <flux:input wire:model="billing.title" />
-            </flux:field>
-
-            <flux:field class="sm:col-span-2">
-                <flux:label>{{ __('Rechnungsname') }}</flux:label>
-                <flux:input wire:model="billing.name" />
-                <flux:error name="billing.name" />
-            </flux:field>
-
-            <flux:field class="sm:col-span-2">
-                <flux:label>{{ __('Adresse Zeile 1') }}</flux:label>
-                <flux:input wire:model="billing.address1" />
-            </flux:field>
-
-            <flux:field class="sm:col-span-2">
-                <flux:label>{{ __('Adresse Zeile 2') }}</flux:label>
-                <flux:input wire:model="billing.address2" />
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('PLZ') }}</flux:label>
-                <flux:input wire:model="billing.postal_code" />
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('Stadt') }}</flux:label>
-                <flux:input wire:model="billing.city" />
-            </flux:field>
-
-            <flux:field>
-                <flux:label>{{ __('Land') }}</flux:label>
-                <flux:select wire:model="billing.country_code">
-                    <option value="">{{ __('Bitte wählen') }}</option>
-                    @foreach($countries as $countryCode => $countryName)
-                        <option value="{{ $countryCode }}">{{ $countryName }}</option>
-                    @endforeach
-                </flux:select>
-            </flux:field>
-        </div>
+        <x-portal.user-billing-fields :salutations="$salutations" :countries="$countries" />
     </flux:card>
 
     <article class="panel">