From f681ea597e4efcf1b621af70c7ffe811f3b151e5 Mon Sep 17 00:00:00 2001
From: meghamalore <maloremegha123@gmail.com>
Date: Thu, 2 May 2024 14:50:31 +0530
Subject: [PATCH] marketplace dashboard

---
 .../Controllers/Frontend/DashboardController.php  |  4 ++++
 app/Models/MarketplaceSellerForm.php              |  4 ++--
 .../Admin/Pages/manage_leads/edit-lead.blade.php  | 15 +++++++++++++++
 .../Frontend/Pages/profile/dashboard.blade.php    |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index 4b8e92d..734daa2 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -819,6 +819,7 @@ class DashboardController extends Controller
             ->where('listing_status', '!=', 'Hide')
             ->select('product_category', 'security_name', 'instrument_type', 'instrument_issuer', 'credit_rating', 'expected_sale_price_per_unit')
             ->get();
+            // dd($data);
         return $data;
     }
 
@@ -828,8 +829,10 @@ class DashboardController extends Controller
             ->where('marketplace_seller_forms.users_id', auth()->guard('users')->user()->id)
             ->join('marketplace_aif_sellers', 'marketplace_seller_forms.id', 'marketplace_aif_sellers.seller_forms_id')
             ->where('marketplace_aif_sellers.listing_status', '!=', 'Hide')
+            // ->where('marketplace_aif_sellers.status', 'Approved')
             ->select('name_of_the_aif_fund', 'fund_category', 'fund_strategy', 'type_of_fund', 'total_capital_commitment', 'uncalled_capital_commitment')
             ->get();
+            // dd($data);
             return $data;
         }
         
@@ -839,6 +842,7 @@ class DashboardController extends Controller
             ->where('marketplace_seller_forms.users_id', auth()->guard('users')->user()->id)
             ->join('marketplace_fre_sellers', 'marketplace_seller_forms.id', 'marketplace_fre_sellers.seller_forms_id')
             ->where('marketplace_fre_sellers.listing_status', '!=', 'Hide')
+            // ->where('marketplace_fre_sellers.status', 'Approved')
             ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
             ->get();
         return $data;
diff --git a/app/Models/MarketplaceSellerForm.php b/app/Models/MarketplaceSellerForm.php
index 2446073..c3e29a2 100644
--- a/app/Models/MarketplaceSellerForm.php
+++ b/app/Models/MarketplaceSellerForm.php
@@ -16,12 +16,12 @@ class MarketplaceSellerForm extends Model
     }
 
     public function aif(){
-        return $this->hasMany(MarketplaceAlternativeInvestmentFundSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide');
+        return $this->hasMany(MarketplaceAlternativeInvestmentFundSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide')->where('status','Approved');
         // return $this->hasMany(MarketplaceAlternativeInvestmentFundSeller::class,'seller_forms_id');
     }
 
     public function fre(){
-        return $this->hasMany(MarketplaceFractionalRealEstateSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide');
+        return $this->hasMany(MarketplaceFractionalRealEstateSeller::class,'seller_forms_id')->where('listing_status', '!=','Hide')->where('status','Approved');
     }
 
     public function op(){
diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
index 39d829e..a0d5e85 100644
--- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
@@ -3079,13 +3079,28 @@
         document.getElementById("reminder").min = today;
 
         $(document).ready(function() {
+
+
+            
             var backRoute = sessionStorage.getItem('backRoute');
             if (backRoute) {
                 $('.backRouteAnchorTag').attr('href', "{{ route('personal-dashboard') }}");
             } else {
                 $('.backRouteAnchorTag').attr('href', "{{ route('manage_leads') }}");
             }
+
         })
+
+        $(document).ready(function() {
+
+        })
+
+        $(document).ready(function() {
+            $('.lead_status').select2();
+            $('.lead_source').select2();
+            $('.lead_owner').select2();
+        });
+
         $('.convertChkbox').click(function() {
             Swal.fire({
                 title: 'Do you want to convert it to closed activity?',
diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php
index 4c4fad3..8d4977c 100644
--- a/resources/views/Frontend/Pages/profile/dashboard.blade.php
+++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php
@@ -239,6 +239,7 @@
                                                             </tr>
                                                         </thead>
                                                         <tbody>
+                                                            
                                                             @foreach ($aifSoldInvestmentWatchlist as $data)
                                                                 <tr>
                                                                     <td>{{ $data->name_of_the_aif_fund }}</td>