diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index a4dc644..aa64e34 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -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' ]); diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php index fc24283..3e1b8e9 100644 --- a/app/Http/Controllers/Frontend/MarketPlaceController.php +++ b/app/Http/Controllers/Frontend/MarketPlaceController.php @@ -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(); diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php index 926293b..274cd3f 100644 --- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php +++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php @@ -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() { diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php index 39bb681..ac018c0 100644 --- a/app/Models/MarketplaceFractionalRealEstateSeller.php +++ b/app/Models/MarketplaceFractionalRealEstateSeller.php @@ -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'); diff --git a/resources/views/Frontend/Pages/marketplace/index.blade.php b/resources/views/Frontend/Pages/marketplace/index.blade.php index e5c8504..fecf553 100644 --- a/resources/views/Frontend/Pages/marketplace/index.blade.php +++ b/resources/views/Frontend/Pages/marketplace/index.blade.php @@ -7,7 +7,7 @@

Secondary Transaction
Opportunities

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.

@@ -151,10 +151,11 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac N/A N/A - {{ $data->date_of_investment }} - {{ $data->current_market_value_of_the_property }} + {{ $data->latest_valuation_date }} + ₹ + {{ $data->current_market_value_of_the_property }} - {{ $data->expected_selling_price }} + ₹ {{ $data->expected_selling_price }} @if (intval($data->discount) > 0) @php($btn = 'green-btn') @@ -224,10 +225,16 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
{{ $data->no_of_units_you_wish_to_sell }} - {{ $data->expected_sale_per_unit }} - {{ $data->date_of_final_close }} ₹ {{ $data->current_or_latest_nav }} - {{ $data->expected_sale_per_unit }} + {{ $data->latest_valuation_date ?? 'N/A' }} + {{-- {{ 'N/A' }} --}} + {{-- ₹ {{ $data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell }} --}} + ₹ + {{ $data->current_or_latest_nav * $data->no_of_units_you_wish_to_sell }} + + ₹ + {{ $data->getRawOriginal('expected_sale_per_unit') * $data->no_of_units_you_wish_to_sell }} + @if ($data->discount > 0) @php($btn = 'green-btn') @@ -432,7 +439,7 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac N/A N/A - {{ $data->date_of_investment }} + {{ $data->latest_valuation_date }} {{ $data->current_market_value_of_the_property }} {{ $data->expected_selling_price }} @@ -504,7 +511,7 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac {{ $data->no_of_units_you_wish_to_sell }} {{ $data->expected_sale_per_unit }} - {{ $data->date_of_final_close }} + {{ $data->latest_valuation_date }} {{ $data->total_capital_commitment }} {{ $data->expected_sale_per_unit }} @@ -662,10 +669,10 @@ Alternative Investment Fund on India’s first Marketplace for Secondary Transac
+ +
-->

Currently, No Secondary Sale Opportunities Available.

diff --git a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php index 927a660..eaa16f6 100644 --- a/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/alternative-investment-fund.blade.php @@ -111,6 +111,21 @@
+
+ + +
+
+

Declaration

+ + +
Need Help?
@@ -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); diff --git a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php index 7248586..39ad3ef 100644 --- a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php @@ -23,10 +23,10 @@
- {{-- +
-
- --}} + {{--
+ -
+
--}}
@@ -105,6 +104,21 @@
+
+ + +
+
+

Declaration

+ + +
Need Help?
@@ -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); diff --git a/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php b/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php index 721263d..015385d 100644 --- a/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php @@ -70,7 +70,7 @@ -
+ {{--

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. -
+
--}} {{--
Need Help?
@@ -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);