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

Merge pull request #292 from Ritikeshyadav/RitikeshFreeu

Browse Source 
Ritikesh freeu
This commit is contained in:
Ritikeshyadav
2024-06-13 14:46:48 +05:30
committed by GitHub
parent 0c77d48c8e 09e4112308
commit 5b65a0f998
8 changed files with 75 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/Admin/Pages/pre_owned_investment/manage_investors.blade.php
View File

@@ -198,4 +198,18 @@
</div>
</div>
<input type="hidden" id="manage_seller_url" value="{{Request::url()}}">
@endsection
@section('scripts')
<script>
$(document).ready(function(){
sessionStorage.removeItem('manage_seller_url');
$('.manage_seller_route').on('click',function(){
sessionStorage.removeItem('manage_seller_url');
sessionStorage.setItem('manage_seller_url',$('#manage_seller_url').val());
url = sessionStorage.getItem('manage_seller_url',$('#manage_seller_url').val());
// alert(url);
})
})
</script>
@endsection

14
resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php
View File

@@ -32,37 +32,37 @@
@endif--}}
<td>
<div class="actions text-end d-flex align-items-center justify-content-around">
<a href="{{route('listing-details',['id' => $data->id, 'table' => $table])}}" class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="View Detail">
<a href="{{route('listing-details',['id' => $data->id, 'table' => $table])}}" class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="View Detail">
<i class="fa-regular fs-4 fa-eye"></i>
</a>
@if($pendingTable)
<a class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Approve" onclick="listingStatus({{$data->id}},'Approved','{{$table}}')">
<a class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Approve" onclick="listingStatus({{$data->id}},'Approved','{{$table}}')">
<i class="fa-solid fs-4 fa-square-check"></i>
</a>
<a class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Reject" onclick="listingStatus({{$data->id}},'Rejected','{{$table}}','{{$data->seller->email}}')">
<a class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Reject" onclick="listingStatus({{$data->id}},'Rejected','{{$table}}','{{$data->seller->email}}')">
<i class="fa-solid fs-4 fa-square-xmark"></i>
</a>
@endif
@if($approvedTable)
<a class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Pending" onclick="listingStatus({{$data->id}},'Pending','{{$table}}')">
<a class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Pending" onclick="listingStatus({{$data->id}},'Pending','{{$table}}')">
<svg class="svg-inline--fa fa-clock-rotate-left" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="clock-rotate-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M75 75L41 41C25.9 25.9 0 36.6 0 57.9V168c0 13.3 10.7 24 24 24H134.1c21.4 0 32.1-25.9 17-41l-30.8-30.8C155 85.5 203 64 256 64c106 0 192 86 192 192s-86 192-192 192c-40.8 0-78.6-12.7-109.7-34.4c-14.5-10.1-34.4-6.6-44.6 7.9s-6.6 34.4 7.9 44.6C151.2 495 201.7 512 256 512c141.4 0 256-114.6 256-256S397.4 0 256 0C185.3 0 121.3 28.7 75 75zm181 53c-13.3 0-24 10.7-24 24V256c0 6.4 2.5 12.5 7 17l72 72c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9l-65-65V152c0-13.3-10.7-24-24-24z"></path>
</svg><!-- <i class="fa-solid fa-clock-rotate-left"></i> Font Awesome fontawesome.com -->
</a>
<a class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Reject" onclick="listingStatus({{$data->id}},'Rejected','{{$table}}')">
<a class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Reject" onclick="listingStatus({{$data->id}},'Rejected','{{$table}}')">
<svg class="svg-inline--fa fa-ban" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="ban" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M367.2 412.5L99.5 144.8C77.1 176.1 64 214.5 64 256c0 106 86 192 192 192c41.5 0 79.9-13.1 111.2-35.5zm45.3-45.3C434.9 335.9 448 297.5 448 256c0-106-86-192-192-192c-41.5 0-79.9 13.1-111.2 35.5L412.5 367.2zM512 256c0 141.4-114.6 256-256 256S0 397.4 0 256S114.6 0 256 0S512 114.6 512 256z"></path>
</svg><!-- <i class="fa-solid fa-ban"></i> Font Awesome fontawesome.com -->
</a>
@endif
@if($rejectedTable)
<a class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Approve" onclick="listingStatus({{$data->id}},'Approved','{{$table}}')">
<a class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Approve" onclick="listingStatus({{$data->id}},'Approved','{{$table}}')">
<i class="fa-solid fs-4 fa-square-check"></i>
</a>
<a class="action_icon" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Pending" onclick="listingStatus({{$data->id}},'Pending','{{$table}}')">
<a class="action_icon back_route" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="Pending" onclick="listingStatus({{$data->id}},'Pending','{{$table}}')">
<svg class="svg-inline--fa fa-clock-rotate-left" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="clock-rotate-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M75 75L41 41C25.9 25.9 0 36.6 0 57.9V168c0 13.3 10.7 24 24 24H134.1c21.4 0 32.1-25.9 17-41l-30.8-30.8C155 85.5 203 64 256 64c106 0 192 86 192 192s-86 192-192 192c-40.8 0-78.6-12.7-109.7-34.4c-14.5-10.1-34.4-6.6-44.6 7.9s-6.6 34.4 7.9 44.6C151.2 495 201.7 512 256 512c141.4 0 256-114.6 256-256S397.4 0 256 0C185.3 0 121.3 28.7 75 75zm181 53c-13.3 0-24 10.7-24 24V256c0 6.4 2.5 12.5 7 17l72 72c9.4 9.4 24.6 9.4 33.9 0s9.4-24.6 0-33.9l-65-65V152c0-13.3-10.7-24-24-24z"></path>
</svg><!-- <i class="fa-solid fa-clock-rotate-left"></i> Font Awesome fontawesome.com -->

