Sayli.Parab/cheerstothe_season_2.0
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Merge pull request #446 from WDI-Ideas/sayli

Browse Source 
Sayli
This commit is contained in:
Sayli Raut
2024-08-12 16:18:25 +05:30
committed by GitHub
parent 9db365a3eb 11f8b03075
commit fb3b95b1ba
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Exports/customer_export.php
View File

@@ -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

4
app/Exports/customer_export_selected.php
View File

@@ -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,

3
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -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();