+
-
@@ -315,7 +319,8 @@ table.dataTable tbody td {
| pk |
- Invoice Amount |
+ Received Amount |
+ TDS |
UTR Number |
Date |
Action |
@@ -324,9 +329,10 @@ table.dataTable tbody td {
|
- |
+ |
+ |
|
- |
+ |
|
@@ -354,19 +360,24 @@ table.dataTable tbody td {
const invoiceNoDiv = document.getElementById('invoice_no_div_modal');
// const invoiceDateDiv = document.getElementById('invoice_date_div_modal');
const paymentTableDiv = document.getElementById('payment_table_div_modal');
+ const totalReceivedAmtDiv = document.getElementById('modal_received_amt_div');
// Hide everything initially
invoiceNoDiv.style.display = 'none';
// invoiceDateDiv.style.display = 'none';
paymentTableDiv.style.display = 'none';
+ totalReceivedAmtDiv.style.display = 'none';
// Show fields based on selected status
if (invoiceStatus === 'generated' || invoiceStatus === 'sent') {
invoiceNoDiv.style.display = 'flex';
+ totalReceivedAmtDiv.style.display = 'none';
switchRequired('invoice_no_modal',true);
switchRequired('invoice_date_modal',true);
+ switchRequired('invoice_amount_no_modal',true);
- switchRequired('invoice_amount',false,'name');
+ switchRequired('received_amount',false,'name');
+ switchRequired('tds',false,'name');
switchRequired('utr_no',false,'name');
switchRequired('payment_date',false,'name');
switchRequired('pk',false,'name');
@@ -374,24 +385,32 @@ table.dataTable tbody td {
} else if (invoiceStatus === 'payment_received') {
invoiceNoDiv.style.display = 'flex';
paymentTableDiv.style.display = 'block';
+ totalReceivedAmtDiv.style.display = 'block';
switchRequired('invoice_no_modal',true);
switchRequired('invoice_date_modal',true);
-
- switchRequired('invoice_amount',true,'name');
+ switchRequired('invoice_amount_no_modal',true);
+
+
+ switchRequired('received_amount',true,'name');
switchRequired('utr_no',true,'name');
+ switchRequired('tds',true,'name');
switchRequired('payment_date',true,'name');
switchRequired('pk',true,'name');
}else if(invoiceStatus === 'pending')
{
invoiceNoDiv.style.display = 'none';
paymentTableDiv.style.display = 'none';
+ totalReceivedAmtDiv.style.display = 'none';
+ // switchRequired('modal_received_amt_div',false);
switchRequired('invoice_no_modal',false);
switchRequired('invoice_date_modal',false);
+ switchRequired('invoice_amount_no_modal',false);
- switchRequired('invoice_amount',false,'name');
+ switchRequired('received_amount',false,'name');
switchRequired('utr_no',false,'name');
switchRequired('payment_date',false,'name');
switchRequired('pk',false,'name');
+ switchRequired('tds',false,'name');
}
});
@@ -417,12 +436,21 @@ table.dataTable tbody td {
$('#invoiceForm').on('submit', function (e) {
e.preventDefault(); // Prevent default form submission
var form = document.getElementById('invoiceForm');
- if(!form.checkValidity())
+ // alert(form.checkValidity());
+ // alert($('#invoice_date_modal').val());
+ if((!form.checkValidity()))
{
+ // console.log('error2');
return false;
}
-
-
+
+ if($('#invoice_date_modal').val().trim() === '' && $('#invoice_status').val() != 'pending')
+ {
+ // console.log('error1');
+ return false;
+ }
+ // console.log('final');
+ // return false;
// Serialize form data to array and then convert to JSON
var formData = new FormData(form);
var formDataJSON = {};
@@ -456,14 +484,13 @@ table.dataTable tbody td {
success: function (response) {
console.log(response);
// Close the modal
- var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
- myModal.hide();
-
+
+ $('.close').click()
// Reset the form data
$('#invoiceForm')[0].reset();
-
- // Optionally display success message or perform further actions
+
alert('Invoice updated successfully!');
+ location.reload();
},
error: function (xhr, status, error) {
// Handle any errors
@@ -471,6 +498,7 @@ table.dataTable tbody td {
alert('An error occurred while updating the invoice.');
}
});
+ // location.reload();
$('.loader').fadeOut();
$('.loader-mask').delay(10).fadeOut('slow');
});
@@ -484,13 +512,18 @@ table.dataTable tbody td {
newRow.innerHTML = `
|
-
|
+
|
+
|
|
-
|
+
|
|
`;
tableBody.appendChild(newRow);
+ $('.payment_date').datepicker({
+ format: 'dd-mm-yyyy',
+ autoclose: true
+ });
});
// Remove row
@@ -529,33 +562,7 @@ table.dataTable tbody td {
});
- function switchRequired(elementId, isRequired, type = 'id') {
-
- if(type == 'id')//id attribute
- {
- let element = document.getElementById(elementId);
- if (isRequired) {
- element.setAttribute('required', 'required');
- } else {
- element.removeAttribute('required');
- }
- }
- else //name attribute
- {
- var name_attribute = elementId+'[]';
- // Select all elements with the name 'invoice_amt[]'
- var elements = document.getElementsByName(name_attribute);
-
- // Loop through the elements and set or remove the 'required' attribute
- elements.forEach(function(element) {
- if (isRequired) {
- element.setAttribute('required', 'required'); // Make required
- } else {
- element.removeAttribute('required'); // Remove required
- }
- });
- }
-}
+
@@ -568,16 +575,31 @@ function showFileUploadModal(input)
// $(input).val('');
}
+function formatDate(date) {
+ var day = ("0" + date.getDate()).slice(-2);
+ var month = ("0" + (date.getMonth() + 1)).slice(-2);
+ var year = date.getFullYear();
+ return day + "-" + month + "-" + year;
+}
+function formatDateToDMY(dateStr) {
+ // Split the date string by the hyphen
+ var parts = dateStr.split('-');
+ return parts[2] + '-' + parts[1] + '-' + parts[0]; // Rearrange to DD-MM-YYYY
+}
function showInvoiceStatusModal(event)
{
+ var modal_received_amt_div = document.getElementById('modal_received_amt_div');
+ modal_received_amt_div.style.display = 'none';
+ // alert();
// console.log(event.target.data)
var dataId = event.target.getAttribute('data-id');
var dataExpAmt = event.target.getAttribute('data-exp-amt');
var dataReceivedAmt = event.target.getAttribute('data-received-amt');
// Set the value to a hidden input field in the modal
document.getElementById('hidden_statement_id').value = dataId;
- document.getElementById('modal_exp_amt').value = dataExpAmt;
+ // document.getElementById('modal_exp_amt').value = dataExpAmt;
document.getElementById('modal_received_amt').value = dataReceivedAmt;
+
$('.loader').fadeIn();
$('.loader-mask').fadeIn();
// AJAX call to get the invoice details based on data-id
@@ -602,8 +624,14 @@ function showInvoiceStatusModal(event)
}
document.getElementById('invoice_no_modal').value = response.data.invoice_no;
- document.getElementById('invoice_date_modal').value = response.data.invoice_date;
+ document.getElementById('invoice_date_modal').value = response.data.invoice_date === '' ? : response.data.invoice_date;
+ document.getElementById('invoice_amount_no_modal').value = response.data.invoice_amount;
+ if (!$('#invoice_date_modal').val()) {
+ // alert('nope');
+ // Set today's date as the default date
+ $('#invoice_date_modal').datepicker('setDate', new Date());
+ }
// Clear existing rows in the payment table
var paymentTableBody = document.querySelector('#payment_table_modal tbody');
@@ -616,14 +644,15 @@ function showInvoiceStatusModal(event)
var row = paymentTableBody.insertRow();
row.innerHTML = `
|
-
|
+
|
+
|
|
-
|
+
|
|
`;
});
}
-
+ $('.payment_date').datepicker({ format: 'dd-mm-yyyy',autoclose: true});
// Show the modal
var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
myModal.show();
@@ -641,17 +670,51 @@ function showInvoiceStatusModal(event)
});
$('.loader').fadeOut();
$('.loader-mask').delay(10).fadeOut('slow');
- var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
- myModal.show();
+ // var myModal = new bootstrap.Modal(document.getElementById('invoice_modal'));
+ // myModal.show();
// $(input).val('');
}
$(document).ready(function(){
- var rollover_date = flatpickr("#statement_month", {
- dateFormat: "Y-M-d",
- allowInput: true
+ // var rollover_date = flatpickr("#statement_month", {
+ // dateFormat: "Y-M",
+ // allowInput: true
+ // });
+ $('#statement_month').datepicker({
+ format: 'yyyy-M',
+ viewMode: 'months',
+ minViewMode: 'months',
+ autoclose: true
});
+
+
+ $('.payment_date').datepicker({
+ format: 'dd-mm-yyyy',
+ autoclose: true
+ });
+
+ // Get today's date
+var today = new Date();
+
+// Calculate the minimum date (60 days before today)
+var minDate = new Date();
+minDate.setDate(today.getDate() - 180);
+
+// Calculate the maximum date (60 days after today)
+var maxDate = new Date();
+maxDate.setDate(today.getDate() + 180);
+ $('#invoice_date_modal').datepicker({
+ format: 'dd-mm-yyyy',
+ autoclose: true,
+ startDate: minDate,
+ endDate: maxDate
+ });
+
+ // var invoice_date_modal = flatpickr("#invoice_date_modal", {
+ // dateFormat: "d-m-Y",
+ // allowInput: true
+ // });
});
@@ -692,7 +755,7 @@ $(document).ready(function(){
toastr.success(
'File upload successs',
'success');
- $('.close').click()
+ $('.close').click();
window.location.reload(true);
} else if (response.code === 404 && response.dataStatus === false) {
console.error('no data found', response);
@@ -765,19 +828,59 @@ $(document).ready(function(){
}
-function checkInvAmont(event)
-{
+function checkInvAmont(event) {
var total = 0;
- document.querySelectorAll('input[name="invoice_amount[]"]').forEach(function(el) {
- let val = parseFloat(el.value) || 0;
- total += val;
- });
- var exp_amt = document.getElementById('modal_exp_amt').value;
- if(exp_amt < total)
- {
- alert('Exceeds expected amt');
- event.target.value = '';
+ var receivedAmounts = document.querySelectorAll('input[name="received_amount[]"]');
+ var tdsAmounts = document.querySelectorAll('input[name="tds[]"]');
+ // console.log();
+ receivedAmounts.forEach(function(el, index) {
+ // Get the received amount
+ let receivedVal = parseFloat(el.value) || 0;
+ // Get the corresponding tds amount (paired with the received amount)
+ let tdsVal = parseFloat(tdsAmounts[index].value) || 0;
+ // Add received amount and tds amount
+ // console.log();
+ total += (receivedVal + tdsVal);
+ });
+ // console.log(total);
+ // Get the expected invoice amount
+ var exp_amt = parseFloat(document.getElementById('invoice_amount_no_modal').value) || 0;
+
+ // Check if the total exceeds the expected amount
+ if (exp_amt < total) {
+ alert('Exceeds Invoice amount');
+ event.target.value = ''; // Reset the value of the element that triggered the event
}
}
+
+function switchRequired(elementId, isRequired, type = 'id') {
+ // console.log('switchRequired: ' + elementId+' - '+' - '+ type);
+ if(type == 'id')//id attribute
+ {
+ let element = document.getElementById(elementId);
+ if (isRequired) {
+ element.setAttribute('required', 'required');
+ } else {
+ element.removeAttribute('required');
+ }
+ }
+ else //name attribute
+ {
+ var name_attribute = elementId+'[]';
+ // Select all elements with the name 'invoice_amt[]'
+ var elements = document.getElementsByName(name_attribute);
+
+ // Loop through the elements and set or remove the 'required' attribute
+ elements.forEach(function(element) {
+ if (isRequired) {
+ element.setAttribute('required', 'required'); // Make required
+ } else {
+ element.removeAttribute('required'); // Remove required
+ }
+ });
+ }
+}
+
+
\ No newline at end of file