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

Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into RitikeshFreeu

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-06 16:04:58 +05:30
parent 6374187688 dcda9a05f1
commit f69d548a3d
11 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Imports/StockFundsRealEstateExchangeImport.php
View File

@@ -52,7 +52,7 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
// {
// $name = 'no';
// }
// dd($rows, $name);
// dd($rows);
foreach ($rows as $row) {
$product = Product::create([
'tables_id' => Table::StockFundsRealEstateExchangeTable,
@@ -62,7 +62,8 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
'created_by' => auth()->user()->id,
'description'=> $row['description'] ?? null
]);
$count = StockFundsRealEstateExchange::where('name',$row['stock_name'])->count();
// $count = StockFundsRealEstateExchange::where('name',$row['stock_name'])->count();
$count = StockFundsRealEstateExchange::where('name',$row['name'])->count();
// $count = StockFundsRealEstateExchange::where(function($query) use($row){
// $query->orWhere('stock_name');
// $query->orWhere('etf_name');
@@ -74,7 +75,8 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
'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),
// '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),
'slug' => $count < 2 ? Str::slug($row['name']) : Str::slug($row['name'].'-'.$count+1),
'name' => $row['name'] ?? null,
// 'type' => $this->fundType,
'ticker' => $row['ticker'],

8
app/Services/Frontend/GlobalRealEstateService.php
View File

@@ -33,12 +33,12 @@ class GlobalRealEstateService{
public function fullyFundedGCRE()
{
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->open()->active()->get());
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->fullyFunded()->active()->get());
}
public function resaleGCRE()
{
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->open()->active()->get());
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->resale()->active()->get());
}
public function openGRRE()
@@ -48,12 +48,12 @@ class GlobalRealEstateService{
public function fullyFundedGRRE()
{
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->open()->active()->get());
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->fullyFunded()->active()->get());
}
public function resaleGRRE()
{
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->open()->active()->get());
return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->resale()->active()->get());
}
public function globalCommercialRealEstateLearnMore(){

5
app/helper.php
View File

@@ -394,6 +394,11 @@ function getCategoryIcons($categoryId)
"public/assets/media/FrontendImages/resi-real-state.svg" => Category::GlobalResidentialRealEstateID,
"public/assets/media/FrontendImages/comm-real-state.svg" => Category::GlobalCommercialRealEstateID,
];
if ($categoryId === Category::PrivateEquityFundId) {
return "public/assets/media/FrontendImages/equity-funds.svg";
}
$condition = array_search($categoryId, $category_icons);
// return $condition;
return $condition == true ? $condition : 'public/assets/media/FrontendImages/bay-arrow.svg';
}

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

Binary file not shown.

8
resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
View File

@@ -111,13 +111,13 @@
<li><a tabindex="-1" class="dropdown-item"
href="{{ route('manage.uploadPrivateEquityFunds') }}">Private Equity
Funds</a></li>
<li><a tabindex="-1" class="dropdown-item"
{{-- <li><a tabindex="-1" class="dropdown-item"
href="{{ route('manage.uploadVentureDebtFunds') }}">Venture Debt
Funds</a></li>
Funds</a></li> --}}
<li><a tabindex="-1" class="dropdown-item"
href="{{ route('manage.uploadHedgeFunds') }}">Hedge Funds</a></li>
<li><a tabindex="-1" class="dropdown-item"
href="{{ route('manage.uploadExchangeTradedFunds') }}">ETFs</a></li>
{{-- <li><a tabindex="-1" class="dropdown-item"
href="{{ route('manage.uploadExchangeTradedFunds') }}">ETFs</a></li> --}}
<li><a tabindex="-1" class="dropdown-item"
href="{{ route('manage.uploadRealEstateInvestmentFunds') }}">REITs</a>
</li>

1
resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
View File

@@ -1,3 +1,4 @@
@extends('Admin.layouts.master')
@section('content')

5
resources/views/Frontend/Pages/global-real-estate/commercial.blade.php
View File

@@ -215,7 +215,6 @@
<x-learn-more :learnMore="$learnMore" />
<div id="open_investments"></div>
<x-global-commercial-real-estate-product :gcreData="$openGCRE" id="open_investments" :type="$type='Primary Offerings'" />
<x-global-commercial-real-estate-product :gcreData="$resaleGCRE" id="resale" :type="$type='Secondary Offerings'" />
<!-- <x-global-commercial-real-estate-product :gcreData="$fullyFundedGCRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> -->
</div>
<x-global-commercial-real-estate-product :gcreData="$fullyFundedGCRE" id="resale" :type="$type='Secondary Offerings'" />
</div>
@endsection

4
resources/views/Frontend/Pages/global-real-estate/industrial.blade.php
View File

@@ -184,7 +184,7 @@
</div>
<x-learn-more :learnMore="$learnMore" />
<div id="open_investments"></div>
<x-global-industrial-real-estate-product :gireData="$openGIRE" id="open_investments" :type="$type='Primary Offerings'" />
<x-global-industrial-real-estate-product :gireData="$resaleGIRE" id="resale" :type="$type='Secondary Offerings'" />
<x-global-industrial-real-estate-product :gireData="$openGCRE" id="open_investments" :type="$type='Primary Offerings'" />
<x-global-industrial-real-estate-product :gireData="$fullyFundedGCRE" id="resale" :type="$type='Secondary Offerings'" />
</div>
@endsection

2
resources/views/Frontend/Pages/index.blade.php
View File

@@ -262,7 +262,7 @@
</div>
@if(count($topPicks['data']))
{{-- @dd($topPicks['data']) --}}
<div class="popular-assets">
<div class="container">
<div class="bg-brown-head mb-5">

2
resources/views/Frontend/Pages/indian-real-estate/industrial.blade.php
View File

@@ -190,7 +190,7 @@
</div>
<x-learn-more :learnMore="$learnMore" />
<x-indian-industrial-real-estate-product :iireData="$openIIRE" id="open_investments" :type="$type='Primary Offerings'" />
<x-indian-industrial-real-estate-product :iireData="$resaleIIRE" id="resale" :type="$type='Secondary Offerings'" />
<x-indian-industrial-real-estate-product :iireData="$fullyFundedIIRE" id="resale" :type="$type='Secondary Offerings'" />
{{-- <x-indian-industrial-real-estate-product :iireData="$fullyFundedIIRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> --}}
<!--<div class="investment">-->
<!-- <div class="container">-->

2
resources/views/Frontend/Pages/indian-real-estate/residential.blade.php
View File

@@ -199,7 +199,7 @@
</div>
<x-learn-more :learnMore="$learnMore" />
<x-indian-residential-real-estate-product :irreData="$openIRRE" id="open_investments" :type="$type = 'Primary Offerings'" />
<x-indian-residential-real-estate-product :irreData="$resaleIRRE" id="resale" :type="$type = 'Secondary Offerings'" />
<x-indian-residential-real-estate-product :irreData="$fullyFundedIRRE" id="resale" :type="$type = 'Secondary Offerings'" />
{{-- <x-indian-residential-real-estate-product :irreData="$fullyFundedIRRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> --}}
<!--<div class="investment">-->
<!-- <div class="container">-->