diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php index 47a4c87..f5379c9 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/VentureCapitalFundController.php @@ -55,7 +55,7 @@ class VentureCapitalFundController extends Controller ]); $category_type = $request->category_id; $category = Category::find($request->category_id); - // dd('hello'); + // dd($category); Excel::import(new AlternativeInvestmentFundImport($category_type), $request->file('productFile')); // return back()->with('success', "$category->category_name Imported Successfully."); return redirect()->route('manage.products')->with('success', "$category->category_name Imported Successfully."); diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index 23ca224..496daaa 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -204,6 +204,7 @@ class AlternativeInvestmentFundController extends Controller public function privateEquityFundProduct($slug) { $privateEquityFund = $this->privateEquityData($slug)->getData()->data; + // dd($privateEquityFund); $otherPEF = AlternativeInvestmentFund::query() ->join('products', 'alternative_investment_funds.products_id', 'products.id') ->join('companies', 'alternative_investment_funds.companies_id', 'companies.id') diff --git a/app/Imports/AlternativeInvestmentFundImport.php b/app/Imports/AlternativeInvestmentFundImport.php index d82e983..d55560c 100644 --- a/app/Imports/AlternativeInvestmentFundImport.php +++ b/app/Imports/AlternativeInvestmentFundImport.php @@ -70,7 +70,7 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow 'products_id' => $product->id, 'slug' => Str::slug($row['name_of_the_fund']) . '-' . ++$count, 'fund_name' => $row['name_of_the_fund'], - 'registration_number' => $row['registration_no'] ?? null, + 'registration_number' => $row['registration_no'] ?? $row['registeration_number'] ?? null, 'fund_category' => $row['fund_category_iiiiii'], 'fund_structure' => $row['fund_structure_openclosed'], 'fund_strategy' => $row['fund_strategy'], @@ -103,12 +103,12 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow 'regions_covered' => $row['regions_coveredgeographical_locations_covered_by_the_fund'] ?? null, 'isin_code' => $row['isin_code'] ?? null, 'focused_real_estate_sectors' => $row['focused_real_estate_sectors'] ?? null, - 'rera_complied_property' => $row['rera_compiled_propertyyesno'] ?? null, + 'rera_complied_property' => $row['rera_compiled_propertyyesno'] ?? $row['rera_complied_propertyyesno'] ?? null, 'return_on_investment' => $row['return_on_investment'] ?? null, 'valuation_per_sector' => $row['valuation_per_sector'] ?? null, 'focused_funds' => $row['focused_funds'] ?? $row['focused_fund'] ?? null, 'trading_strategy' => $row['trading_strategy'] ?? null, - 'involved_in_short_selling' => $row['involved_in_short_selling'] ?? null, + 'involved_in_short_selling' => $row['involved_in_short_selling'] ?? $row['involved_in_short_selling_yesno'] ?? null, 'minimum_investment' => $row['minimum_investment'] ?? null, 'return_on_investment_irr_dpi_rvpi_tvpi' => $row['return_on_investment_irr_dpi_rvpi_tvpi'] ?? null, 'valuation_per_security_nav' => $row['valuation_per_security_nav'] ?? null, diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index cfe2a9c..70bd27b 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -33,7 +33,7 @@ a { p { font-family: "Cambria"; - text-align: justify; + text-align: justify !important; } a:focus-visible { diff --git a/public/excel-template/VentureCapitalFundsTemplate.xlsx b/public/excel-template/VentureCapitalFundsTemplate.xlsx index 02b49cf..8da6bd8 100644 Binary files a/public/excel-template/VentureCapitalFundsTemplate.xlsx and b/public/excel-template/VentureCapitalFundsTemplate.xlsx differ diff --git a/resources/views/Admin/Pages/manage_cms/manage_testimonials/add_testimonial.blade.php b/resources/views/Admin/Pages/manage_cms/manage_testimonials/add_testimonial.blade.php index 7e35df9..7554221 100644 --- a/resources/views/Admin/Pages/manage_cms/manage_testimonials/add_testimonial.blade.php +++ b/resources/views/Admin/Pages/manage_cms/manage_testimonials/add_testimonial.blade.php @@ -84,7 +84,7 @@
- +
diff --git a/resources/views/Admin/Pages/manage_cms/manage_testimonials/edit_testimonial.blade.php b/resources/views/Admin/Pages/manage_cms/manage_testimonials/edit_testimonial.blade.php index 60bf89a..8b884ae 100644 --- a/resources/views/Admin/Pages/manage_cms/manage_testimonials/edit_testimonial.blade.php +++ b/resources/views/Admin/Pages/manage_cms/manage_testimonials/edit_testimonial.blade.php @@ -75,7 +75,7 @@ --}}
- +
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index f5bc96c..ac97dbf 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -297,14 +297,14 @@ {{-- @dd($productData->involved_in_short_selling); --}}
-
+

Involved In Short Selling

- {{ $productData->involved_in_short_selling }} + {{ $productData->involved_in_short_selling ?? 'N/A'}}
-
+

Trading Strategy

- {{ $productData->trading_strategy }} + {{ $productData->trading_strategy ?? 'N/A'}}
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php index 92be0e4..7da4d98 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php @@ -337,32 +337,32 @@
-
+

Involved In Short Selling

{{ $productData->involved_in_short_selling ?? 'N/A' }}
-
+

Trading Strategy

{{ $productData->trading_strategy ?? 'N/A' }}
-
+

Focused Funds

{{ $productData->focused_funds ?? 'N/A' }}
-
+

Valuation Per Sector

{{ $productData->valuation_per_sector ?? 'N/A' }}
-
+

Return On Investment

{{ $productData->return_on_investment ?? 'N/A' }}
-
+

Rera Complied Property

{{ $productData->rera_complied_property ?? 'N/A' }}
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php index 0e360ec..a47161a 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/private-equity-fund-product.blade.php @@ -101,7 +101,7 @@

Registration Number

- {{ $hedgeFund->registration_number ?? 'N/A' }} + {{ $privateEquityFund->registration_number ?? 'N/A' }}

Fund category