From d32c104bdb7ad00f8fdbc66ac0e5829ea1999db0 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Fri, 10 May 2024 15:59:44 +0530 Subject: [PATCH] fix primary offering filter --- .../HandpickedInvestmentController.php | 26 ++++++++++++++----- .../manage_freeu_investment.blade.php | 4 +-- .../Pages/handpicked-investment.blade.php | 2 +- .../market-list/edit-buyer-form.blade.php | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php index fc08adf..6331f65 100644 --- a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php +++ b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php @@ -16,6 +16,12 @@ class HandpickedInvestmentController extends Controller $urlCategories = $this->decode_arr(request()->categories) ?? null; $assetType = request()->assetType ?? null; + $firstTime = true; + if($firstTime) + { + $assetType = 'financial-assets'; + $firstTime = false; + } $geographicFocus = request()->geographicFocus ?? null; $products = $this->filterData(request()->search ?? '', $urlCategories, $assetType, $geographicFocus); $type = FractionalRealEstate::select('asset_type')->distinct()->get(); @@ -35,7 +41,9 @@ class HandpickedInvestmentController extends Controller if ($request->ajax()) { - $products = $this->filterData($request->get('query'), $request->get('categories'), $request->get('assetType'), $request->get('geographicFocus')); + $firstTime = $request->get('assetType') ?? 'financial-assets'; + // dd($firstTime); + $products = $this->filterData($request->get('query'), $request->get('categories'), $firstTime, $request->get('geographicFocus')); // $productsWithCategories = $this->filterData($request->get('query'), $request->get('categories'), $request->get('assetType'), $request->get('geographicFocus')); return view('Frontend.Pages.handpicked-investment.pagination', compact('products'))->render(); @@ -48,19 +56,25 @@ class HandpickedInvestmentController extends Controller if (!is_array($categories) && $categories) $categories = explode(',', $categories); $faCategoriesArr = [ + // Category::DebtFundId, + // Category::SovereignGovernmentBondId, + // Category::GlobalMutualFundId, + // Category::EquitiesId, Category::FractionalRealEstateId, Category::VentureCapitalFundId, Category::InfrastructureFundId, Category::AngelFundId, Category::PrivateEquityFundId, - Category::DebtFundId, + Category::FundForDistressedAssetId, + Category::LongOnlyFundId, + Category::PrivateCreditFundId, Category::PrivateRealEstateFundId, Category::HedgeFundId, Category::PrivateInvestmentInPublicEquityFundId, - Category::SovereignGovernmentBondId, - Category::GlobalMutualFundId, - Category::EquitiesId, Category::GlobalHedgeFundId, + Category::GlobalPrivateEquityFundId, + Category::GlobalVentureCapitalFundId, + Category::GlobalPrivateCreditFundId, ]; $reCategoriesArr = [ @@ -100,7 +114,7 @@ class HandpickedInvestmentController extends Controller $query->where('re.geographic_focus', $geographicFocus); }); }) - ->when($assetType == null && $geographicFocus, function ($query) use ($geographicFocus) { + ->when($assetType && $geographicFocus, function ($query) use ($geographicFocus) { $query->where(function ($query) use ($geographicFocus) { $query->where('fre.geographic_focus', $geographicFocus) ->orWhere('aif.geographic_focus', $geographicFocus) diff --git a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php index a9073e5..14e9189 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php @@ -118,9 +118,9 @@ href="{{ route('manage.uploadHedgeFunds') }}">Hedge Funds {{--
  • ETFs
  • --}} -
  • REITs -
  • + --}}
  • Indian Real Assets diff --git a/resources/views/Frontend/Pages/handpicked-investment.blade.php b/resources/views/Frontend/Pages/handpicked-investment.blade.php index 6466592..6698d39 100644 --- a/resources/views/Frontend/Pages/handpicked-investment.blade.php +++ b/resources/views/Frontend/Pages/handpicked-investment.blade.php @@ -334,7 +334,7 @@ function fetch_data(page, query, categories, assetType, geographicFocus) { $.ajax({ type: 'get', - url: "/primary-investment/fetch_data?page=" + + url: "http://localhost/jericho_28_march/primary-investment/fetch_data?page=" + page + "&query=" + query + "&categories=" + categories + "&assetType=" + assetType + diff --git a/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php b/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php index b8b7ccb..5e7fe56 100644 --- a/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php @@ -100,7 +100,7 @@
    Need Help?
    If you are experiencing any difficulties filling out the required information, we are - here to help. Please reach out to us at info@freeu.in + here to help. Please reach out to us at info@jerichoalternatives.in