nurmuhammet/tbbank-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance ListRecords pages with tab functionality and default sorting

Browse Source 
- Added getTabs method to ListCardPinOrders, ListLoanOrders, and ListLoanOrderMobiles pages to display order statuses for system users.
- Implemented default sorting by 'created_at' in LoanOrdersTable and LoanOrderMobilesTable for improved data organization.
- Updated ManageCards page to ensure proper type declaration for getTitle method.
This commit is contained in:
Mekan1206
2025-12-21 05:21:53 +05:00
parent 5a53b90272
commit 5e37bd1a76
29 changed files with 111 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/Clusters/Cards/Cards/Pages/ManageCards.php
View File

@@ -11,7 +11,7 @@ class ManageCards extends ManageRecords
{
protected static string $resource = CardResource::class;
public function getTitle(): string | Htmlable
public function getTitle(): string|Htmlable
{
return __('My cards');
}

21
app/Filament/Clusters/Cards/Resources/CardPinOrders/Pages/ListCardPinOrders.php
View File

@@ -3,8 +3,10 @@
namespace App\Filament\Clusters\Cards\Resources\CardPinOrders\Pages;
use App\Filament\Clusters\Cards\Resources\CardPinOrders\CardPinOrderResource;
use App\Modules\OrderStatus\Repositories\OrderStatusRepository;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Filament\Schemas\Components\Tabs\Tab;
class ListCardPinOrders extends ListRecords
{
@@ -16,4 +18,23 @@ class ListCardPinOrders extends ListRecords
CreateAction::make(),
];
}
public function getTabs(): array
{
if (! user()->isSystemUser()) {
return [];
}
$data = [];
foreach (array_keys(OrderStatusRepository::statusClasses()) as $status) {
if ($status === '') {
$data[null] = Tab::make(__('All'));
} else {
$data[$status] = Tab::make(OrderStatusRepository::statusFormatted($status))->query(fn ($query) => $query->where('status', $status));
}
}
return $data;
}
}

21
app/Filament/Clusters/Loans/LoanOrders/Pages/ListLoanOrders.php
View File

@@ -3,8 +3,10 @@
namespace App\Filament\Clusters\Loans\LoanOrders\Pages;
use App\Filament\Clusters\Loans\LoanOrders\LoanOrderResource;
use App\Modules\OrderStatus\Repositories\OrderStatusRepository;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Filament\Schemas\Components\Tabs\Tab;
class ListLoanOrders extends ListRecords
{
@@ -16,4 +18,23 @@ class ListLoanOrders extends ListRecords
CreateAction::make(),
];
}
public function getTabs(): array
{
if (! user()->isSystemUser()) {
return [];
}
$data = [];
foreach (array_keys(OrderStatusRepository::statusClasses()) as $status) {
if ($status === '') {
$data[null] = Tab::make(__('All'));
} else {
$data[$status] = Tab::make(OrderStatusRepository::statusFormatted($status))->query(fn ($query) => $query->where('status', $status));
}
}
return $data;
}
}

1
app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php
View File

@@ -25,6 +25,7 @@ class LoanOrdersTable
DefaultQueryForResourceIndexRepository::make($query);
})
->defaultSort('created_at', 'desc')
->columns([
TextColumn::make('id')
->label('ID')

21
app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Pages/ListLoanOrderMobiles.php
View File

@@ -3,8 +3,10 @@
namespace App\Filament\Clusters\Loans\Resources\LoanOrderMobiles\Pages;
use App\Filament\Clusters\Loans\Resources\LoanOrderMobiles\LoanOrderMobileResource;
use App\Modules\OrderStatus\Repositories\OrderStatusRepository;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Filament\Schemas\Components\Tabs\Tab;
class ListLoanOrderMobiles extends ListRecords
{
@@ -16,4 +18,23 @@ class ListLoanOrderMobiles extends ListRecords
CreateAction::make(),
];
}
public function getTabs(): array
{
if (! user()->isSystemUser()) {
return [];
}
$data = [];
foreach (array_keys(OrderStatusRepository::statusClasses()) as $status) {
if ($status === '') {
$data[null] = Tab::make(__('All'));
} else {
$data[$status] = Tab::make(OrderStatusRepository::statusFormatted($status))->query(fn ($query) => $query->where('status', $status));
}
}
return $data;
}
}

1
app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php
View File

