From 991e9adb0b27be5dce3885c9a10e8363baa91283 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 26 Jun 2024 14:50:15 +0530
Subject: [PATCH 1/9] change error message

---
 .../Controllers/Frontend/ProfileController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php
index d419caf..770bf8a 100644
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -142,9 +142,9 @@ class ProfileController extends Controller
                 'required' => 'The :attribute field must be required',
                 'unique' => 'The :attribute field must be unique',
             ]);
-            $validationMessage = $this->validationError($validator);
-            if ($validationMessage) {
-                return response()->json(['status' => 400, 'message' => $validationMessage]);
+            // $validationMessage = $this->validationError($validator);
+            if ($validator->fails()) {
+                return response()->json(['status' => 400, 'message' => $validator->errors()]);
             }
             // dd('both');
             $emailotp = rand(1000, 9999);
@@ -191,9 +191,9 @@ class ProfileController extends Controller
                 'required' => 'The :attribute field must be required',
                 'unique' => 'The :attribute field must be unique',
             ]);
-            $validationMessage = $this->validationError($validator);
-            if ($validationMessage) {
-                return response()->json(['status' => 400, 'message' => $validationMessage]);
+            // $validationMessage = $this->validationError($validator);
+            if ($validator->fails()) {
+                return response()->json(['status' => 400, 'message' => $validator->errors()]);
             }
             // dd('email');
             $emailotp = rand(1000, 9999);
@@ -222,9 +222,9 @@ class ProfileController extends Controller
                 'required' => 'The :attribute field must be required',
                 'unique' => 'The :attribute field must be unique',
             ]);
-            $validationMessage = $this->validationError($validator);
-            if ($validationMessage) {
-                return response()->json(['status' => 400, 'message' => $validationMessage]);
+            // $validationMessage = $this->validationError($validator);
+            if ($validator->fails()) {
+                return response()->json(['status' => 400, 'message' => $validator->errors()]);
             }
 
             // dd('mobile');

From 77e07034387125c97a3b928ef955811e11f4f5aa Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 26 Jun 2024 15:09:15 +0530
Subject: [PATCH 2/9] change error message

---
 .../Frontend/ProfileController.php            | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php
index 770bf8a..bf2c5c5 100644
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -100,9 +100,9 @@ class ProfileController extends Controller
             'max' => 'The :attribute field must be :max digits'
         ]);
 
-        // $validationMessage = $this->validationError($validator);
-        if ($validator->fails()) {
-            return response()->json(['status' => 400, 'message' => $validator->errors()]);
+        $validationMessage = $this->validationErrorWithoutBr($validator);
+        if ($validationMessage) {
+            return response()->json(['status' => 400, 'message' => $validationMessage]);
         }
 
         $user = User::find($request->user()->id);
@@ -142,9 +142,9 @@ class ProfileController extends Controller
                 'required' => 'The :attribute field must be required',
                 'unique' => 'The :attribute field must be unique',
             ]);
-            // $validationMessage = $this->validationError($validator);
-            if ($validator->fails()) {
-                return response()->json(['status' => 400, 'message' => $validator->errors()]);
+            $validationMessage = $this->validationErrorWithoutBr($validator);
+            if ($validationMessage) {
+                return response()->json(['status' => 400, 'message' => $validationMessage]);
             }
             // dd('both');
             $emailotp = rand(1000, 9999);
@@ -191,9 +191,9 @@ class ProfileController extends Controller
                 'required' => 'The :attribute field must be required',
                 'unique' => 'The :attribute field must be unique',
             ]);
-            // $validationMessage = $this->validationError($validator);
-            if ($validator->fails()) {
-                return response()->json(['status' => 400, 'message' => $validator->errors()]);
+            $validationMessage = $this->validationErrorWithoutBr($validator);
+            if ($validationMessage) {
+                return response()->json(['status' => 400, 'message' => $validationMessage]);
             }
             // dd('email');
             $emailotp = rand(1000, 9999);
@@ -222,9 +222,9 @@ class ProfileController extends Controller
                 'required' => 'The :attribute field must be required',
                 'unique' => 'The :attribute field must be unique',
             ]);
