diff --git a/app/Filament/Clusters/Cards/Cards/Pages/ManageCards.php b/app/Filament/Clusters/Cards/Cards/Pages/ManageCards.php index 5a4ec53..501ddfa 100644 --- a/app/Filament/Clusters/Cards/Cards/Pages/ManageCards.php +++ b/app/Filament/Clusters/Cards/Cards/Pages/ManageCards.php @@ -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'); } diff --git a/app/Filament/Clusters/Cards/Resources/CardPinOrders/Pages/ListCardPinOrders.php b/app/Filament/Clusters/Cards/Resources/CardPinOrders/Pages/ListCardPinOrders.php index d5d2894..d845fad 100644 --- a/app/Filament/Clusters/Cards/Resources/CardPinOrders/Pages/ListCardPinOrders.php +++ b/app/Filament/Clusters/Cards/Resources/CardPinOrders/Pages/ListCardPinOrders.php @@ -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; + } } diff --git a/app/Filament/Clusters/Loans/LoanOrders/Pages/ListLoanOrders.php b/app/Filament/Clusters/Loans/LoanOrders/Pages/ListLoanOrders.php index b18c733..ec1b1b1 100644 --- a/app/Filament/Clusters/Loans/LoanOrders/Pages/ListLoanOrders.php +++ b/app/Filament/Clusters/Loans/LoanOrders/Pages/ListLoanOrders.php @@ -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; + } } diff --git a/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php b/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php index cd19b51..10c65da 100644 --- a/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php +++ b/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php @@ -25,6 +25,7 @@ class LoanOrdersTable DefaultQueryForResourceIndexRepository::make($query); }) + ->defaultSort('created_at', 'desc') ->columns([ TextColumn::make('id') ->label('ID') diff --git a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Pages/ListLoanOrderMobiles.php b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Pages/ListLoanOrderMobiles.php index 281fc96..5fb57ce 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Pages/ListLoanOrderMobiles.php +++ b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Pages/ListLoanOrderMobiles.php @@ -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; + } } diff --git a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php index 01ae790..a0b6f7b 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php +++ b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php @@ -25,6 +25,7 @@ class LoanOrderMobilesTable DefaultQueryForResourceIndexRepository::make($query); }) + ->defaultSort('created_at', 'desc') ->columns([ TextColumn::make('id') ->label('ID') diff --git a/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Pages/ListLoanPaidOffLetters.php b/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Pages/ListLoanPaidOffLetters.php index 00dbea7..a8de713 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Pages/ListLoanPaidOffLetters.php +++ b/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Pages/ListLoanPaidOffLetters.php @@ -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; + } } diff --git a/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php b/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php index e061d5e..4785800 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php +++ b/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php @@ -20,6 +20,7 @@ class LoanPaidOffLettersTable ->modifyQueryUsing(function (Builder $query) { DefaultQueryForResourceIndexRepository::make($query); }) + ->defaultSort('created_at', 'desc') ->columns([ TextColumn::make('id') ->label('ID') diff --git a/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Schemas/VisaMasterPaymentOrderForm.php b/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Schemas/VisaMasterPaymentOrderForm.php index b0e46c5..c93d39c 100644 --- a/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Schemas/VisaMasterPaymentOrderForm.php +++ b/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Schemas/VisaMasterPaymentOrderForm.php @@ -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')), diff --git a/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Tables/VisaMasterPaymentOrdersTable.php b/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Tables/VisaMasterPaymentOrdersTable.php index 893c77c..4deef0f 100644 --- a/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Tables/VisaMasterPaymentOrdersTable.php +++ b/app/Filament/Clusters/VisaMasterPayments/Resources/VisaMasterPaymentOrders/Tables/VisaMasterPaymentOrdersTable.php @@ -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') diff --git a/app/Filament/Resources/Users/Schemas/UserForm.php b/app/Filament/Resources/Users/Schemas/UserForm.php index 0365006..dba9686 100644 --- a/app/Filament/Resources/Users/Schemas/UserForm.php +++ b/app/Filament/Resources/Users/Schemas/UserForm.php @@ -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, ]) diff --git a/app/Models/User.php b/app/Models/User.php index a2e83f5..1bfdb6b 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -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; diff --git a/app/Modules/CardOrder/Resources/Lang/tk/base.php b/app/Modules/CardOrder/Resources/Lang/tk/base.php index eecbb53..19e7cc3 100644 --- a/app/Modules/CardOrder/Resources/Lang/tk/base.php +++ b/app/Modules/CardOrder/Resources/Lang/tk/base.php @@ -2,4 +2,4 @@ return [ 'card_order_created' => 'Kart sargydyňyz :order_id belgi bilen hasaba alyndy. Sargydy tassyklamak üçin operatorymyz habarlaşar.', -]; \ No newline at end of file +]; diff --git a/app/Modules/OnlinePayment/Policies/OnlinePaymentPolicy.php b/app/Modules/OnlinePayment/Policies/OnlinePaymentPolicy.php index 44bd8aa..b2f0fad 100644 --- a/app/Modules/OnlinePayment/Policies/OnlinePaymentPolicy.php +++ b/app/Modules/OnlinePayment/Policies/OnlinePaymentPolicy.php @@ -47,4 +47,3 @@ class OnlinePaymentPolicy return $user->can('ForceDelete:OnlinePayment'); } } - diff --git a/app/Modules/Sms/Repositories/SmsRepository.php b/app/Modules/Sms/Repositories/SmsRepository.php index eecb3f0..7dd3fae 100644 --- a/app/Modules/Sms/Repositories/SmsRepository.php +++ b/app/Modules/Sms/Repositories/SmsRepository.php @@ -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; } diff --git a/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php index 0a4adb4..1d2563e 100644 --- a/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php @@ -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; diff --git a/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderItemPolicy.php b/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderItemPolicy.php index 820fd58..abd3d3e 100644 --- a/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderItemPolicy.php +++ b/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderItemPolicy.php @@ -47,4 +47,3 @@ class VisaMasterPaymentOrderItemPolicy return $user->can('ForceDelete:VisaMasterPaymentOrderItem'); } } - diff --git a/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderPolicy.php b/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderPolicy.php index 223d7de..ddfe56c 100644 --- a/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderPolicy.php +++ b/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterPaymentOrderPolicy.php @@ -47,4 +47,3 @@ class VisaMasterPaymentOrderPolicy return $user->can('ForceDelete:VisaMasterPaymentOrder'); } } - diff --git a/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterSettingsPolicy.php b/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterSettingsPolicy.php index b18e6fc..9a66a56 100644 --- a/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterSettingsPolicy.php +++ b/app/Modules/VisaMasterPaymentOrder/Policies/VisaMasterSettingsPolicy.php @@ -47,4 +47,3 @@ class VisaMasterSettingsPolicy return $user->can('ForceDelete:VisaMasterSettings'); } } - diff --git a/database/seeders/Migrators/BranchesMigrator.php b/database/seeders/Migrators/BranchesMigrator.php index 73246d3..7fd22ae 100644 --- a/database/seeders/Migrators/BranchesMigrator.php +++ b/database/seeders/Migrators/BranchesMigrator.php @@ -20,4 +20,4 @@ class BranchesMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/CardOrdersMigrator.php b/database/seeders/Migrators/CardOrdersMigrator.php index 17ad05f..2849d7f 100644 --- a/database/seeders/Migrators/CardOrdersMigrator.php +++ b/database/seeders/Migrators/CardOrdersMigrator.php @@ -20,4 +20,4 @@ class CardOrdersMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/CardPinOrdersMigrator.php b/database/seeders/Migrators/CardPinOrdersMigrator.php index 7fe82e4..c65dd1f 100644 --- a/database/seeders/Migrators/CardPinOrdersMigrator.php +++ b/database/seeders/Migrators/CardPinOrdersMigrator.php @@ -26,4 +26,4 @@ class CardPinOrdersMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/CardStatesMigrator.php b/database/seeders/Migrators/CardStatesMigrator.php index cd87ab0..f44310e 100644 --- a/database/seeders/Migrators/CardStatesMigrator.php +++ b/database/seeders/Migrators/CardStatesMigrator.php @@ -20,4 +20,4 @@ class CardStatesMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/CardTypesMigrator.php b/database/seeders/Migrators/CardTypesMigrator.php index cdd76a9..eb579a8 100644 --- a/database/seeders/Migrators/CardTypesMigrator.php +++ b/database/seeders/Migrators/CardTypesMigrator.php @@ -20,4 +20,4 @@ class CardTypesMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php b/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php index 14a7a6d..566a016 100644 --- a/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php +++ b/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php @@ -20,4 +20,4 @@ class LoanOrderRequiredDocsMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/LoanOrdersMigrator.php b/database/seeders/Migrators/LoanOrdersMigrator.php index 935ca8a..35fa46b 100644 --- a/database/seeders/Migrators/LoanOrdersMigrator.php +++ b/database/seeders/Migrators/LoanOrdersMigrator.php @@ -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); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/ProvincesMigrator.php b/database/seeders/Migrators/ProvincesMigrator.php index 45aa41c..b38ed39 100644 --- a/database/seeders/Migrators/ProvincesMigrator.php +++ b/database/seeders/Migrators/ProvincesMigrator.php @@ -20,4 +20,4 @@ class ProvincesMigrator ->insert($data); } } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php b/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php index 389a86f..5d4092f 100644 --- a/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php +++ b/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php @@ -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 ]); } } -} \ No newline at end of file +} diff --git a/routes/web.php b/routes/web.php index 5d16060..0b85efb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,6 @@