From c6329c2a423348e2d7064b8eaee67e31a374d457 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 12 Oct 2024 16:58:38 +0800
Subject: [PATCH] Laravel Vapor - New UI for admin to download reports (sync
 code from Shipping Portal)

---
 .../Exports/Services/ExportsAnalyticBookingTransactions.php   | 2 +-
 app/Classes/Modules/Exports/Services/ExportsTransactions.php  | 2 +-
 resources/views/pages/downloads/index.blade.php               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsAnalyticBookingTransactions.php
index 3ab92d23..c268d08c 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(1), Carbon::now()]); //Limit, 'expensive' query;
+        return Booking::query()->whereBetween('created_at', [Carbon::now()->subMonths(2), Carbon::now()]); //Limit, 'expensive' query;
     }
 
     /**
diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
index 32ca5cc8..b66cf878 100644
--- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
@@ -27,7 +27,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho
      */
     public function query()
     {
-        return Transaction::whereBetween('created_at', [Carbon::now()->subMonths(2), Carbon::now()]) //Limit, 'expensive' query;
+        return Transaction::whereBetween('created_at', [Carbon::now()->subMonths(1), 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 d36ed6f6..bcd78fcc 100644
--- a/resources/views/pages/downloads/index.blade.php
+++ b/resources/views/pages/downloads/index.blade.php
@@ -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 months)</p>
                             </div>
                             <open-link-in-new-tab-component custom-class="btn btn-primary" :url="route('transactions.export')">
                                 <i class="fa fa-download"></i> Download
@@ -40,7 +40,7 @@
                         <div class="card-body d-flex justify-content-between align-items-center">
                             <div>
                                 <span>bookingData.csv</span>
-                                <p class="text-muted mb-0">(last 1 month)</p>
+                                <p class="text-muted mb-0">(last 2 month)</p>
                             </div>
                             <open-link-in-new-tab-component custom-class="btn btn-primary" :url="route('bookingData.export')">
                                 <i class="fa fa-download"></i> Download