From 13c7cfca13c06b8c44d78db3990bd0b7dbb126c7 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 6 Aug 2024 06:17:35 +0000 Subject: [PATCH] FIX_Date --- app/Views/viewinwardgateregister.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 2f2f21bf..99c38645 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -606,10 +606,10 @@ var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear()); $("#Invoice_Date").val(dcd2); console.log(item.MaterialRcvdDate) - var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(item.MaterialRcvdDate,1); + var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate,1); $("#MaterialRcvdDate").val(Mat_rcv_date); console.log(item.MaterialRcvdDate) - var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(item.GrossWeightDate,2); + var gross_rcv_date = (item.GrossWeightDate == 'null') ? ' ' : formatDateTime(item.GrossWeightDate,2); $("#ser").val(item.ServiceDescription); i = i + 1; @@ -1112,6 +1112,7 @@ function deleteBill(Billno,i){ } $("#WeightCalculator").on("shown.bs.modal", function(e) { var inx = $(e.relatedTarget).data('index'); + console.log(inx); var material = $(e.relatedTarget).data('material'); var modal = $(this); @@ -1260,7 +1261,7 @@ function deleteBill(Billno,i){ // Note 1 means DATE only // 2 means DATE and Time // Check if the date string is null or empty - if (!dateString || dateString === null || dateString === '0000-00-00 00:00:00') { + if (!dateString || dateString == 'null' || dateString === '0000-00-00 00:00:00') { return ''; } else {