Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108 from Ritikeshyadav/megha

Browse Source 
Megha
This commit is contained in:
Ritikeshyadav
2024-05-03 19:19:34 +05:30
committed by GitHub
parent 6843f400f2 14fbcc2219
commit 48eaded8a4
12 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/ManageFreeUInvestmentController.php
View File

@@ -1466,6 +1466,7 @@ class ManageFreeUInvestmentController extends Controller
public function updateAIFProduct(Request $request)
{
dd($request->all());
$request->validate([
'fund_name' => 'required'
]);
@@ -1512,6 +1513,7 @@ class ManageFreeUInvestmentController extends Controller
'focused_funds' => $request->focused_funds,
'trading_strategy' => $request->trading_strategy,
'involved_in_short_selling' => $request->involved_in_short_selling,
'minimum_investment'=> $request->min_investment,
]);
return response()->json(['status' => 200, 'message' => 'Alternative Investment Fund Details Updated Successfully']);

2
app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php
View File

@@ -98,6 +98,7 @@ class VentureCapitalFundController extends Controller
*/
public function update(Request $request, $id)
{
// dd($request->all());
// $request->validate([
// 'fund_name' => 'required'
// ]);
@@ -177,6 +178,7 @@ class VentureCapitalFundController extends Controller
'focused_funds' => $request->focused_funds,
'trading_strategy' => $request->trading_strategy,
'involved_in_short_selling' => $request->involved_in_short_selling,
'minimum_investment' => $request->min_investment,
]);
// dd($id);
$product = Product::where('id', $request->alternative_id)->first();

2
app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
View File

@@ -552,7 +552,7 @@ class AlternativeInvestmentFundController extends Controller
return view('Frontend.Pages.long-only-equity-fund.index', [
'learnMore' => $learnMore,
'openHF' => $this->aif->openLOE()->getData(),
'fullyFundedHF' => $this->aif->fullyFundedLOE()->getData(),
// 'fullyFundedHF' => $this->aif->fullyFundedLOE()->getData(),
'resaleHF' => $this->aif->resaleLOE()->getData(),
]);
}

2
app/Http/Controllers/Frontend/GlobalHedgeFundController.php
View File

@@ -14,7 +14,7 @@ class GlobalHedgeFundController extends Controller
public function index(){
$hedgeFunds = $this->hedgeFundAllData()->getData();
$openGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->open()->active()->latest()->get();
$resaleGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->resale()->active()->latest()->get();
$resaleGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->fullyFunded()->active()->latest()->get();
$fullyFundedGHF = Product::has('funds')->with('funds','categorys')->globalHedgeFund()->fullyFunded()->active()->latest()->get();
$learnMore = (new FractionalRealEstateFrontendController)->globalHedgeFundQuestionAndAnswer()->getData();
// $faqs = (new FractionalRealEstateFrontendController)->globalHedgeFundQuestionAndAnswerFaqs()->getData();

2
app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php
View File

@@ -27,7 +27,7 @@ class GlobalPrivateEquityFundController extends Controller
{
// $privateEquity = $this->privateEquityFundAllData()->getData();
$openGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->globalPrivateEquityFund()->open()->active()->latest()->get();
$resaleGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->globalPrivateEquityFund()->resale()->active()->latest()->get();
$resaleGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->globalPrivateEquityFund()->fullyFunded()->active()->latest()->get();
$fullyFundedGPEF = Product::has('funds')->with('funds', 'categorys')->funds()->globalPrivateEquityFund()->fullyFunded()->active()->latest()->get();
$learnMore = (new FractionalRealEstateFrontendController)->globalPrivateEquityFundQuestionAndAnswer()->getData();
// $faqs = (new FractionalRealEstateFrontendController)->globalPrivateEquityFundQuestionAndAnswerFaqs()->getData();

2
app/Http/Controllers/GlobalPrivateCreditController.php
View File

@@ -18,7 +18,7 @@ class GlobalPrivateCreditController extends Controller
'learnMore' => $learnMore,
'openGPCF' => Product::has('funds')->with('funds')->funds()->globalPrivateCreditFund()->open()->active()->latest()->get(),
// 'resaleGPCF' => Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies', 'categorys')->globalPrivateCreditFund()->resale()->active()->latest()->get(),
'resaleGPCF' => Product::has('funds')->with('funds')->funds()->globalPrivateCreditFund()->resale()->active()->latest()->get(),
'resaleGPCF' => Product::has('funds')->with('funds')->funds()->globalPrivateCreditFund()->fullyFunded()->active()->latest()->get(),
]);
}

