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())
No data available
@else - + @if ($reportType === 'Total Subscribed')| Subscription ID | User Name | State | -Created At | +Subscription Date & Time | @@ -40,10 +40,10 @@|||
|---|---|---|---|---|---|---|---|
| Sr No. | -User ID | -User Name | +Customer ID | +Customer Name | State | -Created At | +Customer Join Date & Time | Restaurant Name | Customer Name | State | -Created At | +Redemption Date & Time | @@ -93,7 +93,7 @@Restaurant Name | Customer Name | State | -Created At | +Redemption Date & Time | @@ -118,7 +118,7 @@State | Subscription Status | -Cancelled At | +Subscription Cancel Date & Time | @@ -144,7 +144,7 @@Phone Number | State | -Referred Date Time | +Referred Date & Time | @@ -172,7 +172,7 @@Phone number | State | -Referred Date Time | +Referred Date & Time |