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

Merge pull request #404 from WDI-Ideas/sayli

Browse Source 
Sayli
This commit is contained in:
Sayli Raut
2024-07-31 11:30:56 +05:30
committed by GitHub
parent 75cee21685 dc5cabe495
commit 513facba64
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/Admin/ManageReportsController.php
View File

@@ -11,6 +11,7 @@ use App\Exports\ReportExports;
use App\Models\ManageRestaurant;
use App\Models\ReferralUsers;
use App\Exports\ExportReports;
use Carbon\Carbon;
class ManageReportsController extends Controller
{
@@ -41,16 +42,15 @@ class ManageReportsController extends Controller
* Use : To download the excel.
*/
public function exportReport(Request $request)
{
// dd($request->all());
$reportType = $request->input('reportType');
$states = $request->input('states');
$restaurants = $request->input('restaurants', []);
$startDate = $request->input('startDate');
$endDate = $request->input('endDate');
$startDate = \Carbon\Carbon::parse( $request->startDate)->format('Y-m-d');
$endDate = \Carbon\Carbon::parse( $request->endDate)->format('Y-m-d');
// Set the file name based on the report type
$fileName = 'reports.xlsx'; // default file name
@@ -71,16 +71,17 @@ class ManageReportsController extends Controller
$fileName = 'referees_joined_report.xlsx';
}
// Log the report type and file name for debugging purposes
\Log::info('Report type: ' . $reportType);
\Log::info('File name: ' . $fileName);
try {
return Excel::download(new ExportReports($reportType, $states, $startDate, $endDate, $restaurants), $fileName);
} catch (\Exception $e) {
\Log::error('Export failed: ' . $e->getMessage());
\Log::error('Stack trace: ' . $e->getTraceAsString());
Log::error('Export failed: ' . $e->getMessage());
Log::error('Stack trace: ' . $e->getTraceAsString());
return response()->json(['error' => 'Export failed. Something went wrong.'], 500);
}
}
}

6
resources/views/Admin/pages/manage_reports/manage_reports.blade.php
View File

@@ -17,7 +17,7 @@ $currentPage = 'manage-reports';
</div>
</div>
</div>
<form id="reportForm" action="{{route('reports.export')}}" method="POST">
<form id="reportForm" action="{{ route('reports.export') }}" method="POST">
@csrf
<div class="row widget-content widget-content-area br-8 position-btn m-auto py-3" style="overflow: auto;">
<div class="col-6">
@@ -98,7 +98,7 @@ $currentPage = 'manage-reports';
<script>
// Initialize Flatpickr for the date range with placeholders and set maxDate to today
flatpickr("#startDate", {
dateFormat: "Y-m-d",
dateFormat: "m/d/Y", // Change date format to 'm/d/Y'
maxDate: "today",
onChange: function (selectedDates, dateStr) {
// Set the minimum date for the end date input
@@ -107,7 +107,7 @@ $currentPage = 'manage-reports';
});
flatpickr("#endDate", {
dateFormat: "Y-m-d",
dateFormat: "m/d/Y", // Change date format to 'm/d/Y'
maxDate: "today",
});

2
resources/views/Admin/pages/manage_users/manage_sub_admin/manage_subadmin.blade.php
View File

@@ -35,7 +35,7 @@
<!-- <th class="text-start">Last Name</th> -->
<th class="text-start">Email Id</th>
<th class="text-start">Last Login</th>
<th class="text-start">Created At</th>
<th class="text-start">Permission</th>
<th class="no-content">Action</th>
</tr>

20
resources/views/exports/reports.blade.php
View File

@@ -7,7 +7,7 @@
<body>
<h1>{{ $reportType }} Report</h1>
@if ($data->isEmpty())
<p>No data available</p>
@else
@@ -35,8 +35,8 @@
<td>{{ $subscription->iamPrincipal->email_address}}</td>
<td>{{ $subscription->iamPrincipal->phone_number}}</td>
<td>{{ $subscription->iamPrincipal->state->name ?? 'N/A' }}</td>
<td>{{\Carbon\Carbon::parse($subscription->created_at)->format('m-d-Y H:i')}}</td>
<td>{{\Carbon\Carbon::parse($subscription->next_payment_date)->format('m-d-Y H:i')}}</td>
<td>{{\Carbon\Carbon::parse($subscription->created_at)->format('m/d/Y H:i')}}</td>
<td>{{\Carbon\Carbon::parse($subscription->next_payment_date)->format('m/d/Y H:i')}}</td>
</tr>
@endforeach
</tbody>
@@ -63,7 +63,7 @@
<td>{{ $user->email_address }}</td>
<td>{{ $user->phone_number }}</td>
<td>{{ $user->state->name }}</td>
<td>{{ \Carbon\Carbon::parse($user->created_at)->format('m-d-Y H:i') }}</td>
<td>{{ \Carbon\Carbon::parse($user->created_at)->format('m/d/Y H:i') }}</td>
</tr>
@endforeach
@@ -93,7 +93,7 @@
<td>{{ $redemption->customer->email_address }}</td>
<td>{{ $redemption->customer->phone_number }}</td>
<td>{{ $redemption->customer->state->name }}</td>
<td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m-d-Y H:i')}} </td>
<td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m/d/Y H:i')}} </td>
</tr>
@endforeach
</tbody>
@@ -122,7 +122,7 @@
<td>{{ $redemption->customer->email_address }}</td>
<td>{{ $redemption->customer->phone_number }}</td>
<td>{{ $redemption->customer->state->name }}</td>
<td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m-d-Y H:i')}} </td>
<td>{{\Carbon\Carbon::parse($redemption->created_at)->format('m/d/Y H:i')}} </td>
</tr>
@endforeach
@@ -152,7 +152,7 @@
<td>{{ $item->iamPrincipal->phone_number }}</td>
<td>{{ $item->iamPrincipal->state->name }}</td>
<td>{{ $item->subscription_status }}</td>
<td>{{ \Carbon\Carbon::parse($item->cancelled_at)->format('m-d-Y H:i') }}</td>
<td>{{ \Carbon\Carbon::parse($item->cancelled_at)->format('m/d/Y H:i') }}</td>
</tr>
@endforeach
@@ -179,8 +179,8 @@
<td>{{ $referral->referredUser->email_address }}</td>
<td>{{ $referral->referredUser->phone_number}}</td>
<td>{{ $referral->referredUser->state->name }}</td>
<td> {{ \Carbon\Carbon::parse($referral->referred_date_time)->format('m-d-Y H:i') }}</td>
<td> {{ \Carbon\Carbon::parse($referral->referred_date_time)->format('m/d/Y H:i') }}</td>
</tr>
@endforeach
@@ -208,7 +208,7 @@
<td>{{ $referees->refeersUser->email_address }}</td>
<td>{{ $referees->refeersUser->phone_number}}</td>
<td>{{ $referees->refeersUser->state->name }}</td>
<td> {{ \Carbon\Carbon::parse($referees->referred_date_time)->format('m-d-Y H:i') }}</td>
<td> {{ \Carbon\Carbon::parse($referees->referred_date_time)->format('m/d/Y H:i') }}</td>
</tr>
@endforeach