diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index fe4dc61a..b7c00d58 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -2428,7 +2428,7 @@ if (!empty($INRSYMBOL)) { }); - $(function() { + $(document).ready(function() { $("#PODate").datepicker({ format: 'dd-mm-yyyy', @@ -2661,6 +2661,7 @@ if (!empty($INRSYMBOL)) { id = ''; }); + $('#MaterialCode').change(function() { var id = $('#MaterialCode').val(); @@ -2669,6 +2670,7 @@ if (!empty($INRSYMBOL)) { $("#CPRate").val(''); $("#CPQuantity").val(''); $("#CPTotalAmount").val(''); + $('#txtTotalOrderValue').val(''); RequistQuantity = ''; clearTaxField(); if (id != '0') { @@ -2709,6 +2711,9 @@ if (!empty($INRSYMBOL)) { if (response) alert(response); } }); + + Ratechange(); + } else { alert('Please select the MaterialCode'); return false; @@ -2958,6 +2963,7 @@ if (!empty($INRSYMBOL)) { // } } } else { + alert("Quantity Or Rate is Empty..!!") $('CPRate').focus(); } @@ -3332,7 +3338,16 @@ if (!empty($INRSYMBOL)) { } var index = 1; /* This is used add capital po line item */ - $('.AddCapital').click(function() { + $(document).click('.AddCapital',function() { + + let CPRate = $('#CPRate').val(); + + + if (parseFloat(CPRate) === 0 || CPRate.trim() === "") { + alert("Rate cannot be empty or zero..!!"); + return false; + } + tinyMCE.triggerSave(); if (validateCapitalTax() && validateExceedLimit() && ExceedQuantityCheck()) { @@ -3622,16 +3637,15 @@ if (!empty($INRSYMBOL)) { } else { basicAmountRate = parseFloat(basicAmountRate) - parseFloat(discountRate); } - // if(basicAmountRate > avalbudAmt) - // { - // alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); - // $('#CPRate').focus(); - // return false; - // } - // else - // { + + let CPRate = $('#CPRate').val(); + + if(CPRate == "0" || CPRate == " " || CPRate == "0.00"){ + return false; + } + return true; - //} + } @@ -3660,7 +3674,7 @@ if (!empty($INRSYMBOL)) { alert('Please Enter the Rate of the Item'); $('#CPRate').focus(); return false; - } else if ($('#CPRate').val() == "0") { + } else if ($('#CPRate').val() == "0" || $('#CPRate').val() == "0.00" ) { alert('Please Enter the Valid Rate of the Item'); $('#CPRate').focus(); return false; @@ -4998,7 +5012,7 @@ if (!empty($INRSYMBOL)) { alert('Please Enter the Rate of the Item'); $('#EditCPRate').focus(); return false; - } else if ($('#EditCPRate').val() == "0") { + } else if ($('#EditCPRate').val() == "0" || $('#EditCPRate').val() == "0.00" ) { alert('Please Enter the Valid Rate of the Item'); $('#EditCPRate').focus(); return false; diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index fef4f668..fd8e346f 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -4094,6 +4094,7 @@ $(document).ready(function () { $("#CPQuantity").val(''); $("#CPTotalAmount").val(''); $("#CPRate").val(''); + $('#txtTotalOrderValue').val(''); RequistQuantity = ''; clearTaxField(); if (id != '0') { @@ -4434,7 +4435,7 @@ $(document).ready(function () { let availableReqQty = 0 ; let usedReqQty = 0; - let originalReqQty = 0; + let originalReqQty = 0; $('#loader').show(); @@ -4898,6 +4899,15 @@ $(document).ready(function () { /* This is used add capital po line item */ $('.AddCapital').click(function() { + + + let CPRate = $('#CPRate').val(); + + if (parseFloat(CPRate) === 0 || CPRate.trim() === "") { + alert("Rate cannot be empty or zero..!!"); + return false; + } + tinyMCE.triggerSave(); if (validateCapitalTax() && validateExceedLimit() ) {