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

Merge pull request #401 from Ritikeshyadav/megha

Browse Source 
Megha
This commit is contained in:
Ritikeshyadav
2024-07-02 15:44:32 +05:30
committed by GitHub
parent 50b8486be6 e49f0bc5c6
commit f1cf2faa5e
11 changed files with 106 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/MarketplaceFractionalRealEstateSeller.php
View File

@@ -66,8 +66,9 @@ class MarketplaceFractionalRealEstateSeller extends Model
$bidArr[] = round(($bid->getAttributes()['total_purchase_value'] - $this->current_market_value_of_the_property)/$this->current_market_value_of_the_property * 100,3);
}
if($bidArr){
$bid = (int)max($bidArr);
return (string)$bid;
// $bid = (int)max($bidArr);
// return (string)$bid;
return (string)max($bidArr);
}
return (string)0;
}

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

@@ -6658,4 +6658,9 @@ ul#user_notification {
.product .drop-page p {
text-align: left !important;
}
.primary-investment .parimay-card .assets-card {
min-height: 480px;
margin-bottom: 30px;
}

14
public/assets/css/style1.css
View File

@@ -1072,4 +1072,16 @@ label.error {
}
#kt_profile_details_view svg.svg-inline--fa.fa-download:hover {
color: #c18948;
}
}
#preview_image img#image_preview {
height: 100%;
object-fit: scale-down !important;
width: 100%;
object-fit: contain;
margin-top: 20px;
}
div#preview_image {
height: 270px;
}

22
resources/views/Admin/Pages/manage_cms/manage_blog/edit_blog.blade.php
View File

@@ -28,23 +28,13 @@
@endforeach
</select>
</div> --}}
<div class="col-md-6 mt-5">
<div class="col-md-12 mt-5">
<label class="fs-6 fw-semibold form-label mt-3">
<span class="required">Title</span>
</label>
<input type="text" class="form-control form-control-solid" name="blog_title"
placeholder='Enter blog title' value="{{ $blog->blog_title }}" />
</div>
<div class="col-md-6 flex-column d-flex mt-5 Upload_image">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Image :</span>
</label>
<div id="preview_image" class="image-input image-input-empty w-100 h-100"
style="background-position:center;">
<input type="file" name="blog_image" class="form-control form-control-solid" accept="image/*" onchange="previewImage(event)" />
<img id="image_preview" src="{{ $blog->blog_image }}" alt="Preview Image" style="width: 20%; height: 100%; object-fit: cover;">
</div>
</div>
<div class="col-md-6 flex-column d-flex mt-4">
<label class="fs-6 fw-semibold form-label mt-3">
<span class="required">Description :</span>
@@ -54,6 +44,16 @@
placeholder="Type Your Answer" rows="15">{{ $blog->blog_description }}</textarea>
</div>
</div>
<div class="col-md-6 flex-column d-flex mt-5 Upload_image">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Image :</span>
</label>
<div id="preview_image" class="image-input image-input-empty w-100"
style="background-position:center;">
<input type="file" name="blog_image" class="form-control form-control-solid" accept="image/*" onchange="previewImage(event)" />
<img id="image_preview" src="{{ $blog->blog_image }}" alt="Preview Image" style="width: 20%; height: 100%; object-fit: cover;">
</div>
</div>
</div>
</div>
<div class="submit_btn d-flex justify-content-center my-15">

2
resources/views/Admin/Pages/manage_cms/manage_blog/show_blog.blade.php
View File

@@ -36,7 +36,7 @@
</select>
<!--end::Input-->
</div> --}}
<div class="col-md-6">
<div class="col-md-12">
<div>
<label class="fs-6 fw-semibold form-label mt-3">
<span class="required">Title</span>

4
resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php
View File

@@ -18,10 +18,10 @@
<td>{{companyName($data->platform)}}</td>
<td>{{$data->total_purchase_value}}</td>
<td>
<a class="get-transaction-detail" title="View detail" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
<a class="get-transaction-detail" title="View detail" data-category="{{$data->table == 'marketplace_fre_sellers' ? 'Fractional Real Estate' : 'Alternative Investment Fund'}}" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
<i class="fa-regular fa-eye"></i>
</a>
<a class="edit-transaction-detail mx-5" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->no_of_units_you_wish_to_buy}}" data-complete_sale_value="{{$data->offer_price_per_unit}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->total_purchase_value}}">
<a class="edit-transaction-detail mx-5" title="Edit detail" data-category="{{$data->table == 'marketplace_fre_sellers' ? 'Fractional Real Estate' : 'Alternative Investment Fund'}}" data-id="{{$data->id}}" data-name="{{$data->name}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->no_of_units_you_wish_to_buy}}" data-complete_sale_value="{{$data->offer_price_per_unit}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->total_purchase_value}}">
<svg class="svg-inline--fa fa-pen-to-square" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pen-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.8 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160V416c0 53 43 96 96 96H352c53 0 96-43 96-96V320c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V160c0-17.7 14.3-32 32-32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H96z"></path>
</svg>

