From 6be3f90ad5fcd8dce9fa2a2003a3e806ca46a97d Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Thu, 16 May 2024 19:31:30 +0530
Subject: [PATCH 1/3] fixing changes

---
 app/Http/Controllers/Frontend/HomeController.php          | 2 +-
 .../manage_user_product/manage_user.blade.php             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php
index 84486f2..d489808 100644
--- a/app/Http/Controllers/Frontend/HomeController.php
+++ b/app/Http/Controllers/Frontend/HomeController.php
@@ -149,7 +149,7 @@ class HomeController extends Controller
         if (!$checkUserKycStatus || $checkUserKycStatus->status != 'Approved') {
             if($checkUserKycStatus && $checkUserKycStatus->status != 'Approved')
             {
-                return response()->json(['status' => 401, 'message' => "Your kyc under review. <br> <small>Please contact us at info@jerichoalternatives.in </small>"]);
+                return response()->json(['status' => 401, 'message' => "Your KYC under review. <br> <small>Please contact us at info@jerichoalternatives.in </small>"]);
             }
             // else{
             //     return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
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 6c289ea..3514015 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
@@ -176,7 +176,7 @@
                                                         title="Holding and Reedemed"> --}}
                                                     <a class="action_icon hold_reedem" data-bs-toggle="tooltip"
                                                         {{-- data-count="{{ $count }}" {{$data->products == null ? onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }})" }} onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }}, {{ $data->products == null ? 'null' : ($data->products->profit_sharing == null ? $data->products->id : $data->products->profit_sharing) }})" --}} data-count="{{ $count }}"
-                                                        onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }}, {{ $data->products == null ? 'null' : ($data->products->profit_sharing == null ? 'null' : $data->products->profit_sharing) }}, '{{ $data->custom_id }}','{{ $data->categories }}',{{ $data->products_id }})"
+                                                        onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }},{{ $data->products->profit_sharing ? (int)$data->products->profit_sharing : 'null' }}, '{{ $data->custom_id }}','{{ $data->categories }}',{{ $data->products_id }})"
                                                         data-bs-custom-class="tooltip-inverse" data-bs-placement="top"
                                                         title="Holding and Reedemed">
                                                         <label
@@ -892,8 +892,8 @@
         });
 
         function holdingStatus(id, status, count = null, profitSharing, customId, categories, productId) {
-            // alert(profitSharing)
-            if (profitSharing <= 0 && status == 'Holding') {
+            // alert(profitSharing);
+            if (profitSharing >= 0 && status == 'Holding') {
                 $('#id').val(id);
                 $('#product_id').val(productId);
                 $('#status').val(status);
@@ -903,7 +903,7 @@
                 $('#categories').val(categories);
                 $('#exampleModalCenter').modal('show');
             }
-            if (profitSharing == null || status == 'Reedemed') {
+            if (status == 'Reedemed') {
                 let text;
                 status == 'Holding' ? text = 'redeem' : text = 'hold';
                 Swal.fire({

From e8980898b73e2c49886837ffa35c92ac86514151 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Fri, 17 May 2024 11:15:52 +0530
Subject: [PATCH 2/3] fixing changes

---
 .../Frontend/DashboardController.php          |  3 ++-
 .../Controllers/Frontend/HomeController.php   | 24 +++++++++----------
 .../profile/market-list/sale-form.blade.php   |  1 +
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index c5bf0ce..b97b978 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -475,6 +475,7 @@ class DashboardController extends Controller
             $id = \Crypt::decrypt($custom_id);
             $data = MonthlyUpdateMaster::with('investor')->where('custom_id', '=', $id)->first();
             $category = $data->categories;
+            $product_id = $data->products_id;
             if ($category == "Fractional Real Estate") {
                 $data['category'] = 'Fractional Real Estate';
             } elseif ($category == "Alternative Investment Fund") {
@@ -514,7 +515,7 @@ class DashboardController extends Controller
         //     'email' => $userKyc ? $marketPlaceSellerForm->email ?? $user->email : null,
         //     'declaration' => $userKyc ? $marketPlaceSellerForm->declaration ?? null : null,
         // ];
-        return view('Frontend.Pages.profile.market-list.sale-form', compact('data', 'userData'));
+        return view('Frontend.Pages.profile.market-list.sale-form', compact('data', 'userData', 'products_id'));
     }
 
     public function sellerFormSubmit(Request $request)
diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php
index d489808..aad7a54 100644
--- a/app/Http/Controllers/Frontend/HomeController.php
+++ b/app/Http/Controllers/Frontend/HomeController.php
@@ -144,18 +144,18 @@ class HomeController extends Controller
         }
 
         // $checkUserKycStatus = UserKyc::where('users_id',auth()->guard('users')->user()->id)->where('status','!=','Approved')->exists();
-        $checkUserKycStatus = UserKyc::where('users_id',auth()->guard('users')->user()->id)->first();
-        // dd($checkUserKycStatus == false ? true:false);
-        if (!$checkUserKycStatus || $checkUserKycStatus->status != 'Approved') {
-            if($checkUserKycStatus && $checkUserKycStatus->status != 'Approved')
-            {
-                return response()->json(['status' => 401, 'message' => "Your KYC under review. <br> <small>Please contact us at info@jerichoalternatives.in </small>"]);
-            }
-            // else{
-            //     return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
-            // }
-            return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
-        }
+        // $checkUserKycStatus = UserKyc::where('users_id',auth()->guard('users')->user()->id)->first();
+        // // dd($checkUserKycStatus == false ? true:false);
+        // if (!$checkUserKycStatus || $checkUserKycStatus->status != 'Approved') {
+        //     if($checkUserKycStatus && $checkUserKycStatus->status != 'Approved')
+        //     {
+        //         return response()->json(['status' => 401, 'message' => "Your KYC under review. <br> <small>Please contact us at info@jerichoalternatives.in </small>"]);
+        //     }
+        //     // else{
+        //     //     return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
+        //     // }
+        //     return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
+        // }
 
 
         $addLead = Lead::create([
diff --git a/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php b/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php
index d01dff6..d503b1f 100644
--- a/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php
+++ b/resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php
@@ -21,6 +21,7 @@
                 <form id="marketplace-seller-form" method="POST">
                     @csrf
                     <input type="hidden" id="id" value="{{ $userData->encrypted_custom_id }}">
+                    <input type="hidden" id="products_id" value="{{ $products_id }}">
                     <div class="row">
                         <div class="form-group col-md-6">
                             <label>Name</label>

From 9c30cc27f3a65bcdf1a8a7baf5c3c7e05096db17 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Fri, 17 May 2024 11:33:18 +0530
Subject: [PATCH 3/3] fixing changes

---
 app/Http/Controllers/Frontend/DashboardController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index b97b978..51b2173 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -475,7 +475,7 @@ class DashboardController extends Controller
             $id = \Crypt::decrypt($custom_id);
             $data = MonthlyUpdateMaster::with('investor')->where('custom_id', '=', $id)->first();
             $category = $data->categories;
-            $product_id = $data->products_id;
+            $products_id = $data->products_id;
             if ($category == "Fractional Real Estate") {
                 $data['category'] = 'Fractional Real Estate';
             } elseif ($category == "Alternative Investment Fund") {