-            // $validationMessage = $this->validationError($validator);
-            if ($validator->fails()) {
-                return response()->json(['status' => 400, 'message' => $validator->errors()]);
+            $validationMessage = $this->validationErrorWithoutBr($validator);
+            if ($validationMessage) {
+                return response()->json(['status' => 400, 'message' => $validationMessage]);
             }
 
             // dd('mobile');
@@ -361,6 +361,17 @@ class ProfileController extends Controller
             return $messages;
         }
     }
+    public function validationErrorWithoutBr($validator)
+    {
+        if ($validator->fails()) {
+            $errors = $validator->errors();
+            $messages = '';
+            foreach ($errors->all() as $message) {
+                $messages .= $message .'.';
+            }
+            return $messages;
+        }
+    }
 
     public function sendEmailOTP(Request $request)
     {

From 5eabac5f27aa3289cc1ab4f8c5874ed951e3896d Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 26 Jun 2024 15:36:11 +0530
Subject: [PATCH 3/9] added class of units fields

---
 .../alternative_investment_fund.blade.php          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
index 1aec578..f5241f7 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
@@ -42,6 +42,7 @@
                         data-no_of_units_redeemed="{{ $data->no_of_units_redeemed }}"
                         data-current_valuation="{{ $data->current_valuation }}"
                         data-current_nav="{{ $data->current_nav }}"
+                        data-class_of_units="{{ $user->class_of_units }}"
                         data-no_of_units_held="{{ $data->no_of_units_held }}">
                         <i class="fa-regular fa-eye"></i>
                     </a>
@@ -60,6 +61,7 @@
                         data-net_income="{{ $data->getRawOriginal('net_income') }}"
                         data-no_of_units_alloted="{{ $data->no_of_units_alloted }}"
                         data-no_of_units_redeemed="{{ $data->no_of_units_redeemed }}"
+                        {{-- data-class_of_units="{{ $data->class_of_units }}" --}}
                         data-current_valuation="{{ $data->getRawOriginal('current_valuation') }}"
                         data-current_nav="{{ $data->getRawOriginal('current_nav') }}"
                         data-statement_reports="{{ json_encode($data->statement_reports) }}"
@@ -209,6 +211,11 @@
 
                             </div>
                         </div>
+                        {{-- <div class="col-md-6 fv-row">
+                            <label class="required fs-6 fw-semibold mb-2 m-2">Class Of Units</label>
+                            <input type="number" class="form-control form-control-solid" name="no_of_units_held"
+                                value="" id="class_of_units"></span>
+                        </div> --}}
                     </div>
                     <div class="submit_btn d-flex justify-content-center mt-15">
                         <button type="submit" id="alternative_update" class="btn btn-light-dark">Save</button>
@@ -335,6 +342,11 @@
                         <input disabled type="text" class="form-control form-control-solid"
                             name="no_of_units_held" value="" id="no_of_units_held_view"></span>
                     </div>
+                    <div class="col-md-6 fv-row">
+                        <label class="required fs-6 fw-semibold mb-2 m-2">Class Of Units</label>
+                        <input disabled type="text" class="form-control form-control-solid"
+                            name="view_class_of_units" value="" id="view_class_of_units"></span>
+                    </div>
                 </div>
 
                 <div class="modal-footer">
@@ -367,6 +379,7 @@
                 $('#current_valuation').val($(this).data('current_valuation'));
                 $('#current_nav').val($(this).data('current_nav'));
                 $('#no_of_units_held').val($(this).data('no_of_units_held'));
+                $('#view_class_of_units').val($(this).data('class_of_units'));
                 // $('#statement_reports').val(statementReportsJSON);
             });
         });
@@ -392,6 +405,7 @@
                 $('#no_of_units_redeemed_update').val($(this).data('no_of_units_redeemed'));
                 $('#current_valuation_update').val($(this).data('current_valuation'));
                 $('#current_nav_update').val($(this).data('current_nav'));
+                // $('#class_of_units').val($(this).data('class_of_units'));
                 $('#no_of_units_held_update').val($(this).data('no_of_units_held'));
 
                 // Ajax request

From b89418bc1afa5c7f26e53ebddaebf9aa1af08f71 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 26 Jun 2024 16:23:07 +0530
Subject: [PATCH 4/9] removed astrisk mark from view modal in monthly update

---
 .../alternative_investment_fund.blade.php     | 44 +++++++++----------
 .../fractional_real_estate.blade.php          | 22 +++++-----
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
index f5241f7..668e287 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
@@ -193,11 +193,11 @@
                             <input type="number" class="form-control form-control-solid" name="current_valuation"
                                 value="" id="current_valuation_update"></span>
                         </div>
