diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php index c268d08c..3ab92d23 100644 --- a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php @@ -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; } /** diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 30a99200..32ca5cc8 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -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); } /** diff --git a/resources/views/pages/downloads/index.blade.php b/resources/views/pages/downloads/index.blade.php index 2e54efaa..8ee2631b 100644 --- a/resources/views/pages/downloads/index.blade.php +++ b/resources/views/pages/downloads/index.blade.php @@ -25,7 +25,7 @@
(last 2 months)
+(last 1 month)