From 497c9412d0889b47cbe39d914cab6e8b5744583d Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Sat, 4 May 2024 21:48:43 +0530
Subject: [PATCH 01/16] fixing bid issue

---
 ...etplaceAlternativeInvestmentFundSeller.php | 36 +++++++++++++++----
 resources/views/Frontend/footer.blade.php     |  2 +-
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
index 84682fa..140f1d1 100644
--- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
+++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
@@ -127,14 +127,36 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
     public function getBidAttribute($id)
     {
         $values = MarketplaceAlternativeInvestmentFundSeller::where('id', $id)->first();
-        $bids = MarketplaceBuyerForm::where(['associated_id' => $this->id, 'table' => 'marketplace_aif_sellers'])->get();
-        $bidArr = [];
-        foreach ($bids as $bid) {
-            $bidArr[] = round(($bid->getAttributes()['total_purchase_value'] - $this->current_or_latest_nav) / $this->current_or_latest_nav * 100, 3);
-        }
-        if ($bidArr) {
-            return (string)max($bidArr);
+        // dd($id);
+        $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']);
+            }
+        });
+        $nav = $values->no_of_units_held * $values->current_or_latest_nav;
+        // $highestBid = intval($bids[0]->bidMaxValue);
+        $highestBid = intval($bidArray->max());
+        $bid = ($highestBid - (int)$nav)/(int)$nav * 100 ;
+        if(count($bids))
+        {
+            return round($bid,3);
         }
+        // dd($bids->toArray());
+        // $bidArr = [];
+        // foreach ($bids as $bid) {
+        //     $bidArr[] = round(($bid->getAttributes()['total_purchase_value'] - $this->current_or_latest_nav) / $this->current_or_latest_nav * 100, 3);
+        // }
+        // if ($bidArr) {
+        //     return (string)max($bidArr);
+        // }
         return (string)0;
     }
 }
diff --git a/resources/views/Frontend/footer.blade.php b/resources/views/Frontend/footer.blade.php
index a398067..ba26114 100644
--- a/resources/views/Frontend/footer.blade.php
+++ b/resources/views/Frontend/footer.blade.php
@@ -93,7 +93,7 @@
                     <h2 id="deactivate_message"></h2>
 
                     {{-- <p>A Advisory Team Will get back to you soon.</p> --}}
-                    <h2>Your account is de-active Please Contact info@jerichoalternatives.in</h2>
+                    <h2>Your account is de-activated Please Contact info@jerichoalternatives.in</h2>
 
                 </div>
 

From 9efbd2e4ab855cf90d9ffc3df8f83f91aa5b5515 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Mon, 6 May 2024 11:33:20 +0530
Subject: [PATCH 02/16] fixing freedcamps bugs

---
 resources/views/Frontend/Pages/register_otp.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/Frontend/Pages/register_otp.blade.php b/resources/views/Frontend/Pages/register_otp.blade.php
index 5b61a4a..861028d 100644
--- a/resources/views/Frontend/Pages/register_otp.blade.php
+++ b/resources/views/Frontend/Pages/register_otp.blade.php
@@ -167,7 +167,7 @@
         var remainingSeconds = seconds % 60;
     
         return (
-          minutes + ":" + (remainingSeconds <script 10 ? "0" : "") + remainingSeconds
+          minutes + ":" + (remainingSeconds < 10 ? "0" : "") + remainingSeconds
         );
       }
     

From 554c8ceee74d59b93900f34686598f43ab7e48bd Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Mon, 6 May 2024 14:49:49 +0530
Subject: [PATCH 03/16] fixing freedcamp bugs and created api

---
 .../Frontend/ProfileController.php            | 34 +++++++++++++++++++
 .../manage_freeu_investment.blade.php         | 12 +++----
 .../views/Frontend/menu-after-lg.blade.php    |  4 +--
 routes/api.php                                |  2 ++
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php
index c2ca6df..2068f3a 100644
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -293,6 +293,40 @@ class ProfileController extends Controller
         }
     }
 
+    public function resendOtpForProfileUpdate(Request $request)
+    {
+        try{
+            $type = $request->type;
+            $user_id = request()->user()->id;
+            $credential = $request->credential;
+            $otp = rand(1000,9999);
+            // $getUser = User::find($user_id);
+            if($type == 1)
+            {
+                // type 1 for email otp
+                // $email = $getUser->email;
+                $mailData = [
+                    'title' => 'Mail from Jerichoalternatives.in',
+                    'body' => 'This is for testing email using smtp.'
+                ];
+                Mail::to($credential)->send(new OtpMail($mailData, $otp));
+                UserOtpModel::where('user_id', $user_id)->update(['email_otp'=> $otp, 'expire_at'=>Carbon::now()->addMinutes(2)]);
+            }
+            else if($type == 2)
+            {
+                // $mobileNumber = $getUser->contact_number;
+                $this->thirdPartyOTP($credential, $otp);
+                UserOtpModel::where('user_id', $user_id)->update(['contact_otp'=> $otp,'expire_at'=>Carbon::now()->addMinutes(2)]);
+            }
+            return response()->json([
+                'status'=>200,
+                'message'=>'OTP has been send',
+            ]);
+        } catch (\Exception $e) {
+            return response()->json(['message' => $e->getMessage()], 400);
+        }
+    }
+
     public function getUser()
     {
         try {
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
index 53999da..de12906 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
@@ -61,23 +61,23 @@
                                                         <ul class="sub_menu">
                                                             <li><a href="{{ route('manage.venture-capital-fund.create') }}"
                                                                     class="dropdown-item">Venture Capital Funds</a></li>
-                                                            <li><a href="{{ route('manage.infrastructure-fund.create') }}"
-                                                                    class="dropdown-item">Infrastructure Funds</a></li>
                                                             <li><a href="{{ route('manage.angel-fund.create') }}"
                                                                 class="dropdown-item">Angel Funds</a></li>
+                                                            <li><a href="{{ route('manage.infrastructure-fund.create') }}"
+                                                                    class="dropdown-item">Infrastructure Funds</a></li>
                                                         </ul>
                                                     </li>
                                                     <li class="has_dropdown">
                                                         <a href="#">AIF Category II<i class="fas fa-angle-right"></i></a>
                                                         <ul class="sub_menu">
-                                                            <li><a href="{{ route('manage.private-equity-fund.create') }}"
-                                                                    class="dropdown-item">Private Equity Funds</a></li>
-                                                            <li><a href="{{ route('manage.private-credit-fund.create') }}"
-                                                                    class="dropdown-item">Private Credit Funds</a></li>
                                                             <li><a href="{{ route('manage.fund-for-distressed-asset.create') }}"
                                                                     class="dropdown-item">Distressed Asset Funds</a></li>
+                                                            <li><a href="{{ route('manage.private-credit-fund.create') }}"
+                                                                    class="dropdown-item">Private Credit Funds</a></li>
                                                             <li><a href="{{ route('manage.private-real-estate-fund.create') }}"
                                                                 class="dropdown-item">Private Real Estate <br> Funds</a></li>
+                                                            <li><a href="{{ route('manage.private-equity-fund.create') }}"
+                                                                    class="dropdown-item">Private Equity Funds</a></li>
                                                         </ul>
                                                     </li>
                                                     <li class="has_dropdown">
diff --git a/resources/views/Frontend/menu-after-lg.blade.php b/resources/views/Frontend/menu-after-lg.blade.php
index 1a7fcf2..16d1bf9 100644
--- a/resources/views/Frontend/menu-after-lg.blade.php
+++ b/resources/views/Frontend/menu-after-lg.blade.php
@@ -368,8 +368,8 @@
 
                                 </li>
                                 <li class="{{ Request::routeIs('market-list') ? 'active_page' : '' }}"><a
-                                        href="{{ route('market-list') }}">List Your Asset</a></li>
-
+                                        onclick="showDeactivatePopup('{{ route('market-list') }}')" href="#">List Your Asset</a></li>
+                                        {{-- href="{{ route('market-list') }}"  --}}
 
 
 
diff --git a/routes/api.php b/routes/api.php
index c6f64e1..db17157 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -156,6 +156,7 @@ Route::post('sign-up', [AuthController::class, 'signUp']);
 Route::post('sign-up-2', [AuthController::class, 'signUp2']);
 
 Route::post('resend-registration-otp', [AuthController::class, 'resendOtp']);
+// Route::post('resend-registration-otp', [AuthController::class, 'resendOtp']);
 
 Route::post('verify-contact-and-email-for-investor', [AuthController::class, 'verifyContactAndEmailForInvestorApi']);
 Route::post('verify-contact-and-email-for-asset-manager', [AuthController::class, 'verifyContactAndEmailForAssetManagerApi']);
@@ -173,6 +174,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     
     Route::post("send-email-otp", [ProfileController::class, 'sendEmailOTPApi']);
     Route::post("verify-user-email-or-contact-otp", [ProfileController::class, 'verifyOtpAPI']);  
+    Route::post("resend-otp-for-email-or-contact", [ProfileController::class, 'resendOtpForProfileUpdate']);  
     
     Route::post('logout', [AuthController::class, 'userLogout']);
     // Route::post("update-profile", [ProfileController::class, 'updateAPI']);

From 0b1da106c5d5f9f6595e971f30264a6bbe8e0c7c Mon Sep 17 00:00:00 2001
From: cj201199 <chiragjain201199@gmail.com>
Date: Mon, 6 May 2024 15:29:06 +0530
Subject: [PATCH 04/16] solving bugs on website

---
 app/helper.php                                 | 5 +++++
 resources/views/Frontend/Pages/index.blade.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helper.php b/app/helper.php
index 9db5ea3..0923007 100644
--- a/app/helper.php
+++ b/app/helper.php
@@ -394,6 +394,11 @@ 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 $condition;
     return $condition == true ? $condition : 'public/assets/media/FrontendImages/bay-arrow.svg';
 }
diff --git a/resources/views/Frontend/Pages/index.blade.php b/resources/views/Frontend/Pages/index.blade.php
index ab42884..131269d 100644
--- a/resources/views/Frontend/Pages/index.blade.php
+++ b/resources/views/Frontend/Pages/index.blade.php
@@ -262,7 +262,7 @@
     </div>
 
     @if(count($topPicks['data']))
-    {{-- @dd($topPicks['data']) --}}
+
     <div class="popular-assets">
         <div class="container">
             <div class="bg-brown-head mb-5">

From 2d7c969620eda5e5c2b6e68d24fb5a497d45f0c5 Mon Sep 17 00:00:00 2001
From: meghamalore <maloremegha123@gmail.com>
Date: Mon, 6 May 2024 15:43:35 +0530
Subject: [PATCH 05/16] Manage Products changes

---
 .../StockFundsRealEstateExchangeImport.php    |   8 +++++---
 .../Frontend/GlobalRealEstateService.php      |   8 ++++----
 .../RealEstateInvestmentTrustsTemplate.xlsx   | Bin 9299 -> 9573 bytes
 .../manage_freeu_investment.blade.php         |   8 ++++----
 .../view-product/real-estate.blade.php        |   1 +
 .../global-real-estate/commercial.blade.php   |   5 ++---
 .../global-real-estate/industrial.blade.php   |   4 ++--
 .../indian-real-estate/industrial.blade.php   |   2 +-
 .../indian-real-estate/residential.blade.php  |   2 +-
 9 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/Imports/StockFundsRealEstateExchangeImport.php b/app/Imports/StockFundsRealEstateExchangeImport.php
index 52d50f3..3449b90 100644
--- a/app/Imports/StockFundsRealEstateExchangeImport.php
+++ b/app/Imports/StockFundsRealEstateExchangeImport.php
@@ -52,7 +52,7 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
         // {
         //     $name = 'no';
         // }
-        // dd($rows, $name);
+        // dd($rows);
         foreach ($rows as $row) {
             $product = Product::create([
                 'tables_id' => Table::StockFundsRealEstateExchangeTable,
@@ -62,7 +62,8 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
                 'created_by' => auth()->user()->id,
                 'description'=> $row['description'] ?? null 
             ]);
-            $count = StockFundsRealEstateExchange::where('name',$row['stock_name'])->count();
+            // $count = StockFundsRealEstateExchange::where('name',$row['stock_name'])->count();
+            $count = StockFundsRealEstateExchange::where('name',$row['name'])->count();
             // $count = StockFundsRealEstateExchange::where(function($query) use($row){
             //     $query->orWhere('stock_name');
             //     $query->orWhere('etf_name');
@@ -74,7 +75,8 @@ class StockFundsRealEstateExchangeImport implements ToCollection, WithHeadingRow
                 'products_id' => $product->id,
                 // 'slug' => $count < 2 ? Str::slug($row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name']) : Str::slug($row['stock_name'].'-'.$count+1 ?? $row['etf_name'].'-'.$count+1 ?? $row['reit_name'].'-'.$count+1),
                 // 'name' => $row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name'],
-                'slug' => $count < 2 ? Str::slug($row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name']) : Str::slug($row['stock_name'].'-'.$count+1 ?? $row['etf_name'].'-'.$count+1 ?? $row['reit_name'].'-'.$count+1),
+                // 'slug' => $count < 2 ? Str::slug($row['stock_name'] ?? $row['etf_name'] ?? $row['reit_name']) : Str::slug($row['stock_name'].'-'.$count+1 ?? $row['etf_name'].'-'.$count+1 ?? $row['reit_name'].'-'.$count+1),
+                'slug' => $count < 2 ? Str::slug($row['name']) : Str::slug($row['name'].'-'.$count+1),
                 'name' => $row['name'] ?? null,
                 // 'type' => $this->fundType,
                 'ticker' => $row['ticker'],
diff --git a/app/Services/Frontend/GlobalRealEstateService.php b/app/Services/Frontend/GlobalRealEstateService.php
index ddeba91..c6bb1d8 100644
--- a/app/Services/Frontend/GlobalRealEstateService.php
+++ b/app/Services/Frontend/GlobalRealEstateService.php
@@ -33,12 +33,12 @@ class GlobalRealEstateService{
 
     public function fullyFundedGCRE()
     {
-        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->open()->active()->get());
+        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->fullyFunded()->active()->get());
     }
 
     public function resaleGCRE()
     {
-        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->open()->active()->get());
+        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalCommercialRealEstate()->resale()->active()->get());
     }
 
     public function openGRRE()