-                        <div class="col-md-6 fv-row">
+                        {{-- <div class="col-md-6 fv-row">
                             <label class="required fs-6 fw-semibold mb-2 m-2">Current Nav</label>
                             <input type="number" class="form-control form-control-solid" name="current_nav"
                                 value="" id="current_nav_update"></span>
-                        </div>
+                        </div> --}}
                         <div class="col-md-6 fv-row">
                             <label class="required fs-6 fw-semibold mb-2 m-2">No Of Units Held</label>
                             <input type="number" class="form-control form-control-solid" name="no_of_units_held"
@@ -252,7 +252,7 @@
                     <!--end::Table-->
                     <div class="row">
                         <div class="col-md-6 fv-row">
-                            <label class="required fs-6 fw-semibold mb-2 m-2">Commitment
+                            <label class=" fs-6 fw-semibold mb-2 m-2">Commitment
                                 Amount</label>
                             <input disabled type="text" class="form-control form-control-solid"
                                 name="commitment_amount" value="" id="commitment_amount_view">
@@ -260,34 +260,34 @@
                                 name="update_alternative_id" value="" id="update_alternative_id">
                         </div>
                         <div class="col-md-6 fv-row">
-                            <label class="required fs-6 fw-semibold mb-2 m-2">Contribution
+                            <label class=" fs-6 fw-semibold mb-2 m-2">Contribution
                                 Amount</label>
                             <input disabled type="text" class="form-control form-control-solid"
                                 name="contribution_amount" value="" id="contribution_amount_view">
                         </div>
                         <div class="col-md-6 fv-row">
-                            <label class="required fs-6 fw-semibold mb-2 m-2">Contribution Called
+                            <label class=" fs-6 fw-semibold mb-2 m-2">Contribution Called
                                 Amount</label>
                             <input disabled type="text" class="form-control form-control-solid"
                                 name="contribution_called_amount" value=""
                                 id="contribution_called_amount_view">
                         </div>
                         <div class="col-md-6 fv-row">
-                            <label class="required fs-6 fw-semibold mb-2 m-2">Contribution Uncalled
+                            <label class=" fs-6 fw-semibold mb-2 m-2">Contribution Uncalled
                                 Amount</label>
                             <input disabled type="text" class="form-control form-control-solid"
                                 name="contribution_uncalled_amount" value=""
                                 id="contribution_uncalled_amount_view">
                         </div>
                         <div class="col-md-6 fv-row">
-                            <label class="required fs-6 fw-semibold mb-2 m-2">Date Of Initial
+                            <label class=" fs-6 fw-semibold mb-2 m-2">Date Of Initial
                                 Contribution</label>
                             <input disabled type="text" class="form-control form-control-solid"
                                 name="date_of_initial_contribution" value=""
                                 id="date_of_initial_contribution_view">
                         </div>
                         <div class="col-md-6 fv-row">
-                            <label class="required fs-6 fw-semibold mb-2 m-2">Face Value Nav Per Unit</label>
+                            <label class=" fs-6 fw-semibold mb-2 m-2">Face Value Nav Per Unit</label>
                             <input disabled type="text" class="form-control form-control-solid"
                                 name="face_value_nav_per_unit" value="" id="face_value_nav_per_unit_view">
                         </div>
@@ -296,54 +296,54 @@
                 </div>
                 <div class="row mb-6 p-2">
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Principal Capital Repaid</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Principal Capital Repaid</label>
                         <input disabled type="text" class="form-control form-control-solid"
                             name="principal_capital_repaid" value="" id="principal_capital_repaid_view">
                     </div>
                     <div class="col-md-6 fv-row ">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Gross Income</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Gross Income</label>
                         <input disabled type="text" class="form-control form-control-solid" name="gross_income"
                             value="" id="gross_income_view">
                     </div>
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Total Fees Paid</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Total Fees Paid</label>
                         <input disabled type="text" class="form-control form-control-solid" name="total_fees_paid"
                             value="" id="total_fees_paid_view">
                     </div>
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Net Income</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Net Income</label>
                         <input disabled type="text" class="form-control form-control-solid" name="net_income"
                             value="" id="net_income_view">
                     </div>
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">No Of Units
+                        <label class=" fs-6 fw-semibold mb-2 m-2">No Of Units
                             Alloted</label>
                         <input disabled type="text" class="form-control form-control-solid"
                             name="no_of_units_alloted" value="" id="no_of_units_alloted_view">
                     </div>
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">No Of Units
+                        <label class=" fs-6 fw-semibold mb-2 m-2">No Of Units
                             Redeemed</label>
                         <input disabled type="text" class="form-control form-control-solid"
                             name="no_of_units_redeemed" value="" id="no_of_units_redeemed_view">
                     </div>
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Current Valuation</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Current Valuation</label>
                         <input disabled type="text" class="form-control form-control-solid"
                             name="current_valuation" value="" id="current_valuation_view"></span>
                     </div>
