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

Merge pull request #378 from Ritikeshyadav/megha

Browse Source 
Megha
This commit is contained in:
Ritikeshyadav
2024-06-27 17:21:27 +05:30
committed by GitHub
parent 5e911b800a 4aba6043c8
commit d7eda11b9f
5 changed files with 286 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Admin/ManageUserProductController.php
View File

@@ -1056,16 +1056,16 @@ class ManageUserProductController extends Controller
$oldStatementReport = MonthlyUpdateAlternativeInvestmentFund::where('id', $request->update_alternative_id)->first();
$statementReport = $oldStatementReport->getRawOriginal()['statement_reports'];
// dd($statementReport);
$ltrim = ltrim($statementReport,'[');
$rtrim = rtrim($ltrim,']');
$explode = explode(',',$rtrim);
// $ltrim = ltrim($statementReport,'[');
// $rtrim = rtrim($ltrim,']');
$explode = json_decode($statementReport);
$oldStatement = [];
foreach($explode as $report)
{
// dd($report);
$ltrimOfReport = ltrim($report,'"');
$rtrimOfReport = rtrim($ltrimOfReport,'"');
// $ltrimOfReport = ltrim($report,'"');
// $rtrimOfReport = rtrim($ltrimOfReport,'"');
// dd($rtrimOfReport);
array_push($oldStatement,$report);
}
@@ -1358,6 +1358,7 @@ class ManageUserProductController extends Controller
if($reports)
{
$originalValue = json_decode($reports->getRawOriginal()['statement_reports'], true);
// dd($originalValue);
$fileNames = [];
foreach ($originalValue as $url) {

222
resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
View File

@@ -29,7 +29,7 @@
<!--begin::Action=-->
<td class="text-end d-flex align-items-center justify-content-around">
<a class="view_icon" data-bs-toggle="modal" data-bs-target="#alternative_view_modal"
data-commitment_amount="{{ $data->commitment_amount }}"
data-id="{{ $data->id }}" data-commitment_amount="{{ $data->commitment_amount }}"
data-contribution_amount="{{ $data->contribution_amount }}"
data-contribution_called_amount="{{ $data->contribution_called_amount }}"
data-contribution_uncalled_amount="{{ $data->contribution_uncalled_amount }}"
@@ -73,7 +73,8 @@
data-bs-placement="top" title="Active and Inactive">
<label
class="form-check form-switch form-switch-sm form-check-custom form-check-solid flex-stack">
<input class="form-check-input status_update" type="checkbox" data-custom-id="{{$data->custom_id}}" data-id="{{ $data->id }}"
<input class="form-check-input status_update" type="checkbox"
data-custom-id="{{ $data->custom_id }}" data-id="{{ $data->id }}"
value="{{ $data->status }}" {{ $data->status == '1' ? 'checked' : '' }} />
</label>
</a>
@@ -142,7 +143,7 @@
<div class="col-md-6 fv-row">
<label class="required fs-6 fw-semibold mb-2 m-2">Date Of Initial
Contribution</label>
<input type="text" class="form-control form-control-solid"
<input type="date" class="form-control form-control-solid"
name="date_of_initial_contribution" value=""
id="date_of_initial_contribution_update">
</div>
@@ -282,7 +283,7 @@
<div class="col-md-6 fv-row">
<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"
<input disabled type="date" class="form-control form-control-solid"
name="date_of_initial_contribution" value=""
id="date_of_initial_contribution_view">
</div>
@@ -347,6 +348,14 @@
<input disabled type="text" class="form-control form-control-solid"
name="view_class_of_units" value="" id="view_class_of_units"></span>
</div>
<div class="col-md-6 fv-row">
<label class="required fs-6 fw-semibold mb-2 m-2">Statement reports</label>
{{-- <input type="file" class="form-control form-control-solid" name="statement_reports[]"
value="" id="statement_reports_update" multiple></span> --}}
<div id="statement_reports_container_view">
</div>
</div>
</div>
<div class="modal-footer">
@@ -357,13 +366,14 @@
</div>
</div>
</div>
<input type="hidden" id="base_url" value="{{url('/download-statement-report')}}">
@section('scripts')
<script>
$('#manageCommission').DataTable();
$(document).ready(function() {
$(".view_icon").click(function() {
var id = $(this).data("id");
$('#commitment_amount').val($(this).data('commitment_amount'));
$('#contribution_amount').val($(this).data('contribution_amount'));
$('#contribution_called_amount').val($(this).data('contribution_called_amount'));
@@ -381,8 +391,135 @@
$('#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);
getStatementReprots(id)
});
});
// $(document).ready(function(){
// alert($('#base_url').val())
// })
function getStatementReprots(id) {
$.ajax({
type: "GET",
dataType: "json",
url: "{{ route('fecth-statement-reports') }}",
data: {
id: id
},
success: function(data) {
if (data.success == 200) {
var statementReports = data.data;
var fileList = $('<ul>');
var downloadList = $('<ul>');
statementReports.forEach(function(fileName) {
var url = $('#base_url').val()+'/'+ fileName;
var anchorTag = $('<li>').html($('<a>').attr('href', url ).text(fileName));
downloadList.append(anchorTag);
var listItem = $('<li>').text(fileName);
var removeIcon = $('<span>').text('❌').addClass(
'remove-icon');
removeIcon.data('id', id);
removeIcon.click(function() {
var id = $(this).data("id");
var removedFileName = $(this).parent()
.text().trim();
var index = removedFileName.indexOf(
'.pdf'); // Find the index of the file extension
if (index !== -1) {
removedFileName = removedFileName
.substring(0, index +
4); // Include the file extension in the substring
}
var listItemToRemove = $(this).parent();
Swal.fire({
title: 'Are you sure you want to delete?',
showDenyButton: false,
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No',
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
headers: {
'X-CSRF-TOKEN': $(
'meta[name="csrf-token"]'
)
.attr(
'content'
)
},
url: "{{ route('delete-statement-reports') }}", // Adjust the route as needed
type: "POST",
data: {
id: id,
fileName: removedFileName
},
success: function(
response
) {
if (response
.success
) {
toastr
.success(
'Document deleted successfully'
);
listItemToRemove
.remove();
setTimeout
(() => {
location
.reload(); // Reload the page after successful deletion
},
1000
);
} else {
toastr
.error(
'Something went wrong! Please Try Again'
);
}
},
error: function(
xhr,
textStatus,
errorThrown
) {
toastr
.error(
'Error: ' +
textStatus
);
}
});
}
});
});
downloadList.append(listItem);
listItem.append(removeIcon);
fileList.append(listItem);
});
// console.log(fileList);
// console.log(downloadList);
// Empty both modal containers first
$('#statement_reports_container').empty().append(fileList);
$('#statement_reports_container_view').empty().append(downloadList); // Clone fileList for the second container
} else {
$('#statement_reports_container').empty().text(
"No statement reports found.");
}
},
error: function(xhr, status, error) {
console.error(xhr.responseText); // Log the error message
$('#statement_reports_container').empty().text(
"Error fetching statement reports. Please try again later.");
}
});
}
$(document).ready(function() {
@@ -409,80 +546,7 @@
$('#no_of_units_held_update').val($(this).data('no_of_units_held'));
// Ajax request
$.ajax({
type: "GET",
dataType: "json",
url: "{{ route('fecth-statement-reports') }}",
data: {
id: id
},
success: function(data) {
if (data.success == 200) {
var statementReports = data.data;
var fileList = $('<ul>');
statementReports.forEach(function(fileName) {
var listItem = $('<li>').text(fileName);
var removeIcon = $('<span>').text('❌').addClass('remove-icon');
removeIcon.data('id', id);
removeIcon.click(function() {
var id = $(this).data("id");
var removedFileName = $(this).parent().text().trim();
var index = removedFileName.indexOf('.pdf'); // Find the index of the file extension
if (index !== -1) {
removedFileName = removedFileName.substring(0, index + 4); // Include the file extension in the substring
}
var listItemToRemove = $(this).parent();
Swal.fire({
title: 'Are you sure you want to delete?',
showDenyButton: false,
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No',
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
url: "{{ route('delete-statement-reports') }}", // Adjust the route as needed
type: "POST",
data: {
id: id,
fileName: removedFileName
},
success: function(response) {
if (response.success) {
toastr.success('Document deleted successfully');
listItemToRemove.remove();
setTimeout(() => {
location.reload(); // Reload the page after successful deletion
}, 1000);
} else {
toastr.error('Something went wrong! Please Try Again');
}
},
error: function(xhr, textStatus, errorThrown) {
toastr.error('Error: ' + textStatus);
}
});
}
});
});
listItem.append(removeIcon);
fileList.append(listItem);
});
$('#statement_reports_container').empty().append(fileList);
} else {
$('#statement_reports_container').empty().text(
"No statement reports found.");
}
},
error: function(xhr, status, error) {
console.error(xhr.responseText); // Log the error message
$('#statement_reports_container').empty().text(
"Error fetching statement reports. Please try again later.");
}
});
getStatementReprots(id)
});

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

