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 @@ -