From fcbc7639c1815aa2215e1de707dd3a06751b8ade Mon Sep 17 00:00:00 2001
From: sayaliparab <sayali00015@gmail.com>
Date: Fri, 12 Jul 2024 16:57:11 +0530
Subject: [PATCH] report

---
 app/Exports/ReportExport.php             |  1 -
 resources/views/exports/report.blade.php | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/Exports/ReportExport.php b/app/Exports/ReportExport.php
index d49794f..1da8fb9 100644
--- a/app/Exports/ReportExport.php
+++ b/app/Exports/ReportExport.php
@@ -50,7 +50,6 @@ class ReportExport implements FromView
             $data = $query->get();
         } elseif ($this->reportType === 'Total Users') {
             $query = IamPrincipal::query()->where('principal_type_xid',3);
-            // $query = Subscriptions::query()->where('is_cancelled_subscription', 1);
 
             if (!empty($this->states)) {
                 $query->whereIn('state_xid', $this->states);
diff --git a/resources/views/exports/report.blade.php b/resources/views/exports/report.blade.php
index 680dbce..1ccea69 100644
--- a/resources/views/exports/report.blade.php
+++ b/resources/views/exports/report.blade.php
@@ -11,7 +11,7 @@
     @if ($data->isEmpty())
         <p>No data available</p>
     @else
-    
+
     @if ($reportType === 'Total Subscribed')
     <table>
         <thead>
@@ -20,7 +20,7 @@
                 <th>Subscription ID</th>
                 <th>User Name</th>
                 <th>State</th>
-                <th>Created At</th>
+                <th>Subscription Date & Time</th>
             </tr>
         </thead>
         <tbody>
@@ -40,10 +40,10 @@
         <thead>
             <tr>
                 <th>Sr No.</th>
-                <th>User ID</th>
-                <th>User Name</th>
+                <th>Customer ID</th>
+                <th>Customer Name</th>
                 <th>State</th>
-                <th>Created At</th>
+                <th>Customer Join Date & Time</th>
             </tr>
         </thead>
         <tbody>
@@ -68,7 +68,7 @@
                 <th>Restaurant Name</th>
                 <th>Customer Name</th>
                 <th>State</th>
-                <th>Created At</th>
+                <th>Redemption Date & Time</th>
             </tr>
         </thead>
         <tbody>
@@ -93,7 +93,7 @@
                 <th>Restaurant Name</th>
                 <th>Customer Name</th>
                 <th>State</th>
-                <th>Created At</th>
+                <th>Redemption Date & Time</th>
             </tr>
         </thead>
         <tbody>
@@ -118,7 +118,7 @@
                 <th>Email</th>
                 <th>State</th>
                 <th>Subscription Status</th>
-                <th>Cancelled At</th>
+                <th>Subscription Cancel Date & Time</th>
             </tr>
         </thead>
         <tbody>
@@ -144,7 +144,7 @@
                 <th>Email</th>
                 <th>Phone Number</th>
                 <th>State</th>
-                <th>Referred Date Time</th>
+                <th>Referred Date & Time</th>
             </tr>
         </thead>
         <tbody>
@@ -172,7 +172,7 @@
                 <th>Email</th>
                 <th>Phone number</th>
                 <th>State</th>
-                <th>Referred Date Time</th>
+                <th>Referred Date & Time</th>
             </tr>
         </thead>
         <tbody>