@@ -25,6 +25,7 @@ class LoanOrderMobilesTable
DefaultQueryForResourceIndexRepository::make($query);
})
->defaultSort('created_at', 'desc')
->columns([
TextColumn::make('id')
->label('ID')

21
app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Pages/ListLoanPaidOffLetters.php
View File

@@ -3,8 +3,10 @@
namespace App\Filament\Clusters\Loans\Resources\LoanPaidOffLetters\Pages;
use App\Filament\Clusters\Loans\Resources\LoanPaidOffLetters\LoanPaidOffLetterResource;
use App\Modules\OrderStatus\Repositories\OrderStatusRepository;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use Filament\Schemas\Components\Tabs\Tab;
class ListLoanPaidOffLetters extends ListRecords
{
@@ -16,4 +18,23 @@ class ListLoanPaidOffLetters extends ListRecords
CreateAction::make(),
];
}
public function getTabs(): array
{
if (! user()->isSystemUser()) {
return [];
}
$data = [];
foreach (array_keys(OrderStatusRepository::statusClasses()) as $status) {
if ($status === '') {
$data[null] = Tab::make(__('All'));
} else {
$data[$status] = Tab::make(OrderStatusRepository::statusFormatted($status))->query(fn ($query) => $query->where('status', $status));
}
}
return $data;
}
}

1
app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php
View File

@@ -20,6 +20,7 @@ class LoanPaidOffLettersTable
->modifyQueryUsing(function (Builder $query) {
DefaultQueryForResourceIndexRepository::make($query);
})
->defaultSort('created_at', 'desc')
->columns([
TextColumn::make('id')
->label('ID')

2
app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Schemas/VisaMasterPaymentOrderForm.php
View File

@@ -150,7 +150,7 @@ class VisaMasterPaymentOrderForm
AdvancedFileUpload::make('sender_passport_local')
->spatieMediaLibrary(collection: 'sender_passport_local')
->multiple(),
SpatieMediaLibraryFileUpload::make('sender_passport_international')
->collection('sender_passport_international')
->label(__('Ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportynyň asyl görnüşi we göçürmesi')),

5
app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Tables/VisaMasterPaymentOrdersTable.php
View File

@@ -2,6 +2,7 @@
namespace App\Filament\Clusters\VisaMasterPayments\Resources\VisaMasterPaymentOrders\Tables;
use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository;
use App\Modules\OrderStatus\Repositories\OrderStatusRepository;
use App\Modules\Region\Repositories\RegionRepository;
use Filament\Actions\BulkActionGroup;
@@ -14,6 +15,7 @@ use Filament\Tables\Columns\IconColumn;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\TrashedFilter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Str;
class VisaMasterPaymentOrdersTable
@@ -21,6 +23,9 @@ class VisaMasterPaymentOrdersTable
public static function configure(Table $table): Table
{
return $table
->modifyQueryUsing(function (Builder $query) {
DefaultQueryForResourceIndexRepository::make($query);
})
->defaultSort('created_at', direction: 'desc')
->columns([
TextColumn::make('id')

2
app/Filament/Resources/Users/Schemas/UserForm.php
View File

@@ -32,7 +32,7 @@ class UserForm
->unique(ignoreRecord: true)
->mask('99 99 99 99')
->prefix('+993')
->dehydrateStateUsing(fn($state) => unMaskTurkmenNumber($state))
->dehydrateStateUsing(fn ($state) => unMaskTurkmenNumber($state))
->rules([
new PhoneNumberVerificationRule,
])

2
app/Models/User.php
View File

@@ -4,9 +4,9 @@ namespace App\Models;
use App\Modules\UserAdjustments\Traits\UserAdjustments;
use Filament\Models\Contracts\FilamentUser;
use Filament\Models\Contracts\HasAvatar;
use Filament\Panel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Filament\Models\Contracts\HasAvatar;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Date;

2
app/Modules/CardOrder/Resources/Lang/tk/base.php
View File

@@ -2,4 +2,4 @@
return [
'card_order_created' => 'Kart sargydyňyz :order_id belgi bilen hasaba alyndy. Sargydy tassyklamak üçin operatorymyz habarlaşar.',
];
];

1
app/Modules/OnlinePayment/Policies/OnlinePaymentPolicy.php
View File

@@ -47,4 +47,3 @@ class OnlinePaymentPolicy
return $user->can('ForceDelete:OnlinePayment');
}
}

3
app/Modules/Sms/Repositories/SmsRepository.php
View File

@@ -15,7 +15,8 @@ class SmsRepository
public static function sendSMS(string|int $phone, string|int $message): mixed
{
if (app()->environment('local')) {
info('Sending SMS to ' . $phone . ' with message: ' . $message);
info('Sending SMS to '.$phone.' with message: '.$message);
return true;
}

2
app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php
View File

@@ -37,7 +37,7 @@ use Spatie\MediaLibrary\InteractsWithMedia;
* @property \Illuminate\Support\Carbon|null $updated_at
* @property \Illuminate\Support\Carbon|null $deleted_at
*/
class VisaMasterPaymentOrder extends Model implements HasMedia, BelongsToBranch
class VisaMasterPaymentOrder extends Model implements BelongsToBranch, HasMedia
{
use InteractsWithMedia;
use SoftDeletes;

1
app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderItemPolicy.php
View File

@@ -47,4 +47,3 @@ class VisaMasterPaymentOrderItemPolicy
return $user->can('ForceDelete:VisaMasterPaymentOrderItem');
}
}

1
app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderPolicy.php
View File

@@ -47,4 +47,3 @@ class VisaMasterPaymentOrderPolicy
return $user->can('ForceDelete:VisaMasterPaymentOrder');
}
}

