Merge pull request #247 from Ritikeshyadav/RitikeshFreeu

Ritikesh freeu

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]);
             // }
         }

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'));

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

resources/views/Frontend/Pages/fractional-real-estate/product.blade.php

@@ -151,7 +151,7 @@
                                 </div>
                                 <div class="col-md-4 mb-2">
                                     <p>Deal size</p>
-                                    <span>{{ $fractionalRealEstate->deal_size_in_crore ?? '-' }}</span>
+                                    <span>{{ IND_money_format($fractionalRealEstate->deal_size_in_crore) ?? '-' }}</span>
                                 </div>
                             </div>
                             <div class="btm-txt">

resources/views/Frontend/Pages/profile/investment-details/alternative-investment-fund.blade.php

@@ -146,13 +146,13 @@
 
             </tr>
 
-            <tr>
+            {{-- <tr>
 
               <td>Current NAV</td>
 
               <td>{{$data['data']['current_nav']}}</td>
 
-            </tr>
+            </tr> --}}
 
             <tr>
 
@@ -168,6 +168,8 @@
               @foreach($data['data']['statement_reports'] as $data)
               <td><a href="{{$data}}">Statement/Reports {{$loop->iteration}}</a></td>
               @endforeach
+              @else
+              <td>N/A</td>
               @endif
             </tr>
 

resources/views/Frontend/Pages/profile/investment-details/fractional-real-estate.blade.php

@@ -143,6 +143,8 @@
               @foreach($data['data']['statement_reports'] as $data)
               <td><a href="{{$data}}">Statement/Reports {{$loop->iteration}}</a></td>
               @endforeach
+              @else
+              <td>N/A</td>
               @endif
             </tr>
             </tbody>