SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IGR issue fixed

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-07-28 12:56:06 +05:30
parent 8bf6602964
commit 309762b0bc
2 changed files with 79 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
application/views/inwardgateregister.php
View File

@ -1,6 +1,5 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -15,9 +14,12 @@
}); });
}); });
//jquery for vechicle masking
$(document).ready(function(){
Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
});
</script> </script>
<style> <style>
.modal { .modal {
text-align: center; text-align: center;
@ -48,7 +50,7 @@
} }
</style> </style>
<div class="content-wrapper"> <div class="content-wrapper" style="min-height:537px;">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<h1> <h1>
@ -59,13 +61,13 @@
<div class="row" style="padding-bottom:1%"> <div class="row" style="padding-bottom:1%">
<div id="content" > </div> <div id="content" > </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-2">
<?php <?php
$attributes = array('class' => 'form-label-left IGR ','name' => 'IGR','id' => 'IGR'); $attributes = array('class' => 'form-label-left IGR ','name' => 'IGR','id' => 'IGR');
echo form_open($this->config->base_url().'/inwardgateregister/addNewigr/',$attributes); ?> echo form_open($this->config->base_url().'/inwardgateregister/addNewigr/',$attributes); ?>
<label>Select Purchase Order NO </label> <label>Select Purchase Order NO </label>
<div>
<?php <?php
$options = array("-1"=>'Purchase Order No'); $options = array("-1"=>'Purchase Order No');
@ -83,13 +85,11 @@
} }
echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"'); echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"');
?>
?>
</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-2">
<label>Supplier Name </label> <label>Supplier Name </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -99,36 +99,35 @@
</div> </div>
</div> </div>
<div class="col-md-3">
</div>
</div> <div class="col-md-2">
<div class="col-md-12"> <label>Delivery Challan/Invoice NO</label>
<div class="col-md-3">
<label>Delivery Challan / Invoice NO</label>
<?php <?php
$data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' ); $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' );
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-3"> <div class="col-md-2">
<label>Delivery Challan / Invoice Date</label> <label>Delivery Challan/Invoice Date</label>
<?php <?php
$data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' ); $data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' );
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-3">
<div class="col-md-2">
<label>Vechicle NO</label> <label>Vechicle NO</label>
<?php <?php
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'),'pattern=>"^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$"','id'=>'VehicleNo', 'class' => 'form-control', 'onchange'=>'validate_Vechicle();'); $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', );
echo form_input($data); echo form_input($data);
?> ?>
<span pattern="" required="true"></span> <span pattern="" required="true"></span>
</div> </div>
<div class="col-md-3"> <div class="col-md-2">
<label>Courier NO</label> <label>Courier NO</label>
<?php <?php
$data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control' ); $data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control' );
@ -136,7 +135,7 @@
?> ?>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@ -209,11 +208,7 @@
<!-- new modal ended--> <!-- new modal ended-->
</div>
</div> </div>
@ -256,12 +251,13 @@ function validate()
var isExceed = 0; var isExceed = 0;
for(k=1;k<=rowcount ; k++) for(k=1;k<=rowcount ; k++)
{ {
var AdvisedQty = parseFloat( $('#QuantityAsPerInvoice'+k).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+k).val()); var AdvisedQty = parseFloat( $('#QuantityAsPerInvoice'+k).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+k).val());
var RecQty = parseFloat( $('#txtReceivedQuantity'+k).val() == '' ? '0.00' : $('#txtReceivedQuantity'+k).val());
var OrderedQty =parseFloat($('#Quantity_1'+k).text()); var OrderedQty =parseFloat($('#Quantity_1'+k).text());
if(AdvisedQty != '0.00') if(AdvisedQty != '0.00')
{ {
if(OrderedQty < AdvisedQty) if(OrderedQty < (AdvisedQty+RecQty))
{ {
isExceed = 1; isExceed = 1;
return false; return false;
@ -361,6 +357,9 @@ function validate()
url:"<?php echo base_url() ?>inwardgateregister/IGRITEM", url:"<?php echo base_url() ?>inwardgateregister/IGRITEM",
success:function(data) { success:function(data) {
//alert(data);
$('#content').loader('hide'); $('#content').loader('hide');
//alert(data); //alert(data);
var trHTML = ''; var trHTML = '';
@ -376,7 +375,7 @@ function validate()
'<td name="Quantity1'+i+'" id="Quantity_1'+i+'">' + item.Quantity + '</td>' + '<td name="Quantity1'+i+'" id="Quantity_1'+i+'">' + item.Quantity + '</td>' +
'<td name="ReceivedQuantity'+i+'" id="ReceivedQuantity'+i+'">'+ item.ReceivedQuantity +'</td>'+ '<td name="ReceivedQuantity'+i+'" id="ReceivedQuantity'+i+'">'+ item.ReceivedQuantity +'</td>'+
'<td name="PendingQuantity'+i+'" id="PendingQuantity'+i+'">'+ item.PendingQty +'</td>'+ '<td name="PendingQuantity'+i+'" id="PendingQuantity'+i+'">'+ item.PendingQty +'</td>'+
'<td data-name="sel" ><input type="text" onchange="validateReceivedQuantity('+i+')"id="QuantityAsPerInvoice'+ i +'" name="QuantityAsPerInvoice'+ i +'" class="form required" value="" onkeypress="return isNumberKey(event);"></td>' + '<td data-name="sel" ><input type="text" onchange="validateReceivedQuantity('+i+')"id="QuantityAsPerInvoice'+ i +'" name="QuantityAsPerInvoice'+ i +'" value="" onkeypress="return isNumberKey(event);"></td>' +
'<td><input type="text" id="Remark'+ i +'" name="Remark'+ i +'" class="form" onchange="SetRemarks('+i+')"> </td>' + '<td><input type="text" id="Remark'+ i +'" name="Remark'+ i +'" class="form" onchange="SetRemarks('+i+')"> </td>' +
'</tr>'; '</tr>';
@ -388,6 +387,11 @@ function validate()
value:item.MaterialCode, value:item.MaterialCode,
name: 'MaterialCode'+i name: 'MaterialCode'+i
}).appendTo('form'); }).appendTo('form');
$('<input>').attr({
type: 'hidden',
id: 'txtQuantityAsPerInvoice'+i,
name: 'txtQuantityAsPerInvoice'+i
}).appendTo('form');
$('<input>').attr({ $('<input>').attr({
type: 'hidden', type: 'hidden',
id: 'OrderedQuantity'+i, id: 'OrderedQuantity'+i,
@ -399,8 +403,9 @@ $('<input>').attr({
$('<input>').attr({ $('<input>').attr({
type: 'hidden', type: 'hidden',
id: 'ReceivedQuantity'+i, id: 'txtReceivedQuantity'+i,
name: 'ReceivedQuantity'+i, name: 'txtReceivedQuantity'+i,
value:item.ReceivedQuantity
}).appendTo('form'); }).appendTo('form');
$('<input>').attr({ $('<input>').attr({
@ -408,6 +413,20 @@ $('<input>').attr({
id: 'txtRemarks'+i, id: 'txtRemarks'+i,
name: 'txtRemarks'+i name: 'txtRemarks'+i
}).appendTo('form'); }).appendTo('form');
$('<input>').attr({
type: 'hidden',
id: 'txtPendingQty'+i,
name: 'txtPendingQty'+i,
value:item.PendingQty
}).appendTo('form');
//alert(item.PendingQty);
if(item.PendingQty == 0.00)
{
//alert('inside if');
$('#QuantityAsPerInvoice'+i).attr('readonly', 'true');
// $('#txtEditFreight').attr('readonly', 'true');
}
}); });
@ -420,7 +439,7 @@ $('<input>').attr({
} }
}); });
@ -429,6 +448,10 @@ $('<input>').attr({
{ {
alert('The Order is completed!!'); alert('The Order is completed!!');
$("#IGRLink").hide(); $("#IGRLink").hide();
}
else
{
$("#IGRLink").show();
} }
} }
@ -451,24 +474,25 @@ function validateReceivedQuantity(Rowid){
var InvoiceQty = parseFloat( $('#QuantityAsPerInvoice'+Rowid).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+Rowid).val()); var InvoiceQty = parseFloat( $('#QuantityAsPerInvoice'+Rowid).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+Rowid).val());
var PendingQty = parseFloat( $('#PendingQuantity'+Rowid).text() == '' ? '0.00' : $('#PendingQuantity'+Rowid).text()); var PendingQty = parseFloat( $('#PendingQuantity'+Rowid).text() == '' ? '0.00' : $('#PendingQuantity'+Rowid).text());
//alert(PendingQty);
var r =$("#Remark"+Rowid).val(); var RecQty = parseFloat( $('#txtReceivedQuantity'+Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity'+Rowid).val());
var OrderedQty =parseFloat($("#Quantity_1"+Rowid).text()); var OrderedQty =parseFloat($("#Quantity_1"+Rowid).text());
var r =$("#Remark"+Rowid).val();
if(InvoiceQty > OrderedQty){ if((InvoiceQty+RecQty) > OrderedQty){
alert("Advised Quantity is exceeding the Ordered Quantity.Please Contact Purchase Team for further Process ") alert("Advised Quantity is exceeding the Ordered Quantity.Please Contact Purchase Team for further Process ")
$("#QuantityAsPerInvoice"+Rowid).focus(); $("#QuantityAsPerInvoice"+Rowid).focus();
$("#QuantityAsPerInvoice"+Rowid).val('');
return false; return false;
} }
else if(PendingQty == '0.00'){ else if(((InvoiceQty+RecQty) - OrderedQty) > 0.00){
alert("Order is completed.") alert("Order is completed.")
$("#QuantityAsPerInvoice"+Rowid).focus(); $("#QuantityAsPerInvoice"+Rowid).focus();
$('#QuantityAsPerInvoice'+Rowid).val(''); $('#QuantityAsPerInvoice'+Rowid).val('');
@ -476,9 +500,12 @@ function validateReceivedQuantity(Rowid){
} }
else { else {
$('#PendingQuantity'+Rowid).text(OrderedQty - InvoiceQty ); // alert(RecQty);
$("#ReceivedQuantity"+Rowid).val(InvoiceQty); $('#PendingQuantity'+Rowid).text((OrderedQty - (InvoiceQty+RecQty)).toFixed(2));
$('#txtPendingQty'+Rowid).val(OrderedQty - (InvoiceQty+RecQty));
$("#ReceivedQuantity"+Rowid).val(InvoiceQty+RecQty);
$("#txtQuantityAsPerInvoice"+Rowid).val(InvoiceQty);
// InvoiceQty
return true; return true;
} }

7
application/views/viewinwardgateregister.php
View File

@ -120,11 +120,14 @@
<br/> <br/>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-3">
<label>Supplier Name:</label> <label>Supplier and Address :</label>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<input type="text" id="Supplier" readonly> <input type="text" id="Supplier" readonly>
</div>
</div>
</div> </div>
<!-- Table to show the line item of po --> <!-- Table to show the line item of po -->
<div id="content" > </div> <div id="content" > </div>