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

secondary data showing

Browse Source
This commit is contained in:
Ritikesh yadav
2024-04-08 13:45:25 +05:30
parent 88895d5727
commit 89cbbaf992
8 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -568,6 +568,7 @@ class DashboardController extends Controller
'no_of_units_held' => 'required',
'no_of_units_you_wish_to_sell' => 'required',
'expected_sale_per_unit' => 'required',
'latest_valuation_date' => 'required',
], [
'required' => 'The :attribute field must be required',
@@ -599,6 +600,7 @@ class DashboardController extends Controller
'no_of_units_held' => $request->no_of_units_held,
'no_of_units_you_wish_to_sell' => $request->no_of_units_you_wish_to_sell,
'expected_sale_per_unit' => $request->expected_sale_per_unit,
'latest_valuation_date' => $request->latest_valuation_date,
'listing_status' => 'Hide',
'status' => 'Pending'
]);
@@ -624,6 +626,7 @@ class DashboardController extends Controller
'original_amount_invested' => 'required',
'current_market_value_of_the_property' => 'required',
'expected_selling_price' => 'required',
'latest_valuation_date' => 'required',
], [
'required' => 'The :attribute field must be required',
@@ -650,6 +653,7 @@ 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,
'latest_valuation_date' => $request->latest_valuation_date,
'listing_status' => 'Hide',
'status' => 'Pending'
]);

8
app/Http/Controllers/Frontend/MarketPlaceController.php
View File

