From b8be1ee4c832a5f825282667c56426ec08aa45d5 Mon Sep 17 00:00:00 2001
From: cj201199 <chiragjain201199@gmail.com>
Date: Fri, 17 May 2024 17:17:11 +0530
Subject: [PATCH] fixing bugs

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

diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index 3435de3..3136c49 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -567,12 +567,13 @@ class DashboardController extends Controller
         if ($custom_id) {
             $productId = MonthlyUpdateMaster::where(['custom_id' => \Crypt::decrypt($custom_id), 'users_id' => auth()->guard('users')->user()->id])->value('products_id');
             $alternativeInvestmentFund = AlternativeInvestmentFund::where('products_id', $productId)->first();
+            // dd($alternativeInvestmentFund);
             $monthlyUpdateMaster = MonthlyUpdateMaster::where(['custom_id' => \Crypt::decrypt($custom_id), 'users_id' => auth()->guard('users')->user()->id])->first();
             // dd($alternativeInvestmentFund);
         }
 
 
-        $aifProduct = (object)[
+        $aifProduct = (object)[                 
             // 'encrypted_custom_id' => $custom_id,
             'name_of_the_aif_fund' => $monthlyUpdateMaster->product_name ?? null,
             'fund_category' => $monthlyUpdateMaster->fund_category ?? null,
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 d0c7c65..d91fd5a 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 ? ($data->products->profit_sharing == null ? 'null' : $data->products->profit_sharing ) : 'null' }}, '{{ $data->custom_id }}','{{ $data->categories }}',{{ $data->products_id }})"
+                                                        onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }},{{ $data->products != null ? ($data->products->profit_sharing == null ? 'null' : $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,10 @@
         });
 
         function holdingStatus(id, status, count = null, profitSharing, customId, categories, productId) {
-            // alert(profitSharing);
-            if (profitSharing >= 0 && status == 'Holding') {
+            // alert(Math.ceil(profitSharing));
+            // profitSharing = 2;
+            // console.log(Math.ceil(profitSharing),profitSharing);
+            if (Math.ceil(profitSharing) > 0 && status == 'Holding') {
                 $('#id').val(id);
                 $('#product_id').val(productId);
                 $('#status').val(status);
@@ -903,7 +905,7 @@
                 $('#categories').val(categories);
                 $('#exampleModalCenter').modal('show');
             }
-            if (status == 'Reedemed') {
+            if(profitSharing == 0 || profitSharing == null || status == 'Reedemed') {
                 let text;
                 status == 'Holding' ? text = 'redeem' : text = 'hold';
                 Swal.fire({