From 92347350cf4fe047bd9f190c51faf2894697ecdb Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 7 Nov 2024 06:56:13 +0800 Subject: [PATCH] Laravel Vapor - Fix a problem on downloading Wallet Transaction History --- .../Services/ExportsCustomersWalletTransactionHistory.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsCustomersWalletTransactionHistory.php b/app/Classes/Modules/Exports/Services/ExportsCustomersWalletTransactionHistory.php index cb328f46..745539f5 100644 --- a/app/Classes/Modules/Exports/Services/ExportsCustomersWalletTransactionHistory.php +++ b/app/Classes/Modules/Exports/Services/ExportsCustomersWalletTransactionHistory.php @@ -20,14 +20,10 @@ class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeading private $request; private $runningBalance = 0; - protected $startDate; - protected $endDate; - public function __construct(Request $request, $startDate = null, $endDate = null) + public function __construct(Request $request) { $this->request = $request; - $this->startDate = $startDate ? Carbon::parse($startDate)->startOfDay() : Carbon::now()->subMonths(3); - $this->endDate = $endDate ? Carbon::parse($endDate)->endOfDay() : Carbon::now(); } public function headings(): array @@ -47,7 +43,7 @@ class ExportsCustomersWalletTransactionHistory implements FromQuery, WithHeading public function query() { $company = Company::where('reference', $this->request->route('marking'))->first(); - $transactions = $company->wallets()->first()->transactions()->whereIn('transactions.status', [2, 3])->whereBetween('created_at', [$this->startDate, $this->endDate])->orderBy('id'); + $transactions = $company->wallets()->first()->transactions()->whereIn('transactions.status', [2, 3])->orderBy('id'); // dd($transactions->get()->toArray()); return $transactions;