@@ -179,6 +179,14 @@
id="absolute_return_till_date_in_pct"></span></div>
</div>
<div class="col-md-6 fv-row">
<label class="required fs-6 fw-semibold mb-2 m-2">Statement reports</label>
{{-- <input type="file" class="form-control form-control-solid" name="statement_reports[]"
value="" id="statement_reports_update" multiple></span> --}}
<div id="statement_reports_container_view">
</div>
</div>
<!--end::Col-->
{{-- @endforeach --}}
</div>
@@ -337,6 +345,7 @@
</div>
<!--end::Modal dialog-->
</div>
<input type="hidden" id="base_url" value="{{url('/download-statement-report')}}">
@section('scripts')
<script>
$('#manageCommission').DataTable();
@@ -344,21 +353,132 @@
$(document).ready(function() {
// alert("hello");
$('.view_icon').click(function() {
var id = $(this).data("id");
$('#custom_id').html($(this).data("custom-id"));
$('#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').html($(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();
// 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
}
$('#total_gross_interest').html($(this).data("total-gross-interest"));
$('#tds').html($(this).data("tds"));
$('#total_net_interest').html($(this).data("total-net-interest"));
$('#gross_entery_yeild_in_pct').html($(this).data("gross-entery-yield-in-pct"));
$('#target_return_in_pct').html($(this).data("target-return-in-pct"));
$('#absolute_return_till_date').html($(this).data("absolute-return-till-date"));
$('#absolute_return_till_date_in_pct').html($(this).data(
"absolute-return-till-date-in-pct"));
$('#absolute_return_till_date_in_pct').html($(this).data("absolute-return-till-date-in-pct"));
$('#statement_report').html($(this).data("statement-reports"));
getStatementReprots(id)
})
});
function getStatementReprots(id) {
$.ajax({
type: "GET",
dataType: "json",
url: "{{ route('fecth-statement-reports-fre') }}",
data: {
id: id
},
success: function(data) {
if (data.success == 200) {
var statementReports = data.data;
var fileList = $('<ul>');
var downloadList = $('<ul>');
statementReports.forEach(function(fileName) {
var url = $('#base_url').val() + '/' + fileName;
// Create anchor tag inside list item for downloadList
var anchorTag = $('<a>').attr('href', url).text(fileName);
var listItemDownload = $('<li>').append(anchorTag);
downloadList.append(listItemDownload);
// Create list item for fileList with remove icon
var listItemFile = $('<li>').text(fileName);
var removeIcon = $('<span>').text('❌').addClass('remove-icon');
removeIcon.data('id', id);
removeIcon.click(function() {
var id = $(this).data("id");
var removedFileName = $(this).parent().text().trim();
var index = removedFileName.indexOf('.pdf');
if (index !== -1) {
removedFileName = removedFileName.substring(0, index + 4);
}
var listItemToRemove = $(this).parent();
Swal.fire({
title: 'Are you sure you want to delete?',
showDenyButton: false,
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No',
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
url: "{{ route('delete-statement-reports-fre') }}",
type: "POST",
data: {
id: id,
fileName: removedFileName
},
success: function(response) {
if (response.success) {
toastr.success('Document deleted successfully');
listItemToRemove.remove();
setTimeout(() => {
location.reload(); // Reload the page after successful deletion
}, 1000);
} else {
toastr.error('Something went wrong! Please Try Again');
}
},
error: function(xhr, textStatus, errorThrown) {
toastr.error('Error: ' + textStatus);
}
});
}
});
});
// Append remove icon to listItemFile for fileList
listItemFile.append(removeIcon);
fileList.append(listItemFile);
});
// Empty both modal containers first
$('#statement_reports_container').empty().append(fileList);
$('#statement_reports_container_view').empty().append(downloadList);
} else {
$('#statement_reports_container').empty().text("No statement reports found.");
}
},
error: function(xhr, status, error) {
console.error(xhr.responseText); // Log the error message
$('#statement_reports_container').empty().text("Error fetching statement reports. Please try again later.");
}
});
}
$(document).ready(function() {
// alert("hello");
$('.action_icon').click(function() {
@@ -379,115 +499,9 @@
// $('#estatement_report').val($(this).data("estatement-reports"));
// Ajax request
$.ajax({
type: "GET",
dataType: "json",
url: "{{ route('fecth-statement-reports-fre') }}",
data: {
id: id
},
success: function(data) {
if (data.success == 200) {
var statementReports = data.data;
var fileList = $('<ul>');
statementReports.forEach(function(fileName) {
var listItem = $('<li>').text(fileName);
var removeIcon = $('<span>').text('❌').addClass(
'remove-icon');
removeIcon.data('id', id);
removeIcon.click(function() {
var id = $(this).data("id");
var removedFileName = $(this).parent()
.text().trim();
var index = removedFileName.indexOf(
'.pdf'
); // Find the index of the file extension
if (index !== -1) {
removedFileName = removedFileName
.substring(0, index +
4
); // Include the file extension in the substring
}
var listItemToRemove = $(this).parent();
Swal.fire({
title: 'Are you sure you want to delete?',
showDenyButton: false,
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'No',
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
headers: {
'X-CSRF-TOKEN': $(
'meta[name="csrf-token"]'
)
.attr(
'content'
)
},
url: "{{ route('delete-statement-reports-fre') }}", // Adjust the route as needed
type: "POST",
data: {
id: id,
fileName: removedFileName
},
success: function(
response
) {
if (response
.success
) {
toastr
.success(
'Document deleted successfully'
);
listItemToRemove
.remove();
setTimeout
(() => {
location
.reload(); // Reload the page after successful deletion
},
1000
);
} else {
toastr
.error(
'Something went wrong! Please Try Again'
);
}
},
error: function(
xhr,
textStatus,
errorThrown
) {
toastr
.error(
'Error: ' +
textStatus
);
}
});
}
});
});
listItem.append(removeIcon);
fileList.append(listItem);
});
$('#statement_reports_container').empty().append(fileList);
} else {
$('#statement_reports_container').empty().text(
"No statement reports found.");
}
},
error: function(xhr, status, error) {
console.error(xhr.responseText); // Log the error message
$('#statement_reports_container').empty().text(
"Error fetching statement reports. Please try again later.");
}
});
getStatementReprots(id)
})
});

