diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php index 8198523..38dc47d 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCategoriesController.php @@ -140,7 +140,7 @@ class ManageCategoriesController extends Controller $status = $row->status == 1 ? 'checked' : 'null'; $btn = '
- + diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php index 35e69cc..102dda3 100644 --- a/app/Http/Controllers/Admin/OverviewController.php +++ b/app/Http/Controllers/Admin/OverviewController.php @@ -100,11 +100,38 @@ class OverviewController extends Controller public function listingTransfer() { - $freMarketPlace = MarketplaceFractionalRealEstateSeller::with('seller')->get(); - $aifMarketPlace = MarketplaceAlternativeInvestmentFundSeller::with('seller')->get(); - $opMarketPlace = MarketplaceOtherProductsSeller::with('seller')->get(); + // $freMarketPlace = MarketplaceFractionalRealEstateSeller::with('seller')->orderBy('created_at', 'desc')->get(); + // $aifMarketPlace = MarketplaceAlternativeInvestmentFundSeller::with('seller')->orderBy('created_at', 'desc')->get(); + // $opMarketPlace = MarketplaceOtherProductsSeller::with('seller')->orderBy('created_at', 'desc')->get(); // dd($aifMarketPlace[29]); - return view('Admin.Pages.pre_owned_investment.pre_owned_investmentV2', compact('freMarketPlace', 'aifMarketPlace', 'opMarketPlace')); + + + //new by hritik + $freMarketPlace = MarketplaceFractionalRealEstateSeller::with('seller')->orderBy('created_at', 'desc')->get(); + $aifMarketPlace = MarketplaceAlternativeInvestmentFundSeller::with('seller')->orderBy('created_at', 'desc')->get(); + $opMarketPlace = MarketplaceOtherProductsSeller::with('seller')->orderBy('created_at', 'desc')->get(); + + $combinedData = collect(); + foreach ($freMarketPlace as $freData) { + $freData->table = 'marketplace_fre_sellers'; + $combinedData->push($freData); + } + foreach ($aifMarketPlace as $aifData) { + $aifData->table = 'marketplace_aif_sellers'; + $combinedData->push($aifData); + } + foreach ($opMarketPlace as $opData) { + $opData->table = 'marketplace_op_sellers'; + $combinedData->push($opData); + } + + $combinedData = $combinedData->sortByDesc('created_at'); + + //new end + // dd($combinedData); + + return view('Admin.Pages.pre_owned_investment.pre_owned_investmentV2', + compact('freMarketPlace', 'aifMarketPlace', 'opMarketPlace','combinedData')); } public function listingDetails($id, $table) diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index b624eff..6005017 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -8,6 +8,7 @@ use App\Http\Controllers\Controller; use App\Http\Resources\DebtFundResource; use App\Http\Resources\AngelFundResource; use App\Http\Resources\HedgeFundResource; +use App\Http\Resources\LongOnlyEquityResource; use App\Models\AlternativeInvestmentFund; use App\Http\Resources\PrivateEquityFundResource; use App\Http\Resources\InfrastructureFundResource; @@ -469,6 +470,17 @@ class AlternativeInvestmentFundController extends Controller } } + public function longOnlyEquityFundData($slug) + { + try { + return (new LongOnlyEquityResource(AlternativeInvestmentFund::where('slug', $slug)->first())) + ->response() + ->setStatusCode(200); + } catch (\Exception $e) { + return response()->json(['message' => $e->getMessage()], 400); + } + } + public function pipeAllData($type = 'Open') { try { @@ -493,10 +505,41 @@ class AlternativeInvestmentFundController extends Controller public function longOnlyEquityFund() { + + $learnMore = (new FractionalRealEstateFrontendController)->loefQuestionAndAnswer()->getData(); - return view('Frontend.Pages.long-only-equity-fund.index', ['learnMore' => $learnMore]); + + // 'openHF' => $this->aif->openHF()->getData(), + // 'fullyFundedHF' => $this->aif->fullyFundedHF()->getData(), + // 'resaleHF' => $this->aif->resaleHF()->getData(), + // 'learnMore' => $this->aif->hedgeFundLearnMore()->getData() + + + return view('Frontend.Pages.long-only-equity-fund.index', [ + 'learnMore' => $learnMore, + 'openHF' => $this->aif->openLOE()->getData(), + 'fullyFundedHF' => $this->aif->fullyFundedLOE()->getData(), + 'resaleHF' => $this->aif->resaleLOE()->getData(), + ]); } + // long only equity fund Product + public function longOnlyEquityFundProduct($slug) + { + $longOnlyEquityFund = $this->longOnlyEquityFundData($slug)->getData()->data; + $otherHF = AlternativeInvestmentFund::query() + ->join('products', 'alternative_investment_funds.products_id', 'products.id') + ->where(['status' => true, 'categories_id' => 40]) + // ->where('status',false) + ->where('slug', '!=', $slug) + // ->where('categories_id',26) + ->get(); + $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); + $productData = Product::where('id', '=', $productData->products_id)->first(); + // dd($productData); + // dd($longOnlyEquityFund, $slug); + return view('Frontend.Pages.alternative-investment-fund.long-only-equity-fund-product', compact('longOnlyEquityFund', 'otherHF', 'productData')); + } public function privateCreditFund() { diff --git a/app/Http/Resources/LongOnlyEquityResource.php b/app/Http/Resources/LongOnlyEquityResource.php new file mode 100644 index 0000000..b70bb2c --- /dev/null +++ b/app/Http/Resources/LongOnlyEquityResource.php @@ -0,0 +1,63 @@ + $this->id, + 'products_id' => $this->products_id, + 'presentation' => Product::find($this->products_id) ? Product::find($this->products_id)->value('presentation') : null, + 'fact_sheet' => Product::find($this->products_id) ? Product::find($this->products_id)->value('fact_sheet') : null, + 'fund_name' => $this->fund_name, + 'slug' => $this->slug, + 'registration_number' => $this->registration_number, + 'fund_category' => $this->fund_category, + 'fund_structure' => $this->fund_structure, + 'fund_strategy' => $this->fund_strategy, + 'fund_domicile' => $this->fund_domicile, + 'fund_manager_name' => $this->fund_manager_name, + 'website_of_the_fund' => $this->website_of_the_fund, + 'fund_manager_experience' => $this->fund_manager_experience, + 'sponsor' => $this->sponsor, + 'manager' => $this->manager, + 'trustee' => $this->trustee, + 'auditor' => $this->auditor, + 'valuer_tax_advisor' => $this->valuer_tax_advisor, + 'credit_rating' => $this->credit_rating, + 'open_date' => $this->open_date, + 'first_close_date' => $this->first_close_date, + 'final_close_date' => $this->final_close_date, + 'tenure_from_final_date' => $this->tenure_from_final_date, + 'commitment_period' => $this->commitment_period, + 'native_currency' => $this->native_currency, + 'target_corpus' => $this->target_corpus, + 'investment_manager_contribution' => $this->investment_manager_contribution, + 'minimum_capital_commitment' => $this->minimum_capital_commitment, + 'intial_drawdown' => $this->intial_drawdown, + 'target_irr' => $this->target_irr, + 'accepting_overseas_investment' => $this->accepting_overseas_investment, + 'return_on_investment' => $this->return_on_investment, + 'valuation_per_sector' => $this->valuation_per_sector, + 'management_fees_and_carry' => $this->management_fees_and_carry, + 'hurdle_rate' => $this->hurdle_rate, + 'other_expenses' => $this->other_expenses, + 'focused_funds' => $this->focused_funds, + 'trading_strategy' => $this->trading_strategy, + 'involved_in_short_selling' => $this->involved_in_short_selling, + 'minimum_investment' => $this->minimum_investment, + 'company' => $this->companies + ]; + } +} diff --git a/app/Models/Category.php b/app/Models/Category.php index 724f4a9..7d84d77 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -88,6 +88,8 @@ class Category extends Model const FundForDistressedAssetId = 38; + const LongOnlyFundId= 40; // id of row + public function scopeActive($query) { return $query->where('status', true); diff --git a/app/Models/Product.php b/app/Models/Product.php index d54debe..3513a36 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -219,6 +219,11 @@ class Product extends Model { return $query->where(['tables_id' => 12, 'categories_id' => 34]); } + public function scopelongOnlyEquityFund($query) + { + return $query->where(['tables_id' => 12, 'categories_id' => 40]); + } + public function scopePipe($query) { diff --git a/app/Services/Frontend/AIFService.php b/app/Services/Frontend/AIFService.php index 86524f2..650bac0 100644 --- a/app/Services/Frontend/AIFService.php +++ b/app/Services/Frontend/AIFService.php @@ -167,6 +167,23 @@ class AIFService{ return $this->returnResponse(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies','categorys')->hedgeFund()->resale()->active()->latest()->get()); } + //long only equity fund + public function openLOE() + { + return $this->returnResponse(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies','categorys')->longOnlyEquityFund()->open()->active()->latest()->get()); + } + public function fullyFundedLOE() + { + return $this->returnResponse(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies','categorys')->longOnlyEquityFund()->fullyFunded()->active()->latest()->get()); + } + + public function resaleLOE() + { + return $this->returnResponse(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies','categorys')->longOnlyEquityFund()->resale()->active()->latest()->get()); + } + //long equity end + + public function hedgeFundLearnMore(){ return $this->returnData(FAQ::where('tag_id', Tag::HedgeFundId)->active()->get()); } diff --git a/app/View/Components/LongOnlyEquityFunds.php b/app/View/Components/LongOnlyEquityFunds.php new file mode 100644 index 0000000..30374c6 --- /dev/null +++ b/app/View/Components/LongOnlyEquityFunds.php @@ -0,0 +1,31 @@ +hfAllData = $hfData; + $this->type = $type; + } + + /** + * Get the view / contents that represent the component. + * + * @return \Illuminate\Contracts\View\View|\Closure|string + */ + public function render() + { + return view('components.long-only-equity-funds'); + } +} + diff --git a/public/assets/js/admin/category.js b/public/assets/js/admin/category.js index 06ba958..1693638 100644 --- a/public/assets/js/admin/category.js +++ b/public/assets/js/admin/category.js @@ -28,8 +28,10 @@ $(document).ready(function () { }); function getCategory(id) { + $.ajax({ - url: "/freeU_investment/manage-investments/categories/get", + // url: "/manage-investments/categories/get", + url: "/manage-investments/categories/get", type: "GET", data: { id: id, diff --git a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php index caf516d..a25a422 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php @@ -64,7 +64,7 @@ Actions - + {{-- @php($iteration = 1) @php($pendingTable = true) @php($approvedTable = false) @@ -90,6 +90,19 @@ @php($iteration++) @endif @endforeach + --}} + + @php($iteration = 1) + @php($pendingTable = true) + @php($approvedTable = false) + @php($rejectedTable = false) + @foreach ($combinedData as $data) + @php($table =$data->table) + @if ($data->status == 'Pending') + @include('Admin.Pages.pre_owned_investment.partial.overview-row') + @php($iteration++) + @endif + @endforeach
@@ -113,7 +126,7 @@ Actions - + {{-- @php($iteration = 1) @php($pendingTable = false) @php($approvedTable = true) @@ -139,6 +152,19 @@ @php($iteration++) @endif @endforeach + --}} + + @php($iteration = 1) + @php($pendingTable = true) + @php($approvedTable = false) + @php($rejectedTable = false) + @foreach ($combinedData as $data) + @php($table =$data->table) + @if ($data->status == 'Approved') + @include('Admin.Pages.pre_owned_investment.partial.overview-row') + @php($iteration++) + @endif + @endforeach @@ -161,7 +187,7 @@ Actions - + {{-- @php($iteration = 1) @php($pendingTable = false) @php($approvedTable = false) @@ -187,6 +213,20 @@ @php($iteration++) @endif @endforeach + --}} + + + @php($iteration = 1) + @php($pendingTable = true) + @php($approvedTable = false) + @php($rejectedTable = false) + @foreach ($combinedData as $data) + @php($table =$data->table) + @if ($data->status == 'Rejected') + @include('Admin.Pages.pre_owned_investment.partial.overview-row') + @php($iteration++) + @endif + @endforeach diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php new file mode 100644 index 0000000..2bf9210 --- /dev/null +++ b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php @@ -0,0 +1,239 @@ +@extends('Frontend.layouts.master') +@section('content') +
+
+
+

{{ $longOnlyEquityFund->fund_name }}

+ Invest +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+

Registration Number

+ {{ $longOnlyEquityFund->registration_number }} +
+
+

Fund category (I/II/II)

+ {{ $longOnlyEquityFund->fund_category }} +
+
+

Fund structure

+ {{ $longOnlyEquityFund->fund_structure }} +
+
+
+

Fund strategy

+

{{ $longOnlyEquityFund->fund_strategy }}

+
+
+
+
+
+
+
+

Fund domicile

+ {{ $longOnlyEquityFund->fund_domicile }} +
+
+

Fund manager name

+ {{ $longOnlyEquityFund->fund_manager_name }} +
+
+

Website of the fund

+ {{ $longOnlyEquityFund->website_of_the_fund }} +
+
+
+
+

Fund manager experience

+ {{ $longOnlyEquityFund->fund_manager_experience }} +
+
+

Sponsor

+ {{ $longOnlyEquityFund->sponsor }} +
+
+

Manager

+ {{ $longOnlyEquityFund->manager }} +
+
+
+
+

Trustee

+ {{ $longOnlyEquityFund->trustee }} +
+
+

Auditor

+ {{ $longOnlyEquityFund->auditor }} +
+
+

Valuer / Tax Advisory

+ {{ $longOnlyEquityFund->valuer_tax_advisor }} +
+
+
+
+
+
+
+
+

Credit rating (if any)

+ {{ $longOnlyEquityFund->credit_rating }} +
+
+

Open date

+ {{ $longOnlyEquityFund->open_date }} +
+
+

1st close date

+ {{ $longOnlyEquityFund->first_close_date }} +
+
+
+
+

Final close date

+ {{ $longOnlyEquityFund->final_close_date }} +
+
+

Tenure from final close

+ {{ $longOnlyEquityFund->tenure_from_final_date }} +
+
+

Commitment period

+ {{ $longOnlyEquityFund->commitment_period }} +
+
+
+
+
+
+
+
+

Native currency

+ {{ $longOnlyEquityFund->native_currency }} +
+
+

Target IRR

+ {{ $longOnlyEquityFund->target_irr }} +
+
+

Initial drawdown

+ {{ $longOnlyEquityFund->intial_drawdown }} +
+
+
+
+
+
+
+
+

Investment manager contribution

+ {{ $longOnlyEquityFund->investment_manager_contribution }} +
+
+

Minimal capital commitment

+ {{ $longOnlyEquityFund->minimum_capital_commitment }} +
+
+
+
+
+
+
+
+

Target corpus

+ {{ $longOnlyEquityFund->target_corpus }} +
+
+

Accepting Overseas investment?

+ {{ $longOnlyEquityFund->accepting_overseas_investment }} +
+
+
+
+
+
+
+
+

Management Fees and Carry - Set Up fee - Management Fee - Performace fee

+ {{ $longOnlyEquityFund->management_fees_and_carry }} +
+
+
+
+
+
+
+
+

Hurdle rate

+ {{ $longOnlyEquityFund->hurdle_rate }} +
+
+

Other expenses

+ {{ $longOnlyEquityFund->other_expenses }} +
+
+
+
+
+
+
+
+

Focused Fund

+ {{ $longOnlyEquityFund->focused_funds }} +
+
+
+
+
+
+
+
+

Regions Covered (Geographical Locations covered by the fund)

+ +
+
+
+
+ @include('Frontend.Pages.alternative-investment-fund.presentation-factsheet') +
+
+
+
+@endsection diff --git a/resources/views/Frontend/Pages/long-only-equity-fund/index.blade.php b/resources/views/Frontend/Pages/long-only-equity-fund/index.blade.php index 11f5727..0a46c95 100644 --- a/resources/views/Frontend/Pages/long-only-equity-fund/index.blade.php +++ b/resources/views/Frontend/Pages/long-only-equity-fund/index.blade.php @@ -1,7 +1,6 @@ @extends('Frontend.layouts.master') @section('content') -
@@ -187,15 +186,11 @@ @@ -205,7 +200,6 @@ - @endsection - diff --git a/resources/views/components/long-only-equity-funds.blade.php b/resources/views/components/long-only-equity-funds.blade.php new file mode 100644 index 0000000..ce3a4d3 --- /dev/null +++ b/resources/views/components/long-only-equity-funds.blade.php @@ -0,0 +1,58 @@ +
+ +
diff --git a/routes/web.php b/routes/web.php index 86ffbeb..6527265 100644 --- a/routes/web.php +++ b/routes/web.php @@ -961,7 +961,10 @@ Route::controller(AlternativeInvestmentFundController::class)->prefix('alternati Route::get('/category-two/private-credit-funds', 'privateCreditFund')->name('private-credit-funds'); + Route::get('/category-three/long-only-equity-funds', 'longOnlyEquityFund')->name('long-only-equity-funds'); + Route::get("/category-three/long-only-equity-funds/{slug}", 'longOnlyEquityFundProduct')->name('long-only-equity-fund-product'); + }); Route::controller(FractionalRealEstateController::class)->prefix('fractional-real-estate')->name('fractional-real-estate.')->group(function () {