From 21a0fc04052bb3ceac12518c50816dce45b44926 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Fri, 7 Jun 2024 11:31:27 +0530 Subject: [PATCH] admin notification issue fix --- app/Http/Controllers/Admin/DashboardController.php | 5 ++++- app/Http/Controllers/Frontend/DashboardController.php | 1 + resources/views/Admin/footer.blade.php | 3 +++ .../Frontend/Pages/fractional-real-estate/product.blade.php | 2 +- .../alternative-investment-fund.blade.php | 6 ++++-- .../investment-details/fractional-real-estate.blade.php | 2 ++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index e2ca913..f247190 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -366,6 +366,7 @@ class DashboardController extends Controller $buyerForm = ''; $contactUs = ''; $leadAssigned = ''; + $newLeads = ''; foreach (getAllAdminNotifications() as $data) { $message = $data->data['message']; $created_at = $data->created_at->diffForHumans(); @@ -383,9 +384,11 @@ class DashboardController extends Controller $contactUs .= $this->notificationData($message, $created_at, $id, $read_at); } else if (array_key_exists('notification_type', $data->data) && $data->data['notification_type'] == 'Leads Assigned') { $leadAssigned .= $this->notificationData($message, $created_at, $id, $read_at); + } else if (array_key_exists('notification_type', $data->data) && $data->data['notification_type'] == 'New Leads') { + $newLeads .= $this->notificationData($message, $created_at, $id, $read_at); } } - $notificationStatus = array('newUser' => $newUser, 'submittedKyc' => $submittedKyc, 'sellerForm' => $sellerForm, 'buyerForm' => $buyerForm, 'contactUs' => $contactUs, 'leadAssigned' => $leadAssigned, 'unreadnotification' => \Auth::user()->unreadnotifications()->count()); + $notificationStatus = array('newUser' => $newUser, 'submittedKyc' => $submittedKyc, 'sellerForm' => $sellerForm, 'buyerForm' => $buyerForm, 'contactUs' => $contactUs, 'leadAssigned' => $leadAssigned, 'newLeads' => $newLeads, 'unreadnotification' => \Auth::user()->unreadnotifications()->count()); return response()->json(['status' => 200, 'message' => "marked as read", 'data' => $notificationStatus]); // } } diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 37d07c0..18cadc6 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -431,6 +431,7 @@ class DashboardController extends Controller public function investmentDetails($customId) { // $customId = Crypt::decrypt($customId); + // dd($customId); $data = $this->getInvestmentDetails($customId); // dd($data); return view('Frontend.Pages.profile.investment-details.index', compact('data')); diff --git a/resources/views/Admin/footer.blade.php b/resources/views/Admin/footer.blade.php index 973220b..c361816 100644 --- a/resources/views/Admin/footer.blade.php +++ b/resources/views/Admin/footer.blade.php @@ -91,6 +91,9 @@ $url_name = request()->segment(count(request()->segments())); if (result.data.leadAssigned) { $('#leads').empty().html(result.data.leadAssigned); } + if (result.data.newLeads) { + $('#newleads').empty().html(result.data.newLeads); + } if(result.data.unreadnotification) { $('#notification_count').empty().html(result.data.unreadnotification); diff --git a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php index d76e11c..946250e 100644 --- a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php @@ -151,7 +151,7 @@

Deal size

- {{ $fractionalRealEstate->deal_size_in_crore ?? '-' }} + {{ IND_money_format($fractionalRealEstate->deal_size_in_crore) ?? '-' }}
diff --git a/resources/views/Frontend/Pages/profile/investment-details/alternative-investment-fund.blade.php b/resources/views/Frontend/Pages/profile/investment-details/alternative-investment-fund.blade.php index 0e091fe..dd8cda7 100644 --- a/resources/views/Frontend/Pages/profile/investment-details/alternative-investment-fund.blade.php +++ b/resources/views/Frontend/Pages/profile/investment-details/alternative-investment-fund.blade.php @@ -146,13 +146,13 @@ - + {{-- Current NAV {{$data['data']['current_nav']}} - + --}} @@ -168,6 +168,8 @@ @foreach($data['data']['statement_reports'] as $data) Statement/Reports {{$loop->iteration}} @endforeach + @else + N/A @endif diff --git a/resources/views/Frontend/Pages/profile/investment-details/fractional-real-estate.blade.php b/resources/views/Frontend/Pages/profile/investment-details/fractional-real-estate.blade.php index d527586..1f89b39 100644 --- a/resources/views/Frontend/Pages/profile/investment-details/fractional-real-estate.blade.php +++ b/resources/views/Frontend/Pages/profile/investment-details/fractional-real-estate.blade.php @@ -143,6 +143,8 @@ @foreach($data['data']['statement_reports'] as $data) Statement/Reports {{$loop->iteration}} @endforeach + @else + N/A @endif