26
resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
View File

@@ -246,24 +246,24 @@
<label class=" fs-6 fw-semibold mb-2">Product Name</label>
<input id="edit-productname" class="form-control form-control-solid" readonly>
</div>
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Final Units Sold</span></label>
<div class="col-md-6 fv-row final_unit_sold">
<label class=" fs-6 fw-semibold mb-2"><span >Final Units Sold</span></label>
<input id="edit-final_units_sold" name="final_units_sold" class="form-control form-control-solid" readonly>
</div>
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Sale Value</span></label>
<div class="col-md-6 fv-row mb-4 sale_value">
<label class=" fs-6 fw-semibold mb-2"><span >Sale Value</span></label>
<input id="edit-final_sale_value" name="final_sale_value" class="form-control form-control-solid" readonly />
</div>
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Commission Earned</span></label>
<label class=" fs-6 fw-semibold mb-2"><span >Commission Earned</span></label>
<input id="edit-commission_earned" name="commission_earned" class="form-control form-control-solid" />
</div>
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Date Of Sale</span></label>
<label class=" fs-6 fw-semibold mb-2"><span >Date Of Sale</span></label>
<input type="date" id="edit_date_of_sale" value="12-12-2024" name="date_of_sale" class="form-control form-control-solid" />
</div>
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Platform</span></label>
<label class=" fs-6 fw-semibold mb-2"><span >Platform</span></label>
<select name="platform" id="edit-platform" class="form-control form-control-solid">
<option value="">Select A Platform</option>
@foreach($companies as $key=>$company)
@@ -272,7 +272,7 @@
</select>
</div>
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Final Purchase Value</span></label>
<label class=" fs-6 fw-semibold mb-2"><span>Final Purchase Value</span></label>
<input id="edit-final_purchase_value" name="final_purchase_value" class="form-control form-control-solid" readonly/>
</div>
</div>
@@ -347,6 +347,16 @@
$('#edit-total_purchase_value').val($(this).data("total_purchase_value"));
$('#edit-units_to_buy').val($(this).data("units_to_buy"));
$('#edit-final_purchase_value').val($(this).data("final_purchase_value"));
category = $(this).data('category');
if(category == 'Fractional Real Estate')
{
$('.final_unit_sold').addClass('d-none');
$('.sale_value').addClass('d-none');
}
else{
$('.final_unit_sold').removeClass('d-none');
$('.sale_value').removeClass('d-none');
}
$('#transactions_sold').modal('show');
})

1
resources/views/Admin/general-dashboard.blade.php
View File