-                    <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Current Nav</label>
+                    {{-- <div class="col-md-6 fv-row">
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Current Nav</label>
                         <input disabled type="text" class="form-control form-control-solid" name="current_nav"
                             value="" id="current_nav_view"></span>
-                    </div>
+                    </div> --}}
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">No Of Units Held</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">No Of Units Held</label>
                         <input disabled type="text" class="form-control form-control-solid"
                             name="no_of_units_held" value="" id="no_of_units_held_view"></span>
                     </div>
                     <div class="col-md-6 fv-row">
-                        <label class="required fs-6 fw-semibold mb-2 m-2">Class Of Units</label>
+                        <label class=" fs-6 fw-semibold mb-2 m-2">Class Of Units</label>
                         <input disabled type="text" class="form-control form-control-solid"
                             name="view_class_of_units" value="" id="view_class_of_units"></span>
                     </div>
@@ -404,7 +404,7 @@
                 $('#no_of_units_alloted_update').val($(this).data('no_of_units_alloted'));
                 $('#no_of_units_redeemed_update').val($(this).data('no_of_units_redeemed'));
                 $('#current_valuation_update').val($(this).data('current_valuation'));
-                $('#current_nav_update').val($(this).data('current_nav'));
+                // $('#current_nav_update').val($(this).data('current_nav'));
                 // $('#class_of_units').val($(this).data('class_of_units'));
                 $('#no_of_units_held_update').val($(this).data('no_of_units_held'));
 
@@ -507,7 +507,7 @@
                 $('#no_of_units_alloted_view').val($(this).data('no_of_units_alloted'));
                 $('#no_of_units_redeemed_view').val($(this).data('no_of_units_redeemed'));
                 $('#current_valuation_view').val($(this).data('current_valuation'));
-                $('#current_nav_view').val($(this).data('current_nav'));
+                // $('#current_nav_view').val($(this).data('current_nav'));
                 $('#no_of_units_held_view').val($(this).data('no_of_units_held'));
             });
         });
diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
index 46b3412..60d32fb 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
@@ -122,59 +122,59 @@
                         <!--end::Table-->
                         <div class="row mb-6">
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Custom ID</label>
+                                <label class=" fs-6 fw-semibold mb-2">Custom ID</label>
                                 <div class="form-control form-control-solid "><span id="custom_id"></span></div>
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Total Net Interest</label>
+                                <label class=" fs-6 fw-semibold mb-2">Total Net Interest</label>
                                 <div class="form-control form-control-solid "><span id="total_net_interest"></span>
                                 </div>
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Total value of the property </label>
+                                <label class=" fs-6 fw-semibold mb-2">Total value of the property </label>
                                 <div class="form-control form-control-solid "><span
                                         id="totalvalue_of_the_property"></span></div>
                             </div>
                             <div class="col-md-6 fv-row ">
