From 0351840e0c736bed7af48b0098942718794df4a7 Mon Sep 17 00:00:00 2001 From: sayliraut Date: Mon, 12 Aug 2024 16:12:44 +0530 Subject: [PATCH 1/2] changes --- app/Exports/customer_export.php | 4 +++- app/Exports/customer_export_selected.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Exports/customer_export.php b/app/Exports/customer_export.php index 993f3f5..8679895 100644 --- a/app/Exports/customer_export.php +++ b/app/Exports/customer_export.php @@ -30,7 +30,9 @@ class customer_export implements FromCollection, WithHeadings $serial = 1; return $customers->map(function ($customer) use (&$serial) { $subscription = $customer->isSubscribed->first(); - $isSubscribed = $subscription && $subscription->status == 'complete' ? 'Subscribed' : 'Unsubscribed'; + $dateTime = now(); + $formattedDateTime = $dateTime->format('Y-m-d H:i:s'); + $isSubscribed = $subscription && $subscription->next_payment_date >= $formattedDateTime && $subscription->status == 'complete' ? 'Subscribed' : 'Unsubscribed'; return [ 'Sr No.' => $serial++, // Increment serial number diff --git a/app/Exports/customer_export_selected.php b/app/Exports/customer_export_selected.php index 6d2eaaa..ff960e5 100644 --- a/app/Exports/customer_export_selected.php +++ b/app/Exports/customer_export_selected.php @@ -42,7 +42,9 @@ class customer_export_selected implements FromCollection, WithHeadings $serial = 1; $mappedCustomers = $selected_customers->map(function ($customer) use (&$serial) { $subscription = $customer->isSubscribed->first(); - $isSubscribed = $subscription && $subscription->status == 'complete' ? 'Subscribed' : 'Unsubscribed'; + $dateTime = now(); + $formattedDateTime = $dateTime->format('Y-m-d H:i:s'); + $isSubscribed = $subscription && $subscription->next_payment_date >= $formattedDateTime && $subscription->status == 'complete' ? 'Subscribed' : 'Unsubscribed'; return [ 'Sr No.' => $serial++, // Increment serial number 'id' => $customer->id, From d2e1ff1fd32cc05f29822f51726f7cfe7b1a90e2 Mon Sep 17 00:00:00 2001 From: sayliraut Date: Mon, 12 Aug 2024 16:17:45 +0530 Subject: [PATCH 2/2] changes --- app/Http/Controllers/Admin/DashboardController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index c24ff58..a53c63f 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -127,8 +127,7 @@ class DashboardController extends Controller $restaurantCount = ManageRestaurant::where('is_active', 1)->count(); $formattedDateTime = now()->format('Y-m-d H:i:s'); - $recent_transactions = Subscriptions::where('next_payment_date', '>=', $formattedDateTime) - ->with('subscription') + $recent_transactions = Subscriptions::with('subscription') ->orderBy('id', 'desc') ->get();