From a728aab8d739936f9f785fe2003d422241744a1c Mon Sep 17 00:00:00 2001
From: sayaliparab <sayali00015@gmail.com>
Date: Tue, 9 Jul 2024 19:27:01 +0530
Subject: [PATCH 1/2] ExportReport

---
 resources/views/exports/report.blade.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/resources/views/exports/report.blade.php b/resources/views/exports/report.blade.php
index 0067a57..3ca0ff3 100644
--- a/resources/views/exports/report.blade.php
+++ b/resources/views/exports/report.blade.php
@@ -13,8 +13,7 @@
             <tr>
                 <th>Sr No.</th>
                 <th>Subscription ID</th>
-                <th>User First Name</th>
-                <th>User Last Name</th>
+                <th>User Name</th>
                 <th>State</th>
                 <th>Created At</th>
             </tr>
@@ -24,10 +23,9 @@
             <tr>
                 <td>{{ $loop->iteration }}</td>
                 <td>{{ $subscription->id }}</td>
-                <td>{{ $subscription->iamPrincipal->first_name ?? 'N/A' }}</td>
-                <td>{{ $subscription->iamPrincipal->last_name ?? 'N/A' }}</td>
+                <td>{{ $subscription->iamPrincipal->first_name ?? 'N/A' }} {{ $subscription->iamPrincipal->last_name ?? 'N/A' }} </td>
                 <td>{{ $subscription->iamPrincipal->state->name ?? 'N/A' }}</td>
-                <td>{{ $subscription->created_at ?? 'N/A' }}</td>
+                <td>{{\Carbon\Carbon::parse($subscription->created_at)->format('m-d-Y H:i')}}</td>
             </tr>
             @endforeach
         </tbody>
@@ -76,7 +74,7 @@
                 <td>{{ $redemption->restaurant->name }}</td>
                 <td>{{ $redemption->customer->first_name }} {{ $redemption->customer->last_name }}</td>
                 <td>{{ $redemption->customer->state->name }}</td>
-                <td>{{ $redemption->created_at }}</td>
+                <td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m-d-Y H:i')}} </td>
             </tr>
             @endforeach
         </tbody>
@@ -102,6 +100,7 @@
                 <td>{{ $redemption->customer->first_name }} {{ $redemption->customer->last_name }}</td>
                 <td>{{ $redemption->customer->state->name }}</td>
                 <td>{{ $redemption->created_at }}</td>
+                <td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m-d-Y H:i')}} </td>
             </tr>
             @endforeach
 
@@ -127,7 +126,7 @@
                 <td>{{ $item->iamPrincipal->email_address }}</td>
                 <td>{{ $item->iamPrincipal->state->name }}</td>
                 <td>{{ $item->subscription_status }}</td>
-                <td>{{ \Carbon\Carbon::parse($item->cancelled_at)->format('m-d-Y') }}</td>
+                <td>{{ \Carbon\Carbon::parse($item->cancelled_at)->format('m-d-Y H:i') }}</td>
                 </tr>
             @endforeach
 

From 5dc49a9c68d5626d14b3550750ee473bde939f1e Mon Sep 17 00:00:00 2001
From: sayaliparab <sayali00015@gmail.com>
Date: Tue, 9 Jul 2024 19:48:49 +0530
Subject: [PATCH 2/2] Export

---
 resources/views/exports/report.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/exports/report.blade.php b/resources/views/exports/report.blade.php
index 3ca0ff3..905520b 100644
--- a/resources/views/exports/report.blade.php
+++ b/resources/views/exports/report.blade.php
@@ -99,7 +99,6 @@
                 <td>{{ $redemption->restaurant->name }}</td>
                 <td>{{ $redemption->customer->first_name }} {{ $redemption->customer->last_name }}</td>
                 <td>{{ $redemption->customer->state->name }}</td>
-                <td>{{ $redemption->created_at }}</td>
                 <td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m-d-Y H:i')}} </td>
             </tr>
             @endforeach