diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 911bf01f..b61334fd 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -222,13 +222,15 @@ if (!empty($INRSYMBOL)) { alert('Please Select the Delivery Date'); $('#Deliverydt').focus(); return false; - }else if ( radioValue == 1 && (scheduleBy.trim() == '' || scheduleBy == false)) + } + else if ( radioValue == 1 && (scheduleBy.trim() == '' || scheduleBy == false)) { alert('Please Enter the Schedule By'); $('#Scheduleby').focus(); return false; - }else if ($('#PoTypeOptions').val() == "0") { + } + else if ($('#PoTypeOptions').val() == "0") { alert('Please Select Revenue Type'); $('#PoTypeOptions').focus(); return false; diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index ce864503..c76b0563 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -2458,7 +2458,10 @@ if (!empty($INRSYMBOL)) { } function vaildateBeforeOpenModal() { + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + var scheduleBy = $('#Scheduleby').val(); // Get the value + if ($('#drpSupplier').val() == "0") { alert('Please Select the Supplier details'); $('#drpSupplier').focus(); @@ -2479,14 +2482,15 @@ if (!empty($INRSYMBOL)) { alert('Please Select the Delivery Date'); $('#Deliverydt').focus(); return false; - }else if (radioValue == 1) { - var scheduleBy = $('#Scheduleby').val(); // Get the value - if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined + } + else if ( radioValue == 1 && (scheduleBy.trim() == '' || scheduleBy == false)) + { alert('Please Enter the Schedule By'); $('#Scheduleby').focus(); return false; - } - }else if($('#PODate').val() == ''){ + + } + else if($('#PODate').val() == ''){ alert('Please Enter the Purchase Order date'); $('#PODate').focus(); return false;