From 8f7e9131f92e61ab8b8d88bf3d54027463042620 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Tue, 3 Jun 2025 16:00:46 +0500 Subject: [PATCH] update transaction --- .../Actions/DownloadCardRequisite.php | 5 ---- lang/vendor/nova/tk.json | 2 +- .../download-card-transaction.blade.php | 23 ++++++++++--------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/app/Nova/Resources/Order/Card/Requisite/Actions/DownloadCardRequisite.php b/app/Nova/Resources/Order/Card/Requisite/Actions/DownloadCardRequisite.php index 3df1fc7..b7648f3 100644 --- a/app/Nova/Resources/Order/Card/Requisite/Actions/DownloadCardRequisite.php +++ b/app/Nova/Resources/Order/Card/Requisite/Actions/DownloadCardRequisite.php @@ -75,11 +75,6 @@ class DownloadCardRequisite extends Action end_date: $date, ); - info([ - 'isJson' => Str::isJson($response), - 'decoded' => json_decode($response), - ]); - return Str::isJson($response) ? json_decode($response) : emptyClass(errCode: 1, message: 'Connection issue to VP'); diff --git a/lang/vendor/nova/tk.json b/lang/vendor/nova/tk.json index 68ceec6..54a3a0e 100644 --- a/lang/vendor/nova/tk.json +++ b/lang/vendor/nova/tk.json @@ -340,7 +340,7 @@ "Restore Selected": "Saýlananlary dikelt", "Reunion": "Reunion", "Romania": "Rumyniýa", - "Run Action": "Hereket et", + "Run Action": "Dowam et", "Russian Federation": "Russiýa Federasiýasy", "Rwanda": "Ruanda", "Saint Barthelemy": "Keramatly Bartelemi", diff --git a/resources/views/orders/cards/card-transaction/download-card-transaction.blade.php b/resources/views/orders/cards/card-transaction/download-card-transaction.blade.php index 0c54235..1bd80d6 100644 --- a/resources/views/orders/cards/card-transaction/download-card-transaction.blade.php +++ b/resources/views/orders/cards/card-transaction/download-card-transaction.blade.php @@ -11,7 +11,7 @@

Sene: {{ now()->format('d.m.Y') }}

-

№ ---YOK--- belgili kart hasaby boýunça GÖÇÜRME

+

№ {{ $data->accountNumber }} belgili kart hasaby boýunça GÖÇÜRME

Müşderiniň FAAa: {{ $data->clientName }}

{{ $data->fromDate }} - {{ $data->toDate }} aralygy üçin

@@ -37,19 +37,20 @@ @foreach($data->transactions as $transaction) @php - $date = Carbon\Carbon::create($transaction->trandate); + $operdate = Carbon\Carbon::create($transaction->operdate); + $trandate = Carbon\Carbon::create($transaction->trandate); @endphp - {{ $date->format('d.m.Y') }} - {{ $date->format('d.m.Y') }} ---Sagady yok--- - {{ $data->cardMaskNumber }} - {{ $transaction->actionName }} - YOK - {{ $transaction->currency }} - {{ $transaction->opersum }} - {{ $transaction->opersum }} - {{ $transaction->balsum }} + {{ $operdate->format('d.m.Y') }} + {{ $transaction->trantime }}, {{ $trandate->format('d.m.Y') }} + {{ $data->cardnum }} + {{ $transaction->binfo }} + {{ $transaction->terminalLocation }} + {{ $transaction->currCode }} + {{ $transaction->currOperSum }} + {{ $transaction->currOperSum }}({{ $transaction->sign }}) + {{ $transaction->rest }} @endforeach