15
app/Imports/StockFundsRealEstateExchangeImport.php
View File

@@ -43,7 +43,16 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
public function collection(Collection $rows)
{
Validator::make($rows->toArray(), $this->rules(), $this->customValidationMessages($rows))->validate();
// $name = '';
// if($rows[0]['stock_name'] == null)
// {
// $name = 'stck';
// }
// else
// {
// $name = 'no';
// }
// dd($rows, $name);
foreach ($rows as $row) {
$product = Product::create([
'tables_id' => Table::StockFundsRealEstateExchangeTable,
@@ -63,8 +72,10 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
StockFundsRealEstateExchange::create([
'products_id' => $product->id,
// 'slug' => $count < 2 ? Str::slug($row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name']) : Str::slug($row['stock_name'].'-'.$count+1 ?? $row['etf_name'].'-'.$count+1 ?? $row['reit_name'].'-'.$count+1),
// 'name' => $row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name'],
'slug' => $count < 2 ? Str::slug($row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name']) : Str::slug($row['stock_name'].'-'.$count+1 ?? $row['etf_name'].'-'.$count+1 ?? $row['reit_name'].'-'.$count+1),
'name' => $row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name'],
'name' => $row['name'] ?? null,
// 'type' => $this->fundType,
'ticker' => $row['ticker'],
'exchange' => $row['exchange'],

BIN
public/excel-template/ExchangeTradedFundsTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalPrivateEquityFundTemplate.xlsx Normal file
View File

Binary file not shown.

24
resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php
View File

@@ -122,7 +122,7 @@
<select name="type" id="" class="form-control form-control-solid">
<option value="">Select A Type</option>
<option value="Open" {{$alternativeInvestmentFund->type=='Open'?'selected':'null'}}>Primary Offerings</option>
<option value="Fully Funded" {{$alternativeInvestmentFund->type=='Fully Funded'?'selected':'null'}}>Secondary Offerings</option>
<option value="Resale" {{$alternativeInvestmentFund->type=='Resale'?'selected':'null'}}>Secondary Offerings</option>
{{-- <option value="Resale" {{$alternativeInvestmentFund->type=='Resale'?'selected':'null'}}>Resale</option> --}}
</select>
</div>
@@ -1116,6 +1116,27 @@
<input type="file" class="form-control form-control-solid" name="fact_sheet" />
</div>
<div class="col-md-6 mt-4">
<!--begin::Label-->
<label class="fs-6 fw-semibold form-label mt-3">
<span class="">Minimum Investment</span>
<!-- <i class="fas fa-exclamation-circle ms-1 fs-7" data-bs-toggle="tooltip" title="Enter the contact's name."></i> -->
</label>
<!--end::Label-->
<!--begin::Input-->
<input type="text" class="form-control form-control-solid" name="min_investment" placeholder='Enter Minimum Investment ' value="{{$alternativeInvestmentFund->alternativeInvestmentFund->minimum_investment}}" />
<!--end::Input-->
</div>
<div class="namediv">
<label class="fs-6 fw-semibold form-label mt-3">
<span class="">Gallery</span>
@@ -1138,6 +1159,7 @@
</div>
@endif
</div>
{{-- <div class="active-edit col-md-6">
<label>Gallery :</label>

5
resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php
View File

@@ -266,6 +266,11 @@
<label> <b class='fw-bold'>Fund Strategy</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->fund_strategy}}</label>
</div>
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Minimum Investment </b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->minimum_investment}}</label>
</div>
</div>
<div class="namediv">
<label><b class='fw-bold'>Gallery :</b></label>

2
resources/views/Frontend/Pages/fractional-real-estate/index.blade.php
View File

@@ -152,7 +152,7 @@
</div>
<x-learn-more :learnMore="$learnMore" />
<x-fractional-real-estate-product :freData="$openFRE" id="open_investments" :type="$type='Primary Offerings'" />
<x-fractional-real-estate-product :freData="$resaleFRE" id="resale" :type="$type='Secondary Offerings'" />
<x-fractional-real-estate-product :freData="$fullyFundedFRE" id="resale" :type="$type='Secondary Offerings'" />
<!-- <x-fractional-real-estate-product :freData="$fullyFundedFRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> -->
<!--<div class="investment" id="open_investments">-->
<!-- <div class="container">-->