From 516c17326c213dba5ae274e461bc10b85956b2a5 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Mon, 3 Nov 2025 20:03:02 +0500 Subject: [PATCH] wip --- .../CardOrders/Tables/CardOrdersTable.php | 1 + .../LoanOrders/Schemas/LoanOrderForm.php | 1 - .../Tables/LoanOrderMobilesTable.php | 15 +++-- .../AppHelpers/Contracts/HasFailedMethod.php | 2 +- app/Providers/AppServiceProvider.php | 2 + composer.json | 1 - composer.lock | 67 +------------------ lang/ru.json | 6 +- lang/tk.json | 13 +++- 9 files changed, 30 insertions(+), 78 deletions(-) diff --git a/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php b/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php index 4fa756a..08db471 100644 --- a/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php +++ b/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php @@ -71,6 +71,7 @@ class CardOrdersTable TextColumn::make('status') ->label(__('Status')) + ->color(OrderStatusRepository::statusColorMatching()) ->formatStateUsing(fn (string $state) => OrderStatusRepository::statusFormatted($state)) ->badge() ->sortable() diff --git a/app/Filament/Clusters/Loans/LoanOrders/Schemas/LoanOrderForm.php b/app/Filament/Clusters/Loans/LoanOrders/Schemas/LoanOrderForm.php index 9f88662..f7ae527 100644 --- a/app/Filament/Clusters/Loans/LoanOrders/Schemas/LoanOrderForm.php +++ b/app/Filament/Clusters/Loans/LoanOrders/Schemas/LoanOrderForm.php @@ -91,7 +91,6 @@ class LoanOrderForm TextInput::make('loan_amount') ->label(__('Loan amount')) ->numeric() - ->required() ->minValue(1) ->maxValue(40000) ->suffix('TMT') diff --git a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php index 7cce8eb..01ae790 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php +++ b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php @@ -3,6 +3,8 @@ namespace App\Filament\Clusters\Loans\Resources\LoanOrderMobiles\Tables; use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; +use App\Modules\OrderStatus\Repositories\OrderStatusRepository; +use App\Modules\Region\Repositories\RegionRepository; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; @@ -28,15 +30,11 @@ class LoanOrderMobilesTable ->label('ID') ->sortable(), - TextColumn::make('loanType.name') - ->label(__('Loan type')) - ->sortable() - ->searchable(), - TextColumn::make('region') ->label(__('Region')) ->sortable() - ->searchable(), + ->searchable() + ->formatStateUsing(fn (string $state) => RegionRepository::label($state)), TextColumn::make('branch.name') ->label(__('Branch')) @@ -60,7 +58,10 @@ class LoanOrderMobilesTable TextColumn::make('status') ->label(__('Status')) ->sortable() - ->searchable(), + ->searchable() + ->badge() + ->color(OrderStatusRepository::statusColorMatching()) + ->formatStateUsing(fn (string $state) => OrderStatusRepository::statusFormatted($state)), TextColumn::make('created_at') ->label(__('Created At')) diff --git a/app/Modules/AppHelpers/Contracts/HasFailedMethod.php b/app/Modules/AppHelpers/Contracts/HasFailedMethod.php index d4176b2..ddab726 100644 --- a/app/Modules/AppHelpers/Contracts/HasFailedMethod.php +++ b/app/Modules/AppHelpers/Contracts/HasFailedMethod.php @@ -2,7 +2,7 @@ namespace App\Modules\AppHelpers\Contracts; -interface HasOnlinePaymentStatusFields +interface HasFailedMethod { public function failed(): bool; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4c305b9..86564d7 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -58,5 +58,7 @@ class AppServiceProvider extends ServiceProvider return $builder; }); + + logDB(); } } diff --git a/composer.json b/composer.json index 315b5a6..63ea5c0 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,6 @@ "laravel/framework": "^12.0", "laravel/tinker": "^2.10.1", "laravel/ui": "^4.6", - "lazy-json/lazy-json": "^1.0", "mpdf/mpdf": "^8.2", "phpoffice/phpword": "dev-master", "spatie/laravel-translatable": "^6.11", diff --git a/composer.lock b/composer.lock index a46980c..44e19d4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "24f3fe1fafb7c9baf0ed1a6b9d3a294e", + "content-hash": "b0a0696c3837569345f4ed8ecd9b2338", "packages": [ { "name": "abdulmajeed-jamaan/filament-translatable-tabs", @@ -3145,71 +3145,6 @@ }, "time": "2025-01-28T15:15:29+00:00" }, - { - "name": "lazy-json/lazy-json", - "version": "v1.0.3", - "source": { - "type": "git", - "url": "https://github.com/rubs33/lazy-json.git", - "reference": "6aff427185cd1a288121e8cd5672ed90ddc1377e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rubs33/lazy-json/zipball/6aff427185cd1a288121e8cd5672ed90ddc1377e", - "reference": "6aff427185cd1a288121e8cd5672ed90ddc1377e", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-json": "*", - "ext-spl": "*", - "php": "^8.1" - }, - "require-dev": { - "phpstan/phpstan": "^2.1", - "phpstan/phpstan-strict-rules": "^2.0", - "phpunit/phpunit": "^10.5", - "shipmonk/composer-dependency-analyser": "^1.8", - "squizlabs/php_codesniffer": "^3.0.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "LazyJson\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rubens Takiguti Ribeiro", - "email": "rubs33@gmail.com" - } - ], - "description": "PHP class to parse large JSON files and provide a lazy-load interface", - "homepage": "https://github.com/rubs33/lazy-json", - "keywords": [ - "json", - "json_decode", - "lazy-load", - "memory-efficient", - "parser" - ], - "support": { - "docs": "https://github.com/rubs33/lazy-json/blob/main/docs/index.md", - "issues": "https://github.com/rubs33/lazy-json/issues", - "source": "https://github.com/rubs33/lazy-json.git" - }, - "funding": [ - { - "url": "https://www.patreon.com/rubs33", - "type": "patreon" - } - ], - "time": "2025-03-03T22:07:12+00:00" - }, { "name": "league/commonmark", "version": "2.7.1", diff --git a/lang/ru.json b/lang/ru.json index 9a6a2bc..70b91d4 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -681,5 +681,9 @@ "Loan reason": "Причина кредита", "Loan paid off letter file": "Файл заявления о погашении кредита", "Salary card": "Карта (Заработная плата)", - "Account number": "Кредитный счет" + "Account number": "Кредитный счет", + "Legal Marriage": "Raýat nika", + "School": "Orta bilim", + "School drop out": "Gutarylmadyk orta bilim", + "Unfinished high education": "Gutarylmadyk ýokary bilim", } diff --git a/lang/tk.json b/lang/tk.json index 5b2f85e..306374d 100644 --- a/lang/tk.json +++ b/lang/tk.json @@ -683,5 +683,16 @@ "Loan contract date": "Karz şertnamanyň senesi", "Loan reason": "Karzyň maksady", "Loan paid off letter file": "Karz ýapylandygy barada güwanama almak faýly", - "Account number": "Karz hasaby" + "Account number": "Karz hasaby", + "Legal Marriage": "Raýat nika", + "School": "Orta bilim", + "School drop out": "Gutarylmadyk orta bilim", + "Middle school": "Orta mekdep", + "Unfinished high education": "Gutarylmadyk ýokary bilim", + "High education": "Ýokary bilim", + "Masters ED": "Magistr", + "PHD": "Ylymlaryň doktory", + "Married": "Öýlenen/Durmuşa çykan", + "Divorced": "Aýrylşan", + "Single": "Öýlenmedik/Durmuşa çykmadyk" }