From 328c2829f73bd31abd73ec2d5091554bdcaac8c9 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Thu, 11 Sep 2025 00:14:07 +0500 Subject: [PATCH] a --- .../CardTransactionsController.php | 24 +++++++++---------- routes/api.php | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Api/CardTransaction/CardTransactionsController.php b/app/Http/Controllers/Api/CardTransaction/CardTransactionsController.php index 4ded388..f7dbc3c 100644 --- a/app/Http/Controllers/Api/CardTransaction/CardTransactionsController.php +++ b/app/Http/Controllers/Api/CardTransaction/CardTransactionsController.php @@ -18,22 +18,20 @@ use Illuminate\Validation\Rule; #[Group('Sargytlar - Kart - Kart hereketleri')] class CardTransactionsController extends Controller { - public function quick(Request $request) + /** + * This month transactions on card + */ + public function lastMonth(): JsonResponse { - $data = $request->validate([ - 'start_date' => ['required', 'string', 'date'], - 'end_date' => ['required', 'string', 'date', 'after:start_date'], - ]); - $user = auth()->user(); - $start_date = Carbon::create($data['start_date'])->format('d.m.Y'); - $end_date = Carbon::create($data['end_date'])->format('d.m.Y'); - $passport_serie = $this->getOption('passport_serie'); - $passport_id = $this->getOption('passport_id'); - $card_number = $this->getOption('card_number'); - $card_month = $this->getOption('card_month'); - $card_year = $this->getOption('card_year'); + $start_date = today()->startOfMonth()->format('d.m.Y'); + $end_date = today()->endOfMonth()->format('d.m.Y'); + $passport_serie = $user->getOption('passport_serie'); + $passport_id = $user->getOption('passport_id'); + $card_number = $user->getOption('card_number'); + $card_month = $user->getOption('card_month'); + $card_year = $user->getOption('card_year'); if ( is_null($passport_serie) || $passport_serie === '' || diff --git a/routes/api.php b/routes/api.php index 60ae0d8..fdbc53b 100644 --- a/routes/api.php +++ b/routes/api.php @@ -108,7 +108,7 @@ Route::middleware(['auth:sanctum', 'not_banned'])->group(function () { Route::delete('card-order/{cardOrder}', [CardOrderController::class, 'destroy']); // Card transactions... [tested fully] - Route::get('card-transactions-quick', [CardTransactionsController::class, 'quick']); + Route::get('card-transactions-last-month', [CardTransactionsController::class, 'lastMonth']); Route::get('card-transactions', [CardTransactionsController::class, 'index']); Route::get('card-transactions/{order}', [CardTransactionsController::class, 'show']); Route::get('card-transactions-download/{order}', [CardTransactionsController::class, 'download']);