From fa414ce5ed54336d2eb53293441c2fb7b1755ef0 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Mon, 14 Oct 2024 21:15:30 +0500 Subject: [PATCH] wip --- .../FetchCardHistoryController.php | 2 +- app/Nova/Actions/CheckOnlinePayment.php | 19 ++++++++++--------- .../Actions/MakePaymentNovaVisaMaster.php | 7 +++---- app/Nova/Resources/CurrencyRate.php | 2 -- app/Policies/OnlinePaymentHistoryPolicy.php | 1 - app/Repos/Payment/OnlinePaymentRepo.php | 2 +- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/FetchCardHistoryController.php b/app/Http/Controllers/FetchCardHistoryController.php index b1138ff..c85968a 100644 --- a/app/Http/Controllers/FetchCardHistoryController.php +++ b/app/Http/Controllers/FetchCardHistoryController.php @@ -9,7 +9,7 @@ class FetchCardHistoryController extends Controller /** * Fetch card history * - * @param Request $request + * @param Request $request */ public function index(Request $request) { diff --git a/app/Nova/Actions/CheckOnlinePayment.php b/app/Nova/Actions/CheckOnlinePayment.php index d05b929..845e48b 100644 --- a/app/Nova/Actions/CheckOnlinePayment.php +++ b/app/Nova/Actions/CheckOnlinePayment.php @@ -3,7 +3,6 @@ namespace App\Nova\Actions; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Collection; use Laravel\Nova\Actions\Action; @@ -40,16 +39,18 @@ class CheckOnlinePayment extends Action $username = $relatedResource->branch; $password = $relatedResource->branch; - $response = Http::asForm()->post('https://mpi.gov.tm/payment/rest/getOrderStatus.do', [ - 'language' => 'ru', - 'orderId' => $onlinePaymentResource->orderId, - 'userName' => $username, - 'password' => $password, - ]); + // $response = Http::asForm()->post('https://mpi.gov.tm/payment/rest/getOrderStatus.do', [ + // 'language' => 'ru', + // 'orderId' => $onlinePaymentResource->orderId, + // 'userName' => $username, + // 'password' => $password, + // ]); - $payment_status = $response['ErrorCode'] == '0'; + // $payment_status = $response['ErrorCode'] == '0'; - if ($payment_status) { + // if ($payment_status) { + + // } } /** diff --git a/app/Nova/Actions/MakePaymentNovaVisaMaster.php b/app/Nova/Actions/MakePaymentNovaVisaMaster.php index 14f2545..76069e5 100644 --- a/app/Nova/Actions/MakePaymentNovaVisaMaster.php +++ b/app/Nova/Actions/MakePaymentNovaVisaMaster.php @@ -11,7 +11,6 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Log; -use Illuminate\Validation\Rule; use Laravel\Nova\Actions\Action; use Laravel\Nova\Actions\ActionResponse; use Laravel\Nova\Fields\ActionFields; @@ -87,7 +86,7 @@ class MakePaymentNovaVisaMaster extends Action Text::make(sprintf('%s (%s)', __('Töleg möçberi'), __('TMT')), 'payment_amount') ->fullWidth() ->required() - ->rules('required', 'numeric', 'max:'. $max_value) + ->rules('required', 'numeric', 'max:'.$max_value) ->help("Iň ýokary möçberi: {$max_value} TMT"), Text::make(__('USD ekwalendi'), 'usd_rate') @@ -104,7 +103,7 @@ class MakePaymentNovaVisaMaster extends Action Text::make(__('Jemi (TMT)'), 'total_amount') ->fullWidth() ->readonly() - ->dependsOn('payment_amount', function ($field, $request, $formData) use ($usd_to_tmt) { + ->dependsOn('payment_amount', function ($field, $request, $formData) { if ($formData->payment_amount) { $field->setValue( floatval(number_format($formData->payment_amount, 2)) + 23 @@ -112,7 +111,7 @@ class MakePaymentNovaVisaMaster extends Action } else { $field->setValue(''); } - }) + }), ]; } diff --git a/app/Nova/Resources/CurrencyRate.php b/app/Nova/Resources/CurrencyRate.php index 8ea5c6d..e09be6e 100644 --- a/app/Nova/Resources/CurrencyRate.php +++ b/app/Nova/Resources/CurrencyRate.php @@ -5,9 +5,7 @@ namespace App\Nova\Resources; use App\Models\CurrencyRate as ModelsCurrencyRate; use App\Nova\Resource; use Illuminate\Http\Request; -use Laravel\Nova\Fields\Currency; use Laravel\Nova\Fields\ID; -use Laravel\Nova\Fields\Number; use Laravel\Nova\Fields\Select; use Laravel\Nova\Fields\Text; use Laravel\Nova\Http\Requests\NovaRequest; diff --git a/app/Policies/OnlinePaymentHistoryPolicy.php b/app/Policies/OnlinePaymentHistoryPolicy.php index d653687..142f2ba 100644 --- a/app/Policies/OnlinePaymentHistoryPolicy.php +++ b/app/Policies/OnlinePaymentHistoryPolicy.php @@ -4,7 +4,6 @@ namespace App\Policies; use App\Models\Payment\OnlinePaymentHistory; use App\Models\User; -use Illuminate\Auth\Access\Response; class OnlinePaymentHistoryPolicy { diff --git a/app/Repos/Payment/OnlinePaymentRepo.php b/app/Repos/Payment/OnlinePaymentRepo.php index a58cd60..3ad187e 100644 --- a/app/Repos/Payment/OnlinePaymentRepo.php +++ b/app/Repos/Payment/OnlinePaymentRepo.php @@ -70,7 +70,7 @@ class OnlinePaymentRepo ]; } - $onlinePaymentHistory = new OnlinePaymentHistory(); + $onlinePaymentHistory = new OnlinePaymentHistory; $onlinePaymentHistory->online_paymantable_id = $resource->id; $onlinePaymentHistory->online_paymantable_type = $resource::$model; $onlinePaymentHistory->amount = $resource->priceAmount();