@@ -2572,6 +2588,17 @@
const dispStatus = String(row.resolved_status || getStatusName(row.status) || '').trim();
+ let screenshotHtml = '-';
+ if (row.mail_screenshot_path) {
+ let imgUrl = row.mail_screenshot_path;
+ if (contextPath && contextPath.endsWith('/') && imgUrl.startsWith('/')) {
+ imgUrl = contextPath + imgUrl.substring(1);
+ } else {
+ imgUrl = contextPath + imgUrl;
+ }
+ screenshotHtml = `
View`;
+ }
+
tr.innerHTML += `
${formatDate(row.received_date)} |
${formatDate(row.invoice_date)} |
@@ -2584,6 +2611,7 @@
${calculateAgeOfBill(row.received_date)} |
${text(dispStatus)} |
${text(row.remarks)} |
+
${screenshotHtml} |
${text(row.payment_review)} |
${formatDateTime(row.updated_date)} |
${text(row.updated_by_name || '-')} |
@@ -2610,6 +2638,25 @@
tdActions.appendChild(btnViewPdf);
}
+ if (row.mail_screenshot_path) {
+ const btnViewScreenshot = document.createElement('button');
+ btnViewScreenshot.className = 'btn-grid-action btn-outline-info me-1';
+ btnViewScreenshot.style.border = '1px solid #06b6d4';
+ btnViewScreenshot.style.color = '#06b6d4';
+ btnViewScreenshot.innerHTML = '
';
+ btnViewScreenshot.title = 'View Screenshot';
+ btnViewScreenshot.onclick = () => {
+ let imgUrl = row.mail_screenshot_path;
+ if (contextPath && contextPath.endsWith('/') && imgUrl.startsWith('/')) {
+ imgUrl = contextPath + imgUrl.substring(1);
+ } else {
+ imgUrl = contextPath + imgUrl;
+ }
+ window.open(imgUrl, '_blank');
+ };
+ tdActions.appendChild(btnViewScreenshot);
+ }
+
// History Button (Available to all logged in users)
const btnHistory = document.createElement('button');
btnHistory.className = 'btn-grid-action btn-outline-secondary me-1';
@@ -2841,6 +2888,10 @@
document.getElementById('form-pdf').value = '';
document.getElementById('form-existing-pdf-container').style.display = 'none';
+ // Reset Screenshot upload elements
+ document.getElementById('form-screenshot').value = '';
+ document.getElementById('form-existing-screenshot-container').style.display = 'none';
+
recordModalObj.show();
}
@@ -2984,6 +3035,23 @@
existingPdfContainer.style.display = 'none';
}
+ // Populate/Reset Screenshot elements
+ document.getElementById('form-screenshot').value = '';
+ const existingScreenshotContainer = document.getElementById('form-existing-screenshot-container');
+ const existingScreenshotLink = document.getElementById('form-existing-screenshot-link');
+ if (row.mail_screenshot_path) {
+ existingScreenshotContainer.style.display = 'block';
+ let imgUrl = row.mail_screenshot_path;
+ if (contextPath && contextPath.endsWith('/') && imgUrl.startsWith('/')) {
+ imgUrl = contextPath + imgUrl.substring(1);
+ } else {
+ imgUrl = contextPath + imgUrl;
+ }
+ existingScreenshotLink.href = imgUrl;
+ } else {
+ existingScreenshotContainer.style.display = 'none';
+ }
+
recordModalObj.show();
}
@@ -3061,10 +3129,44 @@
}
}
+ // Upload Screenshot if selected
+ let screenshotPath = originalRecord ? originalRecord.mail_screenshot_path : null;
+ const screenshotInput = document.getElementById('form-screenshot');
+ if (screenshotInput && screenshotInput.files && screenshotInput.files.length > 0) {
+ showLoader(true, 'Uploading Screenshot...');
+ const formData = new FormData();
+ formData.append('file', screenshotInput.files[0]);
+
+ const csrfHeaders = getCsrfHeaders();
+ try {
+ const uploadResponse = await fetch(contextPath + 'gccservicepaymenttracker/api/upload-screenshot', {
+ method: 'POST',
+ headers: {
+ ...csrfHeaders
+ },
+ body: formData
+ });
+ const uploadResult = await uploadResponse.json();
+ if (uploadResult.success) {
+ screenshotPath = uploadResult.filePath;
+ } else {
+ alert(uploadResult.error || 'Failed to upload Screenshot.');
+ showLoader(false);
+ return;
+ }
+ } catch (err) {
+ console.error("Upload error:", err);
+ alert("Failed to upload Screenshot due to connection error.");
+ showLoader(false);
+ return;
+ }
+ }
+
const payload = {
id, received_date, type, vendor_name: vendorName, subject, amount, invoice_no,
receiptno, invoice_date, physical_file_no, tat, status, followup,
- myfollowup, order_by, remarks, payment_review, file_path: filePath
+ myfollowup, order_by, remarks, payment_review, file_path: filePath,
+ mail_screenshot_path: screenshotPath
};
const csrfHeaders = getCsrfHeaders();
@@ -4258,6 +4360,25 @@
tdActions.appendChild(btnViewPdf);
}
+ if (row.mail_screenshot_path) {
+ const btnViewScreenshot = document.createElement('button');
+ btnViewScreenshot.className = 'btn-grid-action btn-outline-info me-1';
+ btnViewScreenshot.style.border = '1px solid #06b6d4';
+ btnViewScreenshot.style.color = '#06b6d4';
+ btnViewScreenshot.innerHTML = '
';
+ btnViewScreenshot.title = 'View Screenshot';
+ btnViewScreenshot.onclick = () => {
+ let imgUrl = row.mail_screenshot_path;
+ if (contextPath && contextPath.endsWith('/') && imgUrl.startsWith('/')) {
+ imgUrl = contextPath + imgUrl.substring(1);
+ } else {
+ imgUrl = contextPath + imgUrl;
+ }
+ window.open(imgUrl, '_blank');
+ };
+ tdActions.appendChild(btnViewScreenshot);
+ }
+
// History Button
const btnHistory = document.createElement('button');
btnHistory.className = 'btn-grid-action btn-outline-secondary me-1';
@@ -4409,6 +4530,7 @@
Age of Bill (Days) |
Status |
Remarks |
+
Screenshot Status |
Payment Review |
Last Updated At |
Last Updated By |
@@ -4495,6 +4617,7 @@
${calculateAgeOfBill(row.received_date)} |
${text(dispStatus)} |
${text(row.remarks)} |
+
${row.mail_screenshot_path ? 'Screenshot Uploaded' : 'Screenshot not uploaded'} |
${text(row.payment_review)} |
${formatDateTime(row.updated_date)} |
${text(row.updated_by_name || '-')} |
@@ -4712,8 +4835,7 @@
const dispStatus = String(item.resolved_status || getStatusName(item.status) || '').trim();
- // Document button if file path is available
- let docBtnHtml = '-';
+ let docBtnHtml = '';
if (item.file_path) {
let pdfUrl = item.file_path;
if (contextPath && contextPath.endsWith('/') && pdfUrl.startsWith('/')) {
@@ -4721,7 +4843,19 @@
} else {
pdfUrl = contextPath + pdfUrl;
}
- docBtnHtml = `
`;
+ docBtnHtml += `
`;
+ }
+ if (item.mail_screenshot_path) {
+ let imgUrl = item.mail_screenshot_path;
+ if (contextPath && contextPath.endsWith('/') && imgUrl.startsWith('/')) {
+ imgUrl = contextPath + imgUrl.substring(1);
+ } else {
+ imgUrl = contextPath + imgUrl;
+ }
+ docBtnHtml += `
`;
+ }
+ if (!docBtnHtml) {
+ docBtnHtml = '-';
}
// Resolve type badge
diff --git a/src/main/resources/templates/gccservicepaymenttracker/details.html b/src/main/resources/templates/gccservicepaymenttracker/details.html
index bd5ad80..dde7f9a 100644
--- a/src/main/resources/templates/gccservicepaymenttracker/details.html
+++ b/src/main/resources/templates/gccservicepaymenttracker/details.html
@@ -459,6 +459,7 @@
style="max-width: 90px;">STATUS