1
app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterSettingsPolicy.php
View File

@@ -47,4 +47,3 @@ class VisaMasterSettingsPolicy
return $user->can('ForceDelete:VisaMasterSettings');
}
}

2
database/seeders/Migrators/BranchesMigrator.php
View File

@@ -20,4 +20,4 @@ class BranchesMigrator
->insert($data);
}
}
}
}

2
database/seeders/Migrators/CardOrdersMigrator.php
View File

@@ -20,4 +20,4 @@ class CardOrdersMigrator
->insert($data);
}
}
}
}

2
database/seeders/Migrators/CardPinOrdersMigrator.php
View File

@@ -26,4 +26,4 @@ class CardPinOrdersMigrator
->insert($data);
}
}
}
}

2
database/seeders/Migrators/CardStatesMigrator.php
View File

@@ -20,4 +20,4 @@ class CardStatesMigrator
->insert($data);
}
}
}
}

2
database/seeders/Migrators/CardTypesMigrator.php
View File

@@ -20,4 +20,4 @@ class CardTypesMigrator
->insert($data);
}
}
}
}

2
database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php
View File

@@ -20,4 +20,4 @@ class LoanOrderRequiredDocsMigrator
->insert($data);
}
}
}
}

9
database/seeders/Migrators/LoanOrdersMigrator.php
View File

@@ -2,19 +2,16 @@
namespace Database\Seeders\Migrators;
use JsonMachine\JsonMachine;
use JsonMachine\Items;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\File;
use Illuminate\Support\LazyCollection;
use Cerbero\LazyJson\LazyJson;
use JsonMachine\Items;
class LoanOrdersMigrator
{
public function migrate(): void
{
// Running on seeder file, may not work.
DB::table('loan_orders')->truncate();
$path = database_path('data/nurmuhammetsdb/loan_orders.json');
@@ -29,4 +26,4 @@ class LoanOrdersMigrator
DB::table('loan_orders')->insert((array) $item);
}
}
}
}

2
database/seeders/Migrators/ProvincesMigrator.php
View File

@@ -20,4 +20,4 @@ class ProvincesMigrator
->insert($data);
}
}
}
}

4
database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php
View File

@@ -3,7 +3,6 @@
namespace Database\Seeders\Migrators;
use Illuminate\Support\Facades\DB;
use JsonMachine\JsonMachine;
use JsonMachine\Items;
class VisaMasterPaymentOrdersMigrator
@@ -21,7 +20,6 @@ class VisaMasterPaymentOrdersMigrator
continue;
}
$sender_datas = json_decode($item->sender_datas);
$payment_reciever = json_decode($item->payment_reciever);
@@ -63,4 +61,4 @@ class VisaMasterPaymentOrdersMigrator
]);
}
}
}
}

1
routes/web.php
View File

@@ -1,7 +1,6 @@
<?php
use Illuminate\Support\Facades\Route;
use Database\Seeders\Migrators\VisaMasterPaymentOrdersMigrator;
Route::redirect('/', filament_path());