diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php index 7a450c4..595496a 100644 --- a/app/Http/Controllers/Admin/ManageUserProductController.php +++ b/app/Http/Controllers/Admin/ManageUserProductController.php @@ -194,7 +194,19 @@ class ManageUserProductController extends Controller ->join('user_kycs', 'users.id', 'user_kycs.users_id') ->where('user_kycs.status', 'Approved') ->pluck('users.name', 'users.id'); - $aifProductNames = $this->getAllProductNames([Category::VentureCapitalFundId, Category::InfrastructureFundId, Category::AngelFundId, Category::PrivateEquityFundId, Category::DebtFundId, Category::PrivateRealEstateFundId, Category::PrivateInvestmentInPublicEquityFundId,Category::LongOnlyFundId,Category::PrivateCreditFundId]); + $aifProductNames = $this->getAllProductNames([ + Category::VentureCapitalFundId, + Category::AngelFundId, + Category::InfrastructureFundId, + Category::FundForDistressedAssetId, + Category::PrivateCreditFundId, + Category::PrivateRealEstateFundId, + Category::PrivateEquityFundId, + Category::HedgeFundId, + Category::PrivateInvestmentInPublicEquityFundId, + Category::LongOnlyFundId, + ]); + // dd($aifProductNames->toArray()); $freProductNames = $this->getAllProductNames([Category::FractionalRealEstateId]); // $p2pProductNames = $this->getAllProductNames(Category::PeerToPeerLendingId); // $ifaProductNames = $this->getAllProductNames(Category::InvoiceDiscountingId, Category::CleanAndGreenAssetsId, Category::VentureDebtId, Category::HighYieldFinanceId, Category::SecuritizedDebtInstrumentId, Category::LeaseBasedFinancingId, Category::RevenueBasedFinancingId); diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index a0a6bec..ee6383f 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -163,7 +163,7 @@ class AlternativeInvestmentFundController extends Controller ->where(['status' => true, 'categories_id' => 28]) ->where('slug', '!=', $slug) ->get(); - $productData = AlternativeInvestmentFund::where('slug',$slug)->first(); + $productData = AlternativeInvestmentFund::where('slug', $slug)->first(); // dd($productData,$slug,$ventureCapitalFund); $productData = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($ventureCapitalFund, $otherVCP, $productData); @@ -182,7 +182,7 @@ class AlternativeInvestmentFundController extends Controller $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($productData); - return view('Frontend.Pages.alternative-investment-fund.infrastructure-fund-product', compact('infrastructureFund', 'otherIF', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.infrastructure-fund-product', compact('infrastructureFund', 'otherIF', 'productData', 'product')); } public function angelFundProduct($slug) @@ -196,7 +196,7 @@ class AlternativeInvestmentFundController extends Controller $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($product); - return view('Frontend.Pages.alternative-investment-fund.angel-fund-product', compact('angelFund', 'otherAF', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.angel-fund-product', compact('angelFund', 'otherAF', 'productData', 'product')); } public function privateEquityFundProduct($slug) @@ -240,7 +240,7 @@ class AlternativeInvestmentFundController extends Controller $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($productData); - return view('Frontend.Pages.alternative-investment-fund.fund-for-distressed-asset-product', compact('fundForDistressedAsset', 'otherFFDA', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.fund-for-distressed-asset-product', compact('fundForDistressedAsset', 'otherFFDA', 'productData', 'product')); } public function privateRealEstateFundProduct($slug) @@ -255,7 +255,7 @@ class AlternativeInvestmentFundController extends Controller $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($productData); - return view('Frontend.Pages.alternative-investment-fund.private-real-estate-fund-product', compact('realEstate', 'otherPREF', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.private-real-estate-fund-product', compact('realEstate', 'otherPREF', 'productData', 'product')); } public function hedgeFundProduct($slug) @@ -272,7 +272,7 @@ class AlternativeInvestmentFundController extends Controller $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($productData); // dd($productData); - return view('Frontend.Pages.alternative-investment-fund.hedge-fund-product', compact('hedgeFund', 'otherHF', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.hedge-fund-product', compact('hedgeFund', 'otherHF', 'productData', 'product')); } public function privateInvestmentPublicEquityProduct($slug) @@ -289,7 +289,7 @@ class AlternativeInvestmentFundController extends Controller $productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first(); $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($otherPIPE); - return view('Frontend.Pages.alternative-investment-fund.private-investment-public-equity-product', compact('pipe', 'otherPIPE', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.private-investment-public-equity-product', compact('pipe', 'otherPIPE', 'productData', 'product')); } // public function ventureCapital(){ @@ -323,7 +323,7 @@ class AlternativeInvestmentFundController extends Controller public function infrastructure($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->infrastructureFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->infrastructureFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -345,7 +345,7 @@ class AlternativeInvestmentFundController extends Controller public function angelFundAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->angelFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->angelFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -367,7 +367,7 @@ class AlternativeInvestmentFundController extends Controller public function privateEquityAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->privateEquityFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->privateEquityFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -389,7 +389,7 @@ class AlternativeInvestmentFundController extends Controller public function debtFundAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->debtFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->debtFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -411,7 +411,7 @@ class AlternativeInvestmentFundController extends Controller public function privateRealEstateFundAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->privateRealEstateFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->privateRealEstateFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -433,7 +433,7 @@ class AlternativeInvestmentFundController extends Controller public function fundForDistressedAssetAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->fundForDistressedAsset()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->fundForDistressedAsset()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -455,7 +455,7 @@ class AlternativeInvestmentFundController extends Controller public function hedgeFundAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type',$type)->hedgeFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies')->where('type', $type)->hedgeFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -477,7 +477,7 @@ class AlternativeInvestmentFundController extends Controller public function longOnlyEquityFundAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies','product_images','categorys')->where('type',$type)->longOnlyEquityFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies', 'product_images', 'categorys')->where('type', $type)->longOnlyEquityFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -500,7 +500,7 @@ class AlternativeInvestmentFundController extends Controller public function privateCreditFundAllData($type = 'Open') { try { - return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies','product_images')->where('type',$type)->privateCreditFund()->active()->get())) + return (new test(Product::has('alternativeInvestmentFund')->with('alternativeInvestmentFund.companies', 'product_images')->where('type', $type)->privateCreditFund()->active()->get())) ->response() ->setStatusCode(200); } catch (\Exception $e) { @@ -576,7 +576,7 @@ class AlternativeInvestmentFundController extends Controller $product = Product::with('product_images')->where('id', '=', $productData->products_id)->first(); // dd($otherHF); // dd($longOnlyEquityFund, $slug); - return view('Frontend.Pages.alternative-investment-fund.long-only-equity-fund-product', compact('longOnlyEquityFund', 'otherHF', 'productData','product')); + return view('Frontend.Pages.alternative-investment-fund.long-only-equity-fund-product', compact('longOnlyEquityFund', 'otherHF', 'productData', 'product')); } public function privateCreditFund() { @@ -614,4 +614,4 @@ class AlternativeInvestmentFundController extends Controller // dd($privateCreditFund); return view('Frontend.Pages.alternative-investment-fund.private-credit-fund-product', compact('privateCreditFund', 'otherPEF', 'productData')); } -} \ No newline at end of file +} diff --git a/app/Imports/AlternativeInvestmentFundImport.php b/app/Imports/AlternativeInvestmentFundImport.php index 75cb9f3..c17b38b 100644 --- a/app/Imports/AlternativeInvestmentFundImport.php +++ b/app/Imports/AlternativeInvestmentFundImport.php @@ -61,14 +61,14 @@ class AlternativeInvestmentFundImport implements ToCollection, WithHeadingRow 'total_views' => 0, 'status' => 0, 'created_by' => auth()->user()->id, - 'description'=> $row['description'] ?? null, + 'description' => $row['description'] ?? null, ]); - $count = AlternativeInvestmentFund::where('fund_name',$row['name_of_the_fund'])->count(); + $count = AlternativeInvestmentFund::where('fund_name', $row['name_of_the_fund'])->count(); AlternativeInvestmentFund::create([ 'products_id' => $product->id, - 'slug' => $count < 1 ? Str::slug($row['name_of_the_fund']) : Str::slug($row['name_of_the_fund']).'-'.$count+1, + 'slug' => $count < 1 ? Str::slug($row['name_of_the_fund']) : Str::slug($row['name_of_the_fund']) . '-' . $count + 1, 'fund_name' => $row['name_of_the_fund'], 'registration_number' => $row['registration_no'] ?? null, 'fund_category' => $row['fund_category_iiiiii'], diff --git a/app/Imports/RealEstateImport.php b/app/Imports/RealEstateImport.php index 55d1e95..8a84b6d 100644 --- a/app/Imports/RealEstateImport.php +++ b/app/Imports/RealEstateImport.php @@ -20,7 +20,7 @@ class RealEstateImport implements ToCollection, WithHeadingRow */ protected $category_id; - public function __construct($category_id,) + public function __construct($category_id) { $this->category_id= $category_id; } @@ -54,7 +54,7 @@ class RealEstateImport implements ToCollection, WithHeadingRow public function collection(Collection $rows) { Validator::make($rows->toArray(), $this->rules(), $this->customValidationMessages($rows))->validate(); - + // dd($rows, $this->category_id == 20 ? 'Global' : ($this->category_id == 21 ? 'Global' : ($this->category_id == 22 ? 'Global' : 'India'))); foreach ($rows as $row) { $product = Product::create([ 'tables_id' => Table::RealEstateTable, @@ -85,8 +85,8 @@ class RealEstateImport implements ToCollection, WithHeadingRow 'construction_status' => $row['construction_status'] ?? null, // 'launch_date' => getConvertedDate($row['launch_date']) ?? null, // 'completed_in' => getConvertedDate($row['completed_in']) ?? null, - 'launch_date' => $row['launch_date'] ? getConvertedDate($row['launch_date']) : null, - 'completed_in' => $row['completed_in'] ? getConvertedDate($row['completed_in']) : null, + 'launch_date' => getConvertedDate($row['launch_date']) ? getConvertedDate($row['launch_date']) : null, + 'completed_in' => getConvertedDate($row['completed_in']) ? getConvertedDate($row['completed_in']) : null, 'total_units' => $row['total_units'] ?? null, 'unit_type' => $row['unit_type'] ?? null, 'no_of_restrooms' => $row['no_of_restrooms'] ?? null, diff --git a/app/Models/Category.php b/app/Models/Category.php index 31bb079..4814ca4 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -32,7 +32,7 @@ class Category extends Model const GlobalVentureDebtId = 36; - const GlobalPrivateEquityFundId = 13; + const PrivateEquityFundId = 13; // const GlobalPrivateEquityFundId = 39; @@ -76,7 +76,7 @@ class Category extends Model const AngelFundId = 30; - const PrivateEquityFundId = 31; + const GlobalPrivateEquityFundId = 31; const DebtFundId = 32; diff --git a/app/Models/RealEstate.php b/app/Models/RealEstate.php index 24a4448..5dbcb87 100644 --- a/app/Models/RealEstate.php +++ b/app/Models/RealEstate.php @@ -10,7 +10,7 @@ class RealEstate extends Model { use HasFactory, SoftDeletes; - protected $fillable = ['products_id','slug','property_name','property_location','project_type','current_status','price_per_sq_ft','booking_amount','price_range','total_price','transaction_type','project_code_or_rera_id','built_up_area','carpet_area','area_in_sq_ft','construction_status','launch_date','completed_in','total_units','unit_type','no_of_bedrooms','no_of_restrooms','no_of_floors','furnished_status','commencement_certificate','occupancy_certificate','total_towers','builder_details','landmarks','amenities','elevators','car_parking','electricity_status','fire_safety_measures','water_facility','price_negotiable','maintenance_fees','nearest_railway_metro_station','pre_leased','tenant_details','facilities_features','construction_age','remarks','location','country']; + protected $fillable = ['products_id','slug','property_name','property_location','project_type','current_status','price_per_sq_ft','booking_amount','price_range','total_price','transaction_type','project_code_or_rera_id','built_up_area','carpet_area','area_in_sq_ft','construction_status','launch_date','completed_in','total_units','unit_type','no_of_bedrooms','no_of_restrooms','no_of_floors','furnished_status','commencement_certificate','occupancy_certificate','total_towers','builder_details','landmarks','amenities','elevators','car_parking','electricity_status','fire_safety_measures','water_facility','price_negotiable','maintenance_fees','nearest_railway_metro_station','pre_leased','tenant_details','facilities_features','construction_age','remarks','location','country','geographic_focus']; public function photo(){ return $this->hasOne(ProductPhotoDocuments::class,'real_estates_id')->where('type',0); diff --git a/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php index 7a310bb..5fa422e 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php @@ -141,6 +141,7 @@ + @dd
diff --git a/resources/views/Admin/personal-dashboard.blade.php b/resources/views/Admin/personal-dashboard.blade.php index c1424d4..3c56ab4 100644 --- a/resources/views/Admin/personal-dashboard.blade.php +++ b/resources/views/Admin/personal-dashboard.blade.php @@ -1,106 +1,55 @@ @extends('Admin.layouts.master') @section('title', 'Personal Dashboard') @section('style') - - + .dt-buttons { + display: none; + } + @endsection @section('content') -
-
-
-
-
-

