From 8a19640de5fb88cb0b566a2263a3bbf903870ce6 Mon Sep 17 00:00:00 2001
From: meghamalore <maloremegha123@gmail.com>
Date: Mon, 6 May 2024 16:41:51 +0530
Subject: [PATCH 1/2] Investment Listing Transfer

---
 .../Pages/pre_owned_investment/partial/overview-row.blade.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php
index b72259d..745b6c4 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/partial/overview-row.blade.php
@@ -57,6 +57,10 @@
             </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}}')">
+                <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}}')">
                 <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>

From b853d0e8df0e3a37ee921186ad7f854184ef717b Mon Sep 17 00:00:00 2001
From: meghamalore <maloremegha123@gmail.com>
Date: Tue, 7 May 2024 14:57:06 +0530
Subject: [PATCH 2/2] new commit

---
 .../Frontend/MarketPlaceController.php        |  2 +
 ...etplaceAlternativeInvestmentFundSeller.php | 24 ++++--------
 .../MarketplaceFractionalRealEstateSeller.php | 38 +++++++++----------
 .../manage_user_product/manage_user.blade.php |  4 +-
 .../Pages/marketplace/index.blade.php         |  3 +-
 .../views/Frontend/menu-after-lg.blade.php    |  3 +-
 6 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php
index a57604a..e7198ff 100644
--- a/app/Http/Controllers/Frontend/MarketPlaceController.php
+++ b/app/Http/Controllers/Frontend/MarketPlaceController.php
@@ -19,6 +19,7 @@ class MarketPlaceController extends Controller
     {
         $spotlightMarketPlaceListed = $this->spotlightInvestment()['data'];
         $featuredMarketplaceListed = $this->featuredInvestments();
+        // dd($featuredMarketplaceListed);
         $nonFeaturedMarketplaceListed = $this->nonFeaturedInvestments();
         return view('Frontend.Pages.marketplace.index', compact('spotlightMarketPlaceListed', 'featuredMarketplaceListed', 'nonFeaturedMarketplaceListed'));
     }
@@ -70,6 +71,7 @@ class MarketPlaceController extends Controller
         array_push($marketplaceListed, $freMarketplace);
         array_push($marketplaceListed, $aifMarketplace);
         array_push($marketplaceListed, $opMarketplace);
+        // dd($freMarketplace['fractional-real-estate']);
 
         // $marketplaceListed = [];
 
diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
index 0b8c46b..a9b8e1c 100644
--- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
+++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
@@ -127,36 +127,26 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
     public function getBidAttribute($id)
     {
         $values = MarketplaceAlternativeInvestmentFundSeller::where('id', $this->id)->first();
-        // dd("values",$values);
         $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();
-        // dd($bids);
-        // dd($bids[0]->total_purchase_value);
         $bidArray = collect();
         $bids->each(function($value) use ($bidArray,$values){
-            // dd();
-            // dd($value->getAttributes()['total_purchase_value']);
             if($value->no_of_units_you_wish_to_buy < $values->no_of_units_you_wish_to_sell)
             {
-                $bidArray->push($value->getAttributes()['total_purchase_value']);
+                // $bidArray->push($value->getAttributes()['total_purchase_value']);
+                $bidArray->push($value->getAttributes()['offer_price_per_unit']);
             }
         });
-
-// dd($values);
-        $noOfUnitHeld  = $values->current_or_latest_nav;
-        // dd( $noOfUnitHeld, intval($values->no_of_units_held) * intval($values->current_or_latest_nav));
-        $nav = intval($noOfUnitHeld) * intval($values->current_or_latest_nav);
-        // $highestBid = intval($bids[0]->bidMaxValue);
-
-       
+        $noOfUnitHeld  = (int)$values->current_or_latest_nav;
+        // $nav = intval($noOfUnitHeld) * intval($values->current_or_latest_nav);
         $highestBid = intval($bidArray->max());
-
-        // dd($nav,$highestBid, ($highestBid - $nav)/(int)$nav * 100, count($bids));
-        $bid = ($highestBid - $nav)/(int)$nav * 100 ;
+        // $bid = ($highestBid - $nav)/(int)$nav * 100 ;
+        $bid = ($highestBid - $noOfUnitHeld)/(int)$noOfUnitHeld * 100 ;
         if(count($bids))
         {
             return round($bid,3);
         }
+
         // dd($bids->toArray());
         // $bidArr = [];
         // foreach ($bids as $bid) {
diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php
index 91e12bd..28ac5ae 100644
--- a/app/Models/MarketplaceFractionalRealEstateSeller.php
+++ b/app/Models/MarketplaceFractionalRealEstateSeller.php
@@ -48,7 +48,7 @@ class MarketplaceFractionalRealEstateSeller extends Model
 
    public function getBidAttribute($id){
     $values = MarketplaceFractionalRealEstateSeller::where('id', $this->id)->first();
-    $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_fre_sellers'])->get();
+    $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_fre_sellers'])->where('status','!=','Sold')->get();
     $bidArr = [];
     foreach($bids as $bid){
         $bidArr[] = round(($bid->getAttributes()['total_purchase_value'] - $this->current_market_value_of_the_property)/$this->current_market_value_of_the_property * 100,3);
@@ -62,23 +62,23 @@ class MarketplaceFractionalRealEstateSeller extends Model
     public function getSoldStatusAttribute($id)
     {
         return MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->exists() ? 'SOLD' : 'OPEN';
-        // $buyerData = MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->get();
-        // $totalSellUnits = 0;
-        // $buyerData->each(function($data) use($totalSellUnits){
-        //     return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy;
-        // });
-        // if(MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->exists())
-        // {
-        //     $getAIFData = MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->first();
-        //     $aifData = (int)$getAIFData->no_of_units_you_wish_to_sell;
-        //     $remainUnits = $aifData - $totalSellUnits;
-        //     if($remainUnits < 0)
-        //     {
-        //         return 'SOLD';
-        //     }
-        //     return 'OPEN';
-        // }else{
-        //     return 'OPEN';
-        // }
+        $buyerData = MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->get();
+        $totalSellUnits = 0;
+        $buyerData->each(function($data) use($totalSellUnits){
+            return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy;
+        });
+        if(MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->exists())
+        {
+            $getAIFData = MarketplaceFractionalRealEstateSeller::where('id',$buyerData->associated_id)->first();
+            $aifData = (int)$getAIFData->no_of_units_you_wish_to_sell;
+            $remainUnits = $aifData - $totalSellUnits;
+            if($remainUnits < 0)
+            {
+                return 'SOLD';
+            }
+            return 'OPEN';
+        }else{
+            return 'OPEN';
+        }
     }
 }
\ No newline at end of file
diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php
index fe64d6b..c5f824d 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php
@@ -891,8 +891,8 @@
         });
 
         function holdingStatus(id, status, count = null, profitSharing, customId, categories, productId) {
-            // alert(typeof(profitSharing))
-            if (profitSharing && status == 'Holding') {
+            // alert(profitSharing)
+            if (profitSharing <= 0 && status == 'Holding') {
                 $('#id').val(id);
                 $('#product_id').val(productId);
                 $('#status').val(status);
diff --git a/resources/views/Frontend/Pages/marketplace/index.blade.php b/resources/views/Frontend/Pages/marketplace/index.blade.php
index 9391bcc..8247fbc 100644
--- a/resources/views/Frontend/Pages/marketplace/index.blade.php
+++ b/resources/views/Frontend/Pages/marketplace/index.blade.php
@@ -84,7 +84,7 @@
                                         </div>
                                         <div class="crds-inner">
                                             <h2>Contact No</h2>
-                                            <h3>Number</h3>
+                                            <h3>022-62396024</h3>
                                         </div>
                                     </div>
                                 </div>
@@ -125,6 +125,7 @@
                                 @foreach ($featuredMarketplaceListed['data'] as $freData)
                                     @if (array_key_exists('fractional-real-estate', $freData))
                                         @foreach ($freData['fractional-real-estate'] as $data)
+                                        {{-- @dd($data) --}}
                                             @php($true = false)
                                             <tr class="fractional-real-estate">
                                                 <td>
diff --git a/resources/views/Frontend/menu-after-lg.blade.php b/resources/views/Frontend/menu-after-lg.blade.php
index 16d1bf9..e839131 100644
--- a/resources/views/Frontend/menu-after-lg.blade.php
+++ b/resources/views/Frontend/menu-after-lg.blade.php
@@ -367,8 +367,7 @@
                                     </div>
 
                                 </li>
-                                <li class="{{ Request::routeIs('market-list') ? 'active_page' : '' }}"><a
-                                        onclick="showDeactivatePopup('{{ route('market-list') }}')" href="#">List Your Asset</a></li>
+                                <li class="{{ Request::routeIs('market-list') ? 'active_page' : '' }}"><a href="{{ route('market-list') }}">List Your Asset</a></li>
                                         {{-- href="{{ route('market-list') }}"  --}}