@@ -48,12 +48,12 @@ class GlobalRealEstateService{
 
     public function fullyFundedGRRE()
     {
-        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->open()->active()->get());
+        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->fullyFunded()->active()->get());
     }
 
     public function resaleGRRE()
     {
-        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->open()->active()->get());
+        return $this->returnResponse(Product::has('realEstate')->with('realEstate','categorys')->globalResidentialRealEstate()->resale()->active()->get());
     }
 
     public function globalCommercialRealEstateLearnMore(){
diff --git a/public/excel-template/RealEstateInvestmentTrustsTemplate.xlsx b/public/excel-template/RealEstateInvestmentTrustsTemplate.xlsx
index 2c4a5da146a125599b3cd29a87cf80d87f750642..b5cf12eb0af21c0ab5e503b974fb6c61ecbc9849 100644
GIT binary patch
literal 9573
zcmeHN=U-FV)(!-ucaSO_rH3k@fJhG!q!$6{y#x}f(xrn`0cp}fiXuqwy$4W=K<HJP
zAieX(nYniyXWqZy&i-(c^UGN)$==Vi*0a~zst_OsIp78W8vp<>0SfRpJ+09I00K+^
zfDC|*t}g?1bg^)BG1ByOvVa@%dN|lKW@DhUX9Cbs&;L9Ahi9PVRlj2!AF<qV!WmI)
zwU+7E>>^I|2+2eq^>wV8qd?sgwjrs7olUB@MVy#S6CFz8@F7HpNKWrmiYX>ZrMob#
zHc;Cy{;7>f>16j-UV{~8oRbpOPNpTT)Lm*LqnDPc0Nq^25MjHpHsBh&{s(j}hL*ha
zE(I?3nJzIRY2FUHlWk+C?mTylD5VXd36BGem%22ZZ@#R59|vQ+DDjxS=~j{wMjV+K
z5U0@u+aSuDCMg<Cw)-%K28|==dX6(Qc<pC6r%$6iiW^=SdcbL4-uflj_q68Zz(?)Y
z&2{JXRC$Q%Q(lJ@sUW5R)d}<%VXdcJTouT3$(Etco_&Fa53%1a%Xdi_UNwpAdP&Sl
zCyJrVPEoZ$q9r2eS*n=>o)x@~b9M$cR}!5nu36G}x4g>4E_iIh5c|F!AB@dxbAkh&
zGdX9<KS-Bw`?~i|D!nfe!U`Sgf?7PA7r!3pnnPjh`WgsO{R=_Ko;F#aqX;^O;vXK0
zphhqYdpL;q$Ms)g{tvV9r@vkjrwjq|69?}ETr&+c-bZpWf3^q7eN{HUMB`7sG!{vY
z$*sFQmVfAyRYm_St<?REXY!$Cd5%X8@pCuQL^+&*G|Q2C?Ka3|O$`=FJWT%OmSUSf
zvwhKK@uA>L&Xuf*L&@-x#q2;{wrf8sR|W0P0Et=y8&TZ^7}b*lC88oWgM^h^!E-dK
z2%*kFMeO@<V7BB*!)e1^5#>^w{%6qMJQl8)eA&Smy_1+p>5YBiZ0)Q(*47U`ee0op
z=gek6`a4f9GrsQFeNtDKXA4RJrmvoEiDFhX<jTRxe5aG;z1H{|1c(ZB9YMX>$NXgy
zW`jCIBBX<}<!Ap$nMop692y`1P=N&i5TTy%um`zAVRoiasNIizmaBzy%;6*UHnO=!
zJ53M3875EAgpgLmPI21SZ$onX_*FjOz822UDmvS_A8e3fS=m>`{@r0<VPJsz{35$o
za4ESrJc3#Fq(lA&*IPx8GW<`a^%GkxIqJEJinnoZW>acsMYJA6*SMH6R;9(M0jioz
zN(r36{vzu>n0k6>9EGtSb}|{JMr}orx<H&JhZ*M(cXyRH*PRBbThfftt;7+S1@^4g
z=^v$C8RINu(JnbxEGi%Nuk$;J#XfemQIAam@UKzpfOyyiU^I^sgJR6z_#+99BIVnL
zLLO9QIo~xxA89RsspP%wkWL3wjKxasG9YhuJ!i5eG;^YhvjZOuxDr;E<X(fduWt6w
z`J0^gTT|tZ*|Pb~dy^uNF!=DiSF51g9QX^Pg{Lwsy%3+8x^Pr<A)JlrUQnTK*-StP
zzFv|VLh!@Ag7-^Ib{`V<HQO*?*DM;3ZpxNrv6Cx0C|?$r+m?kC0!U~@w%ieHFQ(9N
z{O=Ew(!_WQvvCUBCI?wl4ba3TS@<Rv$qw6A#YB#Myy)DzVIeUjnqC%MKA_1B$|9ZE
zN*Cxgp}q*Yi!+v0#z=Q-#qok)sKww0?WJ;pkg+(mp){dmub?@`9^o`HAYH1*d8aH>
zpe4GLzl#L~Q$h4Zi;uWEP!Y`Z94IVZ5i2xKz;i^L<j>G3a<$j*P14+x<uyNQagj@T
ziHUrOh`;qx=lSL9y6a(kd+3yjcgYOAs>rQ;SR==CUXEFtNuZ3Nd$Iq@WsHWwBU^n~
zYv_BXS6yXBBuK+J@|F%L;6nH#@isq=Yow{iqnR!K@>w-oBGt_CBl%C^SK16kR4TSJ
z)empPVx7^#;^yy$rG8=W{i;b*XD9N;1SvLhUpI%BYwU<olJJ1Jlwq<_u-nCqE|pjE
zBZ7U;aD=u~Vuw6B*bFp&`iW9%*t(<h&So975-ON&%Z_b`w=F*G(C~DIm$xpca`QQi
z&{2LW;ShN}<$*_O&=oaJH^)%x?BVU|?z%kN|9xgjW_oqCboNOMF?)^jlM+PG{Sy>f
z{+@aKC0`}&qv%tI$~-gxY%~;&eosC>lj%Q+2o0qWQCaGLdz7dvLpu0~8}Y6}_}o+7
zC`cw<K+IcOn?%^X6&%RhOoBcKbF`dwhPvYr5D*&dxr69-I~FEf1d<)La=i^F#dt<$
zzjGfGir7a0u}!z%(FZ7Cl96t0Y!+|h5vIV&Y9-@(xZjYAuAZ>7QHSK@Gs_;-ehwD0
z9prNru!Rrb>QmO6?XOt&I}6m<dKXYpUCo%nVYzZ$D}y|`krCj@@M)hK2P{tD3HbDN
zl!@!4RqhCTui?T{*>ljYHRlX}g{~MvUnDHy73{(o(xbrO%Mk}($xg1<+F5XsKJVjb
zM(%O<AM98z_jZr{vsj^QnJIBVfhhzB0H8u);g84*x3;iwfrEZ~;r|hW(_SH?kc_B|
z#dUa#_?W-TIqk(_Ns)H(H?3kvqAwUrRGog99`RaZ?mP1`>KtS5E7j03&abbMO}4gY
z^v1q|b?>|!<bP=z8MvAsa~8A2Ft=mH6`5vLXI%M-xqGN>p?>Dv9T{Jypo6nOLR``B
zyyE?lspGp6`zrGYHi3?k8O8qY7y3}U5@WeL>cZefQI>G<%ja!fDkiVXUm17_G-yem
z)0@g6#5;C4Cu?H!Psr0uk0$O4I%)z#8%y$hzhzQ!G<k|zn@u(aHw+0`(53Tuk)0qE
zQXQ|mz+lIhf_c$?kIr60M~vcyO)jMC5Wb|r`5obRs0nw&m1b{}8XD;KQrz`r;jV9y
zuHDK{kc;x|ZnwH2NFd{NtIN)J*HK?lbRmYKJbU0fR^4fwaXHfMa$h4n{@m)NIPyXG
z6DLs13sdqbICOx2`UIfw91};o?fvDA5f7(q@6?p9&>=|ggtOaD{F}F6!H_gPC(*o+
z5->ECX4*tnDY*MaT~PY-xu?oY?8-JYR=wyfv-hB*EqO1Rbn;)2u8w2|uHXf%F#36t
z59D+*BeeUI(&xp#nFe~MkOk>H%+O+AqcW&?VgWfzp$_`CUipEl68y@dR3|Ws4JShF
zUResc(lD}Z(H63FcyT?(H1qHZwX?jwMuFk_+Wr;7@dY1opb@4s(T5vkp>z;s#%AR+
zeD?5H8v2;BM$NY!O{{{5urCPe_XYxN7>=Lo2pgIq_BZc%yqCd!aa4b5KQj~VVvTT^
z@P;F2?%B`4p<1SkvneM>SR!<|RV$IZjkw{=#bS`yZPEUiZLyIa!nBp1s5G9~bWyID
zbTO{j#`eh|eoDW#WG<;7iw6Le*$&=Te)%B&8$?M@pGG+oo+KPnapJIuJY9SrFMCpZ
z821Vi_-^bG%Yvf>3(4&rOV+l{#w7DnG(-*t<rp5n4A%R{*|KR@C%zRXvmEN#$gpNZ
z*}6bCy+-2L^fLXr0oUH7*R)yr74wI3+jvF7v5R>@2|A_pl3TNuDRDO3mlqu)pashR
z&QLjr;-klh%G^pr16<lYU}df{ErDS{9d-7;M?-#PkUhMX?0h9$@F^SHX)WJVd0SH@
zTar+#lH8cY3?uZVugJ--No$lAlvcU<i4#A<@!zAm*{%7(PpBoiNBv{N{~JYJtSuZY
zK)+poW9OD01WGGH+(h}+S9hy1)_l{1Iu@uOT@#j$Q5MInV4E~$(P7A|*cas}2iwS#
z@~`-sCk2%tmjen(y?A<NhR<p}!tja7y%O?7Gc5#|E0-IQc#d!q6}$+RF>Kmn%$nt2
z4fs&8Cc-=BO;mt}2c|i^xWDwtO26q2tCEbYUikAXbiC`n!Ga6}d89xW&XJTP1@i4$
zx4I>=G6mb1Dh$Hi&e4!6@P-j5TD&NTF5Pc7aQyDZp&QRb*26|}w#=hd7bWzqmkCO~
zR)t=Q3;YSv1Q@RvIL0R8h9{iHRk6#6z55!?WS>h8kd?>t`!IS(Gczs74V7+28zE~A
zWRO9`33lcLwXs*^uplW><S=~CT3uzzzA9yVM!orlYHc{JTky6?{b&IiJGOCNEl<_p
zpnS8QF@fsUNY?XVYWus~4OzbM&efU3vnL(|eTO1CyE$qM4b}_7?A_JcyYCvm&9;n}
zJ``(e4A>cU$3jHq8ND!7`aFqSH){($N-E}I(vUw+-*qe&+ps6^<03bgNj9_%=YXu#
z89;`;yA%MbQsJy%iQ1lBa?F@cZ`s~JvK>F!GR=`phsem|Q&mRo;L*r8*rL7WL(Pdy
z6O;+#YeR3+CB2@V?H-RPM5{1d+1gewAF0tK!$7`gs~HSU2Ul0y-AU2Shyuw7%G+0+
zAfv{Ur6HZd5QO>b!<l%>#~I?+SDVc~K3l_0{hvAlqrm||?!XL>YCUwk(b=-?R<bKg
z(j_Vq2zqBGGV2+;8J>rk|69E35C_WHl@=D>`LR>){_&jGLu}3iUJ@$Y^Gs$g(ar_H
z_r<mNMA2(D%Wu+#l&2j6qYUB4YPOgjqC<XCVGxT4U5Uxn>`H9mPT_e4vt`s>QDZYK
z9ebNhIHF|soQ=;rkTM<Xas0`;VVXGG@feHcPSn_0RbFt9FG#b|$_+Hhs@M-a#I95i
zx<+A3T0%+e&V_V2fhmL!qy*fkJuBw@!)S4FVx#yhX8Ag#Ys?*Cx}_usn=MS=J}`Wi
zGi9k|6-*igcDxRw`=Iwg9=uwSoLd%lX)wSj7waAYro4!mye}&uL#JAIciJ7Ns?A%H
zWE$;ENV$kqwlNv5z+Gx;xzmlA&Rn8*V`7GRJ1}=m;N*PKQ3THjU{_DkjAyh1Tbvd?
zx6*xf>)V4K1W@QP)MSFNxN@CE*f-bm+V?SH^JuS=4A$8yH8kd_pV1Uw8M4EXb)d-0
zE=hcL!IQZc$U-&x(*GM_za@9Xf|c`VwG)ZLldh#lJ`c^k$aC-qzY)wR$!DwH!U36~
zKa-azNqyoaU;PcR+RKEu|K{T-)k_N%dh}k~hFQ+;ETb5)x|zbWx9W}G9<j{q@Diw&
zLrnwulN~zp+d~Io#M!%?EC+qO9pUfW!+G+2sEaJfAv%6G7Mk<c%dP%JYt<>9AR=Y5
zY*9_;KIEB&i<T3w(C5uGFarN=d#8LXnpSRo-*{!eMsdH!wlK2;wMlNOLttz$Kdy6Z
z`szxzTvwfb(5S%UTGLuuPQiQnJ1pbjvV%@QW##<LLif-6$W)%1Ib7B8{et28_9506
z(<B>;5!M)##{SEv!M?PXy)`jF*2U?C6c^ZC#n6uF9M<(y+f$3X!<z8Ws&{2*fxE3V
zUofAX4oAMoL_X{q;ULVVb~BST>aqs#c@0twRzJDeZdHmyFik5sdn_t{O`DUCF@2{Z
zBgV&y&g(%_D<XsL9>*4|b?TnaM^Rz-6nBHJubTv6s;NmHKLD?}{pmB^<txw=9WkfO
z74-93_P}^WiV64kb!$nsD`GE%ic@UL!i!QI1-yObW<L~hW+!Tixo%cH)HL{F2)o5v
z^ie5I!__E<kt$y+UN4^`LdQne*^S>e)y*FZy`5}Z*oVt5aD)u1fBNv7{df_2nYhk|
zL*{h@-?fo({J9i8u%<U%gJZ8AiRI)C3~9RHt;r?esoMwrV+NpajuB-?iL@e=NF(??
z1HfH8?JeLxlv#(iJ~Wk&+$W>r+W0gb#$gV|&{WpQRniwOOs~+vdSr^AG*63inev@0
z>kWFJ<mynl!ZZ=GwBxmA`#E04$wkJs|J8t#2f4AVMIq<yB<d@ep@&)I6B%>4nmD0$
z+Ns6(i_7{7VOo_^?N>Ay#N~+HzSou;=MJ^m0Tl{GS){Y0N_eKm#YsL$Yo(%bdeZ6W
z0OMu6Hr8(>`Pp8Cp^Rt9y6;MCG^P^)&X#ux@mSPUK#A%$<?~XNcxLL^ymaf>uFtGG
zz&n#9C8I@Jm15`yMq|QU>)v%_zKijDei%I<8C<dlq2Eqs*D0AhoAN~l@`=`L-sRe;
z6^?&47oEc0t7w!H36yyzv$bYZSo66@Dv?o9g*hy<v5R`aJ}X&6pJYbb?L5A_ETMMV
zQ48~hqJ9?i-BA@*e!vTkMg#L2cJ$+qiy~!f169UJ&OTqPh?hCYL$aRS{O}NYc$kkC
z%{J=%7`Z;V^w=6CJQ=7aAUc2lg=d{=T|m>M-2Fi7<81Mjio5gqmi-CdG-EB-($v7p
zgaQf{2pdjy7BYQ;w<SFe=40`E)6N^KzBtw(Li%+CXZvv8-LLg*H6IL*JTAKyi9S8s
zLfgV-zn0+M*pRp~E0CE#<}19kkxdDP;_kNHG-<xSV$XrOE$4|_IRX8oWaEZcR22&G
zc$}4PVoj}0$TlZz^WJ6+@NVDmvc~s1Xdy#!vO<!}z7%itg;1N-*eG<p-XH>VEQt0y
zG@&bGvU8~L#J6YA_2$9nOp~38&8F`$x7?_kD)<+jT<ue_c*Y}XZ!=hHwUpG!?AJfE
z-AY*PYMaGfF3uL#gTotrlNZ|0$lgsnk$wJdXiJ_ND;9O1ldiVVGbr*kEt&@(=8;`#
zNqyxkdCr%dK^ZGTXlVwL%nuU*Tf#wMLzerV{5aY3TWj;C-kp^jO~6dUc8@7ojo0D$
z<huwREWKc?)HhA3gHq3Xyh&dMjIiQ2EQ(?`ddPOodbp%{$dStLtBK!#9B$qs;kj@~
zdtx$Sw4CTAApA&maG6)99-kmDhIK-6A+WhW(D$UL&ljbt{w}Jt?9n!$s8487v?Bk5
zQr0Fg3v&$@n2n>=Z_M(FQ?{GtL+yF|FG3z3chqwPs@r2(iSPui!qa7<$UMjCZKDlr
z8o*cHl^BVd`L);wk}1*dLZ_XZ!|hRC#&?4B-tgkb=zjT75#(9YoZ%%*OrF;|i$k&c
zGN6_{I(m<o+_WUH&829mnj5bw2d%x37R)?(??Gl)G4vzfv$oqVviA-qCrzE-5cHU~
z)PXDbtRTSn-Hb48tgHcGQf;Cza&CG5QNK8nYiDDucw6;}(&5IWGVT<KII*45P6N_e
zaHvW;Z~U~{GvO;+hr!z|^_o?0UYq%_La6#PaCl)=pxvFR&T*H$xX=5K*Gb=CU;0Wn
zd)@f*iB1#E(Td^=dC408v(zkG#-W>-w#U-++Jn)9I|Y2co`wY~jzx&Ny2oQvt&b<w
zrfF}AE?);Vu}$c1t*ZvjyVYAj(4LA$ZH9E;zUP;MA=kdue{Cb2$0Z``NPR9^?_tpC
zFg`goJ-_>~e-W1S&kIBpNbpJ<wLrG0S_TQKmSGMxQ-wjD;2<+7%;JwG*S{qU6mq@d
z)FADA<Uw<o*D^iNlPZwm!BxOpKoiW?zK-gcY1huX1mFr}v&eQ;UDnC#G<b6w99%vj
zB7BB!R;-;Tnx+~l6{f9S^ys@?8SXc}@+hv}P3?!_M8@Bl>l?v=mf6C)_D=}9w2Wi#
zaP$YNd><4;V3(O<5mb}ys6L&p%3l~{PzDQ8GBjY2s?o&Xpi7!|{tN_4kbcME=nNgr
z$fpOW6Ti(uTj9pJ!*u%n9^cDLxUnj4n(_+al>5ETMstWWxx(?Rc23!59a!X+>B$9?
zXa5(F%vh%S<$H{I?$`hv;B@6}BzMMeirp7m@?e}=)ia*)>AGo<m%hK3sJYmy`%$oF
zM<CAWyXU*ZONv-wUIK1g&f0fJx-H7u^kj2vq;`Nb6igN_gY4cr8O<p>@${e+jnM0`
zkA8zd8cHF{5$cFVyhZ95g4$AFg(Fmc{d=_FAUf>wMuG7P1xDhZ!D!;-^e+}sApB#b
z#r3PS|7bWWUdSv<xZ+}G_3=xKcc9DW-PEPE`m9^ywoIL!SZWm)8i&s1wqH{x*;G|G
zQQ|!=ElnxIlpk+kPHfL@s7tYE<N4f$SAdmFY01n_+8(VlNK#yNpPW{486a4Nts9#1
zHW?gN6<pbhQwoF@y&ey)QRbp9?$fJ@I`Ss)Uv_?z0iGZZB<;(wv|_)}tp~Xl=E>PU
z+4Zb-pwcbw&;LG1v#7s;Wu?)ftLFBxY(9YwL@~nC(sV~bKb=d=ajcDoNXNc}Yl-C5
z1^wIme1_KWB~sh5&n1`;ev7Y?qE%+GjWmIT1;p>bgBYeIDtCpvw`p^8jZB}l)A*@^
zZ{oK%(b;uZ-X9xz+S1wdL6Azyqb$0{Wf_g3xE6eX_1)#sv><*1a4>s`c93rWP-ivX
z$78O3H~29^;3;iD>DEz*ty(GuTX$o>n~17Ao&H{Wua-j_ZXXD-BX|6HsNH>h<RjQ8
zZl5K}Qpv~H;1Z<@{|?!s<Ea>46l6(IkVPF6_$hw6!d;*a|DyIkm<0fGV+~OelqzTk
z6+wHwQ=@(CsT~xME{spv-_|F5&ezWZE5)gVoXjDH#Ts_yK}LfM3t|oHXIhc7{&s@w
z$!K(p^Ujk+jxqK4;u4M*Y`c*T=3gR}_VDRy(Kav6I2*s%E>00ndk``y-#8jq;lfs~
zU(4qAkH~{O%ab#kDRfsoyc~w*Pw6??Fg;}V-?lFyy*hXa%xD;Ey`q>bJTkYcitg@R
zUtOoX_<GnzXn12**MR?K&cq$zcV3ZB>mxC|UKO&TuX3k`vwg5;T{y|+d*y4^MaIU<
z2;GELKwTSY3o)_ERAVR(2o&KaYI27WXJPVSM`iGX7xLb;ee8M=)b??ByFDE_iFn7e
zX0lafaJ}2kj_>^loir10CxZCe5(sJ@cz~L)-(iM^&V$lS|9l?h&sqKb-9Ma8QHA`~
z!C(93KRd`miL;-&=f4{M+BN*sbo9o5E7||)A^vLo*Ivn=rYK2>`<wCq(>eLo&#wja
zKRv17|My4yt(^X=mtSjqe|q_j>W89=^1oL6es%Ec7V%F9`xL)9_;bVftLd*&_)k-L
zRK*eX-SA(9@vk2Ks@49q2LRS+0D!+Kw_nZwnq7Z3ce(YG`5(FVSL?q9x}UA@F#cq1
a_TR9l3c*Cd<Hy+yJU}ZdIz}=7xcfix4k()d

literal 9299
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

diff --git a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
index 53999da..e1f75d6 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
@@ -111,13 +111,13 @@
                                             <li><a tabindex="-1" class="dropdown-item"
                                                     href="{{ route('manage.uploadPrivateEquityFunds') }}">Private Equity
                                                     Funds</a></li>
-                                            <li><a tabindex="-1" class="dropdown-item"
+                                            {{-- <li><a tabindex="-1" class="dropdown-item"
                                                     href="{{ route('manage.uploadVentureDebtFunds') }}">Venture Debt
-                                                    Funds</a></li>
+                                                    Funds</a></li> --}}
                                             <li><a tabindex="-1" class="dropdown-item"
                                                     href="{{ route('manage.uploadHedgeFunds') }}">Hedge Funds</a></li>
-                                            <li><a tabindex="-1" class="dropdown-item"
-                                                    href="{{ route('manage.uploadExchangeTradedFunds') }}">ETFs</a></li>
+                                            {{-- <li><a tabindex="-1" class="dropdown-item"
+                                                    href="{{ route('manage.uploadExchangeTradedFunds') }}">ETFs</a></li> --}}
                                             <li><a tabindex="-1" class="dropdown-item"
                                                     href="{{ route('manage.uploadRealEstateInvestmentFunds') }}">REITs</a>
                                             </li>
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
index 72d1c31..ad7932f 100644
--- a/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
+++ b/resources/views/Admin/Pages/manage_freeu_investment/view-product/real-estate.blade.php
@@ -1,3 +1,4 @@
+
 @extends('Admin.layouts.master')
 
 @section('content')
diff --git a/resources/views/Frontend/Pages/global-real-estate/commercial.blade.php b/resources/views/Frontend/Pages/global-real-estate/commercial.blade.php
index 9876ea6..65dc2e8 100644
--- a/resources/views/Frontend/Pages/global-real-estate/commercial.blade.php
+++ b/resources/views/Frontend/Pages/global-real-estate/commercial.blade.php
@@ -215,7 +215,6 @@
         <x-learn-more :learnMore="$learnMore" />
         <div id="open_investments"></div>
         <x-global-commercial-real-estate-product :gcreData="$openGCRE" id="open_investments" :type="$type='Primary Offerings'" />
-        <x-global-commercial-real-estate-product :gcreData="$resaleGCRE" id="resale" :type="$type='Secondary Offerings'" />
-        <!-- <x-global-commercial-real-estate-product :gcreData="$fullyFundedGCRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> -->
-    </div>
+        <x-global-commercial-real-estate-product :gcreData="$fullyFundedGCRE" id="resale" :type="$type='Secondary Offerings'" />
+        </div>
 @endsection
diff --git a/resources/views/Frontend/Pages/global-real-estate/industrial.blade.php b/resources/views/Frontend/Pages/global-real-estate/industrial.blade.php
index 5066fc0..f74a895 100644
--- a/resources/views/Frontend/Pages/global-real-estate/industrial.blade.php
+++ b/resources/views/Frontend/Pages/global-real-estate/industrial.blade.php
@@ -184,7 +184,7 @@
     </div>
     <x-learn-more :learnMore="$learnMore" />
     <div id="open_investments"></div>
-    <x-global-industrial-real-estate-product :gireData="$openGIRE" id="open_investments" :type="$type='Primary Offerings'" />
-    <x-global-industrial-real-estate-product :gireData="$resaleGIRE" id="resale" :type="$type='Secondary Offerings'" />
+    <x-global-industrial-real-estate-product :gireData="$openGCRE" id="open_investments" :type="$type='Primary Offerings'" />
+    <x-global-industrial-real-estate-product :gireData="$fullyFundedGCRE" id="resale" :type="$type='Secondary Offerings'" />
 </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/Frontend/Pages/indian-real-estate/industrial.blade.php b/resources/views/Frontend/Pages/indian-real-estate/industrial.blade.php
index e7c5a67..b7a54b8 100644
--- a/resources/views/Frontend/Pages/indian-real-estate/industrial.blade.php
+++ b/resources/views/Frontend/Pages/indian-real-estate/industrial.blade.php
@@ -190,7 +190,7 @@
         </div>
         <x-learn-more :learnMore="$learnMore" />
         <x-indian-industrial-real-estate-product :iireData="$openIIRE" id="open_investments" :type="$type='Primary Offerings'" />
-        <x-indian-industrial-real-estate-product :iireData="$resaleIIRE" id="resale" :type="$type='Secondary Offerings'" />
+        <x-indian-industrial-real-estate-product :iireData="$fullyFundedIIRE" id="resale" :type="$type='Secondary Offerings'" />
         {{-- <x-indian-industrial-real-estate-product :iireData="$fullyFundedIIRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> --}}
         <!--<div class="investment">-->
         <!--    <div class="container">-->
diff --git a/resources/views/Frontend/Pages/indian-real-estate/residential.blade.php b/resources/views/Frontend/Pages/indian-real-estate/residential.blade.php
index 5a60b1d..ef8c88f 100644
--- a/resources/views/Frontend/Pages/indian-real-estate/residential.blade.php
+++ b/resources/views/Frontend/Pages/indian-real-estate/residential.blade.php
@@ -199,7 +199,7 @@
         </div>
         <x-learn-more :learnMore="$learnMore" />
         <x-indian-residential-real-estate-product :irreData="$openIRRE" id="open_investments" :type="$type = 'Primary Offerings'" />
-        <x-indian-residential-real-estate-product :irreData="$resaleIRRE" id="resale" :type="$type = 'Secondary Offerings'" />
+        <x-indian-residential-real-estate-product :irreData="$fullyFundedIRRE" id="resale" :type="$type = 'Secondary Offerings'" />
         {{-- <x-indian-residential-real-estate-product :irreData="$fullyFundedIRRE" id="fullyFunded" :type="$type='Fully Funded Investments'" /> --}}
         <!--<div class="investment">-->
         <!--    <div class="container">-->

From 6374187688d149617690e004d0c30756a43a025f Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Mon, 6 May 2024 16:04:52 +0530
Subject: [PATCH 06/16] fixing bid issue

---
 ...arketplaceAlternativeInvestmentFundSeller.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
index 140f1d1..f9164a2 100644
--- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
+++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
@@ -126,8 +126,8 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
 
     public function getBidAttribute($id)
     {
-        $values = MarketplaceAlternativeInvestmentFundSeller::where('id', $id)->first();
-        // dd($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);
@@ -141,10 +141,18 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
                 $bidArray->push($value->getAttributes()['total_purchase_value']);
             }
         });
-        $nav = $values->no_of_units_held * $values->current_or_latest_nav;
+
+// 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);
+
+       
         $highestBid = intval($bidArray->max());
-        $bid = ($highestBid - (int)$nav)/(int)$nav * 100 ;
+
+        // dd($nav,$highestBid, ($highestBid - $nav)/(int)$nav * 100, count($bids));
+        $bid = ($highestBid - $nav)/(int)$nav * 100 ;
         if(count($bids))
         {
             return round($bid,3);

From ec9d7417e9066c478a05dcfa3703f990761f7e4e Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Mon, 6 May 2024 16:11:27 +0530
Subject: [PATCH 07/16] fixing bid issue

---
 app/Models/MarketplaceAlternativeInvestmentFundSeller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
index f9164a2..0b8c46b 100644
--- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
+++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
@@ -165,6 +165,6 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
         // if ($bidArr) {
         //     return (string)max($bidArr);
         // }
-        return (string)0;
+        return (int)0;
     }
 }

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 08/16] 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 09/16] 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') }}"  --}}
 
 

From 535e1f5d0835ee06797feb4be602ee0e0bf85ea6 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Tue, 7 May 2024 16:45:56 +0530
Subject: [PATCH 10/16] fixing fractional bid issue

---
 .../Controllers/Admin/OverviewController.php  |  63 +-
 .../Frontend/MarketPlaceController.php        | 200 +++---
 public/assets/css/FrontendCss/style.css       |  14 +-
 .../Pages/marketplace/view-offering.blade.php |   4 +-
 .../profile/market-list/buyer-form.blade.php  | 245 ++++++--
 .../market-list/edit-buyer-form.blade.php     | 569 ++++++++++++------
 6 files changed, 754 insertions(+), 341 deletions(-)

diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php
index 31dee97..1e1fa27 100644
--- a/app/Http/Controllers/Admin/OverviewController.php
+++ b/app/Http/Controllers/Admin/OverviewController.php
@@ -180,9 +180,9 @@ class OverviewController extends Controller
         //         return response()->json(['status' => 400, 'message' => 'This product has already been Sold']);
         //     }
         // }
-        // $checkAlreadySold = MarketplaceBuyerForm::where(['id'=>$buyerId,'status'=>'Sold'])->first();
-        // if($checkAlreadySold)
-        // {
+        $checkAlreadySold = MarketplaceBuyerForm::where(['id'=>$buyerId,'status'=>'Sold'])->exists();
+        if(!$checkAlreadySold)
+        {
         //     $marketPlaceId = $checkAlreadySold->associated_id;
         //     if(MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->exists())
         //     {
@@ -206,28 +206,53 @@ class OverviewController extends Controller
         //     // }
         // }else
         
-
-        if($status == 'Sold'){
+        // dd($request->all());
+        // if($status == 'Sold'){
             $getMarketplaceBuyerUnit = MarketplaceBuyerForm::where('id', $buyerId)->first();
             $marketPlaceId = $getMarketplaceBuyerUnit->associated_id;
-            $getUnits = (int)$getMarketplaceBuyerUnit->no_of_units_you_wish_to_buy;
+            $getUnits = (int)$getMarketplaceBuyerUnit->no_of_units_you_wish_to_buy ?? 0;
+            $getBuyingPurchaseValue = (int)$getMarketplaceBuyerUnit->getAttributes()['total_purchase_value'];
             if(MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->exists())
+            {
+                $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->first();
+                $oldUnit = (int)$getAIFData->no_of_units_you_wish_to_sell;
+                $newUnits = $oldUnit - (int)$getUnits;
+                if($newUnits >= 0)
                 {
-                    $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->first();
-                    $oldUnit = (int)$getAIFData->no_of_units_you_wish_to_sell;
-                    $newUnits = $oldUnit - (int)$getUnits;
-                    if($newUnits >= 0)
-                    {
-                        $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->update([
-                            'no_of_units_you_wish_to_sell' => $newUnits,
-                        ]);
-                    }
-                    else{
-                        return response()->json(['status' => 400, 'message' => 'Bid units is more than seller units with '.abs($newUnits).' units']);
-                    }
-                    
+                    $updateUnits = MarketplaceAlternativeInvestmentFundSeller::where('id',$marketPlaceId)->update([
+                        'no_of_units_you_wish_to_sell' => $newUnits,
+                    ]);
                 }
+                else{
+                    return response()->json(['status' => 400, 'message' => 'Bid units is more than seller units with '.abs($newUnits).' units']);
+                }
+                
+            }else if(MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->exists())
+            {
+                // dd('inside');
+                $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->first();
+                $freValue = (int)$getFREData->current_market_value_of_the_property;
+                $nowValue = $freValue - $getBuyingPurchaseValue;
+                // $nowValue = -10;
+                // dd($freValue,' - ',$getBuyingPurchaseValue,' = ',$nowValue);
+                // dd($nowValue < 0 ? 'negative '.$nowValue : 'positive '.$nowValue);
+                if($nowValue <= 0)
+                {
+                    $updatePrice = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->update([
+                        'current_market_value_of_the_property' => 0,
+                ]);
+                }else if($nowValue > 0){
+                    $updatePrice = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->update([
+                        'current_market_value_of_the_property' => $nowValue,
+                ]);
+                }
+                // else{
+                //     return response()->json(['status' => 400, 'message' => 'Bid price is more than seller price with ₹'.abs($nowValue)]);
+                // }
+            }
+            // dd('outside');
         }
+        // dd('hello');
         $alreadySold = MarketplaceBuyerForm::where('id', $buyerId)->update([
             'status' => $status
         ]);
diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php
index a57604a..1c3c838 100644
--- a/app/Http/Controllers/Frontend/MarketPlaceController.php
+++ b/app/Http/Controllers/Frontend/MarketPlaceController.php
@@ -73,7 +73,7 @@ class MarketPlaceController extends Controller
 
         // $marketplaceListed = [];
 
-        
+
 
 
         return [
@@ -119,45 +119,49 @@ class MarketPlaceController extends Controller
         // $status = MarketplaceBuyerForm::where(['associated_id'=>$offering['data']->id,'status'=>'Sold'])->exists() ? 'SOLD':'OPEN';
         $status = '';
         $checkBIDExist = MarketplaceBuyerForm::where('associated_id', $offering['data']->id)->where('status', 'Sold')->exists();
-        if($checkBIDExist)
-        {
+        if ($checkBIDExist) {
             $buyerData = MarketplaceBuyerForm::where('associated_id', $offering['data']->id)->where('status', 'Sold')->get();
             // dd($buyerData->toArray());
-            if(MarketplaceAlternativeInvestmentFundSeller::where('id',$buyerData[0]->associated_id)->exists())
-            {
+            if (MarketplaceAlternativeInvestmentFundSeller::where('id', $buyerData[0]->associated_id)->exists()) {
                 $totalSellUnits = 0;
-                $buyerData->each(function($data) use($totalSellUnits){
+                $buyerData->each(function ($data) use ($totalSellUnits) {
                     return $totalSellUnits += (int)$data->no_of_units_you_wish_to_buy;
                 });
-                $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id',$buyerData[0]->associated_id)->first();
+                $getAIFData = MarketplaceAlternativeInvestmentFundSeller::where('id', $buyerData[0]->associated_id)->first();
                 $aifData = (int)$getAIFData->no_of_units_you_wish_to_sell;
                 $remainUnits = $aifData - $totalSellUnits;
-                if($remainUnits <= 0)
-                {
+                if ($remainUnits <= 0) {
                     $status .= 'SOLD';
                 }
                 $status .= 'OPEN';
-            }
-            elseif(MarketplaceFractionalRealEstateSeller::where('id',$buyerData[0]->associated_id)->exists()){
+            } elseif (MarketplaceFractionalRealEstateSeller::where('id', $buyerData[0]->associated_id)->exists()) {
                 $status .= 'SOLD';
             }
-        }else{
+        } else {
             $status .= 'OPEN';
         }
         // dd($status);
         $invested = $offering['invested'];
 
-       
+
         $totalInterestedBuyers = $offering['total-interested-buyers'];
         $type = $offering['type'];
         $ownProduct = $offering['own-product'];
         $logged_in = auth()->guard('users')->check() == true ? true : false;
         // dd('offering',$offering['invested_data']);
         $investedData = $offering['invested_data'];
-        
 
-        return view('Frontend.Pages.marketplace.view-offering', compact('offering', 'type', 'invested', 
-        'totalInterestedBuyers', 'logged_in', 'ownProduct','investedData', 'status'));
+
+        return view('Frontend.Pages.marketplace.view-offering', compact(
+            'offering',
+            'type',
+            'invested',
+            'totalInterestedBuyers',
+            'logged_in',
+            'ownProduct',
+            'investedData',
+            'status'
+        ));
     }
 
     public function viewOfferingData($slug)
@@ -170,7 +174,9 @@ class MarketPlaceController extends Controller
         if (!auth()->guard('users')->check()) {
             $offering['invested'] = false;
         };
+        // $bidFor = '';
         if (MarketplaceFractionalRealEstateSeller::where('slug', $slug)->exists()) {
+            // $bidFor .= 'fractional-real-estate';
             $offering['type'] = 'fractional-real-estate';
             $marketFRE = MarketplaceFractionalRealEstateSeller::where('slug', $slug)->first();
             // if($user_id){
@@ -182,13 +188,14 @@ class MarketPlaceController extends Controller
 
             $offering['total-interested-buyers'] = $this->checkInvestmentInterested($offering['data'], 'marketplace_fre_sellers')['total-interested-buyers'];
         } elseif (MarketplaceAlternativeInvestmentFundSeller::where('slug', $slug)->exists()) {
+            // $bidFor .= 'alternative-investment-funds';
             $offering['type'] = 'alternative-investment-funds';
             $marketAIF = MarketplaceAlternativeInvestmentFundSeller::where('slug', $slug)->first();
             $offering['own-product'] = $user_id != null ? MarketplaceSellerForm::where(['id' => $marketAIF->seller_forms_id, 'users_id' => $user_id])->exists() : '';
             $offering['data'] = $marketAIF;
             $offering['invested'] = $this->checkInvestmentInterested($offering['data'], 'marketplace_aif_sellers')['interested-status'];
             $offering['invested_data'] = $this->checkInvestmentInterestedData($offering['data'], 'marketplace_aif_sellers')['interested-status-data'];
-            
+
             $offering['total-interested-buyers'] = $this->checkInvestmentInterested($offering['data'], 'marketplace_aif_sellers')['total-interested-buyers'];
         } elseif (MarketplaceOtherProductsSeller::where('slug', $slug)->exists()) {
             $offering['type'] = 'other-products';
@@ -210,7 +217,7 @@ class MarketPlaceController extends Controller
         if (auth()->guard('users')->check()) {
             $interestedStatus = MarketplaceBuyerForm::where(['users_id' => auth()->guard('users')->user()->id, 'table' => $table, 'associated_id' => $offering->id])->first();
         }
-               return ['interested-status-data' => $interestedStatus ];
+        return ['interested-status-data' => $interestedStatus];
     }
 
     public function checkInvestmentInterested($offering, $table)
@@ -229,7 +236,7 @@ class MarketPlaceController extends Controller
     public function buyerForm($slug)
     {
         $offering = $this->viewOfferingData($slug);
-        
+
         $table = $offering['type'];
         $id = $offering['data']->id;
         $userData = array();
@@ -257,26 +264,50 @@ class MarketPlaceController extends Controller
             'contact_number' => $user->contact_number ?? null,
             'email' => $user->email ?? $user->email,
         ];
-        return view('Frontend.Pages.profile.market-list.edit-buyer-form', compact('table', 'id', 'userData','investedData'));
+        return view('Frontend.Pages.profile.market-list.edit-buyer-form', compact('table', 'id', 'userData', 'investedData'));
     }
 
     public function buyerFormSubmit(Request $request)
     {
-        $validator = Validator::make($request->all(), [
-            'id' => 'required',
-            'table' => 'required',
-            'name' => 'required',
-            'city' => 'required',
-            'country' => 'required',
-            'contact_number' => 'required|numeric|digits:10',
-            'email_id' => 'required',
-            'no_of_units_you_wish_to_buy' => 'required|numeric',
-            'offer_price_per_unit' => 'required|numeric',
-        ], [
-            'required' => 'The :attribute field must be required',
-            'numeric' => 'The :attribute field must be in digits',
-            'digits' => 'The :attribute field must have 10 digits',
-        ]);
+        // dd($request->all());
+        if($request->table == 'alternative-investment-funds')
+        {
+            $validator = Validator::make($request->all(), [
+                'id' => 'required',
+                'table' => 'required',
+                'name' => 'required',
+                'city' => 'required',
+                'country' => 'required',
+                'contact_number' => 'required|numeric|digits:10',
+                'email_id' => 'required',
+                'no_of_units_you_wish_to_buy' => 'required|numeric',
+                'offer_price_per_unit' => 'required|numeric',
+            ], [
+                'required' => 'The :attribute field must be required',
+                'numeric' => 'The :attribute field must be in digits',
+                'digits' => 'The :attribute field must have 10 digits',
+            ]);
+        }else
+        {
+            $validator = Validator::make($request->all(), [
+                'id' => 'required',
+                'table' => 'required',
+                'name' => 'required',
+                'city' => 'required',
+                'country' => 'required',
+                'contact_number' => 'required|numeric|digits:10',
+                'email_id' => 'required',
+                'email_id' => 'required',
+                // 'no_of_units_you_wish_to_buy' => 'required|numeric',
+                // 'offer_price_per_unit' => 'required|numeric',
+            ], [
+                'required' => 'The :attribute field must be required',
+                'numeric' => 'The :attribute field must be in digits',
+                'digits' => 'The :attribute field must have 10 digits',
+            ]);
+
+        }
+
 
 
         $validationMessage = $this->validationError($validator);
@@ -304,8 +335,8 @@ class MarketPlaceController extends Controller
             'country' => $request->country,
             'contact_number' => $request->contact_number,
             'email_id' => $request->email_id,
-            'no_of_units_you_wish_to_buy' => $request->no_of_units_you_wish_to_buy,
-            'offer_price_per_unit' => $request->offer_price_per_unit,
+            'no_of_units_you_wish_to_buy' => $request->no_of_units_you_wish_to_buy ?? 0,
+            'offer_price_per_unit' => $request->offer_price_per_unit ?? 0,
             'total_purchase_value' => $request->total_purchase_value,
         ]);
         if ($buyerForm) {
@@ -324,23 +355,41 @@ class MarketPlaceController extends Controller
     //update form start
     public function buyerFormSubmitUpdate(Request $request)
     {
-        $validator = Validator::make($request->all(), [
-            'marketplaceBuyerFormId' => 'required',
-            'id' => 'required',
-            'table' => 'required',
-            'name' => 'required',
-            'city' => 'required',
-            'country' => 'required',
-            'contact_number' => 'required|numeric|digits:10',
-            'email_id' => 'required',
-            'no_of_units_you_wish_to_buy' => 'required|numeric',
-            'offer_price_per_unit' => 'required|numeric',
-        ], [
-            'required' => 'The :attribute field must be required',
-            'numeric' => 'The :attribute field must be in digits',
-            'digits' => 'The :attribute field must have 10 digits',
-        ]);
-
+        // dd($request->all());
+        if ($request->table == 'alternative-investment-funds')
+            $validator = Validator::make($request->all(), [
+                'marketplaceBuyerFormId' => 'required',
+                'id' => 'required',
+                'table' => 'required',
+                'name' => 'required',
+                'city' => 'required',
+                'country' => 'required',
+                'contact_number' => 'required|numeric|digits:10',
+                'email_id' => 'required',
+                'no_of_units_you_wish_to_buy' => 'required|numeric',
+                'offer_price_per_unit' => 'required|numeric',
+            ], [
+                'required' => 'The :attribute field must be required',
+                'numeric' => 'The :attribute field must be in digits',
+                'digits' => 'The :attribute field must have 10 digits',
+            ]);
+        else {
+            $validator = Validator::make($request->all(), [
+                'marketplaceBuyerFormId' => 'required',
+                'id' => 'required',
+                'table' => 'required',
+                'name' => 'required',
+                'city' => 'required',
+                'country' => 'required',
+                'contact_number' => 'required|numeric|digits:10',
+                'email_id' => 'required',
+                'total_purchase_value' => 'required',
+            ], [
+                'required' => 'The :attribute field must be required',
+                'numeric' => 'The :attribute field must be in digits',
+                'digits' => 'The :attribute field must have 10 digits',
+            ]);
+        }
 
         $validationMessage = $this->validationError($validator);
         if ($validationMessage) {
@@ -358,20 +407,23 @@ class MarketPlaceController extends Controller
             $productName = \DB::table($table)->where('id', $request->id)->value('security_name');
         }
 
-        $buyerForm = MarketplaceBuyerForm::where('id',$request->marketplaceBuyerFormId)->update([
-            'users_id' => auth()->guard('users')->user()->id,
-            'associated_id' => $request->id,
-            'table' => $table,
-            'name' => $request->name,
-            'city' => $request->city,
-            'country' => $request->country,
-            'contact_number' => $request->contact_number,
-            'email_id' => $request->email_id,
-            'no_of_units_you_wish_to_buy' => $request->no_of_units_you_wish_to_buy,
-            'offer_price_per_unit' => $request->offer_price_per_unit,
-            'total_purchase_value' => $request->total_purchase_value,
-        ]);
-        if ($buyerForm) {
+        $checkAlreadySold = MarketplaceBuyerForm::where(['id' => $request->marketplaceBuyerFormId, 'status' => 'Sold'])->doesntExist();
+        if ($checkAlreadySold) {
+            $buyerForm = MarketplaceBuyerForm::where('id', $request->marketplaceBuyerFormId)->update([
+                'users_id' => auth()->guard('users')->user()->id,
+                'associated_id' => $request->id,
+                'table' => $table,
+                'name' => $request->name,
+                'city' => $request->city,
+                'country' => $request->country,
+                'contact_number' => $request->contact_number,
+                'email_id' => $request->email_id,
+                'no_of_units_you_wish_to_buy' => $request->no_of_units_you_wish_to_buy ?? 0,
+                'offer_price_per_unit' => $request->offer_price_per_unit ?? 0,
+                'total_purchase_value' => $request->total_purchase_value,
+            ]);
+            if ($buyerForm) {
+            }
             $name = auth()->guard('users')->user()->name;
             $notify['message'] = "$name has Updated a buyer form for $productName!";
             $type = 'Buyer Form';
@@ -380,10 +432,12 @@ class MarketPlaceController extends Controller
                 $data->notify(new UserAdmin($notify, $type));
             }
             return response()->json(['status' => 200, 'message' => "Buyer Form Updated For Successfully"]);
+        } else {
+            return response()->json(['status' => 400, 'message' => "This product has been already sold to you"]);
         }
         return response()->json(['status' => 400, 'message' => "Buyer Form Could Not Be Updated!"]);
     }
-    
+
     //update formm end
     public function buyerFormAPI($slug)
     {
@@ -507,7 +561,7 @@ class MarketPlaceController extends Controller
             $productName = \DB::table($table)->where('id', $request->id)->value('security_name');
         }
 
-        $buyerForm = MarketplaceBuyerForm::where('id',$request->marketplaceBuyerFormId)->update([
+        $buyerForm = MarketplaceBuyerForm::where('id', $request->marketplaceBuyerFormId)->update([
             'users_id' => $request->user()->id,
             'associated_id' => $request->id,
             'table' => $table,
@@ -552,7 +606,6 @@ class MarketPlaceController extends Controller
             $offering['invested'] = $this->checkInvestmentInterestedAPI($offering['data'], 'marketplace_fre_sellers')['interested-status'];
             $offering['invested-data'] = $this->checkInvestmentInterestedDataAPI($offering['data'], 'marketplace_fre_sellers')['interested-status-data']; //new added
             $offering['total-interested-buyers'] = $this->checkInvestmentInterestedAPI($offering['data'], 'marketplace_fre_sellers')['total-interested-buyers'];
-
         } elseif (MarketplaceAlternativeInvestmentFundSeller::where('slug', $slug)->exists()) {
             $offering['type'] = 'alternative-investment-funds';
             $marketAIF = MarketplaceAlternativeInvestmentFundSeller::where('slug', $slug)->first();
@@ -561,9 +614,8 @@ class MarketPlaceController extends Controller
 
             $offering['invested'] = $this->checkInvestmentInterestedAPI($offering['data'], 'marketplace_aif_sellers')['interested-status'];
             $offering['invested-data'] = $this->checkInvestmentInterestedDataAPI($offering['data'], 'marketplace_aif_sellers')['interested-status-data'];
-            
+
             $offering['total-interested-buyers'] = $this->checkInvestmentInterestedAPI($offering['data'], 'marketplace_aif_sellers')['total-interested-buyers'];
-            
         } elseif (MarketplaceOtherProductsSeller::where('slug', $slug)->exists()) {
             $offering['type'] = 'other-products';
             $marketOP = MarketplaceOtherProductsSeller::where('slug', $slug)->first();
@@ -584,7 +636,7 @@ class MarketPlaceController extends Controller
         if (request()->user()) {
             $interestedStatus = MarketplaceBuyerForm::where(['users_id' => request()->user()->id, 'table' => $table, 'associated_id' => $offering->id])->first();
         }
-               return ['interested-status-data' => $interestedStatus ];
+        return ['interested-status-data' => $interestedStatus];
     }
 
     public function checkInvestmentInterestedAPI($offering, $table)
diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css
index 2a91d82..19844f5 100644
--- a/public/assets/css/FrontendCss/style.css
+++ b/public/assets/css/FrontendCss/style.css
@@ -485,7 +485,7 @@ h4.inner-title {
 .assets-card .middle-sec {
   display: flex;
   background-color: #e8c69f;
-  padding:8px 7px;
+  padding: 8px 7px;
   align-items: center;
   justify-content: space-between;
 }
@@ -4601,6 +4601,18 @@ button.swal2-confirm.btn.btn-primary.popup-button {
   background-color: #c18948 !important;
   border: none;
 }
+#exampleModalCenter button.close {
+  border: none;
+  background-color: transparent;
+  font-size: 29px;
+}
+#exampleModalCenter .modal-header.p-2 {
+  display: flex;
+  justify-content: end;
+}
+#exampleModalCenter .modal-content a.yellow-btn {
+  height: 42px;
+}
 
 /*======responsive=====*/
 
diff --git a/resources/views/Frontend/Pages/marketplace/view-offering.blade.php b/resources/views/Frontend/Pages/marketplace/view-offering.blade.php
index 5e410b4..2ec37bd 100644
--- a/resources/views/Frontend/Pages/marketplace/view-offering.blade.php
+++ b/resources/views/Frontend/Pages/marketplace/view-offering.blade.php
@@ -70,14 +70,14 @@
         aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered" role="document">
             <div class="modal-content">
-                <div class="modal-header">
+                <div class="modal-header p-2">
                     {{-- <h5 class="modal-title" id="exampleModalLongTitle">Modal title</h5> --}}
                     <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">Please Login To Show Interest.</h4>
+                    <h5 class="text-center">Please Login To Show Interest.</h5>
                 </div>
                 <div class="modal-footer">
                     {{-- <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> --}}
diff --git a/resources/views/Frontend/Pages/profile/market-list/buyer-form.blade.php b/resources/views/Frontend/Pages/profile/market-list/buyer-form.blade.php
index 0176613..e5bf09a 100644
--- a/resources/views/Frontend/Pages/profile/market-list/buyer-form.blade.php
+++ b/resources/views/Frontend/Pages/profile/market-list/buyer-form.blade.php
@@ -33,7 +33,8 @@
 </div>
 <div class="form">
     <div class="container">
-        <form id="marketplace-buyer-form" method="POST">
+        @if($table == 'alternative-investment-funds')
+        <form id="marketplace-buyer-form-for-aif" method="POST">
             @csrf
             <input type="hidden" id="id" name="id" value="{{$id}}">
             <input type="hidden" id="table" name="table" value="{{$table}}">
@@ -88,6 +89,63 @@
                 </div>
             </div>
         </form>
+        @else
+        <form id="marketplace-buyer-form-for-fre" method="POST">
+            @csrf
+            <input type="hidden" id="id" name="id" value="{{$id}}">
+            <input type="hidden" id="table" name="table" value="{{$table}}">
+            <div class="row">
+                <div class="form-group col-md-6">
+                    <label>Name</label>
+                    <input type="text" name="name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" value="{{$userData->name}}">
+                </div>
+                <div class="form-group col-md-6">
+                    <label>City</label>
+                    <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="city">
+                </div>
+                <div class="form-group col-md-6">
+                    <label>Country</label>
+                    <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="country">
+                </div>
+                <div class="form-group col-md-6">
+                    <label>Contact Number</label>
+                    <input type="text" name="contact_number" minlength="10" maxlength="10" onkeydown="return /^[0-9]{9}+$/i.test(event.key)" value="{{$userData->contact_number}}">
+                </div>
+                <div class="form-group col-md-6">
+                    <label>Email</label>
+                    <input type="email" name="email_id" id="email_id" value="{{$userData->email}}">
+                </div>
+                {{-- <div class="form-group col-md-6">
+                    <label>No. Of Units You Wish To Buy</label>
+                    <input type="number" name="no_of_units_you_wish_to_buy" id="no_of_units_you_wish_to_buy" placeholder="Eg: 500">
+                </div>
+                <div class="form-group col-md-6">
+                    <label>Offer Price per Unit</label>
+                    <input type="number" name="offer_price_per_unit" id="offer_price_per_unit" placeholder="Eg: 500">
+                </div> --}}
+                <div class="form-group col-md-6">
+                    <label>Total Purchase Value</label>
+                    <input type="number" name="total_purchase_value">
+                </div>
+                <div class="form-check">
+                    <h4>Declaration</h4>
+                    <input class="form-check-input" type="checkbox" id="checkbox-1" name="declaration" />
+                    <label class="form-check-label" for="checkbox-1">I hereby declare that the details furnished above are true and correct to the best of my knowledge and belief and I undertake to inform you of any changes therein, immediately. In case any of the above information is found to be false or untrue or misleading or misrepresenting, I am aware that I may be held liable for it.</label>
+                </div>
+                <div class="form-group col-md-12">
+                    <div class="bg-warning text-center">
+                        Need Help? <br>
+                        If you are experiencing any difficulties filling out the required information, we are here to help. Please reach out to us at info@freeu.in
+                    </div>
+                </div>
+                <div class="text-center form-group col-md-12">
+                    <button type="submit" id="submit-btn" class="blue-btn text-center">Submit</button>
+                    <button type="submit" id="loaderBtn" class="blue-btn d-none text-center"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                        Loading...</button>
+                </div>
+            </div>
+        </form>
+        @endif
     </div>
 </div>
 </div>
@@ -98,10 +156,11 @@
 
 
 
-        $.validator.addMethod("ValidEmail",function(value){
-            return /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(value);
-        },"Please enter valid email");
-    $("#marketplace-buyer-form").validate({
+    $.validator.addMethod("ValidEmail",function(value){
+        return /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(value);
+    },"Please enter valid email");
+
+    $("#marketplace-buyer-form-for-aif").validate({
         // jQuery.validator.addMethod('isEmailValid',function(value){
         //     return /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/.test(value);
         // },"Invalid email. Please enter a valid email address.");
@@ -187,54 +246,142 @@
             });
         },
     });
+    $("#marketplace-buyer-form-for-fre").validate({
+        // jQuery.validator.addMethod('isEmailValid',function(value){
+        //     return /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/.test(value);
+        // },"Invalid email. Please enter a valid email address.");
+        ignore: [],
+        debug: false,
+        rules: {
+            name: "required",
+            city: "required",
+            country: "required",
+            contact_number: {
+                required: true,
+                digits: true,
+                minlength: 10,
+                maxlength: 10,
+            },
+             email_id: {
+              required: true,
+              email: true,
+              ValidEmail: true,
+            //   isEmailValid:true,
+            },
+            // no_of_units_you_wish_to_buy: {
+            //     required: true,
+            //     digits: true
+            // },
+            // offer_price_per_unit: {
+            //     required: true,
+            //     digits: true
+            // },
+            declaration: "required",
+            total_purchase_value: "required",
+        },
+        messages: {
+            name: 'Please enter your name',
+            city: 'Please enter your city',
+            country: 'Please enter your country',
+            contact_number: {
+                required: 'Please enter your contact number',
+                digits: 'Please enter digits',
+                minlength: 'Contact Number should be 10 digits',
+                maxlength: 'Contact Number should be 10 digits',
+            },
+            email_id: {
+            required: " Please enter a valid email",
+            ValidEmail:"invalid email",
+            email: " invalid email",
+             },
+            // no_of_units_you_wish_to_buy: {
+            //     required: 'Please enter no. of units you wish to buy',
+            //     digits: 'Please enter digits'
+            // },
+            // offer_price_per_unit: {
+            //     required: 'Please enter offer price per unit',
+            //     digits: 'Please enter digits'
+            // },
+            declaration: 'Please check declaration',
+            total_purchase_value: 'Please enter purchase value'
+        },
+        submitHandler: function(form) {
+            var formData = new FormData(form);
+            $.ajax({
+                url: "{{route('marketplace-buyer-form')}}",
+                type: "POST",
+                data: formData,
+                beforeSend: function() {
+                    $('#loaderBtn').removeClass('d-none');
+                    $('#submit-btn').addClass('d-none');
+                },
+                processData: false,
+                contentType: false,
+                dataType: "json",
+                success: function(result) {
+                    if (result.status == 200) {
+                        toastr.success(result.message);
+                        setTimeout(function (){
+                            window.location.href = '{{route("market_place")}}';
+                        },5000);
+                    }
+                    if (result.status == 400) {
+                        $('#submit-btn').removeClass('d-none');
+                        $('#loaderBtn').addClass('d-none');
+                        toastr.warning(result.message);
+                    }
+                },
+            });
+        },
+    });
     
-$(document).ready(function(){
-        var unit = 0;
-        var price = 0;
-        $('#no_of_units_you_wish_to_buy').keyup(function() {
-            unit = 0 * 1;
-            var no_of_units = $('#no_of_units_you_wish_to_buy').val();
-            unit = unit + no_of_units;
-            totalValue(unit,price);
-        });
+    $(document).ready(function(){
+            var unit = 0;
+            var price = 0;
+            $('#no_of_units_you_wish_to_buy').keyup(function() {
+                unit = 0 * 1;
+                var no_of_units = $('#no_of_units_you_wish_to_buy').val();
+                unit = unit + no_of_units;
+                totalValue(unit,price);
+            });
+            
+            // taking price 
+            $('#offer_price_per_unit').keyup(function() {
+                price = 0 * 1;
+                var price_per_units = $('#offer_price_per_unit').val();
+                price = price + price_per_units;
+                totalValue(unit,price);
+            });
+                
+                // alert(unit * price);
+                // var total = unit * price;
+                // $('#total_purchase_value').val(total);
+                // totalPrice();
+                
+                // if (no_of_units != "") {
+                //     if ($('#offer_price_per_unit').val() != "") {
+                //         var total_price = no_of_units * $('#offer_price_per_unit').val();
+                //         $('#total_purchase_value').val(total_price);
+                //     }
+                // }
         
-        // taking price 
-        $('#offer_price_per_unit').keyup(function() {
-            price = 0 * 1;
-            var price_per_units = $('#offer_price_per_unit').val();
-            price = price + price_per_units;
-            totalValue(unit,price);
-        });
-            
-            // alert(unit * price);
-            // var total = unit * price;
-            // $('#total_purchase_value').val(total);
-            // totalPrice();
-            
-            // if (no_of_units != "") {
-            //     if ($('#offer_price_per_unit').val() != "") {
-            //         var total_price = no_of_units * $('#offer_price_per_unit').val();
-            //         $('#total_purchase_value').val(total_price);
-            //     }
-            // }
-    
-            // $('#offer_price_per_unit').keyup(function() {
-            //     var price_per_units = $('#offer_price_per_unit').val();
-    
-            //     if (no_of_units != "") {
-            //         if (price_per_units != "") {
-            //             var total_price = no_of_units * price_per_units;
-            //             $('#total_purchase_value').val(total_price);
-            //         }
-            //     }
+                // $('#offer_price_per_unit').keyup(function() {
+                //     var price_per_units = $('#offer_price_per_unit').val();
+        
+                //     if (no_of_units != "") {
+                //         if (price_per_units != "") {
+                //             var total_price = no_of_units * price_per_units;
+                //             $('#total_purchase_value').val(total_price);
+                //         }
+                //     }
+                // });
             // });
-        // });
-});
+    });
 
-function totalValue(unit,price){
-    total = unit * price ;
-    $('#total_purchase_value').val(total);
-}
+    function totalValue(unit,price){
+        total = unit * price ;
+        $('#total_purchase_value').val(total);
+    }
 
 </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php b/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php
index c86d54b..b8b7ccb 100644
--- a/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php
+++ b/resources/views/Frontend/Pages/profile/market-list/edit-buyer-form.blade.php
@@ -1,7 +1,7 @@
 @extends('Frontend.layouts.master')
 @section('content')
-<div class="market-list">
-{{-- <div class="banner right-ivestment">
+    <div class="market-list">
+        {{-- <div class="banner right-ivestment">
     <div class="container row">
         <div class="col-md-6 content" data-aos="fade-right">
             <h1 class="invest-header si-hd">EDIT your investment's <br>today!</h1>
@@ -16,220 +16,398 @@
         </div>
     </div>
 </div> --}}
-<div class="banner right-ivestment">
-    <div class="container row">
-        <div class="content" data-aos="fade-right">
-            <h1 class="invest-header si-hd text-center">Edit your investment's today!</h1>
-            <ul class="si-hd_p p-0 d-flex justify-content-between">
-                <li>Verified Buyers</li>
-                <li>Expert Verification</li>
-                <li>Sell From Your Home</li>
-            </ul>
+        <div class="banner right-ivestment">
+            <div class="container row">
+                <div class="content" data-aos="fade-right">
+                    <h1 class="invest-header si-hd text-center">Edit your investment's today!</h1>
+                    <ul class="si-hd_p p-0 d-flex justify-content-between">
+                        <li>Verified Buyers</li>
+                        <li>Expert Verification</li>
+                        <li>Sell From Your Home</li>
+                    </ul>
+                </div>
+                <div class="col-md-6 bgn-image" data-aos="fade-left">
+                    {{-- <img src="/public/assets/media/FrontendImages/r-invest.png"> --}}
+                </div>
+            </div>
         </div>
-        <div class="col-md-6 bgn-image" data-aos="fade-left">
-            {{-- <img src="/public/assets/media/FrontendImages/r-invest.png"> --}}
-        </div>
-    </div>
-</div>
 
-<div class="form">
-    <div class="container">
-        <form id="marketplace-buyer-form-update" method="POST">
-            @csrf
-            
-            <input type="hidden" id="marketplaceBuyerFormId" name="marketplaceBuyerFormId" value="{{$investedData->id}}">
-            <input type="hidden" id="id" name="id" value="{{$id}}">
-            <input type="hidden" id="table" name="table" value="{{$table}}">
-            <div class="row">
-                <div class="form-group col-md-6">
-                    <label>Name</label>
-                    <input type="text" name="name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" value="{{$investedData->name}}">
-                </div>
-                <div class="form-group col-md-6">
-                    <label>City</label>
-                    <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="city" value="{{$investedData->city}}">
-                </div>
-                <div class="form-group col-md-6">
-                    <label>Country</label>
-                    <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="country" value="{{$investedData->country}}">
-                </div>
-                <div class="form-group col-md-6">
-                    <label>Contact Number</label>
-                    <input type="text" name="contact_number" minlength="10" maxlength="10" 
-                    onkeydown="return /^[0-9]{9}+$/i.test(event.key)" value="{{$investedData->contact_number}}" >
-                </div>
-                <div class="form-group col-md-6">
-                    <label>Email</label>
-                    <input type="email" name="email_id" id="email_id" value="{{$investedData->email_id}}" >
-                </div>
-                <div class="form-group col-md-6">
+        <div class="form">
+            <div class="container">
+                @if ($table == 'alternative-investment-funds')
+                    {{-- @if ($table == 'fractional') --}}
+                    <form id="marketplace-buyer-form-update-for-aif" method="POST">
+                        @csrf
+
+                        <input type="hidden" id="marketplaceBuyerFormId" name="marketplaceBuyerFormId"
+                            value="{{ $investedData->id }}">
+                        <input type="hidden" id="id" name="id" value="{{ $id }}">
+                        <input type="hidden" id="table" name="table" value="{{ $table }}">
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label>Name</label>
+                                <input type="text" name="name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)"
+                                    value="{{ $investedData->name }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>City</label>
+                                <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="city"
+                                    value="{{ $investedData->city }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Country</label>
+                                <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="country"
+                                    value="{{ $investedData->country }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Contact Number</label>
+                                <input type="text" name="contact_number" minlength="10" maxlength="10"
+                                    onkeydown="return /^[0-9]{9}+$/i.test(event.key)"
+                                    value="{{ $investedData->contact_number }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Email</label>
+                                <input type="email" name="email_id" id="email_id" value="{{ $investedData->email_id }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>No. Of Units You Wish To Buy</label>
+                                <input type="number" name="no_of_units_you_wish_to_buy" id="no_of_units_you_wish_to_buy"
+                                    placeholder="Eg: 500" value="{{ $investedData->no_of_units_you_wish_to_buy }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Offer Price per Unit</label>
+                                <input type="number" name="offer_price_per_unit" id="offer_price_per_unit"
+                                    placeholder="Eg: 500"
+                                    value="{{ preg_replace('/[^0-9]/', '', $investedData->offer_price_per_unit) }}">
+                                {{-- {{preg_replace('/[^0-9]/', '', $investedData->offer_price_per_unit)}} --}}
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Total Purchase Value</label>
+                                <input type="number" name="total_purchase_value" id="total_purchase_value" readonly
+                                    value="{{ preg_replace('/[^0-9]/', '', $investedData->total_purchase_value) }}">
+                            </div>
+
+                            <div class="form-check">
+                                <h4>Declaration</h4>
+                                <input class="form-check-input" type="checkbox" id="checkbox-1" name="declaration" />
+                                <label class="form-check-label" for="checkbox-1">I hereby declare that the details furnished
+                                    above are true and correct to the best of my knowledge and belief and I undertake to
+                                    inform you of any changes therein, immediately. In case any of the above information is
+                                    found to be false or untrue or misleading or misrepresenting, I am aware that I may be
+                                    held liable for it.</label>
+                            </div>
+                            <div class="form-group col-md-12">
+                                <div class="bg-warning text-center">
+                                    Need Help? <br>
+                                    If you are experiencing any difficulties filling out the required information, we are
+                                    here to help. Please reach out to us at info@freeu.in
+                                </div>
+                            </div>
+                            <div class="text-center form-group col-md-12">
+                                <button type="submit" id="submit-btn" class="blue-btn text-center">Update Your Bid</button>
+                                <button type="submit" id="loaderBtn" class="blue-btn d-none text-center"><span
+                                        class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                                    Loading...</button>
+                            </div>
+                        </div>
+                    </form>
+                @else
+                    <form id="marketplace-buyer-form-update-for-fre" method="POST">
+                        @csrf
+
+                        <input type="hidden" id="marketplaceBuyerFormId" name="marketplaceBuyerFormId"
+                            value="{{ $investedData->id }}">
+                        <input type="hidden" id="id" name="id" value="{{ $id }}">
+                        <input type="hidden" id="table" name="table" value="{{ $table }}">
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label>Name</label>
+                                <input type="text" name="name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)"
+                                    value="{{ $investedData->name }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>City</label>
+                                <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="city"
+                                    value="{{ $investedData->city }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Country</label>
+                                <input type="text" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="country"
+                                    value="{{ $investedData->country }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Contact Number</label>
+                                <input type="text" name="contact_number" minlength="10" maxlength="10"
+                                    onkeydown="return /^[0-9]{9}+$/i.test(event.key)"
+                                    value="{{ $investedData->contact_number }}">
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label>Email</label>
+                                <input type="email" name="email_id" id="email_id"
+                                    value="{{ $investedData->email_id }}">
+                            </div>
+                            {{-- <div class="form-group col-md-6">
                     <label>No. Of Units You Wish To Buy</label>
                     <input type="number" name="no_of_units_you_wish_to_buy" id="no_of_units_you_wish_to_buy" placeholder="Eg: 500" value="{{$investedData->no_of_units_you_wish_to_buy}}">
                 </div>
                 <div class="form-group col-md-6">
                     <label>Offer Price per Unit</label>
                     <input type="number" name="offer_price_per_unit" id="offer_price_per_unit" placeholder="Eg: 500" value="{{preg_replace('/[^0-9]/', '', $investedData->offer_price_per_unit)}}">
-                    {{-- {{preg_replace('/[^0-9]/', '', $investedData->offer_price_per_unit)}} --}}
-                </div>
-                <div class="form-group col-md-6">
-                    <label>Total Purchase Value</label>
-                    <input type="number" name="total_purchase_value" id="total_purchase_value" readonly value="{{preg_replace('/[^0-9]/', '', $investedData->total_purchase_value)}}">
-                </div>
-               
-                <div class="form-check">
-                    <h4>Declaration</h4>
-                    <input class="form-check-input" type="checkbox" id="checkbox-1" name="declaration" />
-                    <label class="form-check-label" for="checkbox-1">I hereby declare that the details furnished above are true and correct to the best of my knowledge and belief and I undertake to inform you of any changes therein, immediately. In case any of the above information is found to be false or untrue or misleading or misrepresenting, I am aware that I may be held liable for it.</label>
-                </div>
-                <div class="form-group col-md-12">
-                    <div class="bg-warning text-center">
-                        Need Help? <br>
-                        If you are experiencing any difficulties filling out the required information, we are here to help. Please reach out to us at info@freeu.in
-                    </div>
-                </div>
-                <div class="text-center form-group col-md-12">
-                    <button type="submit" id="submit-btn" class="blue-btn text-center">Update Your Bid</button>
-                    <button type="submit" id="loaderBtn" class="blue-btn d-none text-center"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-                        Loading...</button>
-                </div>
+                </div> --}}
+                            <div class="form-group col-md-6">
+                                <label>Total Purchase Value</label>
+                                <input type="number" name="total_purchase_value"
+                                    value="{{ preg_replace('/[^0-9]/', '', $investedData->total_purchase_value) }}">
+                            </div>
+
+                            <div class="form-check">
+                                <h4>Declaration</h4>
+                                <input class="form-check-input" type="checkbox" id="checkbox-1" name="declaration" />
+                                <label class="form-check-label" for="checkbox-1">I hereby declare that the details
+                                    furnished above are true and correct to the best of my knowledge and belief and I
+                                    undertake to inform you of any changes therein, immediately. In case any of the above
+                                    information is found to be false or untrue or misleading or misrepresenting, I am aware
+                                    that I may be held liable for it.</label>
+                            </div>
+                            <div class="form-group col-md-12">
+                                <div class="bg-warning text-center">
+                                    Need Help? <br>
+                                    If you are experiencing any difficulties filling out the required information, we are
+                                    here to help. Please reach out to us at info@freeu.in
+                                </div>
+                            </div>
+                            <div class="text-center form-group col-md-12">
+                                <button type="submit" id="submit-btn" class="blue-btn text-center">Update Your
+                                    Bid</button>
+                                <button type="submit" id="loaderBtn" class="blue-btn d-none text-center"><span
+                                        class="spinner-border spinner-border-sm" role="status"
+                                        aria-hidden="true"></span>
+                                    Loading...</button>
+                            </div>
+                        </div>
+                    </form>
+                @endif
             </div>
-        </form>
+        </div>
     </div>
-</div>
-</div>
 @endsection
 
 @section('scripts')
-<script>
-
-
-
-        $.validator.addMethod("ValidEmail",function(value){
+    <script>
+        $.validator.addMethod("ValidEmail", function(value) {
             return /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(value);
-        },"Please enter valid email");
-    $("#marketplace-buyer-form-update").validate({
-        // jQuery.validator.addMethod('isEmailValid',function(value){
-        //     return /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/.test(value);
-        // },"Invalid email. Please enter a valid email address.");
-        ignore: [],
-        debug: false,
-        rules: {
-            name: "required",
-            city: "required",
-            country: "required",
-            contact_number: {
-                required: true,
-                digits: true,
-                minlength: 10,
-                maxlength: 10,
-            },
-             email_id: {
-              required: true,
-              email: true,
-              ValidEmail: true,
-            //   isEmailValid:true,
-            },
-            no_of_units_you_wish_to_buy: {
-                required: true,
-                digits: true
-            },
-            offer_price_per_unit: {
-                required: true,
-                digits: true
-            },
-            declaration: "required",
-        },
-        messages: {
-            name: 'Please enter your name',
-            city: 'Please enter your city',
-            country: 'Please enter your country',
-            contact_number: {
-                required: 'Please enter your contact number',
-                digits: 'Please enter digits',
-                minlength: 'Contact Number should be 10 digits',
-                maxlength: 'Contact Number should be 10 digits',
-            },
-            email_id: {
-            required: " Please enter a valid email",
-            ValidEmail:"invalid email",
-            email: " invalid email"
-             },
-            no_of_units_you_wish_to_buy: {
-                required: 'Please enter no. of units you wish to buy',
-                digits: 'Please enter digits'
-            },
-            offer_price_per_unit: {
-                required: 'Please enter offer price per unit',
-                digits: 'Please enter digits'
-            },
-            declaration: 'Please check declaration'
-        },
-        submitHandler: function(form) {
-            var formData = new FormData(form);
-            $.ajax({
-                url: "{{route('marketplace-buyer-form-update')}}",
-                type: "POST",
-                data: formData,
-                beforeSend: function() {
-                    $('#loaderBtn').removeClass('d-none');
-                    $('#submit-btn').addClass('d-none');
+        }, "Please enter valid email");
+
+        $("#marketplace-buyer-form-update-for-aif").validate({
+            // jQuery.validator.addMethod('isEmailValid',function(value){
+            //     return /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/.test(value);
+            // },"Invalid email. Please enter a valid email address.");
+            ignore: [],
+            debug: false,
+            rules: {
+                name: "required",
+                city: "required",
+                country: "required",
+                contact_number: {
+                    required: true,
+                    digits: true,
+                    minlength: 10,
+                    maxlength: 10,
                 },
-                processData: false,
-                contentType: false,
-                dataType: "json",
-                success: function(result) {
-                    if (result.status == 200) {
-                        toastr.success(result.message);
-                        setTimeout(function (){
-                            window.location.href = '{{route("market_place")}}';
-                        },5000);
-                    }
-                    if (result.status == 400) {
-                        $('#submit-btn').removeClass('d-none');
-                        $('#loaderBtn').addClass('d-none');
-                        toastr.warning(result.message);
-                    }
+                email_id: {
+                    required: true,
+                    email: true,
+                    ValidEmail: true,
+                    //   isEmailValid:true,
                 },
+                no_of_units_you_wish_to_buy: {
+                    required: true,
+                    digits: true
+                },
+                offer_price_per_unit: {
+                    required: true,
+                    digits: true
+                },
+                declaration: "required",
+            },
+            messages: {
+                name: 'Please enter your name',
+                city: 'Please enter your city',
+                country: 'Please enter your country',
+                contact_number: {
+                    required: 'Please enter your contact number',
+                    digits: 'Please enter digits',
+                    minlength: 'Contact Number should be 10 digits',
+                    maxlength: 'Contact Number should be 10 digits',
+                },
+                email_id: {
+                    required: " Please enter a valid email",
+                    ValidEmail: "invalid email",
+                    email: " invalid email"
+                },
+                no_of_units_you_wish_to_buy: {
+                    required: 'Please enter no. of units you wish to buy',
+                    digits: 'Please enter digits'
+                },
+                offer_price_per_unit: {
+                    required: 'Please enter offer price per unit',
+                    digits: 'Please enter digits'
+                },
+                declaration: 'Please check declaration'
+            },
+            submitHandler: function(form) {
+                var formData = new FormData(form);
+                $.ajax({
+                    url: "{{ route('marketplace-buyer-form-update') }}",
+                    type: "POST",
+                    data: formData,
+                    beforeSend: function() {
+                        $('#loaderBtn').removeClass('d-none');
+                        $('#submit-btn').addClass('d-none');
+                    },
+                    processData: false,
+                    contentType: false,
+                    dataType: "json",
+                    success: function(result) {
+                        if (result.status == 200) {
+                            toastr.success(result.message);
+                            setTimeout(function() {
+                                window.location.href = '{{ route('market_place') }}';
+                            }, 5000);
+                        }
+                        if (result.status == 400) {
+                            $('#submit-btn').removeClass('d-none');
+                            $('#loaderBtn').addClass('d-none');
+                            toastr.warning(result.message);
+                        }
+                    },
+                });
+            },
+        });
+
+        $("#marketplace-buyer-form-update-for-fre").validate({
+            // jQuery.validator.addMethod('isEmailValid',function(value){
+            //     return /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/.test(value);
+            // },"Invalid email. Please enter a valid email address.");
+            ignore: [],
+            debug: false,
+            rules: {
+                name: "required",
+                city: "required",
+                country: "required",
+                contact_number: {
+                    required: true,
+                    digits: true,
+                    minlength: 10,
+                    maxlength: 10,
+                },
+                email_id: {
+                    required: true,
+                    email: true,
+                    ValidEmail: true,
+                    //   isEmailValid:true,
+                },
+                // no_of_units_you_wish_to_buy: {
+                //     required: true,
+                //     digits: true
+                // },
+                // offer_price_per_unit: {
+                //     required: true,
+                //     digits: true
+                // },
+                declaration: "required",
+            },
+            messages: {
+                name: 'Please enter your name',
+                city: 'Please enter your city',
+                country: 'Please enter your country',
+                contact_number: {
+                    required: 'Please enter your contact number',
+                    digits: 'Please enter digits',
+                    minlength: 'Contact Number should be 10 digits',
+                    maxlength: 'Contact Number should be 10 digits',
+                },
+                email_id: {
+                    required: " Please enter a valid email",
+                    ValidEmail: "invalid email",
+                    email: " invalid email"
+                },
+                // no_of_units_you_wish_to_buy: {
+                //     required: 'Please enter no. of units you wish to buy',
+                //     digits: 'Please enter digits'
+                // },
+                // offer_price_per_unit: {
+                //     required: 'Please enter offer price per unit',
+                //     digits: 'Please enter digits'
+                // },
+                declaration: 'Please check declaration'
+            },
+            submitHandler: function(form) {
+                var formData = new FormData(form);
+                $.ajax({
+                    url: "{{ route('marketplace-buyer-form-update') }}",
+                    type: "POST",
+                    data: formData,
+                    beforeSend: function() {
+                        $('#loaderBtn').removeClass('d-none');
+                        $('#submit-btn').addClass('d-none');
+                    },
+                    processData: false,
+                    contentType: false,
+                    dataType: "json",
+                    success: function(result) {
+                        if (result.status == 200) {
+                            toastr.success(result.message);
+                            setTimeout(function() {
+                                window.location.href = '{{ route('market_place') }}';
+                            }, 5000);
+                        }
+                        if (result.status == 400) {
+                            $('#submit-btn').removeClass('d-none');
+                            $('#loaderBtn').addClass('d-none');
+                            toastr.warning(result.message);
+                        }
+                    },
+                });
+            },
+        });
+
+        $(document).ready(function() {
+            //the below code is updated by hririk on 5-4-24
+            var unit = $('#no_of_units_you_wish_to_buy').val();
+            var price = $('#offer_price_per_unit').val();
+            $('#no_of_units_you_wish_to_buy').keyup(function() {
+                unit = 0 * 1;
+                var no_of_units = $('#no_of_units_you_wish_to_buy').val();
+                unit = unit + no_of_units;
+                totalValue(unit, price);
             });
-        },
-    });
-    
-$(document).ready(function(){
-    //the below code is updated by hririk on 5-4-24
-        var unit = $('#no_of_units_you_wish_to_buy').val();
-        var price = $('#offer_price_per_unit').val();
-        $('#no_of_units_you_wish_to_buy').keyup(function() {
-            unit = 0 * 1;
-            var no_of_units = $('#no_of_units_you_wish_to_buy').val();
-            unit = unit + no_of_units;
-            totalValue(unit,price);
-        });
-        
-        // taking price 
-        $('#offer_price_per_unit').keyup(function() {
-            price = 0 * 1;
-            var price_per_units = $('#offer_price_per_unit').val();
-            console.log("ss",price_per_units);
-            price = price + price_per_units;
-            console.log(unit,price);
-            totalValue(unit,price);
-        });
-            
+
+            // taking price 
+            $('#offer_price_per_unit').keyup(function() {
+                price = 0 * 1;
+                var price_per_units = $('#offer_price_per_unit').val();
+                console.log("ss", price_per_units);
+                price = price + price_per_units;
+                console.log(unit, price);
+                totalValue(unit, price);
+            });
+
             // alert(unit * price);
             // var total = unit * price;
             // $('#total_purchase_value').val(total);
             // totalPrice();
-            
+
             // if (no_of_units != "") {
             //     if ($('#offer_price_per_unit').val() != "") {
             //         var total_price = no_of_units * $('#offer_price_per_unit').val();
             //         $('#total_purchase_value').val(total_price);
             //     }
             // }
-    
+
             // $('#offer_price_per_unit').keyup(function() {
             //     var price_per_units = $('#offer_price_per_unit').val();
-    
+
             //     if (no_of_units != "") {
             //         if (price_per_units != "") {
             //             var total_price = no_of_units * price_per_units;
@@ -237,13 +415,12 @@ $(document).ready(function(){
             //         }
             //     }
             // });
-        // });
-});
+            // });
+        });
 
-function totalValue(unit,price){
-    total = unit * price ;
-    $('#total_purchase_value').val(total);
-}
-
-</script>
-@endsection
\ No newline at end of file
+        function totalValue(unit, price) {
+            total = unit * price;
+            $('#total_purchase_value').val(total);
+        }
+    </script>
+@endsection

From f2adb3c2ec675273e6252aa6127cda4105563d03 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Tue, 7 May 2024 17:26:06 +0530
Subject: [PATCH 11/16] fixing fractional bid issue

---
 .../Controllers/Admin/OverviewController.php  | 11 ++++++---
 .../MarketplaceFractionalRealEstateSeller.php | 23 ++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php
index 1e1fa27..1d5d6cd 100644
--- a/app/Http/Controllers/Admin/OverviewController.php
+++ b/app/Http/Controllers/Admin/OverviewController.php
@@ -233,17 +233,22 @@ class OverviewController extends Controller
                 $getFREData = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->first();
                 $freValue = (int)$getFREData->current_market_value_of_the_property;
                 $nowValue = $freValue - $getBuyingPurchaseValue;
-                // $nowValue = -10;
-                // dd($freValue,' - ',$getBuyingPurchaseValue,' = ',$nowValue);
-                // dd($nowValue < 0 ? 'negative '.$nowValue : 'positive '.$nowValue);
+
+                $percentage = ($freValue - $getBuyingPurchaseValue) / $freValue * 100;
+
+                $expectedSellingPrice = (int)$getFREData->expected_selling_price;
+                $updateExpectedSellingPrice = $expectedSellingPrice * ($percentage / 100);
+                // dd($percentage,$updateExpectedSellingPrice);
                 if($nowValue <= 0)
                 {
                     $updatePrice = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->update([
                         'current_market_value_of_the_property' => 0,
+                        'expected_selling_price' => 0,
                 ]);
                 }else if($nowValue > 0){
                     $updatePrice = MarketplaceFractionalRealEstateSeller::where('id',$marketPlaceId)->update([
                         'current_market_value_of_the_property' => $nowValue,
+                        'expected_selling_price' => $updateExpectedSellingPrice,
                 ]);
                 }
                 // else{
diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php
index 28ac5ae..029ba39 100644
--- a/app/Models/MarketplaceFractionalRealEstateSeller.php
+++ b/app/Models/MarketplaceFractionalRealEstateSeller.php
@@ -61,18 +61,19 @@ 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())
+        // return MarketplaceBuyerForm::where('associated_id', $id)->where('status', 'Sold')->exists() ? 'SOLD' : 'OPEN';
+        // dd($id);
+        // $buyerData = MarketplaceBuyerForm::where('associated_id', $this->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',$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)
+            $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)
             {
                 return 'SOLD';
             }

From 27f6d8f7c0fa4b8f38a1756b7bf5bc4245316bd1 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Tue, 7 May 2024 18:52:18 +0530
Subject: [PATCH 12/16] fixing fractional bid issue

---
 app/Http/Controllers/Frontend/MarketPlaceController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php
index e9a2685..fd4348c 100644
--- a/app/Http/Controllers/Frontend/MarketPlaceController.php
+++ b/app/Http/Controllers/Frontend/MarketPlaceController.php
@@ -137,7 +137,12 @@ class MarketPlaceController extends Controller
                 }
                 $status .= 'OPEN';
             } elseif (MarketplaceFractionalRealEstateSeller::where('id', $buyerData[0]->associated_id)->exists()) {
-                $status .= 'SOLD';
+                $freData = MarketplaceFractionalRealEstateSeller::where('id', $buyerData[0]->associated_id)->first();
+                if($freData->current_market_value_of_the_property < 0)
+                {
+                    $status .= 'SOLD';
+                }
+                $status .= 'OPEN';
             }
         } else {
             $status .= 'OPEN';

From 478ef3ef7fcb49af3b18f1510ee56edea66a302b Mon Sep 17 00:00:00 2001
From: meghamalore <maloremegha123@gmail.com>
Date: Tue, 7 May 2024 19:13:44 +0530
Subject: [PATCH 13/16] new commit for general dashboard

---
 .../views/Admin/general-dashboard.blade.php   | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/resources/views/Admin/general-dashboard.blade.php b/resources/views/Admin/general-dashboard.blade.php
index a89262d..84d3fe6 100644
--- a/resources/views/Admin/general-dashboard.blade.php
+++ b/resources/views/Admin/general-dashboard.blade.php
@@ -150,20 +150,20 @@
                             <div class="m-0">
                                 <div class="d-flex flex-column mb-2">
                                     <span class="fs-2 fw-bold text-gray-800 me-2 lh-1 ls-n2" id="total-gross-commission-sum"> ₹ 0.0</span>
-                                    <span class="fs-7 text-black-400">Net Received</span>
+                                    <span class="fs-7 text-black-400">Gross Received</span>
                                 </div>
                             </div>
                             <div class="m-0">
                                 <div class="d-flex flex-column mb-2">
                                     <span class="fs-2 fw-bold text-gray-800 me-2 lh-1 ls-n2"  id="total-net-commission-sum" > ₹ 0.0</span>
-                                    <span class="fs-7 text-black-400">Gross Earn</span>
+                                    <span class="fs-7 text-black-400">Net Earn</span>
                                 </div>
                             </div>
                             <div class="chart d-flex">
                                 <div class="m-0">
                                     <div class="d-flex flex-column mb-2">
                                         <span class="fs-7 text-black-400">From</span>
-                                        <span class=""><input type="date" name="from" id="from-date"></span>
+                                        <span class=""><input type="date" name="from" id="from-date" ></span>
                                     </div>
                                 </div>
                                 <div class="m-0">
@@ -262,5 +262,21 @@
             },
         });
     }
+
+    
 </script>
+<script>
+    // Get today's date
+    var today = new Date();
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0'); // January is 0!
+    var yyyy = today.getFullYear();
+
+    today = yyyy + '-' + mm + '-' + dd;
+
+    // Set max attribute for both inputs to prevent selecting future dates
+    document.getElementById("from-date").setAttribute("max", today);
+    document.getElementById("to-date").setAttribute("max", today);
+</script>
+
 @endsection
\ No newline at end of file

From f730e38dca68841a0da388e774e43170c30af8ca Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 8 May 2024 12:29:02 +0530
Subject: [PATCH 14/16] fixing description issue

---
 app/Models/Product.php                                        | 2 +-
 .../Admin/Pages/pre_owned_investment/transactions.blade.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/Product.php b/app/Models/Product.php
index 8fcaadd..e5cf31a 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -18,7 +18,7 @@ class Product extends Model
 
     protected $hidden = ['tables_id', 'total_views', 'created_by', 'modified_by', 'updated_at', 'deleted_at'];
 
-    protected $fillable = ['tables_id', 'categories_id', 'total_views', 'status', 'top_pick', 'created_by', 'modified_by', 'presentation', 'fact_sheet', 'type', 'profit_sharing', 'upfront_rate', 'trail_rate', 'gst', 'tds', 'end_of_trail', 'channel_partner_aggrement'];
+    protected $fillable = ['tables_id', 'description', 'categories_id', 'total_views', 'status', 'top_pick', 'created_by', 'modified_by', 'presentation', 'fact_sheet', 'type', 'profit_sharing', 'upfront_rate', 'trail_rate', 'gst', 'tds', 'end_of_trail', 'channel_partner_aggrement'];
 
     // public function companies(){
     //     return $this->belongsTo(Company::class,'id','companies_id');
diff --git a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
index 17698b8..a29c33a 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
@@ -259,7 +259,7 @@
                             </div>
                             <div class="col-md-6 fv-row">
                                 <label class=" fs-6 fw-semibold mb-2"><span class="required">Date Of Sale</span></label>
-                                <input type="date" id="edit_date_of_sale" name="date_of_sale" class="form-control form-control-solid" />
+                                <input type="date" id="edit_date_of_sale" value="12-12-2024" name="date_of_sale" class="form-control form-control-solid" />
                             </div>
                             <div class="col-md-6 fv-row">
                                 <label class=" fs-6 fw-semibold mb-2"><span class="required">Platform</span></label>
@@ -332,7 +332,7 @@
     })
 
     $('.edit-transaction-detail').click(function(e) {
-        // alert($(this).data('id'));
+        alert($(this).data('date_of_sale'));
         $('#edit-id').val($(this).data("id"));
         $('#edit-name').val($(this).data("name"));
         $('#edit-final_units_sold').val($(this).data("complete_units_sold"));

From 07b5efbf8a324f24b87e75d0217d0b4322f9ead8 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 8 May 2024 17:46:59 +0530
Subject: [PATCH 15/16] fixing description issue

---
 .../Controllers/Admin/OverviewController.php  | 46 +++++++++++++------
 .../AlternativeInvestmentFundController.php   |  3 +-
 ...etplaceAlternativeInvestmentFundSeller.php |  5 ++
 app/Models/MarketplaceBuyerForm.php           |  7 +++
 .../MarketplaceFractionalRealEstateSeller.php |  4 ++
 .../partial/transaction-row.blade.php         | 20 ++++----
 .../transactions.blade.php                    |  5 +-
 7 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/app/Http/Controllers/Admin/OverviewController.php b/app/Http/Controllers/Admin/OverviewController.php
index 1d5d6cd..3ce3722 100644
--- a/app/Http/Controllers/Admin/OverviewController.php
+++ b/app/Http/Controllers/Admin/OverviewController.php
@@ -367,22 +367,38 @@ class OverviewController extends Controller
         if (!$check) {
             abort(404);
         }
-        $aifBuyerForm = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_aif_sellers.id', 'marketplace_buyer_forms.associated_id')
-            ->latest('marketplace_aif_sellers.created_at')->get();
-        $freBuyerForm = MarketplaceFractionalRealEstateSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_fre_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_fre_sellers.created_at')->get();
-        $opBuyerForm = MarketplaceOtherProductsSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_op_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_op_sellers.created_at')->get();
-        $completedData = collect();
-        $aifBuyerForm->each(function($value) use($completedData){
-            $completedData[] = $value;
-        });
-        $freBuyerForm->each(function($value) use($completedData){
-            $completedData[] = $value;
-        });
-        // $latestArray = array_merge($aifBuyerForm->toArray(),$freBuyerForm->toArray());
-        $newData = $completedData->sortBy('created_at');
+        // $aifBuyerForm = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company', 'buyer')->join('marketplace_buyer_forms', 'marketplace_aif_sellers.id', 'marketplace_buyer_forms.associated_id')
+        //     ->latest('marketplace_aif_sellers.created_at')->get();
+        // $freBuyerForm = MarketplaceFractionalRealEstateSeller::with('seller', 'company', 'buyer')->join('marketplace_buyer_forms', 'marketplace_fre_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_fre_sellers.created_at')->get();
+        // $opBuyerForm = MarketplaceOtherProductsSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_op_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_op_sellers.created_at')->get();
+
+
+        $marketPlaceBuyerFrom = MarketplaceBuyerForm::where('status','Sold')->get();
+        $newData = collect();
+        foreach($marketPlaceBuyerFrom as $item){
+            if($item->table == 'marketplace_fre_sellers'){
+                $item['data'] = MarketplaceFractionalRealEstateSeller::with('seller', 'company',)->where('id',$item->associated_id)->first();
+                $newData->push($item);
+            }
+            else if($item->table == 'marketplace_aif_sellers')
+            {
+                $item['data'] = MarketplaceAlternativeInvestmentFundSeller::with('seller', 'company',)->where('id',$item->associated_id)->first();
+                $newData->push($item);
+            }
+        }
+        // dd($newData);
+        // $completedData = collect();
+        // $aifBuyerForm->each(function($value) use($completedData){
+        //     $completedData[] = $value;
+        // });
+        // $freBuyerForm->each(function($value) use($completedData){
+        //     $completedData[] = $value;
+        // });
+        // $newData = $completedData->sortBy('buyer.updated_at');
 
         $companies = Company::active()->pluck('company_name', 'id');
-        return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies','newData'));
+        // return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies','newData'));
+        return view('Admin.Pages.pre_owned_investment.transactions', compact('companies','newData'));
     }
 
     // public function manage_seller_profile()
@@ -437,7 +453,7 @@ class OverviewController extends Controller
 
     public function updateCompleteTransaction(Request $request)
     {
-
+        // dd($request->all());
         $completedTransactionUpdated = MarketplaceBuyerForm::where('id', $request->buyer_id)->update([
             'complete_units_sold' => $request->final_units_sold,
             'complete_sale_value' => $request->final_sale_value,
diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
index 7a7166a..59af686 100644
--- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
+++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
@@ -156,7 +156,8 @@ class AlternativeInvestmentFundController extends Controller
 
     public function ventureCapitalFundProduct($slug)
     {
-        $ventureCapitalFund = $this->ventureCapitalData($slug)->getData();
+        $ventureCapitalFund = $this->ventureCapitalData($slug)->getData()->data;
+        // dd($ventureCapitalFund);
         $otherVCP = AlternativeInvestmentFund::query()
             ->join('products', 'alternative_investment_funds.products_id', 'products.id')
             ->where(['status' => true, 'categories_id' => 28])
diff --git a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
index a9b8e1c..7cd6a0d 100644
--- a/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
+++ b/app/Models/MarketplaceAlternativeInvestmentFundSeller.php
@@ -21,6 +21,11 @@ class MarketplaceAlternativeInvestmentFundSeller extends Model
         return $this->belongsTo(MarketplaceSellerForm::class, 'seller_forms_id');
     }
 
+    public function buyer()
+    {
+        return $this->belongsTo(MarketplaceBuyerForm::class, 'seller_forms_id');
+    }
+
     public function Sluggable(): array
     {
         return [
diff --git a/app/Models/MarketplaceBuyerForm.php b/app/Models/MarketplaceBuyerForm.php
index a9430c4..fb3eced 100644
--- a/app/Models/MarketplaceBuyerForm.php
+++ b/app/Models/MarketplaceBuyerForm.php
@@ -89,4 +89,11 @@ class MarketplaceBuyerForm extends Model
     public function company(){
         return $this->belongsTo(Company::class,'platform');
     }
+
+    public function freSellerData(){
+        return $this->hasOne(MarketplaceFractionalRealEstateSeller::class,'id','associated_id');
+    }
+    public function aifSellerData(){
+        return $this->hasOne(MarketplaceAlternativeInvestmentFundSeller::class,'id','associated_id');
+    }
 }
diff --git a/app/Models/MarketplaceFractionalRealEstateSeller.php b/app/Models/MarketplaceFractionalRealEstateSeller.php
index 029ba39..4415b3f 100644
--- a/app/Models/MarketplaceFractionalRealEstateSeller.php
+++ b/app/Models/MarketplaceFractionalRealEstateSeller.php
@@ -19,6 +19,10 @@ class MarketplaceFractionalRealEstateSeller extends Model
     public function seller(){
         return $this->belongsTo(MarketplaceSellerForm::class,'seller_forms_id');
     }
+    
+    public function buyer(){
+        return $this->belongsTo(MarketplaceBuyerForm::class,'seller_forms_id');
+    }
 
     public function company(){
         return $this->belongsTo(Company::class,'fractional_real_estate_platform');
diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php
index 7abcb69..d504391 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php
@@ -1,28 +1,26 @@
 <tr>
     <td>
         <div class="form-check form-check-sm form-check-custom form-check-solid">
-            {{$iteration}}
+            {{$loop->iteration}}
         </div>
     </td>
     <td>{{$data->name}}</td>
-    <td>{{$data->seller->name}}</td>
-    <td>{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}</td>
-    @php($offerPricePerUnit = IND_money_format($data->offer_price_per_unit))
-    @php($totalPurchaseValue = IND_money_format($data->total_purchase_value))
-    {{--<td>{{$offerPricePerUnit}}</td>
-    <td>{{$totalPurchaseValue}}</td>
-    <td>{{$data->created_at->format('d/m/y')}}</td>--}}
-    <td>{{$data->complete_units_sold}}</td>
+    <td>{{$data->data->seller->name}}</td>
+    <td>{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}</td>
+    @php($offerPricePerUnit = IND_money_format($data->getAttributes()['offer_price_per_unit']))
+    @php($totalPurchaseValue = IND_money_format($data->getAttributes()['total_purchase_value']))
+    <td>{{$data->table == 'marketplace_fre_sellers' ? 'Fractional Real Estate' : 'Alternative Investment Fund'}}</td>
+    <td>{{$data->no_of_units_you_wish_to_buy}}</td>
     <td>{{$data->complete_sale_value}}</td>
     <td>{{$data->commission_earned}}</td>
     <td>{{$data->date_of_sale}}</td>
     <td>{{companyName($data->platform)}}</td>
     <td>{{$data->final_purchase_value}}</td>
     <td>
-        <a class="get-transaction-detail" title="View detail" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
+        <a class="get-transaction-detail" title="View detail" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
             <i class="fa-regular fa-eye"></i>
         </a>
-        <a class="edit-transaction-detail mx-5" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->complete_units_sold}}" data-complete_sale_value="{{$data->complete_sale_value}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->final_purchase_value}}">
+        <a class="edit-transaction-detail mx-5" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-seller="{{$data->data->seller->name}}" data-productname="{{$data->data->name_of_the_aif_fund ?? $data->data->property_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->complete_units_sold}}" data-complete_sale_value="{{$data->complete_sale_value}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->final_purchase_value}}">
             <svg class="svg-inline--fa fa-pen-to-square" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pen-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
                 <path fill="currentColor" d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.8 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160V416c0 53 43 96 96 96H352c53 0 96-43 96-96V320c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V160c0-17.7 14.3-32 32-32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H96z"></path>
             </svg>
diff --git a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
index a29c33a..df292a5 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
@@ -77,6 +77,7 @@
                                         {{--<th class="min-w-100px  w-100px align-top">Offer Price Per Unit</th>
                                         <th class="min-w-125px w-125px align-top">Total Purchase Value</th>
                                         <th class="min-w-125px w-125px align-top">Created At</th>--}}
+                                        <th class="min-w-125px  w-200px align-top">Category</th>
                                         <th class="min-w-125px  w-200px align-top">Final Units Sold</th>
                                         <th class="min-w-125px  w-200px align-top">Final Sale Value</th>
                                         <th class="min-w-125px w-125px align-top">Commission Earned</th>
@@ -331,8 +332,8 @@
         $('#transactions_view').modal('show');
     })
 
-    $('.edit-transaction-detail').click(function(e) {
-        alert($(this).data('date_of_sale'));
+    $('.edit-transaction-detail').on('click',function(e) {
+        // alert($(this).data('id'));
         $('#edit-id').val($(this).data("id"));
         $('#edit-name').val($(this).data("name"));
         $('#edit-final_units_sold').val($(this).data("complete_units_sold"));

From 259e1c44b921211723c59be9b83913a8d0ae0a8d Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 8 May 2024 18:20:19 +0530
Subject: [PATCH 16/16] fixing issue

---
 app/Imports/FractionalRealEstateImport.php    |  4 ++--
 app/Models/Product.php                        |  3 ++-
 .../fractional-real-estate-product.blade.php  | 23 ++++++++++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/Imports/FractionalRealEstateImport.php b/app/Imports/FractionalRealEstateImport.php
index 96e1325..38ccf07 100644
--- a/app/Imports/FractionalRealEstateImport.php
+++ b/app/Imports/FractionalRealEstateImport.php
@@ -93,9 +93,9 @@ class FractionalRealEstateImport implements ToCollection, WithHeadingRow
                     'tables_id' => Table::FractionalRealEstateTable,
                     'categories_id' => $this->category_id,
                     'total_views' => 0,
-                    'status' => 1,
+                    // 'status' => 1,
                     'created_by' => auth()->user()->id,
-                    'description'=> $row['description'] ?? null,
+                    'description'=> $row['property_description'] ?? null,
                 ]);
                 $count = FractionalRealEstate::where('property_name_and_location',$row['property_name_and_location'])->count();
                 FractionalRealEstate::create([
diff --git a/app/Models/Product.php b/app/Models/Product.php
index e5cf31a..e94772d 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -405,7 +405,8 @@ class Product extends Model
 
         $products = $query->select(\DB::raw('products.id,coalesce(fre.property_name_and_location,aif.fund_name,bd.issuer,fd.fund_name,exchange.name,re.property_name) as product_name'), 'products.categories_id as categories_id', 'categories.category_name', 'top_pick', 'fre.property_image', 'company_logo', 'file_name', \DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,bd.geographic_focus,fd.geographic_focus,exchange.geographic_focus,re.geographic_focus) as geographic_focus'), \DB::raw('coalesce(fre.minimum_investment,aif.minimum_capital_commitment,bd.minimum_investment,fd.minimum_investment,re.total_price) as minimum_investment'), \DB::raw('coalesce(fre.slug,aif.slug,bd.slug,fd.slug,re.slug,exchange.slug) as slug'),
         //  \DB::raw('coalesce(fre.property_description,aif.description,bd.about_issuer,fd.fund_description,exchange.about,re.remarks) as description')
-        'products.description'
+         \DB::raw('coalesce(products.description) as description')
+        // 'products.description'
         )
             ->leftJoin('fractional_real_estates as fre', 'products.id', 'fre.products_id')
             ->leftJoin('alternative_investment_funds as aif', 'products.id', 'aif.products_id')
diff --git a/resources/views/components/fractional-real-estate-product.blade.php b/resources/views/components/fractional-real-estate-product.blade.php
index 4c2d96b..dd07b72 100644
--- a/resources/views/components/fractional-real-estate-product.blade.php
+++ b/resources/views/components/fractional-real-estate-product.blade.php
@@ -28,13 +28,30 @@
                             <p>{{ $freData->fractional_real_estate->property_name_and_location }}</p>
                         </div>
                         <p class="cate">Category: {{ $freData->categorys->category_name }}</p>
+                        {{-- <div class="middle-sec">
+                            <p class="">Expected IRR: {{ $freData->fractional_real_estate->expected_irr }} %</p>
+                        </div> --}}
                         <div class="middle-sec">
-                            <p class="">Expected IRR: {{ $freData->fractional_real_estate->expected_irr }}</p>
+                            <div class="dropdown-tooltip">
+                                <div class="dropdown-toggle" type="button" data-bs-toggle="dropdown"
+                                    aria-expanded="false">
+                                    <img
+                                        src="{{imagePath('public/assets/media/FrontendImages/tooptips-icon.png')}}">
+                                </div>
+                                {{-- <div class="dropdown-menu">
+                                    <p>Close Date: Approx. Sep 2030</p>
+                                </div> --}}
+                            </div>
+                            <p class="">Expected IRR: {{ $freData->fractional_real_estate->expected_irr }} %</p>
+                            <p class=""></p>
+                            {{-- <p class="w-50">Target IRR: {{ $data->alternative_investment_fund->target_irr }}</p> <span class="mx-2">|</span>
+                            <p class="w-50">Tenure From Final Date:
+                                {{ $data->alternative_investment_fund->tenure_from_final_date }}</p> --}}
                         </div>
                         <div class="dics">
-                            <h4>Minimum Investment: {{ $freData->fractional_real_estate->minimum_investment }}</h4>
+                            <h4>Minimum Investment: {{ $freData->fractional_real_estate->minimum_investment ?? 'N/A' }}</h4>
                             {{-- <p>{{ $freData->fractional_real_estate->property_description }}</p> --}}
-                            <p>{{ $freData->description }}</p>
+                            <p>{{ $freData->description ?? $freData->fractional_real_estate->property_description }}</p>
                         </div>
                     </a>
                 </div>