diff --git a/app/Http/Controllers/Frontend/FractionalRealEstateController.php b/app/Http/Controllers/Frontend/FractionalRealEstateController.php
index a0d269b..fc92e93 100644
--- a/app/Http/Controllers/Frontend/FractionalRealEstateController.php
+++ b/app/Http/Controllers/Frontend/FractionalRealEstateController.php
@@ -21,7 +21,7 @@ class FractionalRealEstateController extends Controller
$fullyFundedFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies', 'categorys')->fullyFunded()->active()->latest()->get();
$learnMore = (new FractionalRealEstateFontendController)->fractionalRealEstateQuestionAndAnswer()->getData();
// $faqs = (new FractionalRealEstateFontendController)->fractionalRealEstateQuestionAndAnswerFaqs()->getData();
- // dd($openFRE);
+ // dd($fractionalRealEstate,$openFRE,$resaleFRE,$fullyFundedFRE,$learnMore);
return view('Frontend.Pages.fractional-real-estate.index', compact('fractionalRealEstate', 'learnMore', 'openFRE', 'resaleFRE', 'fullyFundedFRE'));
}
diff --git a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php
index 4a4405f..222081e 100644
--- a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php
+++ b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php
@@ -88,7 +88,7 @@ class HandpickedInvestmentController extends Controller
];
$products = Product::query()
- ->select(DB::raw('products.id, products.description, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'),
+ ->select(DB::raw('products.id, products.description, fre.property_image, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'),
DB::raw('coalesce(companies.company_logo) as company_logo'), DB::raw('coalesce(fre.slug,aif.slug,re.slug, funds.slug) as slug'), DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,re.geographic_focus, funds.geographic_focus) as geographic_focus'), DB::raw('coalesce(aif.minimum_investment,fre.minimum_investment,funds.minimum_investment,re.total_price) as minimum_investment'),
// DB::raw('coalesce(aif.description,fre.property_description,re.remarks,funds.fund_description) as description'),
// DB::raw('coalesce(fre.property_description,products.description) as description'),
diff --git a/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php b/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php
index 37d6fac..3f06d9a 100644
--- a/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php
+++ b/app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php
@@ -43,8 +43,9 @@ class ImportMontlyUpdateAlternativeInvestmentFund implements ToCollection, With
public function collection(Collection $rows)
{
Validator::make($rows->toArray(), $this->rules(), $this->customValidationMessages($rows))->validate();
-
+ // dd($rows);
foreach ($rows as $row) {
+ // dd(getConvertedDate($row['date_of_initial_contribution']));
if ($row['commitment_amount'] != null && $row['contribution_amount'] != null && $row['contribution_called_amount'] != null && $row['contribution_uncalled_amount'] != null) {
$latestId = MonthlyUpdateAlternativeInvestmentFund::insertGetId([
'custom_id' => $row['custom_id'] ?? null,
diff --git a/app/helper.php b/app/helper.php
index 59a9937..fdea623 100644
--- a/app/helper.php
+++ b/app/helper.php
@@ -57,6 +57,12 @@ function getConvertedDate($date)
$newDate = str_split($dateArray[0], 2);
return (string)$newDate[0] . '-' . (string)$newDate[1] . '-' . (string)$dateArray[1];
}
+ elseif(strlen($date) == 7)
+ {
+ $dateArray = str_split($date, 1);
+ // $newDate = str_split($dateArray[0], 1);
+ return '0'.(string)$dateArray[0] . '-' . (string)$dateArray[1].(string)$dateArray[2] . '-' . (string)$dateArray[3]. (string)$dateArray[4]. (string)$dateArray[5]. (string)$dateArray[6];
+ }
return null;
}
@@ -70,7 +76,8 @@ function imagePath($path = null)
$finalPath = "https://staging.jerichoalternatives.in/";
}
if (env('APP_ENV') == 'local') {
- $finalPath = "http://localhost/jericho_28_march/";
+ // $finalPath = "https://jerichoalternatives.in/";
+ $finalPath = "http://localhost/freeu/my-freeu/";
}
return $finalPath . $path;
}
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index dcdb797..9139fb0 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -1292,6 +1292,12 @@ div#kt_drawer_chat_messenger {
overflow-y: scroll;
overflow-x: hidden;
}
+.right-lts {
+ display: flex;
+ align-items: center;
+ width: 35%;
+ justify-content: space-between;
+}
#update_lead_form .select2-container--bootstrap5 .select2-selection {
height: 50px !important;
}
diff --git a/public/assets/css/style1.css b/public/assets/css/style1.css
index efba934..83b9c07 100644
--- a/public/assets/css/style1.css
+++ b/public/assets/css/style1.css
@@ -1085,3 +1085,15 @@ label.error {
div#preview_image {
height: 270px;
}
+
+.dataTable_area .card-header {
+ width: 100%;
+ overflow-x: auto;
+}
+span.text-white.opacity-75.pt-1.fw-semibold.fs-7 {
+ height: auto !important;
+}
+
+#alternative_view_modal button.btn.btn-secondary {
+ margin: 0 auto;
+}
diff --git a/public/assets/uploads/fractionalrealestate_images/202407031118_0121719470229 (15).png b/public/assets/uploads/fractionalrealestate_images/202407031118_0121719470229 (15).png
new file mode 100644
index 0000000..0eee154
Binary files /dev/null and b/public/assets/uploads/fractionalrealestate_images/202407031118_0121719470229 (15).png differ
diff --git a/public/uploads/fractional_real_estate/property_image/1719989860.png b/public/uploads/fractional_real_estate/property_image/1719989860.png
new file mode 100644
index 0000000..0eee154
Binary files /dev/null and b/public/uploads/fractional_real_estate/property_image/1719989860.png differ
diff --git a/public/uploads/fractional_real_estate/property_image/1719992352.png b/public/uploads/fractional_real_estate/property_image/1719992352.png
new file mode 100644
index 0000000..3d5a05b
Binary files /dev/null and b/public/uploads/fractional_real_estate/property_image/1719992352.png differ
diff --git a/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php b/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php
index d90cb15..7f03bc7 100644
--- a/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php
+++ b/resources/views/Admin/Pages/manage_commission/edit_commission.blade.php
@@ -114,7 +114,7 @@
+ value="{{ optional($product->end_of_trail)->format('d-m-Y') }}">
-
-
- Description: {{$alternativeInvestmentFund->description ?? 'N/A'}}
-
-
+
Other Expenses: {{$alternativeInvestmentFund->alternativeInvestmentFund->other_expenses ?? 'N/A'}}
@@ -277,11 +273,18 @@
Involved In Short Selling: {{$alternativeInvestmentFund->alternativeInvestmentFund->involved_in_short_selling ?? 'N/A'}}
+
+
Fund Strategy: {{$alternativeInvestmentFund->alternativeInvestmentFund->fund_strategy ?? 'N/A'}}
+
+
+ Description: {{$alternativeInvestmentFund->description ?? 'N/A'}}
+
+
Minimum Investment : {{$alternativeInvestmentFund->alternativeInvestmentFund->minimum_investment ?? 'N/A'}}
@@ -292,7 +295,7 @@
valuation par security : {{$alternativeInvestmentFund->alternativeInvestmentFund->valuation_per_security_nav ?? 'N/A'}}
-
+
@if(isset($alternativeInvestmentFund['product_images']) && count($alternativeInvestmentFund['product_images']) > 0)
Gallery :
diff --git a/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php b/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php
index bc97b31..afb5937 100644
--- a/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php
@@ -249,7 +249,7 @@
-
{{$data->date_of_initial_contribution}}
+
{{ date('d-m-Y', strtotime($data->date_of_initial_contribution)) }}
-
+
@@ -289,7 +281,14 @@
-
{{$data->total_fees_paid}}
+
+ @if($data->getRawOriginal('total_fees_paid'))
+ ₹{{$data->getRawOriginal('total_fees_paid')}}
+ @else
+ N/A
+ @endif
+
+
+
diff --git a/resources/views/Admin/Pages/manage_investors/invested_products/index.blade.php b/resources/views/Admin/Pages/manage_investors/invested_products/index.blade.php
index 5efd33f..3d6c423 100644
--- a/resources/views/Admin/Pages/manage_investors/invested_products/index.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/invested_products/index.blade.php
@@ -1,6 +1,9 @@
@extends('Admin.layouts.master')
@section('title','Investment Details')
@section('content')
+@php
+$id = request('id');
+@endphp
@@ -8,6 +11,9 @@
@php($ifaValues = ['Invoice Discounting' ,'Clean And Green Assets' ,'Venture Debt' ,'High Yield Finance','Securitized Debt Instrument','Lease Based Financing','Revenue Based Financing'])
diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
index 61d05b5..f78d7e5 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
@@ -515,11 +515,11 @@
"No statement reports found.");
}
},
- error: function(xhr, status, error) {
- console.error(xhr.responseText); // Log the error message
- $('#statement_reports_container').empty().text(
- "Error fetching statement reports. Please try again later.");
- }
+ // error: function(xhr, status, error) {
+ // console.error(xhr.responseText); // Log the error message
+ // $('#statement_reports_container').empty().text(
+ // "Error fetching statement reports. Please try again later.");
+ // }
});
}
diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
index 018d2de..cf4cfdb 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
@@ -169,7 +169,7 @@
@@ -470,10 +470,10 @@
$('#statement_reports_container').empty().text("No statement reports found.");
}
},
- error: function(xhr, status, error) {
- console.error(xhr.responseText); // Log the error message
- $('#statement_reports_container').empty().text("Error fetching statement reports. Please try again later.");
- }
+ // error: function(xhr, status, error) {
+ // console.error(xhr.responseText); // Log the error message
+ // $('#statement_reports_container').empty().text("Error fetching statement reports. Please try again later.");
+ // }
});
}
diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
index 9c83750..14230eb 100644
--- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
@@ -582,6 +582,19 @@
+
+
+
+
+
+ Industry
+
+
+
+
+
+
@@ -660,18 +673,7 @@
name="annual_revenue" value='{{ $lead->annual_revenue }}' />
-
-
-
-
- Industry
-
-
-
-
-
-
+
{{--
diff --git a/resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php
index c4eff53..d37e2bf 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php
@@ -59,7 +59,7 @@
- Date of investment: {{$data->date_of_investment}}
+ Date of investment: {{ \Carbon\Carbon::parse($data->date_of_investment)->format('d-m-Y') }}
@@ -165,7 +165,7 @@
- Date of Final Close: {{$data->date_of_final_close}}
+ Date of Final Close: {{\Carbon\Carbon::parse($data->date_of_final_close)->format('d-m-Y') }}
diff --git a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investment.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investment.blade.php
index 2516869..b0044b1 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investment.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investment.blade.php
@@ -23,7 +23,7 @@