bugs fixing
This commit is contained in:
meghamalore
@@ -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) {
|
||||
|
||||
@@ -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 }}"
|
||||
@@ -71,7 +71,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>
|
||||
@@ -335,6 +336,14 @@
|
||||
<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">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">
|
||||
@@ -345,13 +354,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'));
|
||||
@@ -368,8 +378,135 @@
|
||||
$('#current_nav').val($(this).data('current_nav'));
|
||||
$('#no_of_units_held').val($(this).data('no_of_units_held'));
|
||||
// $('#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() {
|
||||
@@ -395,80 +532,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)
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user