diff --git a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php index fece0f5..e23134a 100644 --- a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php +++ b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php @@ -34,7 +34,7 @@ class GlobalHedgeFundController extends Controller public function hedgeFundAllData($type = 'Open') { try { - return (new test(Product::has('funds')->with('funds','product_images')->where('type',$type)->funds()->globalHedgeFund()->get())) + return (new test(Product::has('funds')->with('funds.companies','product_images')->where('type',$type)->funds()->globalHedgeFund()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Controllers/Frontend/GlobalMutualFundController.php b/app/Http/Controllers/Frontend/GlobalMutualFundController.php index c855518..6bbd365 100644 --- a/app/Http/Controllers/Frontend/GlobalMutualFundController.php +++ b/app/Http/Controllers/Frontend/GlobalMutualFundController.php @@ -42,7 +42,7 @@ class GlobalMutualFundController extends Controller public function fundData($slug) { try { - return (new GlobalFundResource(Fund::where('slug', $slug)->first())) + return (new GlobalFundResource(Fund::with('companies')->where('slug', $slug)->first())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php index 8bc631d..b9613f7 100644 --- a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php +++ b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php @@ -47,7 +47,7 @@ class GlobalPrivateEquityFundController extends Controller public function privateEquityFundAllData($type = 'Open') { try { - return (new test(Product::has('funds')->with('funds','product_images')->funds()->globalPrivateEquityFund()->where('type', $type)->get())) + return (new test(Product::has('funds')->with('funds.companies','product_images')->funds()->globalPrivateEquityFund()->where('type', $type)->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Controllers/Frontend/GlobalRealAssetController.php b/app/Http/Controllers/Frontend/GlobalRealAssetController.php index 68ba383..486e43e 100644 --- a/app/Http/Controllers/Frontend/GlobalRealAssetController.php +++ b/app/Http/Controllers/Frontend/GlobalRealAssetController.php @@ -57,7 +57,7 @@ class GlobalRealAssetController extends Controller public function globalIndustrialRealEstateAllData($type = 'Open') { try { - return (new test(Product::has('realEstate')->with('realEstate.photo')->globalIndustrialRealEstate()->where('type', $type)->active()->get())) + return (new test(Product::has('realEstate')->with('realEstate.photo','product_images')->globalIndustrialRealEstate()->where('type', $type)->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -68,7 +68,7 @@ class GlobalRealAssetController extends Controller public function globalResidentialRealEstateAllData($type = 'Open') { try { - return (new test(Product::has('realEstate')->with('realEstate.photo')->globalResidentialRealEstate()->where('type', $type)->active()->get())) + return (new test(Product::has('realEstate')->with('realEstate.photo','product_images')->globalResidentialRealEstate()->where('type', $type)->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -79,7 +79,7 @@ class GlobalRealAssetController extends Controller public function globalCommercialRealEstateAllData($type = 'Open') { try { - return (new test(Product::has('realEstate')->with('realEstate.photo')->globalCommercialRealEstate()->where('type', $type)->active()->get())) + return (new test(Product::has('realEstate')->with('realEstate.photo','product_images')->globalCommercialRealEstate()->where('type', $type)->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php b/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php index c4dc132..d257083 100644 --- a/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php +++ b/app/Http/Controllers/Frontend/GlobalVentureCapitalFund.php @@ -35,7 +35,7 @@ class GlobalVentureCapitalFund extends Controller public function ventureCapitalAllData($type = 'Open') { try { - return (new test(Product::has('funds')->with('funds','product_images')->where('type',$type)->funds()->globalVentureCapitalFund()->get())) + return (new test(Product::has('funds')->with('funds.companies','product_images')->where('type',$type)->funds()->globalVentureCapitalFund()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Controllers/Frontend/IndianRealAssetController.php b/app/Http/Controllers/Frontend/IndianRealAssetController.php index 3c1b125..54d17d1 100644 --- a/app/Http/Controllers/Frontend/IndianRealAssetController.php +++ b/app/Http/Controllers/Frontend/IndianRealAssetController.php @@ -63,7 +63,7 @@ class IndianRealAssetController extends Controller public function indianIndustrialRealEstateAllData($type = 'Open') { try { - return (new test(Product::has('realEstate')->with('realEstate.photo')->indianIndustrialRealEstate()->where('type',$type)->active()->get())) + return (new test(Product::has('realEstate')->with('realEstate.photo','product_images')->indianIndustrialRealEstate()->where('type',$type)->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -74,7 +74,7 @@ class IndianRealAssetController extends Controller public function indianResidentialRealEstateAllData($type = 'Open') { try { - return (new test(Product::has('realEstate')->with('realEstate.photo')->indianResidentialRealEstate()->where('type',$type)->active()->get())) + return (new test(Product::has('realEstate')->with('realEstate.photo','product_images')->indianResidentialRealEstate()->where('type',$type)->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -85,7 +85,7 @@ class IndianRealAssetController extends Controller public function indianCommercialRealEstateAllData($type = 'Open') { try { - return (new test(Product::has('realEstate')->with('realEstate.photo')->indianCommercialRealEstate()->where('type',$type)->active()->get())) + return (new test(Product::has('realEstate')->with('realEstate.photo','product_images')->indianCommercialRealEstate()->where('type',$type)->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/Http/Controllers/GlobalPrivateCreditController.php b/app/Http/Controllers/GlobalPrivateCreditController.php index eac44dc..f2db3f0 100644 --- a/app/Http/Controllers/GlobalPrivateCreditController.php +++ b/app/Http/Controllers/GlobalPrivateCreditController.php @@ -34,7 +34,7 @@ class GlobalPrivateCreditController extends Controller public function privateCreditAllData($type = 'Open') { try { - return (new test(Product::has('funds')->with('funds','product_images')->where('type', $type)->funds()->globalPrivateCreditFunds()->get())) + return (new test(Product::has('funds')->with('funds.companies','product_images')->where('type', $type)->funds()->globalPrivateCreditFunds()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { diff --git a/app/helper.php b/app/helper.php index 8ff61fd..59a9937 100644 --- a/app/helper.php +++ b/app/helper.php @@ -70,7 +70,7 @@ function imagePath($path = null) $finalPath = "https://staging.jerichoalternatives.in/"; } if (env('APP_ENV') == 'local') { - $finalPath = "http://localhost/new_freeu/my-freeu/"; + $finalPath = "http://localhost/jericho_28_march/"; } return $finalPath . $path; } diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index d62b142..c5779a1 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -4472,7 +4472,7 @@ label.error { .detail img { object-fit: cover; width: 100%; - height: 190px; + height: 190px !important; margin-right: 10px; }