@@ -58,10 +58,10 @@ class MarketPlaceController extends Controller
public function featuredInvestments()
{
$freMarketplace['fractional-real-estate'] = MarketplaceFractionalRealEstateSeller::where(['status' => 'Approved', 'listing_status' => 'Featured'])
->select('id', 'property_name', 'asset_type', 'fractional_real_estate_platform', 'property_address', 'expected_selling_price', 'annual_rental_yield_earned', 'slug', 'rental_escalation', 'property_grade', 'current_market_value_of_the_property', 'id as sold_status', 'id as category', 'id as discount', 'id as bid')
->select('id', 'property_name', 'asset_type', 'fractional_real_estate_platform', 'property_address', 'expected_selling_price', 'annual_rental_yield_earned', 'slug', 'rental_escalation', 'property_grade', 'latest_valuation_date', 'current_market_value_of_the_property', 'id as sold_status', 'id as category', 'id as discount', 'id as bid')
->get();
$aifMarketplace['alternative-investment-fund'] = MarketplaceAlternativeInvestmentFundSeller::where(['status' => 'Approved', 'listing_status' => 'Featured'])
->select('id', 'name_of_the_aif_fund', 'current_or_latest_nav', 'credit_rating', 'fund_category', 'type_of_fund', 'expected_sale_per_unit', 'no_of_units_you_wish_to_sell', 'slug', 'id as sold_status', 'id as discount', 'id as bid')
->select('id', 'name_of_the_aif_fund', 'current_or_latest_nav', 'credit_rating', 'fund_category', 'type_of_fund', 'expected_sale_per_unit', 'no_of_units_you_wish_to_sell', 'latest_valuation_date', 'slug', 'id as sold_status', 'id as discount', 'id as bid')
->get();
$opMarketplace['other-products'] = MarketplaceOtherProductsSeller::where(['status' => 'Approved', 'listing_status' => 'Featured'])
->select('id', 'face_value_per_unit', 'security_name', 'product_category', 'instrument_issuer', 'no_of_units_offered_for_sale', 'expected_sale_price_per_unit', 'slug', 'principal_repaid', 'id as sold_status', 'payout_frequency', 'id as discount', 'id as bid')
@@ -84,8 +84,8 @@ class MarketPlaceController extends Controller
public function nonFeaturedInvestments()
{
$freMarketplace['fractional-real-estate'] = MarketplaceFractionalRealEstateSeller::where(['status' => 'Approved', 'listing_status' => 'Non-Featured'])->select('id', 'property_name', 'asset_type', 'fractional_real_estate_platform', 'property_address', 'expected_selling_price', 'annual_rental_yield_earned', 'slug', 'rental_escalation', 'property_grade', 'current_market_value_of_the_property', 'id as sold_status', 'id as category', 'id as discount', 'id as bid')->get();
$aifMarketplace['alternative-investment-fund'] = MarketplaceAlternativeInvestmentFundSeller::where(['status' => 'Approved', 'listing_status' => 'Non-Featured'])->select('id', 'name_of_the_aif_fund', 'current_or_latest_nav', 'credit_rating', 'fund_category', 'type_of_fund', 'expected_sale_per_unit', 'no_of_units_you_wish_to_sell', 'slug', 'id as sold_status', 'id as discount', 'id as bid')
$freMarketplace['fractional-real-estate'] = MarketplaceFractionalRealEstateSeller::where(['status' => 'Approved', 'listing_status' => 'Non-Featured'])->select('id', 'property_name', 'asset_type', 'fractional_real_estate_platform', 'property_address', 'expected_selling_price', 'annual_rental_yield_earned', 'latest_valuation_date', 'slug', 'rental_escalation', 'property_grade', 'current_market_value_of_the_property', 'id as sold_status', 'id as category', 'id as discount', 'id as bid')->get();
$aifMarketplace['alternative-investment-fund'] = MarketplaceAlternativeInvestmentFundSeller::where(['status' => 'Approved', 'listing_status' => 'Non-Featured'])->select('id', 'name_of_the_aif_fund', 'current_or_latest_nav', 'credit_rating', 'fund_category', 'type_of_fund', 'expected_sale_per_unit', 'latest_valuation_date', 'no_of_units_you_wish_to_sell', 'slug', 'id as sold_status', 'id as discount', 'id as bid')
->get();
$opMarketplace['other-products'] = MarketplaceOtherProductsSeller::where(['status' => 'Approved', 'listing_status' => 'Non-Featured'])->select('id', 'face_value_per_unit', 'security_name', 'product_category', 'instrument_issuer', 'no_of_units_offered_for_sale', 'expected_sale_price_per_unit', 'slug', 'principal_repaid', 'id as sold_status', 'payout_frequency', 'id as discount', 'id as bid')
->get();

2
app/Models/MarketplaceAlternativeInvestmentFundSeller.php
View File

@@ -14,7 +14,7 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
protected $appends = ['sold_status', 'discount', 'bid'];
protected $fillable = ['seller_forms_id', 'name_of_the_aif_fund', 'slug', 'fund_category', 'fund_structure', 'type_of_fund', 'fund_strategy', 'fund_manager_name', 'sponsor', 'credit_rating', 'total_capital_commitment', 'uncalled_capital_commitment', 'date_of_final_close', 'tenure_from_final_close', 'current_or_latest_nav', 'no_of_units_held', 'no_of_units_you_wish_to_sell', 'expected_sale_per_unit', 'status', 'listing_status'];
protected $fillable = ['seller_forms_id', 'name_of_the_aif_fund', 'slug', 'fund_category', 'fund_structure', 'type_of_fund', 'fund_strategy', 'fund_manager_name', 'sponsor', 'credit_rating', 'total_capital_commitment', 'uncalled_capital_commitment', 'date_of_final_close', 'tenure_from_final_close', 'current_or_latest_nav', 'no_of_units_held', 'no_of_units_you_wish_to_sell', 'expected_sale_per_unit', 'latest_valuation_date', 'status', 'listing_status'];
public function seller()
{

2
app/Models/MarketplaceFractionalRealEstateSeller.php
View File

@@ -14,7 +14,7 @@ class MarketplaceFractionalRealEstateSeller extends Model
protected $appends = ['sold_status', 'category', 'discount', 'bid'];
protected $fillable = ['seller_forms_id','property_name','slug','property_address','property_grade','asset_type','annual_rental_yield_earned','rental_escalation','fractional_real_estate_platform','date_of_investment','original_amount_invested','current_market_value_of_the_property','expected_selling_price','status','listing_status'];
protected $fillable = ['seller_forms_id','property_name','slug','property_address','property_grade','asset_type','annual_rental_yield_earned','rental_escalation','fractional_real_estate_platform','date_of_investment','original_amount_invested','current_market_value_of_the_property','expected_selling_price', 'latest_valuation_date','status','listing_status'];
public function seller(){
return $this->belongsTo(MarketplaceSellerForm::class,'seller_forms_id');

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

@@ -7,7 +7,7 @@
<div class="col-md-6">
<h2>Secondary Transaction<br>Opportunities</h2>
<p class="text-center mb-3">Find Potentail Liquidity for your Illiquid
Alternative Investment Fund on India’s first Marketplace for Secondary Transaction.
Alternative Investment Fund on India’s first Marketplace for Secondary Transaction.
</p>
<!--<button type="button" id="print_array">alert array</button>-->
<div class="checkbox-sec">
@@ -151,10 +151,11 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
</td>
<td class="text-center">N/A</td>
<td class="text-center">N/A</td>
<td class="text-center">{{ $data->date_of_investment }}</td>
<td class="text-center">{{ $data->current_market_value_of_the_property }}
<td class="text-center">{{ $data->latest_valuation_date }}</td>
<td class="text-center">₹
{{ $data->current_market_value_of_the_property }}
</td>
<td class="text-center">{{ $data->expected_selling_price }}</td>
<td class="text-center">₹ {{ $data->expected_selling_price }}</td>
<td class="text-center">
@if (intval($data->discount) > 0)
@php($btn = 'green-btn')
@@ -224,10 +225,16 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
</div>
</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">{{ $data->date_of_final_close }}</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">{{ $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">₹
{{ $data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell }}
</td>
<td class="text-center">₹
{{ $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')
@@ -432,7 +439,7 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
</td>
<td class="text-center">N/A</td>
<td class="text-center">N/A</td>
<td class="text-center">{{ $data->date_of_investment }}</td>
<td class="text-center">{{ $data->latest_valuation_date }}</td>
<td class="text-center">{{ $data->current_market_value_of_the_property }}
</td>
<td class="text-center">{{ $data->expected_selling_price }}</td>
@@ -504,7 +511,7 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
</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">{{ $data->date_of_final_close }}</td>
<td class="text-center">{{ $data->latest_valuation_date }}</td>
<td class="text-center">{{ $data->total_capital_commitment }}</td>
<td class="text-center">{{ $data->expected_sale_per_unit }}</td>
<td class="text-center">
@@ -662,10 +669,10 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
<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>

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

@@ -111,6 +111,21 @@
<label>Expected Sale Price per unit</label>
<input type="number" name="expected_sale_per_unit">
</div>
<div class="form-group col-md-6">
<label>Latest Valuation Date</label>
<input type="date" name="latest_valuation_date">
</div>
<div class="form-check">
<h4>Declaration</h4>
<input class="form-check-input" type="checkbox" value="" id="checkbox-1"
name="declaration" />
<label class="form-check-label" for="checkbox-1">I, affirm that the information provided above
is accurate and complete to the best of my knowledge and belief. I commit to promptly notify
you of any changes to this information. I understand that any falsification,
misrepresentation, or omission may result in legal consequences. By submission of this form,
I acknowledge that I have read and understood the terms governing this secondary transaction
sale.</label>
</div>
<div class="form-group col-md-12">
<div class="bg-warning text-center">
Need Help? <br>
@@ -151,6 +166,8 @@
no_of_units_held: "required",
no_of_units_you_wish_to_sell: "required",
expected_sale_per_unit: "required",
latest_valuation_date: "required",
declaration: "required",
},
messages: {
@@ -171,6 +188,8 @@
no_of_units_held: 'Please enter no. of units held',
no_of_units_you_wish_to_sell: 'Please enter no. of units you wish to sell',
expected_sale_per_unit: 'Please enter expected sale per unit',
latest_valuation_date: 'Please select latest valuation date',
declaration: 'Please check this box',
},
submitHandler: function(form) {
var formData = new FormData(form);

28
resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php
View File

@@ -23,10 +23,10 @@
<div class="row">
<div class="form-group col-md-6">
<label>Property Name</label>
{{-- <input type="text" name="property_name" value="{{ $freProduct->property_name }}">
<input type="text" name="property_name" value="{{ $freProduct->property_name }}">
</div>
<div class="form-group col-md-6">
<label>Select Product Category</label> --}}
{{-- <div class="form-group col-md-6">
<label>Select Product Category</label>
<select name="property_name" id="property_name">
@if ($freProduct->property_name)
<option value="{{ $freProduct->property_name }}">{{ $freProduct->property_name }}
@@ -48,10 +48,9 @@
<option value="Hbits">Hbits</option>
<option value="WiseX">WiseX</option>
<option value="Nuvama Alternatives">Nuvama Alternatives</option>
{{-- <option value="Other Products">Other Products</option> --}}
@endif
</select>
</div>
</div> --}}
<div class="form-group col-md-6">
<label>Property Address</label>
<input type="text" name="property_address" value="{{ $freProduct->property_address }}">
@@ -105,6 +104,21 @@
<label>Expected Selling Price</label>
<input type="number" name="expected_selling_price" value="">
</div>
<div class="form-group col-md-6">
<label>Latest Valuation Date</label>
<input type="date" name="latest_valuation_date">
</div>
<div class="form-check">
<h4>Declaration</h4>
<input class="form-check-input" type="checkbox" value="" id="checkbox-1"
name="declaration" />
<label class="form-check-label" for="checkbox-1">I, affirm that the information provided above
is accurate and complete to the best of my knowledge and belief. I commit to promptly notify
you of any changes to this information. I understand that any falsification,
misrepresentation, or omission may result in legal consequences. By submission of this form,
I acknowledge that I have read and understood the terms governing this secondary transaction
sale.</label>
</div>
<div class="form-group col-md-12">
<div class="bg-warning text-center">
Need Help? <br>
@@ -139,6 +153,8 @@
original_amount_invested: "required",
current_market_value_of_the_property: "required",
expected_selling_price: "required",
latest_valuation_date: "required",
declaration: "required",
},
messages: {
property_name: 'Please enter property name',
@@ -152,6 +168,8 @@
original_amount_invested: 'Please enter original amount invested',
current_market_value_of_the_property: 'Please enter current market value of the property',
expected_selling_price: 'Please enter expected selling price',
latest_valuation_date: 'Please select latest valuation date',
declaration: 'Please check this box',
},
submitHandler: function(form) {
var formData = new FormData(form);

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

@@ -70,7 +70,7 @@
<!-- <input class="checkbox-effect checkbox-effect-1" type="checkbox" placeholder="select" id="featured">-->
<!-- <label>I, the undersigned, declare that I am the rightful owner of the Alternative asset product mentioned above and have the legal right to sell them to the buyer. I confirm that the information provided in this form is true and accurate to the best of my knowledge. I also agree to transfer the ownership to the buyer upon receipt of the agreed-upon payment.</label>-->
<!--</div>-->
<div class="form-check">
{{-- <div class="form-check">
<h4>Declaration</h4>
<input class="form-check-input" type="checkbox" value="" id="checkbox-1"
name="declaration" />
@@ -80,7 +80,7 @@
misrepresentation, or omission may result in legal consequences. By submission of this form,
I acknowledge that I have read and understood the terms governing this secondary transaction
sale.</label>
</div>
</div> --}}
{{-- <div class="form-group col-md-12">
<div class="bg-warning text-center">
Need Help? <br>
@@ -131,7 +131,7 @@
email: true,
},
product_category: "required",
declaration: "required",
// declaration: "required",
},
messages: {
name: 'Please enter your name',
@@ -144,7 +144,7 @@
email: " invalid email",
},
product_category: 'Please select your product category',
declaration: 'Please check this box',
// declaration: 'Please check this box',
},
submitHandler: function(form) {
var formData = new FormData(form);