diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
index f19542d..8647bcf 100644
--- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
+++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
@@ -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(),
]);
}
diff --git a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php
index 68607c3..b794131 100644
--- a/app/Http/Controllers/Frontend/GlobalHedgeFundController.php
+++ b/app/Http/Controllers/Frontend/GlobalHedgeFundController.php
@@ -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();
diff --git a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php
index 32ced18..7ba2d78 100644
--- a/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php
+++ b/app/Http/Controllers/Frontend/GlobalPrivateEquityFundController.php
@@ -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();
diff --git a/app/Http/Controllers/GlobalPrivateCreditController.php b/app/Http/Controllers/GlobalPrivateCreditController.php
index 96d2c85..6dedacf 100644
--- a/app/Http/Controllers/GlobalPrivateCreditController.php
+++ b/app/Http/Controllers/GlobalPrivateCreditController.php
@@ -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(),
]);
}
diff --git a/app/Imports/StockFundsRealEstateExchangeImport.php b/app/Imports/StockFundsRealEstateExchangeImport.php
index 7f66bae..c87041a 100644
--- a/app/Imports/StockFundsRealEstateExchangeImport.php
+++ b/app/Imports/StockFundsRealEstateExchangeImport.php
@@ -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,
@@ -62,8 +71,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'],
diff --git a/public/excel-template/ExchangeTradedFundsTemplate.xlsx b/public/excel-template/ExchangeTradedFundsTemplate.xlsx
index 46bbe9a..7b45814 100644
Binary files a/public/excel-template/ExchangeTradedFundsTemplate.xlsx and b/public/excel-template/ExchangeTradedFundsTemplate.xlsx differ
diff --git a/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx b/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx
new file mode 100644
index 0000000..1b8d35c
Binary files /dev/null and b/public/excel-template/InternationalPrivateEquityFundTemplate.xlsx differ
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php
index 06857ca..6e9fe6a 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/alternative-investment-fund.blade.php
@@ -122,7 +122,7 @@
diff --git a/resources/views/Frontend/Pages/fractional-real-estate/index.blade.php b/resources/views/Frontend/Pages/fractional-real-estate/index.blade.php
index ecce640..db6dee2 100644
--- a/resources/views/Frontend/Pages/fractional-real-estate/index.blade.php
+++ b/resources/views/Frontend/Pages/fractional-real-estate/index.blade.php
@@ -152,7 +152,7 @@
-
+