Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing bugs

Browse Source
This commit is contained in:
meghamalore
2024-07-04 14:54:00 +05:30
parent 8bf93a6e2c
commit c13175e95b
14 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Imports/ImportMontlyUpdateFractionalRealEstate.php
View File

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

2
app/helper.php
View File

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

1
resources/views/Admin/Pages/contact_form_leads/contact_form_leads.blade.php
View File

@@ -324,6 +324,7 @@
$('#reply_mail_form').validate({
ignore: [],
debug: false,
scrollX: true,
rules: {
subject: 'required',
reply: 'required',

1
resources/views/Admin/Pages/manage_commission/manage_commission.blade.php
View File

@@ -339,6 +339,7 @@
var table = $('#manageCommissionTable').DataTable({
dom: 'Bfrtip',
ordering: false,
scrollX: true,
buttons: [{
extend: 'excel',
title: 'Product Commission',

1
resources/views/Admin/Pages/manage_commission/user_commission.blade.php
View File

@@ -389,6 +389,7 @@
var table = $('#manageCommissionTable').DataTable({
dom: 'Bfrtip',
ordering: false,
scrollX: true,
buttons: [{
extend: 'excel',
title: 'Product Commission',

1
resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
View File

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

5
resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php
View File

@@ -191,9 +191,10 @@
<label> <b class='fw-bold'>Accepting Overseas Investment</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->accepting_overseas_investment ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->target_irr)}}">
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr'))}}">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Target IRR(%)</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->target_irr ?? 'N/A'}}</label>
{{-- @dd($alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr')) --}}
<label> <b class='fw-bold'>Target IRR(%)</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->getRawOriginal('target_irr') ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->management_fees_and_carry)}}">

2
resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php
View File

@@ -283,7 +283,7 @@
<!--begin::Input-->
<div class="form-control form-control-solid">
@if($data->getRawOriginal('total_fees_paid'))
₹{{$data->getRawOriginal('total_fees_paid')}}
{{$data->getRawOriginal('total_fees_paid')}}
@else
N/A
@endif

1
resources/views/Admin/Pages/manage_investors/manage_investors.blade.php
View File

@@ -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') }}",

29
resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
View File

@@ -298,7 +298,7 @@
<div class="col-md-6 fv-row">
<label class="required fs-6 fw-semibold mb-2">Investment Date</label>
<input class="form-control form-control-solid " type="date"
<input class="form-control form-control-solid " type="text"
name="investment_date" id="einvestment_Date" />
</div>
<div class="col-md-6 fv-row">
@@ -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"));

1
resources/views/Admin/Pages/manage_leads/manage_leads.blade.php
View File

@@ -327,6 +327,7 @@
$(function() {
var table = $('#manage-leads').DataTable({
dom: "Bfrtip",
scrollX: true,
buttons: [{
extend: "excel",
title: "Leads List",

3
resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
View File

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

1
resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
View File

@@ -299,6 +299,7 @@
$(function() {
var table = $('#transactions').DataTable({
dom: "Bfrtip",
scrollX: true,
buttons: [{
extend: "excel",
title: "Completed Transactions List",

2
resources/views/Frontend/Pages/alternative-investment-fund/infrastructure-fund-product.blade.php
View File

@@ -196,7 +196,7 @@
{{-- <span>{{ $infrastructureFund->website_of_the_fund ?? '--' }}</span> --}}
<span>
@if($infrastructureFund->website_of_the_fund)
<a href="{{'http://'.$infrastructureFund->website_of_the_fund}}" target=”_blank”>{{$infrastructureFund->website_of_the_fund}}<a>
<a href="{{'http://'.$infrastructureFund->website_of_the_fund}}" target=”_blank”>{{$infrastructureFund->website_of_the_fund}}</a>
@else
{{'--'}}
@endif