cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 06:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2024-11-07 06:56:24 +08:00
parent 713881cc46 92347350cf
commit 32aeaf057b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsCustomersWalletTransactionHistory.php
+2 -6
View File
@@ -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;