diff --git a/app/Filament/Clusters/Cards/CardOrders/Pages/CreateCardOrder.php b/app/Filament/Clusters/Cards/CardOrders/Pages/CreateCardOrder.php index 2b74fae..5b017ee 100644 --- a/app/Filament/Clusters/Cards/CardOrders/Pages/CreateCardOrder.php +++ b/app/Filament/Clusters/Cards/CardOrders/Pages/CreateCardOrder.php @@ -4,8 +4,22 @@ namespace App\Filament\Clusters\Cards\CardOrders\Pages; use App\Filament\Clusters\Cards\CardOrders\CardOrderResource; use Filament\Resources\Pages\CreateRecord; +use Illuminate\Support\Facades\URL; class CreateCardOrder extends CreateRecord { protected static string $resource = CardOrderResource::class; + + protected function getRedirectUrl(): string + { + $defaultUrl = $this->getResource()::getUrl('index'); + + return $defaultUrl; + + // $payment = (new OnlinePaymentRepo)->payCardOrder($resource); + + // $payment['status'] === 'success' + // ? URL::remote($payment['url']) + // : $defaultUrl; + } } diff --git a/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php b/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php index fa31f40..725b411 100644 --- a/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php +++ b/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php @@ -2,6 +2,8 @@ namespace App\Filament\Clusters\Cards\CardOrders\Tables; +use App\Modules\OrderStatus\Repositories\OrderStatusRepository; +use App\Modules\Region\Repositories\RegionRepository; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; @@ -19,64 +21,58 @@ class CardOrdersTable return $table ->columns([ TextColumn::make('unique_id') + ->label(__('ID')) ->searchable(), + TextColumn::make('cardState.name') + ->label(__('Reason')) ->searchable(), + TextColumn::make('cardType.name') + ->label(__('Card type')) ->searchable(), - TextColumn::make('region') - ->searchable(), - TextColumn::make('branch.name') - ->searchable(), - TextColumn::make('customer_name') - ->searchable(), - TextColumn::make('customer_surname') - ->searchable(), - TextColumn::make('customer_patronic_name') - ->searchable(), - TextColumn::make('born_at') - ->date() - ->sortable(), - TextColumn::make('old_surname') - ->searchable(), - TextColumn::make('citizenship') - ->searchable(), - TextColumn::make('passport_serie') - ->searchable(), - TextColumn::make('passport_id') - ->searchable(), - TextColumn::make('passport_given_at') - ->date() - ->sortable(), - TextColumn::make('passport_given_by') - ->searchable(), - TextColumn::make('born_place') - ->searchable(), - TextColumn::make('job_location') - ->searchable(), - TextColumn::make('passport_address') - ->searchable(), - TextColumn::make('real_address') - ->searchable(), - TextColumn::make('phone') - ->searchable(), - TextColumn::make('phone_additional') - ->searchable(), - TextColumn::make('status') - ->searchable(), - TextColumn::make('user.name') - ->searchable(), - IconColumn::make('paid') - ->boolean(), + TextColumn::make('created_at') + ->label(__('Created At')) ->dateTime() - ->sortable() - ->toggleable(isToggledHiddenByDefault: true), + ->sortable(), + + TextColumn::make('region') + ->label(__('Region')) + ->formatStateUsing(fn (string $state): string => RegionRepository::label($state)) + ->searchable(), + + TextColumn::make('branch.name') + ->label(__('Branch')) + ->searchable(), + + TextColumn::make('customer_name') + ->label(__('Name')) + ->searchable(), + + TextColumn::make('customer_surname') + ->label(__('Surname')) + ->searchable(), + + IconColumn::make('paid') + ->label(__('Paid')) + ->boolean(), + + TextColumn::make('phone') + ->label(__('Phone')) + ->searchable(), + + TextColumn::make('status') + ->formatStateUsing(fn (string $state) => OrderStatusRepository::statusFormatted($state)) + ->searchable(), + TextColumn::make('updated_at') + ->label(__('Updated At')) ->dateTime() ->sortable() ->toggleable(isToggledHiddenByDefault: true), TextColumn::make('deleted_at') + ->label(__('Deleted At')) ->dateTime() ->sortable() ->toggleable(isToggledHiddenByDefault: true), diff --git a/app/Filament/Clusters/Cards/Cards/CardResource.php b/app/Filament/Clusters/Cards/Cards/CardResource.php index caebd61..1f954b5 100644 --- a/app/Filament/Clusters/Cards/Cards/CardResource.php +++ b/app/Filament/Clusters/Cards/Cards/CardResource.php @@ -2,13 +2,13 @@ namespace App\Filament\Clusters\Cards\Cards; -use App\Filament\Clusters\Cards\CardsCluster; use App\Filament\Clusters\Cards\Cards\Pages\ManageCards; +use App\Filament\Clusters\Cards\CardsCluster; use App\Modules\AppHelpers\Repositories\DateHelper; +use App\Modules\Card\Models\Card; use App\Modules\CardBalance\Repositories\CardBalanceRepository; use App\Modules\CardRequisite\Repositories\CardRequisiteRepository; use App\Modules\CardTransaction\Repositories\CardTransactionRepository; -use App\Modules\Card\Models\Card; use BackedEnum; use Filament\Actions\Action; use Filament\Actions\BulkActionGroup; diff --git a/app/Livewire/UserProfileFields.php b/app/Livewire/UserProfileFields.php index 8eb72dc..2f5e5a6 100644 --- a/app/Livewire/UserProfileFields.php +++ b/app/Livewire/UserProfileFields.php @@ -43,7 +43,7 @@ class UserProfileFields extends Component implements HasForms ->description(__('Fill your account profile information')) ->schema([ TextInput::make('first_name') - ->label(__('First name')) + ->label(__('Name')) ->string() ->maxLength(255) ->default(user()->first_name) @@ -51,7 +51,7 @@ class UserProfileFields extends Component implements HasForms ->required(), TextInput::make('last_name') - ->label(__('Last name')) + ->label(__('Surname')) ->string() ->maxLength(255) ->default(user()->last_name) @@ -89,6 +89,7 @@ class UserProfileFields extends Component implements HasForms ->label(__('Email')) ->email() ->default(user()->email) + ->unique(ignoreRecord: false) ->columnSpan(2), Fieldset::make(__('Passport')) diff --git a/app/Providers/Filament/WorkPanelProvider.php b/app/Providers/Filament/WorkPanelProvider.php index 38e4bd5..36492f1 100644 --- a/app/Providers/Filament/WorkPanelProvider.php +++ b/app/Providers/Filament/WorkPanelProvider.php @@ -85,7 +85,6 @@ class WorkPanelProvider extends PanelProvider ]) ->spa() ->databaseTransactions() - ->breadcrumbs(false) ->colors([ 'danger' => Color::Rose, 'gray' => Color::Gray,