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

Merge pull request #376 from Ritikeshyadav/RitikeshFreeu

Browse Source 
Ritikesh freeu
This commit is contained in:
Ritikeshyadav
2024-06-27 13:29:33 +05:30
committed by GitHub
parent 9bdc801b8c c26ecdf7f7
commit 8003cc5d0e
6 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -901,7 +901,7 @@ class DashboardController extends Controller
'marketplace_fre_sellers.property_grade',
'marketplace_fre_sellers.asset_type',
'marketplace_fre_sellers.fractional_real_estate_platform',
'marketplace_fre_sellers.expected_selling_price'
'marketplace_fre_sellers.og_expected_selling_price'
)
->get();
$data['data']->each(function ($value) {
@@ -958,7 +958,7 @@ class DashboardController extends Controller
->sold()
// ->where('listing_status', '!=', 'Hide')
// ->where('marketplace_fre_sellers.listing_status', 'Hide')
->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'og_expected_selling_price')
->get();
$data['data']->each(function ($value) {
if ($value->fractional_real_estate_platform != null) {
@@ -1001,7 +1001,7 @@ class DashboardController extends Controller
->join('marketplace_fre_sellers', 'marketplace_seller_forms.id', 'marketplace_fre_sellers.seller_forms_id')
->where('marketplace_fre_sellers.listing_status', '!=', 'Hide')
// ->where('marketplace_fre_sellers.status', 'Approved')
->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'og_expected_selling_price')
->get();
return $data;
}

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

@@ -6468,7 +6468,7 @@ ul.notification-drop {
.inn_to_testi {
width: 80%;
background: #fff;
box-shadow: 0 0 16px 0px #fcdff0;
box-shadow: 0 0 16px 0px #EDD9C2;
padding: 20px;
vertical-align: middle;
border-radius: 10px;

4
resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
View File

@@ -151,7 +151,7 @@
<span>PAN</span>
</label>
<!--begin::Input-->
<input type="text" oninput="convertToUpperCase('#pan')" class="form-control form-control-solid" name="pan" id="pan" value="{{$data->pan}}" minlength="10" maxlength="10"/>
<input type="text" oninput="convertToUpperCase('#pan')" class="form-control form-control-solid" name="pan" id="pan" value="" minlength="10" maxlength="10"/>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
@@ -1001,7 +1001,7 @@
<span>PAN</span>
</label>
<!--begin::Input-->
<input type="text" class="form-control form-control-solid" value="{{$data->pan}}" name="pan" />
<input type="text" class="form-control form-control-solid" value="" name="pan" />
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">

16
resources/views/Admin/add-sub-admin.blade.php
View File

@@ -61,7 +61,7 @@
<!--begin::Input-->
<input type="text" name="name"
class="form-control form-control-solid mb-3 mb-lg-0"
placeholder="Please enter name"
placeholder="Please enter full name"
onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" />
<!--end::Input-->
</div>
@@ -347,7 +347,7 @@
<!--end::Input-->
<!--begin::Label-->
<label class="form-check-label" for="investor">
<div class="fw-bold text-gray-800">Investor (user)
<div class="fw-bold text-gray-800">Investor (users)
</div>
</label>
<!--end::Label-->
@@ -397,7 +397,7 @@
<label class="form-check-label"
for="manage_investor_kyc">
<div class="fw-bold text-gray-800">Manage
Investor KYC
Investors KYC
</div>
</label>
<!--end::Label-->
@@ -497,7 +497,7 @@
<label class="form-check-label"
for="manage_product">
<div class="fw-bold text-gray-800">Manage
Product</div>
Products</div>
</label>
<!--end::Label-->
</div>
@@ -537,7 +537,7 @@
<!--begin::Label-->
<label class="form-check-label"
for="manage_categories">
<div class="fw-bold text-gray-800">Manage
<div class="fw-bold text-gray-800">Manage Investment
Categories</div>
</label>
<!--end::Label-->
@@ -803,7 +803,7 @@
<label class="form-check-label"
for="kt_modal_update_role_option_0">
<div class="fw-bold text-gray-800">Manage
Testimoials
Testimonials
</div>
</label>
<!--end::Label-->
@@ -844,9 +844,7 @@
<!--begin::Label-->
<label class="form-check-label"
for="terms_and_conditions">
<div class="fw-bold text-gray-800">Terms
And
Conditions
<div class="fw-bold text-gray-800">Risk Disclosure
</div>
</label>
<!--end::Label-->

8
resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php
View File

@@ -410,11 +410,11 @@
<p>Focused Real Estate Sectors</p>
<span>{{ $longOnlyEquityFund->focused_real_estate_sectors ?? '--' }}</span>
</div>
{{-- <div class="col-md-4">
<p>Regions Covered</p>
<span>{{ $longOnlyEquityFund->regions_covered ?? '--' }}</span>
</div>
<div class="col-md-4">
<p>Return on investment (IRR/DPI)</p>
<span>{{ $longOnlyEquityFund->return_on_investment_irr_dpi_rvpi_tvpi ?? '--' }}</span>
</div>
{{-- <div class="col-md-4">
<p>ISIN Code</p>
<span>{{ $longOnlyEquityFund->isin_code ?? '--' }}</span>
</div> --}}

4
resources/views/Frontend/Pages/profile/dashboard.blade.php
View File

@@ -278,7 +278,7 @@
<td>{{ $data->property_grade }}</td>
<td>{{ $data->asset_type }}</td>
<td>{{ $data->company_name }}</td>
<td>{{ number_format((float) $data->expected_selling_price, 0, '.', '') }}</td> </td>
<td>{{ number_format((float) $data->og_expected_selling_price, 0, '.', '') }}</td> </td>
</tr>
@endforeach
</tbody>
@@ -418,7 +418,7 @@
<td>{{ $data->property_grade }}</td>
<td>{{ $data->asset_type }}</td>
<td>{{ $data->company_name }}</td>
<td>{{ number_format((float) IND_money_format($data->expected_selling_price), 0, '.', '') }}</td>
<td>{{ number_format((float) IND_money_format($data->og_expected_selling_price), 0, '.', '') }}</td>
</td>
<td>
<a href="{{route('market_place_offering',$data->slug)}}" class="blue-btn"><i class="fa fa-eye" aria-hidden="true"></i></a>