4
resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php
View File

@@ -64,7 +64,7 @@
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Latest Valuation Date</b>: {{$data->latest_valuation_date}}</label>
<label> <b class='fw-bold'>Latest Valuation Date</b>: {{ \Carbon\Carbon::parse($data->latest_valuation_date)->format('d-m-Y') }}</label>
</div>
</div>
<div class="col-md-6 my-3">
@@ -170,7 +170,7 @@
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Latest Valuation Date</b>: {{$data->latest_valuation_date}}</label>
<label> <b class='fw-bold'>Latest Valuation Date</b>: {{ \Carbon\Carbon::parse($data->latest_valuation_date)->format('d-m-Y') }}</label>
</div>
</div>
<div class="col-md-6 my-3">

9
routes/web.php
View File

@@ -465,6 +465,15 @@ Route::get('new-mail-template',function(){
Route::get("get-statement-report/{file_name}", [FrontendDashboardController::class, 'getStatementReportAPI'])->name('get-statement-report-api');
Route::get('download-statement-report/{filename}', function($filename){
$filenameWithPath = 'files/monthly-update/0121719470229.png';
if(\Storage::exists($filenameWithPath))
{
return \Storage::download($filenameWithPath);
}
return 'No file found';
})->name('download-statement-report');
//User Routes
Route::middleware([FrontendAccess::class])->group(function () {
Route::get("market-list/{custom_id?}", [FrontendDashboardController::class, 'viewDetailMarketPlace'])->name('market-list');