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

Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-10-12 16:31:28 +08:00
parent 06f9b33553 ea49856890
commit bbf3e9acbc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php
+1 -1
View File
@@ -52,7 +52,7 @@ class ExportsAnalyticBookingTransactions implements FromQuery, WithHeadings, Wit
*/
public function query()
{
return Booking::query()->whereBetween('created_at', [Carbon::now()->subMonths(2), Carbon::now()]); //Limit, 'expensive' query;
return Booking::query()->whereBetween('created_at', [Carbon::now()->subMonths(1), Carbon::now()]); //Limit, 'expensive' query;
}
/**
app/Classes/Modules/Exports/Services/ExportsTransactions.php
+3 -3
View File
@@ -27,9 +27,9 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho
*/
public function query()
{
return Transaction::whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL])
->where('owner_type', '!=',Wallet::class)
->whereBetween('created_at', [Carbon::now()->subMonths(2), Carbon::now()]); //Limit, 'expensive' query;
return Transaction::whereBetween('created_at', [Carbon::now()->subMonths(2), Carbon::now()]) //Limit, 'expensive' query;
->whereIn('type', [TransactionType::PAYMENT, TransactionType::BILL])
->where('owner_type', '!=',Wallet::class);
}
/**
resources/views/pages/downloads/index.blade.php
+1 -1
View File
@@ -25,7 +25,7 @@
<div class="card-body d-flex justify-content-between align-items-center">
<div>
<span>transactions.csv</span>
<p class="text-muted mb-0">(last 2 months)</p>
<p class="text-muted mb-0">(last 1 month)</p>
</div>
<open-link-in-new-tab-component custom-class="btn btn-primary" :url="route('transactions.export')">
<i class="fa fa-download"></i> Download