diff --git a/app/Http/Controllers/Frontend/IndianRealAssetController.php b/app/Http/Controllers/Frontend/IndianRealAssetController.php
index 150e4cd..62c5683 100644
--- a/app/Http/Controllers/Frontend/IndianRealAssetController.php
+++ b/app/Http/Controllers/Frontend/IndianRealAssetController.php
@@ -55,8 +55,8 @@ class IndianRealAssetController extends Controller
{
$realEstate = RealEstate::with('realEstatePhoto')->where('slug', $slug)->first();
$productData = RealEstate::where('slug', '=', $slug)->first();
- $productData = Product::where('id', '=', $productData->products_id)->first();
- // dd($realEstate);
+ $productData = Product::with('product_images')->where('id', '=', $productData->products_id)->first();
+ // dd($productData);
return view('Frontend.Pages.indian-real-estate.product', compact('realEstate', 'productData'));
}
diff --git a/app/Imports/FundImport.php b/app/Imports/FundImport.php
index b194b84..76a0f48 100644
--- a/app/Imports/FundImport.php
+++ b/app/Imports/FundImport.php
@@ -85,14 +85,17 @@ class FundImport implements ToCollection, WithHeadingRow
$totalKeys = count($row->toArray()) - 1;
for ($yearIndex = $init; $yearIndex <= $totalKeys; $yearIndex++) {
- array_push($returns, $arrayKeys[$yearIndex]);
+ if($arrayKeys[$yearIndex] != 'description')
+ {
+ array_push($returns, $arrayKeys[$yearIndex]);
+ }
};
$count = Fund::where('issuer',$row['issuer'])->count();
$fund = Fund::create([
'products_id' => $product->id,
'slug' => Str::slug($row['issuer']).'-'.$count+1,
'issuer' => $row['issuer'],
- 'type' => "Global",
+ 'geographic_focus' => "Global",
'fund_name' => $row['fund_name'],
'fund_type' => $row['fund_type'],
'about_issuer' => $row['about_issuer'],
diff --git a/app/helper.php b/app/helper.php
index 9e693da..592225c 100644
--- a/app/helper.php
+++ b/app/helper.php
@@ -41,6 +41,15 @@ function getUnreadMessage()
return Chat::where(['user_id'=>auth()->guard('users')->user()->id,'is_read'=>false])->count();
}
+function dNone($value = null)
+{
+ if($value)
+ {
+ return '';
+ }
+ return 'd-none';
+}
+
function getConvertedDate($date)
{
if(strlen($date) == 8)
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/view-product/fractional-real-estate.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/view-product/fractional-real-estate.blade.php
index acd0bde..7c781f6 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/view-product/fractional-real-estate.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/view-product/fractional-real-estate.blade.php
@@ -61,131 +61,131 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ @if(isset($fractionalRealEstate['product_images']) && count($fractionalRealEstate['product_images']) > 0)
- @if(isset($fractionalRealEstate['product_images']) && count($fractionalRealEstate['product_images']) > 0)
@foreach($fractionalRealEstate['product_images'] as $image)
@@ -195,8 +195,8 @@
@endforeach
- @endif
+ @endif
{{--
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
index ad7932f..01c4785 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
@@ -62,236 +62,236 @@
-
+
-
+
-
+
-
+
-
+ @php($companyName = null)
+ @if(!is_null($products->realEstates->companies))
+ @php($companyName = $products->realEstates->companies->company_name)
+ @endif
+
- @php($companyName = null)
- @if(!is_null($products->realEstates->companies))
- @php($companyName = $products->realEstates->companies->company_name)
- @endif
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+