-                                <label class="required fs-6 fw-semibold mb-2">Gross Entery Yeild In PCT</label>
+                                <label class=" fs-6 fw-semibold mb-2">Gross Entery Yeild In PCT</label>
                                 <div class="form-control form-control-solid "><span
                                         id="gross_entery_yeild_in_pct"></span>
                                 </div>
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2"> Investment value</label>
+                                <label class=" fs-6 fw-semibold mb-2"> Investment value</label>
                                 <div class="form-control form-control-solid "><span id="investment_value"></span>
                                 </div>
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Target Return In PCT</label>
+                                <label class=" fs-6 fw-semibold mb-2">Target Return In PCT</label>
                                 <div class="form-control form-control-solid "><span id="target_return_in_pct"></span>
                                 </div>
 
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Investment Date</label>
+                                <label class=" fs-6 fw-semibold mb-2">Investment Date</label>
                                 <div class="form-control form-control-solid "><span id="investment_Date"></span></div>
                             </div>
 
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Absolute Return Till Date</label>
+                                <label class=" fs-6 fw-semibold mb-2">Absolute Return Till Date</label>
                                 <div class="form-control form-control-solid "><span
                                         id="absolute_return_till_date"></span></div>
 
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Total Gross Interest</label>
+                                <label class=" fs-6 fw-semibold mb-2">Total Gross Interest</label>
                                 <div class="form-control form-control-solid "><span id="total_gross_interest"></span>
                                 </div>
                             </div>
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Tds</label>
+                                <label class=" fs-6 fw-semibold mb-2">Tds</label>
                                 <div class="form-control form-control-solid "><span id="tds"></span></div>
                             </div>
 
                             <div class="col-md-6 fv-row">
-                                <label class="required fs-6 fw-semibold mb-2">Absolute Return Till Date In PCT</label>
+                                <label class=" fs-6 fw-semibold mb-2">Absolute Return Till Date In PCT</label>
                                 <div class="form-control form-control-solid "><span
                                         id="absolute_return_till_date_in_pct"></span></div>
 

From fa982cb6a6b9e48744080a7668914b41cdadb729 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 26 Jun 2024 16:26:04 +0530
Subject: [PATCH 5/9] removed astrisk mark from view modal in monthly update

---
 app/Http/Controllers/Admin/ManageUserProductController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php
index 374b2cc..5e53311 100644
--- a/app/Http/Controllers/Admin/ManageUserProductController.php
+++ b/app/Http/Controllers/Admin/ManageUserProductController.php
@@ -1017,7 +1017,7 @@ class ManageUserProductController extends Controller
             "no_of_units_alloted" => "required",
             "no_of_units_redeemed" => "required",
             "current_valuation" => "required",
-            "current_nav" => "required",
+            // "current_nav" => "required",
             "no_of_units_held" => "required",
         ], [
             "required" => "The :attribute field are required",
@@ -1041,7 +1041,7 @@ class ManageUserProductController extends Controller
             "no_of_units_alloted" => $request->no_of_units_alloted,
             "no_of_units_redeemed" => $request->no_of_units_redeemed,
             "current_valuation" => $request->current_valuation,
-            "current_nav" => $request->current_nav,
+            // "current_nav" => $request->current_nav,
             "no_of_units_held" => $request->no_of_units_held
         ]);
 

From 26295ee31be89879e1c1974bd1755ff35af645fb Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Wed, 26 Jun 2024 16:31:19 +0530
Subject: [PATCH 6/9] added number format function

---
 .../Admin/Pages/manage_commission/view_commission.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/Admin/Pages/manage_commission/view_commission.blade.php b/resources/views/Admin/Pages/manage_commission/view_commission.blade.php
index 9cf24fb..735e79f 100644
--- a/resources/views/Admin/Pages/manage_commission/view_commission.blade.php
+++ b/resources/views/Admin/Pages/manage_commission/view_commission.blade.php
@@ -50,7 +50,7 @@
                                             <span class="">Upfront Rate</span>
                                         </label>
                                         <input type="text" class="form-control form-control-solid"
-                                            value="{{ $product->upfront_rate }}" readonly>
+                                            value="{{ number_format($product->upfront_rate, 2, '.', '') }}" readonly>
                                     </div>
                                     @endif
                                     @if($product->commission_type == 'Hybrid Structure' || $product->commission_type == 'Trail Commission' || $product->commission_type == null)

From 10c04d51c6b61a3539070a81492d8d77b673feac Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Thu, 27 Jun 2024 12:50:21 +0530
Subject: [PATCH 7/9] fixing changes

---
 app/Http/Controllers/Frontend/DashboardController.php      | 6 +++---
 public/assets/css/FrontendCss/style.css                    | 2 +-
 resources/views/Frontend/Pages/profile/dashboard.blade.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index 5ecaa76..4e10802 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -901,7 +901,7 @@ class DashboardController extends Controller
                     'marketplace_fre_sellers.property_grade',
                     'marketplace_fre_sellers.asset_type',
                     'marketplace_fre_sellers.fractional_real_estate_platform',