My Tasks

-
- -
- - - - - - - -
-
-
- -
-
-
- - - - - - - - - - - - - - @foreach($tasks as $task) - - - - - - - - - - @endforeach - -
Sr NoSubjectDue DateStatusPriorityReminderActions
{{$loop->iteration}}{{$task->subject}}{{$task->due_date->format('d/m/Y')}}{{$task->status == 1?'Closed':'Open'}}{{$task->priority}}{{$task->reminder}} - - - - id}}> - - -
-
-
-
+
+
+
-

My Meetings

+

My Tasks

-
- - - + + + - +
@@ -108,732 +57,901 @@
- +
- - - - - - + + + + + - @foreach($meetings as $meeting) - - - - - - - - - - + @foreach ($tasks as $task) + + + + + + + + + @endforeach
Sr NoLocationfromToPriorityRelated ToStatusSubjectDue DateStatusPriorityReminder Actions
{{$loop->iteration}}{{$meeting->location}}{{$meeting->from->format('d/m/Y H:i:s')}}{{$meeting->to->format('d/m/Y H:i:s')}}{{$meeting->priority}}{{$meeting->related_to}}{{$meeting->status == 1?'Closed':'Open'}} - - - - - - - - -
{{ $loop->iteration }}{{ $task->subject }}{{ $task->due_date->format('d/m/Y') }}{{ $task->status == 1 ? 'Closed' : 'Open' }}{{ $task->priority }}{{ $task->reminder }} + + + + id }}> + + +
-
-
-
-

