diff --git a/app/Imports/ImportMontlyUpdateFractionalRealEstate.php b/app/Imports/ImportMontlyUpdateFractionalRealEstate.php index 8834f4a..870fe38 100644 --- a/app/Imports/ImportMontlyUpdateFractionalRealEstate.php +++ b/app/Imports/ImportMontlyUpdateFractionalRealEstate.php @@ -48,13 +48,14 @@ class ImportMontlyUpdateFractionalRealEstate implements ToCollection, WithHeadin foreach ($rows as $row) { // dd($row); + // dd(getConvertedDate($row['investment_date'])); if($row['investment_value'] != null && $row['total_net_interest'] != null && $row['total_gross_interest'] != null && $row['total_value_of_the_property'] != null) { $latestId = MonthlyUpdateFractionalRealEstate::insertGetId([ 'custom_id' => $row['custom_id'], 'total_value_of_the_property' => $row['total_value_of_the_property'] ?? 0, 'investment_value' => $row['investment_value'] ?? 0, - 'investment_date' => $row['investment_date'], + 'investment_date' => getConvertedDate($row['investment_date']) ?? 0, 'total_gross_interest' => $row['total_gross_interest'] ?? 0, 'tds' => $row['tds'] ?? 0, 'total_net_interest' => $row['total_net_interest'] ?? 0, diff --git a/app/helper.php b/app/helper.php index fdea623..e91fb41 100644 --- a/app/helper.php +++ b/app/helper.php @@ -63,7 +63,7 @@ function getConvertedDate($date) // $newDate = str_split($dateArray[0], 1); return '0'.(string)$dateArray[0] . '-' . (string)$dateArray[1].(string)$dateArray[2] . '-' . (string)$dateArray[3]. (string)$dateArray[4]. (string)$dateArray[5]. (string)$dateArray[6]; } - return null; + return $date; } function imagePath($path = null) diff --git a/resources/views/Admin/Pages/contact_form_leads/contact_form_leads.blade.php b/resources/views/Admin/Pages/contact_form_leads/contact_form_leads.blade.php index e74b5d3..42a10f9 100644 --- a/resources/views/Admin/Pages/contact_form_leads/contact_form_leads.blade.php +++ b/resources/views/Admin/Pages/contact_form_leads/contact_form_leads.blade.php @@ -324,6 +324,7 @@ $('#reply_mail_form').validate({ ignore: [], debug: false, + scrollX: true, rules: { subject: 'required', reply: 'required', diff --git a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php index 76dd3ca..58b00dc 100644 --- a/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/manage_commission.blade.php @@ -339,6 +339,7 @@ var table = $('#manageCommissionTable').DataTable({ dom: 'Bfrtip', ordering: false, + scrollX: true, buttons: [{ extend: 'excel', title: 'Product Commission', diff --git a/resources/views/Admin/Pages/manage_commission/user_commission.blade.php b/resources/views/Admin/Pages/manage_commission/user_commission.blade.php index a9bca42..6356570 100644 --- a/resources/views/Admin/Pages/manage_commission/user_commission.blade.php +++ b/resources/views/Admin/Pages/manage_commission/user_commission.blade.php @@ -389,6 +389,7 @@ var table = $('#manageCommissionTable').DataTable({ dom: 'Bfrtip', ordering: false, + scrollX: true, buttons: [{ extend: 'excel', title: 'Product Commission', 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 8b279e9..4585a0a 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 @@ -560,6 +560,7 @@ $(document).ready(function() { var table = $('#total_active_investors').DataTable({ dom: 'Bfrtip', ordering: false, + scrollX: true, buttons: [{ extend: 'excel', title: 'Product List', diff --git a/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php index b251255..d70187a 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php @@ -191,9 +191,10 @@ -
+
- + {{-- @dd($alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr')) --}} +
diff --git a/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php b/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php index afb5937..0125587 100644 --- a/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php +++ b/resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php @@ -283,7 +283,7 @@
@if($data->getRawOriginal('total_fees_paid')) - ₹{{$data->getRawOriginal('total_fees_paid')}} + {{$data->getRawOriginal('total_fees_paid')}} @else N/A @endif diff --git a/resources/views/Admin/Pages/manage_investors/manage_investors.blade.php b/resources/views/Admin/Pages/manage_investors/manage_investors.blade.php index c413c33..f468e70 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_investors.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_investors.blade.php @@ -259,6 +259,7 @@ ordering: false, processing: true, serverSide: true, + scrollX: true, "lengthMenu": [10, 25, 50, 75, 100], ajax: { url: "{{ route('kyc.manage-investors-datatable') }}", 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 cf4cfdb..43582a6 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 @@ -298,7 +298,7 @@
-
@@ -358,21 +358,24 @@ $('#totalvalue_of_the_property').html($(this).data("total-value-of-the-property")); $('#investment_value').html($(this).data("investment-value")); // $('#investment_Date').html($(this).data("investment-date")); + // $('#investment_Date').val($(this).data('investment-date')); var investmentDate = $(this).data("investment-date"); - if (investmentDate) { - var parsedDate = new Date(investmentDate); - var day = parsedDate.getDate(); - var month = parsedDate.getMonth() + 1; // January is 0, so we add 1 - var year = parsedDate.getFullYear(); + $('#investment_Date').val($(this).data(investmentDate)); + // alert(investmentDate); + // if (investmentDate) { + // var parsedDate = new Date(investmentDate); + // var day = parsedDate.getDate(); + // var month = parsedDate.getMonth() + 1; // January is 0, so we add 1 + // var year = parsedDate.getFullYear(); - // Format the date in DD-MM-YYYY format - var formattedDate = ('0' + day).slice(-2) + '-' + ('0' + month).slice(-2) + '-' + year; + // // Format the date in DD-MM-YYYY format + // var formattedDate = ('0' + day).slice(-2) + '-' + ('0' + month).slice(-2) + '-' + year; - // Update the HTML content of #investment_Date element - $('#investment_Date').html(formattedDate); - } else { - $('#investment_Date').html(''); // Handle case where investmentDate is not available - } + // // Update the HTML content of #investment_Date element + // $('#investment_Date').html(formattedDate); + // } else { + // $('#investment_Date').html(''); // Handle case where investmentDate is not available + // } $('#total_gross_interest').html($(this).data("total-gross-interest")); $('#tds').html($(this).data("tds")); $('#total_net_interest').html($(this).data("total-net-interest")); diff --git a/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php b/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php index d33d641..fb20181 100644 --- a/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php +++ b/resources/views/Admin/Pages/manage_leads/manage_leads.blade.php @@ -327,6 +327,7 @@ $(function() { var table = $('#manage-leads').DataTable({ dom: "Bfrtip", + scrollX: true, buttons: [{ extend: "excel", title: "Leads List", diff --git a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php index 2e12580..aa2f43f 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php @@ -458,6 +458,7 @@ $(function() { var approveTable = $('#approve_investors_list').DataTable({ dom: "Bfrtip", + scrollX: true, buttons: [{ extend: "excel", title: "Marketplace Investment List", @@ -477,6 +478,7 @@ $(function() { var pendingTable = $('#pending_investors_list').DataTable({ dom: "Bfrtip", + scrollX: true, buttons: [{ extend: "excel", title: "Marketplace Investment List", @@ -496,6 +498,7 @@ $(function() { var rejectedTable = $('#rejected_table').DataTable({ dom: "Bfrtip", + scrollX: true, buttons: [{ extend: "excel", title: "Marketplace Investment List", 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 27f48d7..d1f9706 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php @@ -299,6 +299,7 @@ $(function() { var table = $('#transactions').DataTable({ dom: "Bfrtip", + scrollX: true, buttons: [{ extend: "excel", title: "Completed Transactions List", diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php index c003cad..1cb9acb 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php @@ -196,7 +196,7 @@ {{-- {{ $infrastructureFund->website_of_the_fund ?? '--' }} --}} @if($infrastructureFund->website_of_the_fund) - {{$infrastructureFund->website_of_the_fund}} + {{$infrastructureFund->website_of_the_fund}} @else {{'--'}} @endif