@@ -292,7 +292,6 @@
to: $('#to-date').val()
},
success: function(result) {
console.log(result);
$('#total-investment-sum').html(result.total_investment);
$('#total-gross-commission-sum').html(result.gross_commission);
$('#total-net-commission-sum').html(result.net_commission);

2
resources/views/Frontend/Pages/alternative-investment-fund/private-investment-public-equity-product.blade.php
View File

@@ -360,7 +360,7 @@
<div class="tables row">
<div class="col-md-4">
<p>Hurdle rate</p>
<span>{{ $pipe->hurdle_rate ?? '--' }}</span>
<span>{{ isset($pipe->hurdle_rate) ? $pipe->hurdle_rate . '%' : '--' }}</span>
</div>
<div class="col-md-4">
<p>Other expenses</p>

72
resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php
View File

@@ -20,7 +20,12 @@
</div>
<div class="form-group col-md-6">
<label>Fund Category <span class="color-red">*</span></label>
<select name="fund_category" id="fund_category">
{{-- @dd($aifProduct) --}}
@if($aifProduct->fund_category)
<input type="text" name="fund_category" class="fund_category" id="fund_category"
value="{{ $aifProduct->fund_category == 'I' || $aifProduct->fund_category == 'Category I' ? 'Category I':($aifProduct->fund_category == 'II' || $aifProduct->fund_category == 'Category II' ? 'Category II':'Category III') }}">
@else
<select name="fund_category" id="fund_category" class="fund_category">
<option value="">Select Fund Category</option>
<option value="Category I"
{{ $aifProduct->fund_category == 'Category I' ? 'selected' : '' }}>Category I</option>
@@ -30,6 +35,7 @@
{{ $aifProduct->fund_category == 'Category III' ? 'selected' : '' }}>Category III
</option>
</select>
@endif
</div>
<div class="form-group col-md-6">
<label>Fund Structure <span class="color-red">*</span></label>
@@ -43,6 +49,11 @@
</div>
<div class="form-group col-md-6">
<label>Type Of Fund <span class="color-red">*</span></label>
{{-- @dd($aifProduct) --}}
@if($aifProduct->type_of_fund)
<input type="text" name="type_of_fund" id="type_of_fund"
value="{{ $aifProduct->type_of_fund }}">
@else
<select name="type_of_fund" id="type_of_fund">
<option value="">Select Type Of Fund</option>
<option value="Angel Fund"
@@ -74,6 +85,7 @@
{{ $aifProduct->type_of_fund == 'PIPE Fund' ? 'selected' : '' }}>PIPE Fund</option>
<option value="Others">Others</option>
</select>
@endif
</div>
<div class="form-group col-md-6">
<label>Fund Strategy</label>
@@ -151,7 +163,7 @@
</div>
</div>
<div class="text-center form-group col-md-12">
<button type="submit" class="blue-btn text-center">Submit</button>
<button type="submit" class="blue-btn text-center">Review & Submit</button>
</div>
</div>
</form>
@@ -195,29 +207,44 @@
</script>
@section('scripts')
<script>
$('#fund_category').change(function() {
value = $(this).val();
// alert(value);
if (value == 'Category I') {
$('#type_of_fund').html('');
$('#type_of_fund').html(
"<select name='type_of_fund' id='type_of_fund'><option value=''>Select Type Of Fund</option><option value='Venture Capital Fund'>Venture Capital Fund</option><option value='Angel Fund'>Angel Fund</option><option value='Infrastructure Fund'>Infrastructure Fund</option></select>"
);
}
if (value == 'Category II') {
$('#type_of_fund').html('');
$('#type_of_fund').html(
"<select name='type_of_fund' id='type_of_fund'><option value=''>Select Type Of Fund</option><option value='Private Real Estate Fund'>Private Real Estate Fund</option><option value='Private Equity Fund'>Private Equity Fund</option><option value='Distressed Asset Fund'>Distressed Asset Fund</option><option value='Private Credit Fund'>Private Credit Fund</option></select>"
);
}
if (value == 'Category III') {
$('#type_of_fund').html('');
$('#type_of_fund').html(
"<select name='type_of_fund' id='type_of_fund'><option value=''>Select Type Of Fund</option><option value='Long Only Equity Funds'>Long Only Equity Funds</option><option value='Hedge Fund'>Hedge Fund</option><option value='PIPE Fund'>PIPE Fund</option><option value='Others'>Others</option></select>"
);
$(document).ready(function(){
// alert($('#fund_category').val());
$('#fund_category').change(function() {
value = $(this).val();
// alert(value);
appendTypeOfFund(value);
return;
})
if($('#fund_category').val())
{
appendTypeOfFund($('#fund_category').val());
return;
}
})
function appendTypeOfFund(value)
{
if (value == 'Category I') {
$('#type_of_fund').html('');
$('#type_of_fund').html(
"<select name='type_of_fund' id='type_of_fund'><option value=''>Select Type Of Fund</option><option value='Venture Capital Fund'>Venture Capital Fund</option><option value='Angel Fund'>Angel Fund</option><option value='Infrastructure Fund'>Infrastructure Fund</option></select>"
);
}
if (value == 'Category II') {
$('#type_of_fund').html('');
$('#type_of_fund').html(
"<select name='type_of_fund' id='type_of_fund'><option value=''>Select Type Of Fund</option><option value='Private Real Estate Fund'>Private Real Estate Fund</option><option value='Private Equity Fund'>Private Equity Fund</option><option value='Distressed Asset Fund'>Distressed Asset Fund</option><option value='Private Credit Fund'>Private Credit Fund</option></select>"
);
}
if (value == 'Category III') {
$('#type_of_fund').html('');
$('#type_of_fund').html(
"<select name='type_of_fund' id='type_of_fund'><option value=''>Select Type Of Fund</option><option value='Long Only Equity Funds'>Long Only Equity Funds</option><option value='Hedge Fund'>Hedge Fund</option><option value='PIPE Fund'>PIPE Fund</option><option value='Others'>Others</option></select>"
);
}
}
$(function() {
let today = new Date().toISOString().split('T')[0];
$('#latest_valuation_date').attr('max', today);
@@ -315,4 +342,5 @@
// });
</script>
@endsection

4
resources/views/Frontend/Pages/profile/market-list/buyer-form.blade.php
View File

@@ -45,11 +45,11 @@
</div>
<div class="form-group col-md-6">
<label>City <span class="color-red">*</span></label>
<input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="city">
<input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="city" value="{{$dataOfBuyerForm->city}}">
</div>
<div class="form-group col-md-6">
<label>Country <span class="color-red">*</span></label>
<input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="country">
<input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="country" value="{{$dataOfBuyerForm->country}}">
</div>
<div class="form-group col-md-6">
<label>Contact Number <span class="color-red">*</span></label>