feat(Password process for new admin, cleaning translations)
All checks were successful
Deploy Roxane to Preprod / deploy (push) Successful in 1m21s
All checks were successful
Deploy Roxane to Preprod / deploy (push) Successful in 1m21s
This commit is contained in:
@@ -3,22 +3,22 @@
|
||||
namespace App\Filament\Resources\Members\Schemas;
|
||||
|
||||
use App\Enums\IspconfigType;
|
||||
use App\Filament\Actions\ServiceToggleAction;
|
||||
use App\Models\Member;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Forms\Components\DatePicker;
|
||||
use Filament\Forms\Components\Select;
|
||||
use Filament\Infolists\Components\ViewEntry;
|
||||
use Filament\Schemas\Components\Tabs;
|
||||
use Filament\Schemas\Components\Tabs\Tab;
|
||||
use Filament\Forms\Components\TextInput;
|
||||
use Filament\Forms\Components\Toggle;
|
||||
use Filament\Schemas\Components\Grid;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Schema;
|
||||
use Filament\Infolists\Components\RepeatableEntry;
|
||||
use Filament\Infolists\Components\TextEntry;
|
||||
use Filament\Infolists\Components\ViewEntry;
|
||||
use Filament\Schemas\Components\Grid;
|
||||
use Filament\Schemas\Components\Section;
|
||||
use Filament\Schemas\Components\Tabs;
|
||||
use Filament\Schemas\Components\Tabs\Tab;
|
||||
use Filament\Schemas\Schema;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use App\Filament\Actions\ServiceToggleAction;
|
||||
|
||||
class MemberForm
|
||||
{
|
||||
@@ -42,10 +42,10 @@ class MemberForm
|
||||
| TAB : Informations générales
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
Tabs\Tab::make('Informations générales')
|
||||
Tabs\Tab::make(__('members.tabs.general_info'))
|
||||
->icon(Heroicon::OutlinedInformationCircle)
|
||||
->schema([
|
||||
Section::make('Informations personnelles')
|
||||
Section::make(__('members.sections.personal_info'))
|
||||
->collapsible()
|
||||
->schema([
|
||||
TextInput::make('lastname')
|
||||
@@ -64,7 +64,7 @@ class MemberForm
|
||||
])
|
||||
->columns(2),
|
||||
|
||||
Section::make('Informations administratives')
|
||||
Section::make(__('members.sections.administrative_info'))
|
||||
->collapsible()
|
||||
->schema([
|
||||
TextInput::make('keycloak_id')
|
||||
@@ -86,7 +86,7 @@ class MemberForm
|
||||
])
|
||||
->columns(2),
|
||||
|
||||
Section::make('Coordonnées')
|
||||
Section::make(__('members.sections.contact_info'))
|
||||
->collapsible()
|
||||
->schema([
|
||||
TextInput::make('email')
|
||||
@@ -122,143 +122,135 @@ class MemberForm
|
||||
| TAB : Services/Modules
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
Tabs\Tab::make('Modules')
|
||||
Tabs\Tab::make(__('members.tabs.modules'))
|
||||
->icon(Heroicon::OutlinedPuzzlePiece)
|
||||
->schema([
|
||||
/*
|
||||
| Messageries ISPConfig (lecture seule)
|
||||
*/
|
||||
Section::make('Messagerie ISPConfig')
|
||||
Section::make(__('members.sections.ispconfig_mail'))
|
||||
->afterHeader([
|
||||
ServiceToggleAction::forService('mail'),
|
||||
])
|
||||
->collapsible()
|
||||
->schema([
|
||||
RepeatableEntry::make('ispconfig_mails')
|
||||
->label('Données ISPConfig Mail')
|
||||
->state(fn(?Member $record) => $record?->ispconfigs()
|
||||
->label(__('members.ispconfig.mail_data'))
|
||||
->state(fn (?Member $record) => $record?->ispconfigs()
|
||||
->where('type', IspconfigType::MAIL)
|
||||
->get()
|
||||
)
|
||||
->schema([
|
||||
TextEntry::make('email')
|
||||
->label('Adresse email'),
|
||||
->label(__('members.ispconfig.email')),
|
||||
|
||||
TextEntry::make('ispconfig_service_user_id')
|
||||
->label('ID ISPConfig'),
|
||||
->label(__('members.ispconfig.id')),
|
||||
|
||||
TextEntry::make('data.mailuser.quota')
|
||||
->label('Quota'),
|
||||
//->formatStateUsing(fn($state) => $state ? "{$state} Mo" : 'Non défini'
|
||||
//),
|
||||
->label(__('members.ispconfig.quota')),
|
||||
|
||||
TextEntry::make('data.mailuser.domain')
|
||||
->label('Domaine')
|
||||
->label(__('members.ispconfig.domain'))
|
||||
->default('retzien.fr'),
|
||||
ViewEntry::make('data')
|
||||
->label('JSON')
|
||||
->view('filament.components.json-viewer')
|
||||
->viewData(fn($state) => [
|
||||
->viewData(fn ($state) => [
|
||||
'data' => $state,
|
||||
])
|
||||
->columnSpanFull(),
|
||||
])
|
||||
->columns(2),
|
||||
])
|
||||
->visible(fn(?Member $record) => $record?->ispconfigs()
|
||||
->visible(fn (?Member $record) => $record?->ispconfigs()
|
||||
->where('type', IspconfigType::MAIL)
|
||||
->exists()
|
||||
),
|
||||
|
||||
/*
|
||||
| Hébergements web ISPConfig
|
||||
*/
|
||||
Section::make('Hébergements Web')
|
||||
Section::make(__('members.sections.ispconfig_web'))
|
||||
->afterHeader([
|
||||
ServiceToggleAction::forService('webhosting'),
|
||||
])
|
||||
->collapsible()
|
||||
->schema([
|
||||
RepeatableEntry::make('ispconfigs_web')
|
||||
->label('Données ISPConfig Web')
|
||||
->state(fn(?Member $record) => $record?->ispconfigs()
|
||||
->label(__('members.ispconfig.web_data'))
|
||||
->state(fn (?Member $record) => $record?->ispconfigs()
|
||||
->where('type', IspconfigType::WEB)
|
||||
->get()
|
||||
->map(fn($ispconfig) => $ispconfig->toArray())
|
||||
->map(fn ($ispconfig) => $ispconfig->toArray())
|
||||
->all()
|
||||
)
|
||||
->schema([
|
||||
TextEntry::make('data.domain_id')
|
||||
->label('ID ISPConfig'),
|
||||
->label(__('members.ispconfig.id')),
|
||||
|
||||
TextEntry::make('data.domain')
|
||||
->label('Domaine'),
|
||||
->label(__('members.ispconfig.domain')),
|
||||
|
||||
TextEntry::make('data.active')
|
||||
->label('État')
|
||||
->formatStateUsing(fn($state) => $state === 'y' ? 'Activé' : 'Désactivé'
|
||||
->label(__('members.ispconfig.state'))
|
||||
->formatStateUsing(fn ($state) => $state === 'y'
|
||||
? __('members.ispconfig.enabled')
|
||||
: __('members.ispconfig.disabled')
|
||||
),
|
||||
ViewEntry::make('data')
|
||||
->label('JSON')
|
||||
->view('filament.components.json-viewer')
|
||||
->viewData(fn($state) => [
|
||||
->viewData(fn ($state) => [
|
||||
'data' => $state,
|
||||
])
|
||||
->columnSpanFull(),
|
||||
// @todo: background color : #F5F8FA
|
||||
])
|
||||
->columns(3),
|
||||
|
||||
])
|
||||
->visible(fn(?Member $record) => $record?->ispconfigs()
|
||||
->visible(fn (?Member $record) => $record?->ispconfigs()
|
||||
->where('type', IspconfigType::WEB)
|
||||
->exists()
|
||||
),
|
||||
|
||||
/*
|
||||
| Compte(s) NextCloud (lecture seule)
|
||||
*/
|
||||
Section::make('NextCloud')
|
||||
Section::make(__('members.sections.nextcloud'))
|
||||
->afterHeader([
|
||||
ServiceToggleAction::forService('nextcloud'),
|
||||
])
|
||||
->collapsible()
|
||||
->schema([
|
||||
RepeatableEntry::make('nextcloud_accounts')
|
||||
->label('Données NextCloud')
|
||||
->state(fn(?Member $record) => $record?->nextcloudAccounts()
|
||||
->label(__('members.ispconfig.nextcloud_data'))
|
||||
->state(fn (?Member $record) => $record?->nextcloudAccounts()
|
||||
->get()
|
||||
->map(fn($nextcloudAccount) => $nextcloudAccount->toArray())
|
||||
->map(fn ($nextcloudAccount) => $nextcloudAccount->toArray())
|
||||
->all()
|
||||
)
|
||||
->schema([
|
||||
TextEntry::make('nextcloud_user_id')
|
||||
->label('Id Nextcloud'),
|
||||
->label(__('members.ispconfig.nextcloud_id')),
|
||||
|
||||
TextEntry::make('data.displayname')
|
||||
->label('Nom de l\'utilisateur'),
|
||||
->label(__('members.ispconfig.display_name')),
|
||||
|
||||
TextEntry::make('data.enabled')
|
||||
->label('État')
|
||||
->formatStateUsing(fn($state) => $state == 'true' ? 'Activé' : 'Désactivé'
|
||||
->label(__('members.ispconfig.state'))
|
||||
->formatStateUsing(fn ($state) => $state == 'true'
|
||||
? __('members.ispconfig.enabled')
|
||||
: __('members.ispconfig.disabled')
|
||||
),
|
||||
|
||||
ViewEntry::make('data')
|
||||
->label('JSON')
|
||||
->view('filament.components.json-viewer')
|
||||
->viewData(fn($state) => [
|
||||
->viewData(fn ($state) => [
|
||||
'data' => $state,
|
||||
])
|
||||
->columnSpanFull(),
|
||||
])
|
||||
->columns(3),
|
||||
])
|
||||
->visible(fn(?Member $record) => $record?->nextcloudAccounts()
|
||||
->visible(fn (?Member $record) => $record?->nextcloudAccounts()
|
||||
->exists()
|
||||
),
|
||||
]),
|
||||
])
|
||||
->contained(false)
|
||||
->contained(false),
|
||||
])
|
||||
->columnSpan(3),
|
||||
|
||||
@@ -269,7 +261,7 @@ class MemberForm
|
||||
*/
|
||||
Grid::make(1)
|
||||
->schema([
|
||||
Section::make('Statut')
|
||||
Section::make(__('members.sections.status'))
|
||||
->collapsible()
|
||||
->schema([
|
||||
Select::make('status')
|
||||
@@ -290,18 +282,18 @@ class MemberForm
|
||||
])
|
||||
->extraAttributes(['class' => 'sticky top-4 h-fit']),
|
||||
|
||||
Section::make('Actions')
|
||||
Section::make(__('members.sections.actions'))
|
||||
->collapsible()
|
||||
->schema([
|
||||
Action::make('send-payment-mail')
|
||||
->label('Envoyer le mail de paiement')
|
||||
->label(__('members.actions.send_payment_mail'))
|
||||
->icon('heroicon-o-envelope')
|
||||
->action(function () {
|
||||
// Mail de paiement pour nouvelle inscription (Job)
|
||||
}),
|
||||
|
||||
Action::make('send-renewal-mail')
|
||||
->label('Envoyer un mail de relance')
|
||||
->label(__('members.actions.send_renewal_mail'))
|
||||
->icon('heroicon-o-envelope')
|
||||
->action(function () {
|
||||
// Mail de relance à créer (Job)
|
||||
|
||||
@@ -40,14 +40,14 @@ class MembershipForm
|
||||
| TAB : Informations générales
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
Tabs\Tab::make('Informations générales')
|
||||
Tabs\Tab::make(__('memberships.tabs.general_info'))
|
||||
->icon(Heroicon::OutlinedInformationCircle)
|
||||
->schema([
|
||||
Section::make('Adhérent')
|
||||
Section::make(__('memberships.sections.member'))
|
||||
->headerActions([
|
||||
Action::make('view-profile')
|
||||
->icon('heroicon-o-user')
|
||||
->label('Voir le profil du membre')
|
||||
->label(__('memberships.actions.view_profile'))
|
||||
->action(function (Membership $record) {
|
||||
return redirect()->route('filament.admin.resources.members.edit', ['record' => $record->member_id]);
|
||||
}),
|
||||
@@ -62,7 +62,7 @@ class MembershipForm
|
||||
])
|
||||
->columns(2),
|
||||
|
||||
Section::make('Informations de transaction')
|
||||
Section::make(__('memberships.sections.transaction'))
|
||||
->schema([
|
||||
Select::make('package_id')
|
||||
->label(Membership::getAttributeLabel('package_id'))
|
||||
@@ -89,136 +89,131 @@ class MembershipForm
|
||||
| TAB : Services/Modules
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
Tabs\Tab::make('Modules')
|
||||
Tabs\Tab::make(__('memberships.tabs.modules'))
|
||||
->icon(Heroicon::OutlinedPuzzlePiece)
|
||||
->schema([
|
||||
/*
|
||||
| Messageries ISPConfig (lecture seule)
|
||||
*/
|
||||
Section::make('Messagerie ISPConfig')
|
||||
Section::make(__('memberships.sections.ispconfig_mail'))
|
||||
->afterHeader([
|
||||
ServiceToggleAction::forService('mail'),
|
||||
])
|
||||
->collapsible()
|
||||
->schema([
|
||||
RepeatableEntry::make('ispconfig_mails')
|
||||
->label('Données ISPConfig Mail')
|
||||
->state(fn(?Membership $record) => $record?->member?->ispconfigs()
|
||||
->label(__('members.ispconfig.mail_data'))
|
||||
->state(fn (?Membership $record) => $record?->member?->ispconfigs()
|
||||
->where('type', IspconfigType::MAIL)
|
||||
->get()
|
||||
)
|
||||
->schema([
|
||||
TextEntry::make('email')
|
||||
->label('Adresse email'),
|
||||
->label(__('members.ispconfig.email')),
|
||||
|
||||
TextEntry::make('ispconfig_service_user_id')
|
||||
->label('ID ISPConfig'),
|
||||
->label(__('members.ispconfig.id')),
|
||||
|
||||
TextEntry::make('data.mailuser.quota')
|
||||
->label('Quota'),
|
||||
->label(__('members.ispconfig.quota')),
|
||||
|
||||
TextEntry::make('data.mailuser.domain')
|
||||
->label('Domaine')
|
||||
->label(__('members.ispconfig.domain'))
|
||||
->default('retzien.fr'),
|
||||
|
||||
ViewEntry::make('data')
|
||||
->label('JSON')
|
||||
->view('filament.components.json-viewer')
|
||||
->viewData(fn($state) => [
|
||||
->viewData(fn ($state) => [
|
||||
'data' => $state,
|
||||
])
|
||||
->columnSpanFull(),
|
||||
])
|
||||
->columns(2),
|
||||
])
|
||||
->visible(fn(?Membership $record) => $record?->member?->ispconfigs()
|
||||
->visible(fn (?Membership $record) => $record?->member?->ispconfigs()
|
||||
->where('type', IspconfigType::MAIL)
|
||||
->exists() ?? false
|
||||
),
|
||||
|
||||
/*
|
||||
| Hébergements web ISPConfig
|
||||
*/
|
||||
Section::make('Hébergements Web')
|
||||
Section::make(__('memberships.sections.ispconfig_web'))
|
||||
->afterHeader([
|
||||
ServiceToggleAction::forService('webhosting'),
|
||||
])
|
||||
->collapsible()
|
||||
->schema([
|
||||
RepeatableEntry::make('ispconfigs_web')
|
||||
->label('Données ISPConfig Web')
|
||||
->state(fn(?Membership $record) => $record?->member?->ispconfigs()
|
||||
->label(__('members.ispconfig.web_data'))
|
||||
->state(fn (?Membership $record) => $record?->member?->ispconfigs()
|
||||
->where('type', IspconfigType::WEB)
|
||||
->get()
|
||||
->map(fn($ispconfig) => $ispconfig->toArray())
|
||||
->map(fn ($ispconfig) => $ispconfig->toArray())
|
||||
->all()
|
||||
)
|
||||
->schema([
|
||||
TextEntry::make('data.domain_id')
|
||||
->label('ID ISPConfig'),
|
||||
->label(__('members.ispconfig.id')),
|
||||
|
||||
TextEntry::make('data.domain')
|
||||
->label('Domaine'),
|
||||
->label(__('members.ispconfig.domain')),
|
||||
|
||||
TextEntry::make('data.active')
|
||||
->label('État')
|
||||
->formatStateUsing(fn($state) => $state === 'y' ? 'Activé' : 'Désactivé'
|
||||
->label(__('members.ispconfig.state'))
|
||||
->formatStateUsing(fn ($state) => $state === 'y'
|
||||
? __('members.ispconfig.enabled')
|
||||
: __('members.ispconfig.disabled')
|
||||
),
|
||||
|
||||
ViewEntry::make('data')
|
||||
->label('JSON')
|
||||
->view('filament.components.json-viewer')
|
||||
->viewData(fn($state) => [
|
||||
->viewData(fn ($state) => [
|
||||
'data' => $state,
|
||||
])
|
||||
->columnSpanFull(),
|
||||
])
|
||||
->columns(3),
|
||||
])
|
||||
->visible(fn(?Membership $record) => $record?->member?->ispconfigs()
|
||||
->visible(fn (?Membership $record) => $record?->member?->ispconfigs()
|
||||
->where('type', IspconfigType::WEB)
|
||||
->exists() ?? false
|
||||
),
|
||||
|
||||
/*
|
||||
| Compte(s) NextCloud (lecture seule)
|
||||
*/
|
||||
Section::make('NextCloud')
|
||||
Section::make(__('memberships.sections.nextcloud'))
|
||||
->afterHeader([
|
||||
ServiceToggleAction::forService('nextcloud'),
|
||||
])
|
||||
->collapsible()
|
||||
->schema([
|
||||
RepeatableEntry::make('nextcloud_accounts')
|
||||
->label('Données NextCloud')
|
||||
->state(fn(?Membership $record) => $record?->member?->nextcloudAccounts()
|
||||
->label(__('members.ispconfig.nextcloud_data'))
|
||||
->state(fn (?Membership $record) => $record?->member?->nextcloudAccounts()
|
||||
->get()
|
||||
->map(fn($nextcloudAccount) => $nextcloudAccount->toArray())
|
||||
->map(fn ($nextcloudAccount) => $nextcloudAccount->toArray())
|
||||
->all()
|
||||
)
|
||||
->schema([
|
||||
TextEntry::make('nextcloud_user_id')
|
||||
->label('Id Nextcloud'),
|
||||
->label(__('members.ispconfig.nextcloud_id')),
|
||||
|
||||
TextEntry::make('data.displayname')
|
||||
->label('Nom de l\'utilisateur'),
|
||||
->label(__('members.ispconfig.display_name')),
|
||||
|
||||
TextEntry::make('data.enabled')
|
||||
->label('État')
|
||||
->formatStateUsing(fn($state) => $state == 'true' ? 'Activé' : 'Désactivé'
|
||||
->label(__('members.ispconfig.state'))
|
||||
->formatStateUsing(fn ($state) => $state == 'true'
|
||||
? __('members.ispconfig.enabled')
|
||||
: __('members.ispconfig.disabled')
|
||||
),
|
||||
|
||||
ViewEntry::make('data')
|
||||
->label('JSON')
|
||||
->view('filament.components.json-viewer')
|
||||
->viewData(fn($state) => [
|
||||
->viewData(fn ($state) => [
|
||||
'data' => $state,
|
||||
])
|
||||
->columnSpanFull(),
|
||||
])
|
||||
->columns(3),
|
||||
])
|
||||
->visible(fn(?Membership $record) => $record?->member?->nextcloudAccounts()
|
||||
->visible(fn (?Membership $record) => $record?->member?->nextcloudAccounts()
|
||||
->exists() ?? false
|
||||
),
|
||||
]),
|
||||
@@ -234,7 +229,7 @@ class MembershipForm
|
||||
*/
|
||||
Grid::make(1)
|
||||
->schema([
|
||||
Section::make('Statut')
|
||||
Section::make(__('memberships.sections.status'))
|
||||
->schema([
|
||||
Select::make('status')
|
||||
->label(Membership::getAttributeLabel('status'))
|
||||
|
||||
@@ -11,7 +11,6 @@ use Filament\Tables\Enums\FiltersLayout;
|
||||
use Filament\Tables\Filters\QueryBuilder;
|
||||
use Filament\Tables\Filters\QueryBuilder\Constraints\DateConstraint;
|
||||
use Filament\Tables\Filters\QueryBuilder\Constraints\SelectConstraint;
|
||||
use Filament\Tables\Filters\SelectFilter;
|
||||
use Filament\Tables\Table;
|
||||
|
||||
class MembershipsTable
|
||||
@@ -84,29 +83,27 @@ class MembershipsTable
|
||||
'amount',
|
||||
])
|
||||
->filters([
|
||||
// Filtres pour status, date de début et date de fin, status de paiement
|
||||
|
||||
QueryBuilder::make()
|
||||
->constraints([
|
||||
SelectConstraint::make('status')
|
||||
->label('Statut de l\'adhésion')
|
||||
->label(Membership::getAttributeLabel('status'))
|
||||
->options([
|
||||
'active' => 'Active',
|
||||
'expired' => 'Expirée',
|
||||
'pending' => 'En attente',
|
||||
'active' => Membership::getAttributeLabel('active'),
|
||||
'expired' => Membership::getAttributeLabel('expired'),
|
||||
'pending' => Membership::getAttributeLabel('pending'),
|
||||
]),
|
||||
DateConstraint::make('start_date')
|
||||
->label('Date de début'),
|
||||
->label(Membership::getAttributeLabel('start_date')),
|
||||
DateConstraint::make('end_date')
|
||||
->label('Date de fin'),
|
||||
->label(Membership::getAttributeLabel('end_date')),
|
||||
SelectConstraint::make('payment_status')
|
||||
->label('Statut de paiement')
|
||||
->label(Membership::getAttributeLabel('payment_status'))
|
||||
->options([
|
||||
'paid' => 'Payée',
|
||||
'unpaid' => 'Impayée',
|
||||
'partial' => 'Partiellement payée'
|
||||
'paid' => Membership::getAttributeLabel('paid'),
|
||||
'unpaid' => Membership::getAttributeLabel('unpaid'),
|
||||
'partial' => Membership::getAttributeLabel('partial'),
|
||||
]),
|
||||
]),
|
||||
]),
|
||||
], layout: FiltersLayout::Modal)
|
||||
->recordActions([
|
||||
EditAction::make(),
|
||||
|
||||
@@ -32,11 +32,15 @@ class NotificationTemplateForm
|
||||
TextInput::make('subject')
|
||||
->label(NotificationTemplate::getAttributeLabel('subject'))
|
||||
->required()
|
||||
->helperText('Variables : {member_name}, {expiry_date}'),
|
||||
->helperText(fn (?NotificationTemplate $record) => $record?->variables
|
||||
? NotificationTemplate::getAttributeLabel('variables').' : '.implode(', ', array_map(fn ($k) => '{'.$k.'}', array_keys($record->variables)))
|
||||
: null),
|
||||
RichEditor::make('body')
|
||||
->label(NotificationTemplate::getAttributeLabel('body'))
|
||||
->required()
|
||||
->helperText('Variables : {member_name}, {expiry_date}')
|
||||
->helperText(fn (?NotificationTemplate $record) => $record?->variables
|
||||
? NotificationTemplate::getAttributeLabel('variables').' : '.implode(', ', array_map(fn ($k) => '{'.$k.'}', array_keys($record->variables)))
|
||||
: null)
|
||||
->columnSpanFull(),
|
||||
]),
|
||||
]);
|
||||
|
||||
@@ -7,14 +7,12 @@ use App\Filament\Resources\Packages\Pages\EditPackage;
|
||||
use App\Filament\Resources\Packages\Pages\ListPackages;
|
||||
use App\Filament\Resources\Packages\Schemas\PackageForm;
|
||||
use App\Filament\Resources\Packages\Tables\PackagesTable;
|
||||
use App\Models\Package;
|
||||
use BackedEnum;
|
||||
use Filament\Resources\Resource;
|
||||
use Filament\Schemas\Schema;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use Filament\Tables\Table;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
||||
use App\Models\Package;
|
||||
|
||||
class PackageResource extends Resource
|
||||
{
|
||||
@@ -24,6 +22,16 @@ class PackageResource extends Resource
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedShoppingCart;
|
||||
|
||||
public static function getModelLabel(): string
|
||||
{
|
||||
return Package::getAttributeLabel('package');
|
||||
}
|
||||
|
||||
public static function getPluralModelLabel(): string
|
||||
{
|
||||
return Package::getAttributeLabel('packages');
|
||||
}
|
||||
|
||||
public static function form(Schema $schema): Schema
|
||||
{
|
||||
return PackageForm::configure($schema);
|
||||
|
||||
@@ -22,6 +22,16 @@ class ServiceResource extends Resource
|
||||
|
||||
protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedPuzzlePiece;
|
||||
|
||||
public static function getModelLabel(): string
|
||||
{
|
||||
return Service::getAttributeLabel('service');
|
||||
}
|
||||
|
||||
public static function getPluralModelLabel(): string
|
||||
{
|
||||
return Service::getAttributeLabel('services');
|
||||
}
|
||||
|
||||
public static function form(Schema $schema): Schema
|
||||
{
|
||||
return ServiceForm::configure($schema);
|
||||
|
||||
@@ -6,7 +6,6 @@ use App\Models\Service;
|
||||
use Filament\Actions\BulkActionGroup;
|
||||
use Filament\Actions\DeleteBulkAction;
|
||||
use Filament\Actions\EditAction;
|
||||
use Filament\Support\Icons\Heroicon;
|
||||
use Filament\Tables\Columns\IconColumn;
|
||||
use Filament\Tables\Columns\TextColumn;
|
||||
use Filament\Tables\Table;
|
||||
@@ -24,8 +23,8 @@ class ServicesTable
|
||||
->label(Service::getAttributeLabel('identifier'))
|
||||
->searchable(),
|
||||
IconColumn::make('icon')
|
||||
->label('Icône')
|
||||
->icon(fn (Service $record) => 'heroicon-o-' . $record->icon),
|
||||
->label(Service::getAttributeLabel('icon'))
|
||||
->icon(fn (Service $record) => 'heroicon-o-'.$record->icon),
|
||||
TextColumn::make('created_at')
|
||||
->dateTime()
|
||||
->sortable()
|
||||
|
||||
@@ -3,9 +3,44 @@
|
||||
namespace App\Filament\Resources\Users\Pages;
|
||||
|
||||
use App\Filament\Resources\Users\UserResource;
|
||||
use App\Models\User;
|
||||
use App\Notifications\AdminInvitationNotification;
|
||||
use Filament\Resources\Pages\CreateRecord;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Password;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class CreateUser extends CreateRecord
|
||||
{
|
||||
protected static string $resource = UserResource::class;
|
||||
|
||||
/**
|
||||
* Generate a random password if none was provided, so the invitation
|
||||
* flow can proceed without requiring the admin to set one manually.
|
||||
*
|
||||
* @param array<string, mixed> $data
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
protected function mutateFormDataBeforeCreate(array $data): array
|
||||
{
|
||||
if (empty($data['password'])) {
|
||||
$data['password'] = Str::random(32);
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send an invitation email after the user is created so they can
|
||||
* set their own password via the admin panel reset flow.
|
||||
*/
|
||||
protected function afterCreate(): void
|
||||
{
|
||||
/** @var User $user */
|
||||
$user = $this->record;
|
||||
$token = Password::broker()->createToken($user);
|
||||
|
||||
$user->notify(new AdminInvitationNotification($token));
|
||||
Log::info('User invited: '.$user->email);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ class UserForm
|
||||
->required(),
|
||||
TextInput::make('email')
|
||||
->label(User::getAttributeLabel('email'))
|
||||
->label('Email address')
|
||||
->email()
|
||||
->required(),
|
||||
DateTimePicker::make('email_verified_at')
|
||||
@@ -28,14 +27,19 @@ class UserForm
|
||||
TextInput::make('password')
|
||||
->label(User::getAttributeLabel('password'))
|
||||
->password()
|
||||
->revealable()
|
||||
->dehydrated(fn ($state) => filled($state))
|
||||
->dehydrateStateUsing(fn ($state) => Hash::make($state)),
|
||||
->dehydrateStateUsing(fn ($state) => Hash::make($state))
|
||||
->hint(fn (string $operation) => $operation === 'create'
|
||||
? __('users.hints.password_create')
|
||||
: __('users.hints.password_edit'))
|
||||
->hintIcon('heroicon-m-information-circle'),
|
||||
Select::make('role')
|
||||
->label(User::getAttributeLabel('role'))
|
||||
->relationship('roles', 'name')
|
||||
->multiple()
|
||||
->preload()
|
||||
->searchable()
|
||||
->searchable(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Filament\Resources\Users\Tables;
|
||||
|
||||
use App\Models\User;
|
||||
use Filament\Actions\BulkActionGroup;
|
||||
use Filament\Actions\DeleteBulkAction;
|
||||
use Filament\Actions\EditAction;
|
||||
@@ -15,11 +16,13 @@ class UsersTable
|
||||
return $table
|
||||
->columns([
|
||||
TextColumn::make('name')
|
||||
->label(User::getAttributeLabel('name'))
|
||||
->searchable(),
|
||||
TextColumn::make('email')
|
||||
->label('Email address')
|
||||
->label(User::getAttributeLabel('email'))
|
||||
->searchable(),
|
||||
TextColumn::make('email_verified_at')
|
||||
->label(User::getAttributeLabel('email_verified_at'))
|
||||
->dateTime()
|
||||
->sortable(),
|
||||
TextColumn::make('created_at')
|
||||
|
||||
Reference in New Issue
Block a user