Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed changes

Browse Source
This commit is contained in:
Ritikesh yadav
2024-06-20 15:04:59 +05:30
parent a39fa60a54
commit 5d8a8f6bbc
5 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Frontend/DashboardController.php
View File

@@ -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

3
app/Http/Resources/GlobalFundResource.php
View File

@@ -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(),
];

14
app/Http/Resources/RealEstateResource.php
View File

@@ -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)
];

10
public/assets/css/FrontendCss/style.css
View File

@@ -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;
}

89
resources/views/Frontend/Pages/marketplace/index.blade.php
View File

@@ -104,7 +104,7 @@
<table>
<thead>
<tr>
<th scope="col" style="width:200px;">Asset Name</th>
<th scope="col" style="min-width:200px;">Asset Name</th>
<th scope="col" style="width: 80px;min-width: 80px">Region</th>
<th scope="col" style="width: 80px;min-width: 80px">Product Category</th>
<th scope="col" style="width: 90px;min-width: 90px">No. of Units</th>
@@ -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)
<tr class="fractional-real-estate">
<td>
<div class="d-flex tb-img"
style="width: 200px; text-align: left; align-items: center;">
<p>{{ $data->property_name }}</p>
</div>
{{ $data->property_name }}
</td>
<td>
@if ($data->geographic_focus == 'India')
@@ -158,7 +155,8 @@
<td class="text-center">
{{ IND_money_format($data->current_market_value_of_the_property) }}
</td>
<td class="text-center">{{ IND_money_format($data->expected_selling_price) }}</td>
<td class="text-center">
{{ IND_money_format($data->expected_selling_price) }}</td>
<td class="text-center">
@if (intval($data->discount) > 0)
@php($btn = 'green-btn')
@@ -171,7 +169,7 @@
@php($style = '')
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->discount, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}%</a>
</td class="text-center">
<td class="text-center">
@if ($data->bid > 0)
@@ -184,7 +182,7 @@
@php($style = '')
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}%</a>
</td>
<td class="text-center">
<a href=""
@@ -205,10 +203,11 @@
@php($true = false)
<tr class="alternative-investment-fund">
<td>
<div class="d-flex tb-img"
{{-- <div class="d-flex tb-img"
style="width: 200px; text-align: left; align-items: center;">
<p>{{ $data->name_of_the_aif_fund }}</p>
</div>
</div> --}}
{{ $data->name_of_the_aif_fund }}
</td>
<td>
@if ($data->geographic_focus == 'India')
@@ -229,13 +228,16 @@
</div>
</td>
<td class="text-center">{{ $data->no_of_units_you_wish_to_sell }}</td>
<td class="text-center">{{ IND_money_format($data->current_or_latest_nav) }}</td>
<td class="text-center">
{{ IND_money_format($data->current_or_latest_nav) }}</td>
<td class="text-center">{{ $data->latest_valuation_date ?? 'N/A' }}</td>
{{-- <td class="text-center">{{ 'N/A' }}</td> --}}
{{-- <td class="text-center">₹ {{ $data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell }}</td> --}}
<td class="text-center">{{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }}
<td class="text-center">
{{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }}
</td>
<td class="text-center">{{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }}
<td class="text-center">
{{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }}
</td>
<td class="text-center">
@if ($data->discount > 0)
@@ -249,7 +251,7 @@
@php($style = '')
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->discount, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}%</a>
</td class="text-center">
<td class="text-center">
@if ($data->bid > 0)
@@ -262,7 +264,7 @@
@php($style = '')
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}%</a>
</td>
<td class="text-center">
<a href="javascript:void(0)"
@@ -322,7 +324,7 @@
@php($style = '')
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->discount, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->discount, 2, '.', '') }}%</a>
</td class="text-center">
<td class="text-center">
@if ($data->bid > 0)
@@ -335,7 +337,7 @@
@php($style = '')
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}%</a>
</td>
<td class="text-center">
<a href="javascript:void(0)"
@@ -349,7 +351,7 @@
@endforeach
@endif
@endforeach
{{-- @if($true == true)
{{-- @if ($true == true)
<tr>
<td></td>
<td></td>
@@ -416,7 +418,7 @@
<table>
<thead>
<tr>
<th scope="col" style="width:200px;">Asset Name</th>
<th scope="col" style="min-width:200px;">Asset Name</th>
<th scope="col" style="width: 80px;min-width: 80px">Region</th>
<th scope="col" style="width: 80px;min-width: 80px">Product Category</th>
<th scope="col" style="width: 90px;min-width: 90px">No. of Units</th>
@@ -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) --}}
<tr class="fractional-real-estate">
<td>
<div class="d-flex tb-img"
{{-- <div class="d-flex tb-img"
style="width: 200px; text-align: left; align-items: center;">
<p>{{ $data->property_name }}</p>
</div>
</div> --}}
{{ $data->property_name }}
</td>
<td>
@if ($data->geographic_focus == 'India')
@@ -466,9 +469,11 @@
<td class="text-center">N/A</td>
<td class="text-center">N/A</td>
<td class="text-center">{{ $data->latest_valuation_date }}</td>
<td class="text-center">{{ IND_money_format($data->current_market_value_of_the_property) }}
<td class="text-center">
{{ IND_money_format($data->current_market_value_of_the_property) }}
</td>
<td class="text-center">{{ IND_money_format($data->expected_selling_price) }}</td>
<td class="text-center">
{{ IND_money_format($data->expected_selling_price) }}</td>
<td class="text-center">
@if ($data->discount > 0)
@php($btn = 'green-btn')
@@ -491,9 +496,9 @@
@elseif($data->bid == 0)
@php($btn = 'sliver-btn')
@php($style = '')
@endif
@endif
<a href="" class="{{ $btn }}"
style="{{ $style }}">{{ number_format((float)$data->bid, 2, '.', '') }}%</a>
style="{{ $style }}">{{ number_format((float) $data->bid, 2, '.', '') }}%</a>
</td>
<td class="text-center">
<a href=""
@@ -510,13 +515,14 @@
@foreach ($nonFeaturedMarketplaceListed['data'] as $aifData)
@if (array_key_exists('alternative-investment-fund', $aifData))
@foreach ($aifData['alternative-investment-fund'] as $data)
{{-- @php($secondTrue = false) --}}
{{-- @php($secondTrue = false) --}}
<tr class="alternative-investment-fund">
<td>
<div class="d-flex tb-img"
{{-- <div class="d-flex tb-img"
style="width: 200px; text-align: left; align-items: center;">
<p>{{ $data->name_of_the_aif_fund }}</p>
</div>
</div> --}}
{{ $data->name_of_the_aif_fund }}
</td>
<td>
@if ($data->geographic_focus == 'India')
@@ -538,13 +544,18 @@
</td>
<td class="text-center">{{ $data->no_of_units_you_wish_to_sell }}</td>
{{-- <td class="text-center">{{ $data->expected_sale_per_unit }}</td> --}}
<td class="text-center">{{ IND_money_format($data->current_or_latest_nav) }}</td>
<td class="text-center">
{{ IND_money_format($data->current_or_latest_nav) }}</td>
<td class="text-center">{{ $data->latest_valuation_date ?? 'N/A' }}</td>
{{-- <td class="text-center">{{ $data->total_capital_commitment }}</td> --}}
{{-- <td class="text-center">{{ $data->current_or_latest_nav }}</td>
<td class="text-center">{{ $data->expected_sale_per_unit }}</td> --}}
<td class="text-center">{{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }}</td>
<td class="text-center">{{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }}</td>
<td class="text-center">
{{ IND_money_format($data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell) }}
</td>
<td class="text-center">
{{ IND_money_format($data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell) }}
</td>
<td class="text-center">
@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) --}}
<tr class="other-products">
<td>
<div class="d-flex tb-img"
@@ -656,7 +667,7 @@
@endforeach
@endif
@endforeach
{{-- @if($secondTrue == true)
{{-- @if ($secondTrue == true)
<tr>
<td></td>
<td></td>
@@ -722,10 +733,10 @@
<div class="modal-content">
<!-- <h5 class="modal-title" id="exampleModalLongTitle">Modal title</h5> -->
<!-- <div class="modal-header">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div> -->
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div> -->
<div class="modal-body">
<h4 class="text-center">Currently, No Secondary Sale Opportunities Available.</h4>
</div>