2
resources/views/Admin/Pages/pre_owned_investment/partial/seller-product-listing.blade.php
View File

@@ -7,7 +7,7 @@
<td>{{ $data->name_of_the_aif_fund ?? ($data->property_name ?? $data->security_name) }}</td>
<td>{{ $data->expected_sale_per_unit ?? ($data->expected_selling_price ?? $data->expected_sale_price_per_unit) }}</td>
<td>
<a href="{{ route('listing-details', ['id' => $data->id, 'table' => $table]) }}" class="action_icon"
<a href="{{ route('listing-details', ['id' => $data->id, 'table' => $table]) }}" class="action_icon manage_seller_route"
data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" title="View Detail">
<i class="fa-regular fs-4 fa-eye"></i>
</a>

24
resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php
View File

@@ -62,6 +62,11 @@
<label> <b class='fw-bold'>Date of investment</b>: {{$data->date_of_investment}}</label>
</div>
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Latest Valuation Date</b>: {{$data->latest_valuation_date}}</label>
</div>
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Original Amount Invested</b>: {{$data->original_amount_invested}}</label>
@@ -163,6 +168,11 @@
<label> <b class='fw-bold'>Date of Final Close</b>: {{$data->date_of_final_close}}</label>
</div>
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Latest Valuation Date</b>: {{$data->latest_valuation_date}}</label>
</div>
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Tenure from Final Close</b>: {{$data->tenure_from_final_close}}</label>
@@ -320,7 +330,7 @@
</div>
</div>
<!--end::Content wrapper-->
<input type="hidden" id="back_route" name="back_route" value="{{URL::previous()}}">
{{-- <input type="hidden" id="back_route" name="back_route" value="{{URL::previous()}}"> --}}
</div>
<!--end:::Main-->
@endsection
@@ -351,11 +361,17 @@
success: function(result) {
if (result.status == 200) {
toastr.success(result.message);
if($('#back_route').val() == '')
url = sessionStorage.getItem('back_url');
// alert(sessionStorage.getItem('manage_seller_url'),sessionStorage.getItem('back_url'));
if(url)
{
window.location.href = $('#back_route').val();
window.location.href = url;
}
location.reload();
else
{
window.location.href = sessionStorage.getItem('manage_seller_url');
}
// location.reload();
}
if (result.status == 400) {

43
resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
View File

@@ -23,24 +23,26 @@
<div id="kt_app_content_container" class="app-container container-xxl">
<div class="row max-w-100 index_table">
<div class="top_header d-flex justify-content-between">
<p class='fs-2 fw-bold'>Investment Listing Transfer</p>
<div class="table_right_options d-flex">
<div class="row max-w-100 index_table m-4">
<div class="d-flex justify-content-between">
<div class="top_header d-flex justify-content-between">
<p class='fs-2 fw-bold'>Investment Listing Transfer</p>
<div class="table_right_options d-flex">
</div>
</div>
</div>
<div class="d-flex align-items-center position-relative">
<!--begin::Svg Icon | path: icons/duotune/general/gen021.svg-->
<span class="svg-icon svg-icon-1 position-absolute ms-6">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect opacity="0.5" x="17.0365" y="15.1223" width="8.15546" height="2" rx="1" transform="rotate(45 17.0365 15.1223)" fill="currentColor" />
<path d="M11 19C6.55556 19 3 15.4444 3 11C3 6.55556 6.55556 3 11 3C15.4444 3 19 6.55556 19 11C19 15.4444 15.4444 19 11 19ZM11 5C7.53333 5 5 7.53333 5 11C5 14.4667 7.53333 17 11 17C14.4667 17 17 14.4667 17 11C17 7.53333 14.4667 5 11 5Z" fill="currentColor" />
</svg>
</span>
<!--end::Svg Icon-->
<!-- <div id="newSearchPlace"></div> -->
<input type="text" data-kt-user-table-filter="search" class="form-control bg-white form-control-solid w-250px ps-14" placeholder="Search Investments" id="searchbox" />
<div class="d-flex align-items-center position-relative">
<!--begin::Svg Icon | path: icons/duotune/general/gen021.svg-->
<span class="svg-icon svg-icon-1 position-absolute ms-6">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect opacity="0.5" x="17.0365" y="15.1223" width="8.15546" height="2" rx="1" transform="rotate(45 17.0365 15.1223)" fill="currentColor" />
<path d="M11 19C6.55556 19 3 15.4444 3 11C3 6.55556 6.55556 3 11 3C15.4444 3 19 6.55556 19 11C19 15.4444 15.4444 19 11 19ZM11 5C7.53333 5 5 7.53333 5 11C5 14.4667 7.53333 17 11 17C14.4667 17 17 14.4667 17 11C17 7.53333 14.4667 5 11 5Z" fill="currentColor" />
</svg>
</span>
<!--end::Svg Icon-->
<!-- <div id="newSearchPlace"></div> -->
<input type="text" data-kt-user-table-filter="search" class="form-control bg-white form-control-solid w-250px ps-14" placeholder="Search Investments" id="searchbox" />
</div>
</div>
<div class="dataTable_area my-5 mb-0">
@@ -330,11 +332,20 @@
</div>
</div>
</div>
<input type="hidden" id="back_url" value="{{Request::url()}}">
{{-- reply mail popup end --}}
<!-- </div> -->
@endsection
@section('scripts')
<script>
$(document).ready(function(){
sessionStorage.removeItem("back_url");
$('.back_route').on('click',function(){
sessionStorage.removeItem("back_url");
sessionStorage.setItem("back_url",$('#back_url').val());
// url = sessionStorage.getItem("back_url");
})
})
// $(document).ready(function() {
// DataTable.datetime('D MMM, YYYY');
// })

6
resources/views/Frontend/Pages/marketplace/alternative-investment-fund.blade.php
View File

@@ -99,9 +99,9 @@
<p>Expected Sale Per Unit</p>
<span>{{$offering->expected_sale_per_unit}}</span>
</div>
<div class="col-md-4 {{dNone($offering->returns)}}">
<p>Returns</p>
<span>{{$offering->returns}}</span>
<div class="col-md-4">
<p>Latest Valuation Date</p>
<span>{{$offering->latest_valuation_date}}</span>
</div>
</div>
</div>

4
resources/views/Frontend/Pages/marketplace/fractional-real-estate.blade.php
View File

@@ -68,8 +68,8 @@
<span>{{$offering->expected_selling_price}}</span>
</div>
<div class="col-md-4">
<p>Returns</p>
<span>{{$offering->returns}}</span>
<p>Latest Valuation Date</p>
<span>{{$offering->latest_valuation_date}}</span>
</div>
</div>
</div>

2
resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php
View File

@@ -41,7 +41,7 @@
<div class="form-group col-md-6">
<label>Postal Code</label>
<input type="tel" name="postal_code" minlength="6" maxlength="6"
onkeydown="return /^[0-9]{9}+$/i.test(event.key)" value="{{ $userData->postal_code }}">
oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" value="{{ $userData->postal_code }}">
<!--<input type="number" name="postal_code" min="100000" max="999999" value="{{ $userData->postal_code }}">-->
</div>
<div class="form-group col-md-6">