From d4ba0d134569debe8901d8c0edcbdc94414566e4 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 9 May 2024 15:42:22 +0530 Subject: [PATCH] fixing changes --- .../Controllers/Admin/OverviewController.php | 4 + .../HandpickedInvestmentController.php | 4 +- .../Frontend/MarketPlaceController.php | 2 +- ...etplaceAlternativeInvestmentFundSeller.php | 8 ++ .../MarketplaceFractionalRealEstateSeller.php | 12 ++- app/helper.php | 91 +++++++++++++++++-- 6 files changed, 110 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php index 59bb618..d5308e9 100644 --- a/app/Http/Controllers/Admin/OverviewController.php +++ b/app/Http/Controllers/Admin/OverviewController.php @@ -232,6 +232,10 @@ class OverviewController extends Controller { // dd('inside'); $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->first(); + if((int)$getFREData->current_market_value_of_the_property <= 0) + { + return response()->json(['status' => 400, 'message' => 'Product cannot be sold. because product has no value.']); + } $freValue = (int)$getFREData->current_market_value_of_the_property; $nowValue = $freValue - $getBuyingPurchaseValue; diff --git a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php index e6e4474..fc08adf 100644 --- a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php +++ b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php @@ -73,9 +73,9 @@ class HandpickedInvestmentController extends Controller ]; $products = Product::query() - ->select(DB::raw('products.id, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'), DB::raw('coalesce(companies.company_logo) as company_logo'), DB::raw('coalesce(fre.slug,aif.slug,re.slug, funds.slug) as slug'), DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,re.geographic_focus, funds.geographic_focus) as geographic_focus'), DB::raw('coalesce(aif.minimum_capital_commitment,fre.minimum_investment,funds.minimum_investment,re.total_price) as minimum_investment'), + ->select(DB::raw('products.id, products.description, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'), DB::raw('coalesce(companies.company_logo) as company_logo'), DB::raw('coalesce(fre.slug,aif.slug,re.slug, funds.slug) as slug'), DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,re.geographic_focus, funds.geographic_focus) as geographic_focus'), DB::raw('coalesce(aif.minimum_investment,fre.minimum_investment,funds.minimum_investment,re.total_price) as minimum_investment'), // DB::raw('coalesce(aif.description,fre.property_description,re.remarks,funds.fund_description) as description'), - DB::raw('coalesce(fre.property_description,products.description) as description'), + // DB::raw('coalesce(fre.property_description,products.description) as description'), // 'products.description', DB::raw('coalesce(categories.category_name) as category_name')) ->leftJoin('fractional_real_estates as fre', 'products.id', 'fre.products_id') diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php index fd4348c..0afd67b 100644 --- a/app/Http/Controllers/Frontend/MarketPlaceController.php +++ b/app/Http/Controllers/Frontend/MarketPlaceController.php @@ -138,7 +138,7 @@ class MarketPlaceController extends Controller $status .= 'OPEN'; } elseif (MarketplaceFractionalRealEstateSeller::where('id', $buyerData[0]->associated_id)->exists()) { $freData = MarketplaceFractionalRealEstateSeller::where('id', $buyerData[0]->associated_id)->first(); - if($freData->current_market_value_of_the_property < 0) + if($freData->current_market_value_of_the_property <= 0) { $status .= 'SOLD'; } diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php index 7cd6a0d..e9eadf3 100644 --- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php +++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php @@ -125,6 +125,10 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model // return (string)round($total, 3); // return $espu; // dd($espu); + if((int)$this->current_or_latest_nav <= 0) + { + return (string)0; + } return (string)round(($espu - (int)$this->current_or_latest_nav) / (int)$this->current_or_latest_nav * 100, 3); // dd((string)round((intval($this->expected_sale_per_unit) - intval($this->current_or_latest_nav)) / intval($this->current_or_latest_nav) * 100, 3)); } @@ -132,6 +136,10 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model public function getBidAttribute($id) { $values = MarketplaceAlternativeInvestmentFundSeller::where('id', $this->id)->first(); + if($values->no_of_units_you_wish_to_sell <= 0) + { + return 0; + } $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_aif_sellers'])->where('status','!=','Sold')->get(); // $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_aif_sellers'])->get(); $bidArray = collect(); diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php index 4415b3f..de2823a 100644 --- a/app/Models/MarketplaceFractionalRealEstateSeller.php +++ b/app/Models/MarketplaceFractionalRealEstateSeller.php @@ -47,11 +47,19 @@ class MarketplaceFractionalRealEstateSeller extends Model $values = MarketplaceFractionalRealEstateSeller::where('id', $this->id)->first(); // dd($values->expected_selling_price); // return (string)round(((int)$values->expected_selling_price - (int)$values->current_market_value_of_the_property)/(int)$values->current_market_value_of_the_property * 100,3); - return (string)round((intval($values->expected_selling_price) - intval($values->current_market_value_of_the_property))/intval($values->current_market_value_of_the_property) * 100,3); + if($values->current_market_value_of_the_property <= 0) + { + return (string)0; + } + return (string)round((intval($values->expected_selling_price) - intval($values->current_market_value_of_the_property))/intval($values->current_market_value_of_the_property) * 100,3); } public function getBidAttribute($id){ $values = MarketplaceFractionalRealEstateSeller::where('id', $this->id)->first(); + if($values->current_market_value_of_the_property <= 0) + { + return 0; + } $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_fre_sellers'])->where('status','!=','Sold')->get(); $bidArr = []; foreach($bids as $bid){ @@ -77,7 +85,7 @@ class MarketplaceFractionalRealEstateSeller extends Model $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$id)->first(); // $aifData = (int)$getFREData->no_of_units_you_wish_to_sell; // $remainUnits = $aifData - $totalSellUnits; - if($getFREData->current_market_value_of_the_property < 0) + if($getFREData->current_market_value_of_the_property <= 0) { return 'SOLD'; } diff --git a/app/helper.php b/app/helper.php index daccf56..6d73000 100644 --- a/app/helper.php +++ b/app/helper.php @@ -394,11 +394,90 @@ function getCategoryIcons($categoryId) "public/assets/media/FrontendImages/resi-real-state.svg" => Category::GlobalResidentialRealEstateID, "public/assets/media/FrontendImages/comm-real-state.svg" => Category::GlobalCommercialRealEstateID, ]; - - if ($categoryId === Category::PrivateEquityFundId) { - return "public/assets/media/FrontendImages/equity-funds.svg"; - } - $condition = array_search($categoryId, $category_icons); + // return $categoryId; + // if ($categoryId === Category::PrivateEquityFundId) { + // return "public/assets/media/FrontendImages/equity-funds.svg"; + // } + // if ($categoryId === Category::VentureCapitalFundId) { + // return "public/assets/media/FrontendImages/capital-funds.svg"; + // } + // $condition = array_search($categoryId, $category_icons); // return $condition; - return $condition == true ? $condition : 'public/assets/media/FrontendImages/bay-arrow.svg'; + // return $condition == true ? $condition : 'public/assets/media/FrontendImages/bay-arrow.svg'; + + switch($categoryId) + { + case Category::FractionalRealEstateId: + return "public/assets/media/FrontendImages/fract-state.svg"; + break; + case Category::VentureCapitalFundId: + return "public/assets/media/FrontendImages/capital-funds.svg"; + break; + case Category::IndianCommercialRealEstateID: + return "public/assets/media/FrontendImages/comm-real-state.svg"; + break; + case Category::HedgeFundId: + return "public/assets/media/FrontendImages/stra-fund.svg"; + break; + case Category::FundForDistressedAssetId: + return "public/assets/media/FrontendImages/assets-funds.svg"; + break; + case Category::PrivateRealEstateFundId: + return "public/assets/media/FrontendImages/private.svg"; + break; + case Category::LongOnlyFundId: + return "public/assets/media/FrontendImages/bay-arrow.svg"; + break; + case Category::InfrastructureFundId: + return "public/assets/media/FrontendImages/Infr-funds.svg"; + break; + case Category::PrivateCreditFundId: + return "public/assets/media/FrontendImages/cradit-funds.svg"; + break; + case Category::PrivateEquityFundId: + return "public/assets/media/FrontendImages/equity-funds.svg"; + break; + case Category::AngelFundId: + return "public/assets/media/FrontendImages/angel-funds.svg"; + break; + case Category::HedgeFundId: + return "public/assets/media/FrontendImages/stra-fund.svg"; + break; + case Category::PrivateInvestmentInPublicEquityFundId: + return "public/assets/media/FrontendImages/pipe-funds.svg"; + break; + case Category::GlobalHedgeFundId: + return "public/assets/media/FrontendImages/stra-fund.svg"; + break; + case Category::GlobalPrivateCreditFundId: + return "public/assets/media/FrontendImages/cradit-funds.svg"; + break; + case Category::GlobalPrivateEquityFundId: + return "public/assets/media/FrontendImages/equity-funds.svg"; + break; + case Category::GlobalVentureCapitalFundId: + return "public/assets/media/FrontendImages/capital-funds.svg"; + break; + case Category::IndianIndustrialRealEstateID: + return "public/assets/media/FrontendImages/login-img/alternative.svg"; + break; + case Category::IndianResidentialRealEstateID: + return "public/assets/media/FrontendImages/resi-real-state.svg"; + break; + case Category::IndianCommercialRealEstateID: + return "public/assets/media/FrontendImages/comm-real-state.svg"; + break; + case Category::GlobalIndustrialRealEstateID: + return "public/assets/media/FrontendImages/login-img/alternative.svg"; + break; + case Category::GlobalResidentialRealEstateID: + return "public/assets/media/FrontendImages/resi-real-state.svg"; + break; + case Category::GlobalCommercialRealEstateID: + return "public/assets/media/FrontendImages/comm-real-state.svg"; + break; + default: + return 'public/assets/media/FrontendImages/bay-arrow.svg'; + + } }