My Leads

-
- -
- - - - - - - +
+
+

My Meetings

+
+ +
+ + + + + + + +
+
+
+ +
+
+
+ + + + + + + + + + + + + + + @foreach ($meetings as $meeting) + + + + + + + + + + + @endforeach + +
Sr NoLocationfromToPriorityRelated ToStatusActions
{{ $loop->iteration }}{{ $meeting->location }}{{ $meeting->from->format('d/m/Y H:i:s') }}{{ $meeting->to->format('d/m/Y H:i:s') }}{{ $meeting->priority }}{{ $meeting->related_to }}{{ $meeting->status == 1 ? 'Closed' : 'Open' }} + + + + + + + + +
+
+
+
+
+
+
+

My Leads

+
+ +
+ + + + + + + +
+
+
+ + +
+
+
+ + + + + + + + + + + + + + {{-- @dd($leads) --}} + @foreach ($leads as $lead) + + + + + + + + + + @endforeach + +
Sr NoLead NameCompanyEmailPhoneLead SourceActions
{{ $loop->iteration }}{{ $lead->user->name }}{{ $lead->lead_company ?? 'N/A' }}{{ $lead->email }}{{ $lead->mobile }}{{ $lead->lead_source == null ? 'No Lead Source Assigned' : $lead->lead_source }} + + + + + + + +
+
+
+
+
+ + -
-
-
- - - - - - - - - - - - - - {{-- @dd($leads) --}} - @foreach($leads as $lead) - - - - - - - -
Sr NoLead NameCompanyEmailPhoneLead SourceActions
{{$loop->iteration}}{{$lead->user->name}}{{$lead->lead_company ?? 'N/A'}}{{$lead->email}}{{$lead->mobile}}{{$lead->lead_source == null ? 'No Lead Source Assigned' : $lead->lead_source}} - -