-                    'marketplace_fre_sellers.expected_selling_price'
+                    'marketplace_fre_sellers.og_expected_selling_price'
                 )
                 ->get();
             $data['data']->each(function ($value) {
@@ -958,7 +958,7 @@ class DashboardController extends Controller
             ->sold()
             // ->where('listing_status', '!=', 'Hide')
             // ->where('marketplace_fre_sellers.listing_status', 'Hide')
-            ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
+            ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'og_expected_selling_price')
             ->get();
         $data['data']->each(function ($value) {
             if ($value->fractional_real_estate_platform != null) {
@@ -1001,7 +1001,7 @@ class DashboardController extends Controller
             ->join('marketplace_fre_sellers', 'marketplace_seller_forms.id', 'marketplace_fre_sellers.seller_forms_id')
             ->where('marketplace_fre_sellers.listing_status', '!=', 'Hide')
             // ->where('marketplace_fre_sellers.status', 'Approved')
-            ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
+            ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'og_expected_selling_price')
             ->get();
         return $data;
     }
diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css
index d5739b0..3f823ea 100644
--- a/public/assets/css/FrontendCss/style.css
+++ b/public/assets/css/FrontendCss/style.css
@@ -6468,7 +6468,7 @@ ul.notification-drop {
 .inn_to_testi {
   width: 80%;
   background: #fff;
-  box-shadow: 0 0 16px 0px #fcdff0;
+  box-shadow: 0 0 16px 0px #EDD9C2;
   padding: 20px;
   vertical-align: middle;
   border-radius: 10px;
diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php
index 1c00a53..fecc641 100644
--- a/resources/views/Frontend/Pages/profile/dashboard.blade.php
+++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php
@@ -278,7 +278,7 @@
                                                                     <td>{{ $data->property_grade }}</td>
                                                                     <td>{{ $data->asset_type }}</td>
                                                                     <td>{{ $data->company_name }}</td>
-                                                                    <td>{{ number_format((float) $data->expected_selling_price, 0, '.', '') }}</td>                                                                  </td>
+                                                                    <td>{{ number_format((float) $data->og_expected_selling_price, 0, '.', '') }}</td>                                                                  </td>
                                                                 </tr>
                                                             @endforeach
                                                         </tbody>
@@ -418,7 +418,7 @@
                                                                     <td>{{ $data->property_grade }}</td>
                                                                     <td>{{ $data->asset_type }}</td>
                                                                     <td>{{ $data->company_name }}</td>
-                                                                    <td>{{ number_format((float) IND_money_format($data->expected_selling_price), 0, '.', '') }}</td>
+                                                                    <td>{{ number_format((float) IND_money_format($data->og_expected_selling_price), 0, '.', '') }}</td>
                                                                     </td>
                                                                     <td>
                                                                         <a href="{{route('market_place_offering',$data->slug)}}" class="blue-btn"><i class="fa fa-eye" aria-hidden="true"></i></a>

From 7d2e50e49a0357def48fb264949e9ed31dd8d027 Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Thu, 27 Jun 2024 13:21:27 +0530
Subject: [PATCH 8/9] fixing changes

---
 .../manage_user_product/manage_user_add.blade.php         | 4 ++--
 resources/views/Admin/add-sub-admin.blade.php             | 2 +-
 .../long-only-equity-fund-product.blade.php               | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
index 9d7728a..428cfee 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
@@ -151,7 +151,7 @@
                                             <span>PAN</span>
                                         </label>
                                         <!--begin::Input-->
-                                        <input type="text" oninput="convertToUpperCase('#pan')" class="form-control form-control-solid" name="pan" id="pan" value="{{$data->pan}}" minlength="10" maxlength="10"/>
+                                        <input type="text" oninput="convertToUpperCase('#pan')" class="form-control form-control-solid" name="pan" id="pan" value="" minlength="10" maxlength="10"/>
                                     </div>
                                     <div class="form-box mb-5">
                                         <label class="fs-6 fw-semibold form-label mt-3">
@@ -1001,7 +1001,7 @@
                                             <span>PAN</span>
                                         </label>
                                         <!--begin::Input-->
-                                        <input type="text" class="form-control form-control-solid" value="{{$data->pan}}" name="pan" />
+                                        <input type="text" class="form-control form-control-solid" value="" name="pan" />
                                     </div>
                                     <div class="form-box mb-5">
                                         <label class="fs-6 fw-semibold form-label mt-3">
diff --git a/resources/views/Admin/add-sub-admin.blade.php b/resources/views/Admin/add-sub-admin.blade.php
index 4b8c03b..306c04e 100644
--- a/resources/views/Admin/add-sub-admin.blade.php
+++ b/resources/views/Admin/add-sub-admin.blade.php
@@ -61,7 +61,7 @@
                                                 <!--begin::Input-->
                                                 <input type="text" name="name"
                                                     class="form-control form-control-solid mb-3 mb-lg-0"
-                                                    placeholder="Please enter name"
+                                                    placeholder="Please enter full name"
                                                     onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" />
                                                 <!--end::Input-->
                                             </div>
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php
index 76251ac..7c445d3 100644
--- a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php
+++ b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php
@@ -410,11 +410,11 @@
                                     <p>Focused Real Estate Sectors</p>
                                     <span>{{ $longOnlyEquityFund->focused_real_estate_sectors ?? '--' }}</span>
                                 </div>
-                                {{-- <div class="col-md-4">
-                                    <p>Regions Covered</p>
-                                    <span>{{ $longOnlyEquityFund->regions_covered ?? '--' }}</span>
-                                </div>
                                 <div class="col-md-4">
+                                    <p>Return on investment (IRR/DPI)</p>
+                                    <span>{{ $longOnlyEquityFund->return_on_investment_irr_dpi_rvpi_tvpi ?? '--' }}</span>
+                                </div>
+                                {{-- <div class="col-md-4">
                                     <p>ISIN Code</p>
                                     <span>{{ $longOnlyEquityFund->isin_code ?? '--' }}</span>
                                 </div> --}}

From c26ecdf7f7bb66c84d82710f13b5553448620bcc Mon Sep 17 00:00:00 2001
From: Ritikesh yadav <yadavritikesh02@gmail.com>
Date: Thu, 27 Jun 2024 13:28:55 +0530
Subject: [PATCH 9/9] fixing changes

---
 resources/views/Admin/add-sub-admin.blade.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/views/Admin/add-sub-admin.blade.php b/resources/views/Admin/add-sub-admin.blade.php
index 306c04e..8ec4dc0 100644
--- a/resources/views/Admin/add-sub-admin.blade.php
+++ b/resources/views/Admin/add-sub-admin.blade.php
@@ -347,7 +347,7 @@
                                                             <!--end::Input-->
                                                             <!--begin::Label-->
                                                             <label class="form-check-label" for="investor">
-                                                                <div class="fw-bold text-gray-800">Investor (user)
+                                                                <div class="fw-bold text-gray-800">Investor (users)
                                                                 </div>
                                                             </label>
                                                             <!--end::Label-->
@@ -397,7 +397,7 @@
                                                                             <label class="form-check-label"
                                                                                 for="manage_investor_kyc">
                                                                                 <div class="fw-bold text-gray-800">Manage
-                                                                                    Investor KYC
+                                                                                    Investors KYC
                                                                                 </div>
                                                                             </label>
                                                                             <!--end::Label-->
@@ -497,7 +497,7 @@
                                                                             <label class="form-check-label"
                                                                                 for="manage_product">
                                                                                 <div class="fw-bold text-gray-800">Manage
-                                                                                    Product</div>
+                                                                                    Products</div>
                                                                             </label>
                                                                             <!--end::Label-->
                                                                         </div>
@@ -537,7 +537,7 @@
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
                                                                                 for="manage_categories">
-                                                                                <div class="fw-bold text-gray-800">Manage
+                                                                                <div class="fw-bold text-gray-800">Manage Investment
                                                                                     Categories</div>
                                                                             </label>
                                                                             <!--end::Label-->
@@ -803,7 +803,7 @@
                                                                             <label class="form-check-label"
                                                                                 for="kt_modal_update_role_option_0">
                                                                                 <div class="fw-bold text-gray-800">Manage
-                                                                                    Testimoials
+                                                                                    Testimonials
                                                                                 </div>
                                                                             </label>
                                                                             <!--end::Label-->
@@ -844,9 +844,7 @@
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
                                                                                 for="terms_and_conditions">
-                                                                                <div class="fw-bold text-gray-800">Terms
-                                                                                    And
-                                                                                    Conditions
+                                                                                <div class="fw-bold text-gray-800">Risk Disclosure
                                                                                 </div>
                                                                             </label>
                                                                             <!--end::Label-->