wip

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()

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')

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'))

app/Modules/AppHelpers/Contracts/HasFailedMethod.php

@@ -2,7 +2,7 @@
 
 namespace App\Modules\AppHelpers\Contracts;
 
-interface HasOnlinePaymentStatusFields
+interface HasFailedMethod
 {
     public function failed(): bool;
 

app/Modules/BaseAuth/Middleware/RedirectIfUserPhoneIsVerfied.php

@@ -17,7 +17,7 @@ class RedirectIfUserPhoneIsVerfied
     public function handle(Request $request, Closure $next): Response
     {
         if (Auth::check() && ! is_null($request->user()?->phone_verified_at)) {
-            return redirect()->route(config()->string('module.base-auth.redirect_path'));
+            return redirect(config()->string('module.base-auth.redirect_path'));
         }
 
         return $next($request);

app/Modules/CardOrder/Database/Migrations/2025_10_23_012416_create_card_orders_table.php

@@ -53,7 +53,7 @@ return new class extends Migration
 
             $table->text('notes')->nullable();
 
-            $table->foreignId('user_id')->constrained('users')->restrictOnDelete();
+            $table->foreignId('user_id')->nullable()->constrained('users')->nullOnDelete();
 
             $table->boolean('paid')->default(false);
 

app/Modules/UserAdjustments/Database/Migrations/2025_11_03_173856_add_active_to_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('active')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('active');
+        });
+    }
+};

app/Providers/AppServiceProvider.php

@@ -58,5 +58,7 @@ class AppServiceProvider extends ServiceProvider
 
             return $builder;
         });
+
+        logDB();
     }
 }

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",

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",

database/seeders/FillJsonData.php

@@ -16,18 +16,6 @@ class FillJsonData extends Seeder
      */
     public function run(): void
     {
-
-    }
-
-    public function insertByFiles(): void
-    {
-        $files = glob(database_path('data').'/*');
-
-        foreach ($files as $file) {
-            $table_data = File::json($file);
-            $table_name = Str::afterLast(Str::before($file, '.json'), '/');
-
-            DB::table($table_name)->insert($table_data);
-        }
+        // provinces
     }
 }

database/seeders/ShieldSeeder.php

@@ -35,14 +35,6 @@ class ShieldSeeder extends Seeder
                 'name' => 'admin',
                 'guard_name' => 'web',
             ],
-            [
-                'name' => 'operator',
-                'guard_name' => 'web',
-            ],
-            [
-                'name' => 'currency_maintainer',
-                'guard_name' => 'web',
-            ],
         ])->map(fn ($role) => [
             ...$role,
             'created_at' => now(),

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",
 }

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"
 }