diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index f18c8da..79e2ddf 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -1132,6 +1132,7 @@ class DashboardController extends Controller 'current_or_latest_nav' => $request->current_or_latest_nav, 'no_of_units_held' => $request->no_of_units_held, 'no_of_units_you_wish_to_sell' => $request->no_of_units_you_wish_to_sell, + 'og_no_of_units_wish_to_sell' => $request->no_of_units_you_wish_to_sell, 'expected_sale_per_unit' => $request->expected_sale_per_unit, 'listing_status' => 'Hide', 'status' => 'Pending', @@ -1207,6 +1208,8 @@ class DashboardController extends Controller 'original_amount_invested' => $request->original_amount_invested, 'current_market_value_of_the_property' => $request->current_market_value_of_the_property, 'expected_selling_price' => $request->expected_selling_price, + 'og_current_market_value_of_the_property' => $request->current_market_value_of_the_property, + 'og_expected_selling_price' => $request->expected_selling_price, 'listing_status' => 'Hide', 'status' => 'Pending', 'latest_valuation_date' => $request->latest_valuation_date, //latest_valuation_date added by hritik on 09-04-24 diff --git a/app/Http/Resources/GlobalFundResource.php b/app/Http/Resources/GlobalFundResource.php index 90305a1..edaa08e 100644 --- a/app/Http/Resources/GlobalFundResource.php +++ b/app/Http/Resources/GlobalFundResource.php @@ -28,7 +28,7 @@ class GlobalFundResource extends JsonResource return [ 'id' => $this->id, 'products_id' => $this->products_id, - 'product_images' => $imagePaths, + 'product_images' => $imagePaths, 'presentation' => Product::find($this->products_id) ? Product::where('id',$this->products_id)->value('presentation') : null, 'fact_sheet' => Product::find($this->products_id) ? Product::where('id',$this->products_id)->value('fact_sheet') : null, 'slug' => $this->slug, @@ -50,6 +50,7 @@ class GlobalFundResource extends JsonResource 'year1_return' => $this->year1_return, 'year3_return' => $this->year3_return, 'returns' => $this->returns, + 'date_as_on' => $this->date_as_on, // 'product_images' => ProductImage::where('product_xid',$this->products_id)->get(), ]; diff --git a/app/Http/Resources/RealEstateResource.php b/app/Http/Resources/RealEstateResource.php index 87b6272..8358d99 100644 --- a/app/Http/Resources/RealEstateResource.php +++ b/app/Http/Resources/RealEstateResource.php @@ -5,6 +5,7 @@ namespace App\Http\Resources; use App\Models\Product; use App\Resources\ProductPhotoResources; use Illuminate\Http\Resources\Json\JsonResource; +use App\Models\ProductImage; class RealEstateResource extends JsonResource { @@ -16,11 +17,23 @@ class RealEstateResource extends JsonResource */ public function toArray($request) { + $images = ProductImage::where('product_xid', $this->products_id)->get(); + $imagePaths = []; + if (!empty($images)) { + foreach ($images as $imageItem) { + $path = asset('public/' . $imageItem['images']); + $imagePaths[] = $path; + } + + } + return [ 'id' => $this->id, 'products_id' => $this->products_id, + 'product_images' => $imagePaths, 'presentation' => Product::find($this->products_id) ? Product::where('id',$this->products_id)->value('presentation') : null, 'fact_sheet' => Product::find($this->products_id) ? Product::where('id',$this->products_id)->value('fact_sheet') : null, + 'description' => Product::find($this->products_id) ? Product::where('id',$this->products_id)->value('description') : null, 'property_name' => $this->property_name, 'slug' => $this->slug, 'property_location' => $this->property_location, @@ -65,6 +78,7 @@ class RealEstateResource extends JsonResource 'location' => $this->location, 'country' => $this->country, 'remarks' => $this->remarks, + 'minimum_investment' => $this->total_price, 'photos' => ProductPhotoResource::collection($this->realEstatePhoto), 'documents' => ProductPhotoResource::collection($this->realEstateDocuments) ]; diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index 80c99a8..f992b17 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -2074,7 +2074,7 @@ li.item.list-item:nth-child(even) { .logout-modal p.log-ctn { font-size: 18px; text-align: center !important; -} +} .logout-modal .log-btn { display: flex; @@ -6506,10 +6506,10 @@ button.swal2-confirm.btn.yellow-btn.popup-button { } .menubar .admin-profile .dropdown-menu { - width: 300px; + width: 280px; transform: translate(-40%, 40px) !important; padding: 10px; - height: 400px; + /* height: 400px; */ overflow-x: hidden; } .notifications .list-item p strong { @@ -6555,3 +6555,7 @@ button#modal_close span { .your-investment .accordion-button::after { transform: rotate(180deg) !important; } + +.admin-profile .dropdown .dropdown-menu { + max-height: 500px !important; +} diff --git a/resources/views/Frontend/Pages/marketplace/index.blade.php b/resources/views/Frontend/Pages/marketplace/index.blade.php index af7be97..3f1796d 100644 --- a/resources/views/Frontend/Pages/marketplace/index.blade.php +++ b/resources/views/Frontend/Pages/marketplace/index.blade.php @@ -104,7 +104,7 @@ - + @@ -125,14 +125,11 @@ @foreach ($featuredMarketplaceListed['data'] as $freData) @if (array_key_exists('fractional-real-estate', $freData)) @foreach ($freData['fractional-real-estate'] as $data) - {{-- @dd($data) --}} + {{-- @dd($data) --}} @php($true = false) - + - + {{-- --}} {{-- --}} - - @@ -416,7 +418,7 @@
Asset NameAsset Name Region Product Category No. of Units
-
-

