salam/nutzwerte_fi4
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

register wip

Browse Source
This commit is contained in:
salam committed 2025-10-15 14:13:06 +02:00
1 parent 76f4127bb2
commit 7d9a28a84d
6 files changed
+295 -63
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Filament/Pages/Auth/Register.backup
+249
View File
@@ -0,0 +1,249 @@
<?php
namespace App\Filament\Pages\Auth;
use App\Models\Auftraggeber;
use App\Models\Gutachter;
use App\Models\Konto;
use App\Models\Plan;
use Danielebarbaro\LaravelVatEuValidator\Rules\VatNumber;
use Filament\Auth\Pages\Register as BaseRegister;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Schemas\Components\Fieldset;
use Filament\Schemas\Components\Icon;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Schemas\Components\View;
use Filament\Schemas\Components\Wizard;
use Filament\Schemas\Components\Wizard\Step;
use Filament\Schemas\Schema;
use Filament\Support\Enums\Alignment;
use Filament\Support\Enums\IconPosition;
use Filament\Support\Enums\IconSize;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\HtmlString;
use JaOcero\RadioDeck\Forms\Components\RadioDeck;
use Ysfkaya\FilamentPhoneInput\Forms\PhoneInput;
class Register extends BaseRegister
{
public function form(Schema $schema): Schema
{
return $schema
->components([
Wizard::make([
Step::make('Profile')
->icon('lucide-user-plus')
->description('Benutzer anlegen.')
->schema([
Select::make('gender')
->label('Geschlecht')
->options([
'Herr' => 'Herr',
'Frau' => 'Frau',
'Non-binary' => 'Non-binary',
])
->required()
->validationMessages([
'required' => 'Ein Geschlecht ist erforderlich.',
]),
$this->getNameFormComponent()->validationMessages([
'required' => 'Ein Name ist erforderlich.',
]),
$this->getEmailFormComponent()
->validationMessages([
'required' => 'Eine E-Mail-Adresse ist erforderlich.',
]),
$this->getPasswordFormComponent()
->validationMessages([
'required' => 'Ein Passwort ist erforderlich.',
'same' => 'Das Passwort muß mit dem "Passwort bestätigen" Feld übereinstimmen.',
'min' => [
'string' => 'Das :attribute muß mindestens :min Stellen lang sein.',
],
]),
$this->getPasswordConfirmationFormComponent(),
])->columnSpan(3),
Wizard\Step::make('Konto')
// ->columns(4)
->icon('lucide-key-square')
->description('Mit einem Konto verbinden.')
->schema([
/** BESTEHENDES / NEU */
Select::make('register-modus')
->columnSpan(4)
->label('Registriermodus')
->prefixIcon('lucide-key-square')
->prefixIconColor('primary')
->aboveLabel(function (Get $get) {
if (! $get('register-modus')) {
return ['Bitte wählen Sie ein Konto oder erstellen Sie ein neues.'];
}
})
->options([
'old' => 'Mit einem bestehenden Konto verbinden',
'new' => 'Ein neues Konto erstellen',
])
->live()
->required(),
/** BESTEHEND */
Select::make('konto_id')
->columnSpan(4)
->label('Konto auswählen')
->belowLabel([
'Um das erstellte Profil zu aktivieren muß der Kontoinhaber die Anmeldung im Programm freischalten',
])
->visible(fn (Get $get): bool => $get('register-modus') == 'old')
->options(Konto::query()->pluck('company', 'id'))
->searchable()
->required(),
/** NEU */
Fieldset::make('Rechnungsdaten')
->visible(fn (Get $get): bool => $get('register-modus') == 'new')
->schema([
TextInput::make('kontos.company')
->label('Firma')
->required(),
TextInput::make('kontos.uid_number')
->label('UID Nummer')
->rules([new VatNumber])
->required(),
Textarea::make('kontos.address')
->label('Adresse')
->required(),
])->columnSpan(4),
Fieldset::make('Kontaktperson')
->visible(fn (Get $get): bool => $get('register-modus') == 'new')
->schema([
Select::make('kontos.gender')
->columnSpan(2)
->label('Geschlecht')
->options([
'Herr' => 'Herr',
'Frau' => 'Frau',
'Non-binary' => 'Non-binary',
])
->required(),
TextInput::make('kontos.title')
->label('Titel'),
TextInput::make('kontos.name')
->required(),
TextInput::make('kontos.email')
->label('E-Mail')
->unique(table: Konto::class)
->required(),
PhoneInput::make('kontos.phone')
->label('Telefon')
->defaultCountry('AT'),
])->columnSpan(4),
Fieldset::make('Mit diesen Daten auch einen')
->visible(fn (Get $get): bool => $get('register-modus') == 'new')
->schema([
Checkbox::make('gutachter_anlegen')->inline(),
Checkbox::make('auftraggeber_anlegen')->inline(),
])->columnSpan(4),
]),
// Wizard\Step::make('Zahlungsmodus')
// ->icon('phosphor-coins')
// ->visible(fn (Get $get): bool => $get('register-modus') == 'new')
// ->description('Drei Optionen stehen zur Auswahl')
// ->schema([
// Section::make('Zahlungsoptionen')
// ->description('können jederzeit geändert werden. Im Moment bieten wir nur unseren Basic Plan an.')->columnSpanFull(),
// RadioDeck::make('plan_id')
// ->label('Wählen sie eine Option')
// ->options(fn () => Plan::pluck('name', 'id')->toArray())
// ->descriptions(Plan::options())
// ->icons(fn () => Plan::pluck('icon', 'id')->toArray())
// ->required()
// ->default(1)
// ->disabled()
// ->iconPosition(IconPosition::Before) // Before | After
// ->iconSize(IconSize::ExtraLarge)
// ->alignment(Alignment::Center) // Start | Center | End
// ->padding('p-2') // Padding around the deck
// ->extraCardsAttributes([
// 'class' => 'rounded-xl drop-shadow-xl mt-1',
// ])
// ->extraOptionsAttributes([
// 'class' => 'text-2xl font-black tracking-tight lg:text-3xl',
// ])
// ->colors('primary')
// ->columns(3)
// ->columnSpanFull(),
// ]),
Wizard\Step::make('AGB')
->icon('lucide-receipt-text')
->description('Allgemeine Geschäftsbedingungen')
->schema([
Fieldset::make('Bitte lesen und akzeptieren Sie die Allgemeinen Geschäftsbedinnungen.')
->schema([
View::make('pages.agb'),
Checkbox::make('agb_akzeptiert')
->default(false)
->beforeLabel(Icon::make('phosphor-arrow-fat-right'))
->label('Allgemeinen Geschäftsbedinnungen akzeptieren')
->accepted()
->validationMessages([
'accepted' => 'Das Akzeptieren der Allgemeinen Geschäftsbedinnungen ist erforderlich.',
]),
])->columns(1),
]),
])->submitAction(new HtmlString(Blade::render(<<<'BLADE'
<x-filament::button
type="submit"
size="sm"
wire:submit="register"
>
Registrieren
</x-filament::button>
BLADE))),
]);
}
protected function getFormActions(): array
{
return [];
}
public function handleRegistration(array $data): Model
{
// dd($data);
if (isset($data['kontos'])) {
$konto = new Konto($data['kontos']);
$konto->save();
$data['konto_id'] = $konto->id;
unset($data['kontos']['uid_number']);
}
if (isset($data['gutachter_anlegen'])) {
$gutachter = new Gutachter($data['kontos']);
$gutachter->konto_id = $konto->id;
$gutachter->save();
}
if (isset($data['auftraggeber_anlegen'])) {
$auftraggeber = new Auftraggeber($data['kontos']);
$auftraggeber->konto_id = $konto->id;
$auftraggeber->save();
}
unset($data['gutachter_anlegen']);
unset($data['auftraggeber_anlegen']);
unset($data['kontos']);
$user = parent::handleRegistration($data);
return $user;
}
}
app/Filament/Pages/Auth/Register.php
-33
View File
@@ -73,37 +73,7 @@ class Register extends BaseRegister
->icon('lucide-key-square') ->icon('lucide-key-square')
->description('Mit einem Konto verbinden.') ->description('Mit einem Konto verbinden.')
->schema([ ->schema([
/** BESTEHENDES / NEU */
Select::make('register-modus')
->columnSpan(4)
->label('Registriermodus')
->prefixIcon('lucide-key-square')
->prefixIconColor('primary')
->aboveLabel(function (Get $get) {
if (! $get('register-modus')) {
return ['Bitte wählen Sie ein Konto oder erstellen Sie ein neues.'];
}
})
->options([
'old' => 'Mit einem bestehenden Konto verbinden',
'new' => 'Ein neues Konto erstellen',
])
->live()
->required(),
/** BESTEHEND */
Select::make('konto_id')
->columnSpan(4)
->label('Konto auswählen')
->belowLabel([
'Um das erstellte Profil zu aktivieren muß der Kontoinhaber die Anmeldung im Programm freischalten',
])
->visible(fn (Get $get): bool => $get('register-modus') == 'old')
->options(Konto::query()->pluck('company', 'id'))
->searchable()
->required(),
/** NEU */
Fieldset::make('Rechnungsdaten') Fieldset::make('Rechnungsdaten')
->visible(fn (Get $get): bool => $get('register-modus') == 'new')
->schema([ ->schema([
TextInput::make('kontos.company') TextInput::make('kontos.company')
->label('Firma') ->label('Firma')
@@ -117,7 +87,6 @@ class Register extends BaseRegister
->required(), ->required(),
])->columnSpan(4), ])->columnSpan(4),
Fieldset::make('Kontaktperson') Fieldset::make('Kontaktperson')
->visible(fn (Get $get): bool => $get('register-modus') == 'new')
->schema([ ->schema([
Select::make('kontos.gender') Select::make('kontos.gender')
->columnSpan(2) ->columnSpan(2)
@@ -141,7 +110,6 @@ class Register extends BaseRegister
->defaultCountry('AT'), ->defaultCountry('AT'),
])->columnSpan(4), ])->columnSpan(4),
Fieldset::make('Mit diesen Daten auch einen') Fieldset::make('Mit diesen Daten auch einen')
->visible(fn (Get $get): bool => $get('register-modus') == 'new')
->schema([ ->schema([
Checkbox::make('gutachter_anlegen')->inline(), Checkbox::make('gutachter_anlegen')->inline(),
Checkbox::make('auftraggeber_anlegen')->inline(), Checkbox::make('auftraggeber_anlegen')->inline(),
@@ -187,7 +155,6 @@ class Register extends BaseRegister
View::make('pages.agb'), View::make('pages.agb'),
Checkbox::make('agb_akzeptiert') Checkbox::make('agb_akzeptiert')
->default(false) ->default(false)
->beforeLabel(Icon::make('phosphor-arrow-fat-right'))
->label('Allgemeinen Geschäftsbedinnungen akzeptieren') ->label('Allgemeinen Geschäftsbedinnungen akzeptieren')
->accepted() ->accepted()
->validationMessages([ ->validationMessages([
app/Filament/Resources/Kontos/Pages/ListKontos.php
+13
View File
@@ -3,9 +3,22 @@
namespace App\Filament\Resources\Kontos\Pages; namespace App\Filament\Resources\Kontos\Pages;
use App\Filament\Resources\Kontos\KontoResource; use App\Filament\Resources\Kontos\KontoResource;
use Filament\Actions\Action;
use Filament\Resources\Pages\ListRecords; use Filament\Resources\Pages\ListRecords;
class ListKontos extends ListRecords class ListKontos extends ListRecords
{ {
protected static string $resource = KontoResource::class; protected static string $resource = KontoResource::class;
protected function getHeaderActions(): array
{
return [
Action::make('agb')
->label('AGB\'s')
->icon('phosphor-paragraph')
->modalContent(view('pages.agb'))
->modalSubmitAction(false)
->modalCancelAction(fn (Action $action) => $action->label('Schließen')),
];
}
} }
app/Filament/Resources/Users/Schemas/UserForm.php
+8
View File
@@ -3,6 +3,7 @@
namespace App\Filament\Resources\Users\Schemas; namespace App\Filament\Resources\Users\Schemas;
use App\Models\User; use App\Models\User;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\Select; use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
use Filament\Schemas\Components\Section; use Filament\Schemas\Components\Section;
@@ -52,6 +53,13 @@ class UserForm
->required() ->required()
->same('password') // Validates that this matches the 'password' field ->same('password') // Validates that this matches the 'password' field
->label('Passwort Bestätigen'), ->label('Passwort Bestätigen'),
Checkbox::make('agb_akzeptiert')
->default(false)
->label('Allgemeinen Geschäftsbedinnungen akzeptieren')
->accepted()
->validationMessages([
'accepted' => 'Das Akzeptieren der Allgemeinen Geschäftsbedingungen ist erforderlich.',
]),
Select::make('roles') Select::make('roles')
->label('Rolle') ->label('Rolle')
->prefixIcon('phosphor-gear') ->prefixIcon('phosphor-gear')
app/Http/Middleware/AppUserAGBMiddleware.php
+4 -9
View File
@@ -4,20 +4,15 @@ namespace App\Http\Middleware;
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
class AppUserAGBMiddleware class AppUserAGBMiddleware
{ {
/** public function handle(Request $request, Closure $next)
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
*/
public function handle(Request $request, Closure $next): Response
{ {
if ($request->user()->agb_akzeptiert == 0) { if (Auth::check() && ! Auth::user()->agb_akzeptiert) {
// return static::getResource()::getUrl('index'); abort(Response::HTTP_FORBIDDEN, 'Die Allgemeine Geschäftsbedingungen wurden nicht akzeptiert, bitte wenden Sie sich an den Adminstrator.');
abort(Response::HTTP_FORBIDDEN, 'Bitte akzeptieren sie unsere AGBs.');
} }
return $next($request); return $next($request);
bootstrap/cache/routes-v7.php
Vendored
+21 -21
View File
@@ -531,7 +531,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::XELvTeyTx0iucj1I', '_route' => 'generated::LUUw5i2RsURFkW2a',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -551,7 +551,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::RJCRoaZCsw58BXBj', '_route' => 'generated::STB9w8ucJJWNXkfn',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -609,7 +609,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::6A0l0tPkXKDuiCPC', '_route' => 'generated::bzQFt5mIDVIkXZeK',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -629,7 +629,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::nW1FfJkaaRaObIs1', '_route' => 'generated::0o6soFY4V0jZThYm',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -649,7 +649,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::9no3IR4iKrXVmjP1', '_route' => 'generated::mWEHFF6qpOqca4wZ',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -669,7 +669,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::3cYLBNVGFReEu7sY', '_route' => 'generated::2NSbOa2Gi9GN1jMm',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -689,7 +689,7 @@ app('router')->setCompiledRoutes(
array ( array (
0 => 0 =>
array ( array (
'_route' => 'generated::8gMtlzrt61r64CMZ', '_route' => 'generated::pwCRpUbDXVNsrC8y',
), ),
1 => NULL, 1 => NULL,
2 => 2 =>
@@ -2740,7 +2740,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::XELvTeyTx0iucj1I' => 'generated::LUUw5i2RsURFkW2a' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -2752,7 +2752,7 @@ app('router')->setCompiledRoutes(
array ( array (
'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile',
'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@returnJavaScriptAsFile',
'as' => 'generated::XELvTeyTx0iucj1I', 'as' => 'generated::LUUw5i2RsURFkW2a',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>
@@ -2768,7 +2768,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::RJCRoaZCsw58BXBj' => 'generated::STB9w8ucJJWNXkfn' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -2780,7 +2780,7 @@ app('router')->setCompiledRoutes(
array ( array (
'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', 'uses' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps',
'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps', 'controller' => 'Livewire\\Mechanisms\\FrontendAssets\\FrontendAssets@maps',
'as' => 'generated::RJCRoaZCsw58BXBj', 'as' => 'generated::STB9w8ucJJWNXkfn',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>
@@ -2882,7 +2882,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::6A0l0tPkXKDuiCPC' => 'generated::bzQFt5mIDVIkXZeK' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -2911,7 +2911,7 @@ app('router')->setCompiledRoutes(
\'exception\' => $exception, \'exception\' => $exception,
]), status: $exception ? 500 : 200); ]), status: $exception ? 500 : 200);
}";s:5:"scope";s:54:"Illuminate\\Foundation\\Configuration\\ApplicationBuilder";s:4:"this";N;s:4:"self";s:32:"0000000000000f3b0000000000000000";}}', }";s:5:"scope";s:54:"Illuminate\\Foundation\\Configuration\\ApplicationBuilder";s:4:"this";N;s:4:"self";s:32:"0000000000000f3b0000000000000000";}}',
'as' => 'generated::6A0l0tPkXKDuiCPC', 'as' => 'generated::bzQFt5mIDVIkXZeK',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>
@@ -2927,7 +2927,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::nW1FfJkaaRaObIs1' => 'generated::0o6soFY4V0jZThYm' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -2949,7 +2949,7 @@ app('router')->setCompiledRoutes(
'where' => 'where' =>
array ( array (
), ),
'as' => 'generated::nW1FfJkaaRaObIs1', 'as' => 'generated::0o6soFY4V0jZThYm',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>
@@ -2965,7 +2965,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::9no3IR4iKrXVmjP1' => 'generated::mWEHFF6qpOqca4wZ' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -2987,7 +2987,7 @@ app('router')->setCompiledRoutes(
'where' => 'where' =>
array ( array (
), ),
'as' => 'generated::9no3IR4iKrXVmjP1', 'as' => 'generated::mWEHFF6qpOqca4wZ',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>
@@ -3003,7 +3003,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::3cYLBNVGFReEu7sY' => 'generated::2NSbOa2Gi9GN1jMm' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -3025,7 +3025,7 @@ app('router')->setCompiledRoutes(
'where' => 'where' =>
array ( array (
), ),
'as' => 'generated::3cYLBNVGFReEu7sY', 'as' => 'generated::2NSbOa2Gi9GN1jMm',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>
@@ -3041,7 +3041,7 @@ app('router')->setCompiledRoutes(
'waitSeconds' => NULL, 'waitSeconds' => NULL,
'withTrashed' => false, 'withTrashed' => false,
), ),
'generated::8gMtlzrt61r64CMZ' => 'generated::pwCRpUbDXVNsrC8y' =>
array ( array (
'methods' => 'methods' =>
array ( array (
@@ -3063,7 +3063,7 @@ app('router')->setCompiledRoutes(
'where' => 'where' =>
array ( array (
), ),
'as' => 'generated::8gMtlzrt61r64CMZ', 'as' => 'generated::pwCRpUbDXVNsrC8y',
), ),
'fallback' => false, 'fallback' => false,
'defaults' => 'defaults' =>