From 7095880f7ac0f40ea507d0b78375c9553a3535b8 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Tue, 1 Oct 2024 23:11:03 +0500 Subject: [PATCH] wip --- .../FetchCardHistoryController.php | 31 +++++++++++--- app/Nova/Resources/Order/Loan/LoanOrder.php | 1 - .../Loan/LoanOrderMobileFieldsForDetail.php | 2 +- .../NovaCustomHtml/src/NovaCustomHtml.php | 5 ++- resources/js/vendor/nova/js/additional.js | 41 ++++++++++--------- routes/web.php | 3 +- 6 files changed, 51 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/FetchCardHistoryController.php b/app/Http/Controllers/FetchCardHistoryController.php index 8110afb..fd4b5e5 100644 --- a/app/Http/Controllers/FetchCardHistoryController.php +++ b/app/Http/Controllers/FetchCardHistoryController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Http; class FetchCardHistoryController extends Controller { @@ -16,14 +15,34 @@ class FetchCardHistoryController extends Controller 'card_expiry_date' => ['required', 'string', 'max:255'], ]); - $response = Http::withBody('{ + $curl = curl_init(); + + curl_setopt_array($curl, [ + CURLOPT_URL => 'http://10.3.158.102:9999/api/clientinfo', + 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 => '{ "idSeria": "I-AS", "idNo": "314567", - "cardMaskNumber":"993403******3258", + "clientType": "recipient", + "cardMaskNumber": "993403******3258", "expDate": "07/49" - "clientType":"recipient", - }')->acceptJson()->post('http://10.3.158.102:9999/api/clientinfo'); + }', + CURLOPT_HTTPHEADER => [ + 'Accept: application/json', + 'Content-Type: application/json', + ], + ]); - return $response->body(); + $response = curl_exec($curl); + + curl_close($curl); + + return $response; } } diff --git a/app/Nova/Resources/Order/Loan/LoanOrder.php b/app/Nova/Resources/Order/Loan/LoanOrder.php index d07e3d2..27b0164 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanOrder.php @@ -25,7 +25,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Email; -use Laravel\Nova\Fields\Heading; use Laravel\Nova\Fields\Hidden; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Image; diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php index 2c22bd7..bb87a7a 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php @@ -93,7 +93,7 @@ class LoanOrderMobileFieldsForDetail new Panel(__('Card'), [ NovaCustomHtml::make(__('Data'), 'card_name') ->html(view('orders.loan.mobile.card-history', [ - 'resource' => $resource + 'resource' => $resource, ])->render()) ->fillUsing(NovaForm::fillEmpty()), ]), diff --git a/nova-components/NovaCustomHtml/src/NovaCustomHtml.php b/nova-components/NovaCustomHtml/src/NovaCustomHtml.php index 98e556b..e65a9e6 100644 --- a/nova-components/NovaCustomHtml/src/NovaCustomHtml.php +++ b/nova-components/NovaCustomHtml/src/NovaCustomHtml.php @@ -7,7 +7,7 @@ use Laravel\Nova\Fields\SupportsDependentFields; class NovaCustomHtml extends Field { - use SupportsDependentFields; + use SupportsDependentFields; /** * The field's component. @@ -46,7 +46,8 @@ class NovaCustomHtml extends Field /** * Hide - * @param bool|boolean + * + * @param bool|bool */ public function hidden(bool $hidden = true): self { diff --git a/resources/js/vendor/nova/js/additional.js b/resources/js/vendor/nova/js/additional.js index c831867..0141f9a 100644 --- a/resources/js/vendor/nova/js/additional.js +++ b/resources/js/vendor/nova/js/additional.js @@ -27,33 +27,34 @@ async function fetchCardHistory(passport_serie, passport_id, card_number, card_e }) .then(response => response.json()) .then(result => { + console.log({result: result}) if (result.errCode != 0) { Nova.error('Barlap bolmady, tor näsazlygy') } - cardHistoryDetailContainer.innerHTML = ` -

Şahamça: ${result.depName},

+ // cardHistoryDetailContainer.innerHTML = ` + //

Şahamça: ${result.depName},

-

-

+ //

+ // `; }) .catch(error => console.log('error', error)); } diff --git a/routes/web.php b/routes/web.php index fcaff83..ab1b76d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,7 +3,6 @@ use App\Http\Controllers\Auth\LoginController; use App\Http\Controllers\Auth\RegisterController; use App\Http\Controllers\Auth\ResetPasswordController; -use App\Http\Controllers\FetchCardHistoryController; use App\Http\Controllers\LocaleController; use App\Http\Controllers\OnlinePaymentController; use Illuminate\Support\Facades\Route; @@ -39,7 +38,7 @@ Route::middleware(['auth', 'unVerified'])->group(function () { Route::get('online-payment-store', [OnlinePaymentController::class, 'store'])->name('online-payment-store'); Route::get('online-payment-store-visa-master', [ - OnlinePaymentController::class, 'visaMaster' + OnlinePaymentController::class, 'visaMaster', ])->name('online-payment-store-visa-master'); Route::redirect('/', config('nova.path'));