From f51de7b2aa7de3a34d0703a9daebc91402128e51 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Thu, 8 May 2025 20:24:47 +0500 Subject: [PATCH] test loan remaining --- .../FetchLoanRemainingController.php | 42 ++++++++++++++++--- app/Nova/User.php | 10 +++-- lang/tk.json | 1 + 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/FetchLoanRemainingController.php b/app/Http/Controllers/FetchLoanRemainingController.php index 798589b..2d543e6 100644 --- a/app/Http/Controllers/FetchLoanRemainingController.php +++ b/app/Http/Controllers/FetchLoanRemainingController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use App\Modules\LoanRemainingOrder\Actions\FetchRemainingLoanFromBilling; use App\Repos\System\Settings\Legal\PassportRepo; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -23,11 +22,42 @@ class FetchLoanRemainingController extends Controller 'account_number' => ['required', 'string', 'max:255'], ]); - $response = FetchRemainingLoanFromBilling::make()->handle( - passport_serie: $request->passport_serie, - passport_id: $request->passport_id, - account_number: $request->account_number, - ); + $passport_serie = $request->passport_serie; + $passport_id = $request->passport_id; + $account_number = $request->account_number; + + $curl = curl_init(); + + curl_setopt_array($curl, [ + CURLOPT_URL => 'http://10.3.158.102:9999/api/loaninfo', + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 0, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'POST', + CURLOPT_POSTFIELDS => sprintf(' + { + "idSeria": "%s", + "idNo": "%s", + "accountCode": "%s" + } + ', + $passport_serie, + $passport_id, + $account_number, + ), + CURLOPT_HTTPHEADER => [ + 'Authorization: Basic dGJ1c2VyOlFBWndzeDEyMw==', + 'Content-Type: application/json', + ], + ]); + + /** @var array|bool */ + $response = curl_exec($curl); + + curl_close($curl); return response()->json($response); } diff --git a/app/Nova/User.php b/app/Nova/User.php index 8d55478..51780d1 100644 --- a/app/Nova/User.php +++ b/app/Nova/User.php @@ -15,10 +15,10 @@ use Laravel\Nova\Fields\Boolean; use Laravel\Nova\Fields\Hidden; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\MorphToMany; -use Laravel\Nova\Fields\Number; use Laravel\Nova\Fields\Password; use Laravel\Nova\Fields\Text; use Laravel\Nova\Http\Requests\NovaRequest; +use Nurmuhammet\NovaInputmask\NovaInputmask; /** * @mixin \App\Models\User @@ -119,8 +119,12 @@ class User extends Resource ->sortable() ->rules('required', 'max:255'), - Number::make(__('Phone'), 'phone') - ->rules('required', 'integer', 'between:61000000,71999999', 'unique:users,phone'), + NovaInputmask::make(__('Phone'), 'phone') + ->mask('+(\\9\\93)-99-99-99-99') + ->storeRawValue() + ->rules('required', 'integer', 'between:61000000, 71999999') + ->creationRules('unique:users,phone') + ->updateRules('unique:users,phone,{{resourceId}}'), Text::make(__('Email'), 'email') ->sortable() diff --git a/lang/tk.json b/lang/tk.json index a77f05e..3fe1cd5 100644 --- a/lang/tk.json +++ b/lang/tk.json @@ -206,6 +206,7 @@ "Use Proxy": "Proksi ulanyň", "User": "Ulanyjy", "Users": "Ulanyjylar", + "All users": "Ähli ulanyjylar", "Variant Also Negotiates": "Wariant hem gepleşik geçirýär", "Verify Phone Number": "Telefon beligiňizi tassyklaň", "Phone verified": "Telefon tassyklanan",