This commit is contained in:
2024-10-14 21:15:30 +05:00
parent c524bc8091
commit fa414ce5ed
6 changed files with 15 additions and 18 deletions

View File

@@ -3,7 +3,6 @@
namespace App\Nova\Actions; namespace App\Nova\Actions;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Laravel\Nova\Actions\Action; use Laravel\Nova\Actions\Action;
@@ -40,16 +39,18 @@ class CheckOnlinePayment extends Action
$username = $relatedResource->branch; $username = $relatedResource->branch;
$password = $relatedResource->branch; $password = $relatedResource->branch;
$response = Http::asForm()->post('https://mpi.gov.tm/payment/rest/getOrderStatus.do', [ // $response = Http::asForm()->post('https://mpi.gov.tm/payment/rest/getOrderStatus.do', [
'language' => 'ru', // 'language' => 'ru',
'orderId' => $onlinePaymentResource->orderId, // 'orderId' => $onlinePaymentResource->orderId,
'userName' => $username, // 'userName' => $username,
'password' => $password, // 'password' => $password,
]); // ]);
$payment_status = $response['ErrorCode'] == '0'; // $payment_status = $response['ErrorCode'] == '0';
if ($payment_status) { // if ($payment_status) {
// }
} }
/** /**

View File

@@ -11,7 +11,6 @@ use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Blade; use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Validation\Rule;
use Laravel\Nova\Actions\Action; use Laravel\Nova\Actions\Action;
use Laravel\Nova\Actions\ActionResponse; use Laravel\Nova\Actions\ActionResponse;
use Laravel\Nova\Fields\ActionFields; 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') Text::make(sprintf('%s (%s)', __('Töleg möçberi'), __('TMT')), 'payment_amount')
->fullWidth() ->fullWidth()
->required() ->required()
->rules('required', 'numeric', 'max:'. $max_value) ->rules('required', 'numeric', 'max:'.$max_value)
->help("Iň ýokary möçberi: {$max_value} TMT"), ->help("Iň ýokary möçberi: {$max_value} TMT"),
Text::make(__('USD ekwalendi'), 'usd_rate') Text::make(__('USD ekwalendi'), 'usd_rate')
@@ -104,7 +103,7 @@ class MakePaymentNovaVisaMaster extends Action
Text::make(__('Jemi (TMT)'), 'total_amount') Text::make(__('Jemi (TMT)'), 'total_amount')
->fullWidth() ->fullWidth()
->readonly() ->readonly()
->dependsOn('payment_amount', function ($field, $request, $formData) use ($usd_to_tmt) { ->dependsOn('payment_amount', function ($field, $request, $formData) {
if ($formData->payment_amount) { if ($formData->payment_amount) {
$field->setValue( $field->setValue(
floatval(number_format($formData->payment_amount, 2)) + 23 floatval(number_format($formData->payment_amount, 2)) + 23
@@ -112,7 +111,7 @@ class MakePaymentNovaVisaMaster extends Action
} else { } else {
$field->setValue(''); $field->setValue('');
} }
}) }),
]; ];
} }

View File

@@ -5,9 +5,7 @@ namespace App\Nova\Resources;
use App\Models\CurrencyRate as ModelsCurrencyRate; use App\Models\CurrencyRate as ModelsCurrencyRate;
use App\Nova\Resource; use App\Nova\Resource;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Laravel\Nova\Fields\Currency;
use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\ID;
use Laravel\Nova\Fields\Number;
use Laravel\Nova\Fields\Select; use Laravel\Nova\Fields\Select;
use Laravel\Nova\Fields\Text; use Laravel\Nova\Fields\Text;
use Laravel\Nova\Http\Requests\NovaRequest; use Laravel\Nova\Http\Requests\NovaRequest;

View File

@@ -4,7 +4,6 @@ namespace App\Policies;
use App\Models\Payment\OnlinePaymentHistory; use App\Models\Payment\OnlinePaymentHistory;
use App\Models\User; use App\Models\User;
use Illuminate\Auth\Access\Response;
class OnlinePaymentHistoryPolicy class OnlinePaymentHistoryPolicy
{ {

View File

@@ -70,7 +70,7 @@ class OnlinePaymentRepo
]; ];
} }
$onlinePaymentHistory = new OnlinePaymentHistory(); $onlinePaymentHistory = new OnlinePaymentHistory;
$onlinePaymentHistory->online_paymantable_id = $resource->id; $onlinePaymentHistory->online_paymantable_id = $resource->id;
$onlinePaymentHistory->online_paymantable_type = $resource::$model; $onlinePaymentHistory->online_paymantable_type = $resource::$model;
$onlinePaymentHistory->amount = $resource->priceAmount(); $onlinePaymentHistory->amount = $resource->priceAmount();