{{ $data->property_name }}

-
+ {{ $data->property_name }} 		@if ($data->geographic_focus == 'India') @@ -158,7 +155,8 @@ {{ IND_money_format($data->current_market_value_of_the_property) }} {{ IND_money_format($data->expected_selling_price) }} + {{ IND_money_format($data->expected_selling_price) }} @if (intval($data->discount) > 0) @php($btn = 'green-btn') @@ -171,7 +169,7 @@ @php($style = '') @endif {{ number_format((float)$data->discount, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -184,7 +182,7 @@ @php($style = '') @endif {{ number_format((float)$data->bid, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}% -

{{ $data->name_of_the_aif_fund }}

-
+ --}} + {{ $data->name_of_the_aif_fund }} 		@if ($data->geographic_focus == 'India') @@ -229,13 +228,16 @@ {{ $data->no_of_units_you_wish_to_sell }}{{ IND_money_format($data->current_or_latest_nav) }} + {{ IND_money_format($data->current_or_latest_nav) }} {{ $data->latest_valuation_date ?? 'N/A' }}{{ 'N/A' }}₹ {{ $data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell }}{{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }} + + {{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }} {{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }} + + {{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }} @if ($data->discount > 0) @@ -249,7 +251,7 @@ @php($style = '') @endif {{ number_format((float)$data->discount, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -262,7 +264,7 @@ @php($style = '') @endif {{ number_format((float)$data->bid, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}% {{ number_format((float)$data->discount, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}% @if ($data->bid > 0) @@ -335,7 +337,7 @@ @php($style = '') @endif {{ number_format((float)$data->bid, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}%
- + @@ -437,13 +439,14 @@ @foreach ($nonFeaturedMarketplaceListed['data'] as $freData) @if (array_key_exists('fractional-real-estate', $freData)) @foreach ($freData['fractional-real-estate'] as $data) - {{-- @php($secondTrue = false) --}} + {{-- @php($secondTrue = false) --}} - - + {{-- --}} - + {{-- --}} {{-- --}} - - + + @@ -722,10 +733,10 @@
+ +
-->

Currently, No Secondary Sale Opportunities Available.

Asset NameAsset Name Region Product Category No. of Units
-

{{ $data->property_name }}

-
+ --}} + {{ $data->property_name }} 		@if ($data->geographic_focus == 'India') @@ -466,9 +469,11 @@ N/A N/A {{ $data->latest_valuation_date }}{{ IND_money_format($data->current_market_value_of_the_property) }} + + {{ IND_money_format($data->current_market_value_of_the_property) }} {{ IND_money_format($data->expected_selling_price) }} + {{ IND_money_format($data->expected_selling_price) }} @if ($data->discount > 0) @php($btn = 'green-btn') @@ -491,9 +496,9 @@ @elseif($data->bid == 0) @php($btn = 'sliver-btn') @php($style = '') - @endif + @endif {{ number_format((float)$data->bid, 2, '.', '') }}% + style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}% -

{{ $data->name_of_the_aif_fund }}

-
+ --}} + {{ $data->name_of_the_aif_fund }} 		@if ($data->geographic_focus == 'India') @@ -538,13 +544,18 @@ {{ $data->no_of_units_you_wish_to_sell }}{{ $data->expected_sale_per_unit }}{{ IND_money_format($data->current_or_latest_nav) }} + {{ IND_money_format($data->current_or_latest_nav) }} {{ $data->latest_valuation_date ?? 'N/A' }}{{ $data->total_capital_commitment }}{{ $data->current_or_latest_nav }} {{ $data->expected_sale_per_unit }}{{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }}{{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }} + {{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }} + + {{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }} + @if ($data->discount > 0) @php($btn = 'green-btn') @@ -586,7 +597,7 @@ @foreach ($nonFeaturedMarketplaceListed['data'] as $opData) @if (array_key_exists('other-products', $opData)) @foreach ($opData['other-products'] as $data) - {{-- @php($secondTrue = false) --}} + {{-- @php($secondTrue = false) --}}