diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php index 839cce28..947da6e9 100644 --- a/application/controllers/inwardgateregister.php +++ b/application/controllers/inwardgateregister.php @@ -34,12 +34,12 @@ class inwardgateregister extends BaseController $this->loadViews("viewinwardgateregister", $this->global,NULL , NULL); } - function viewinwardgateregister($IGRNO='',$IGR='') + function viewinwardgateregister() { $this->load->model('inwardgateregister_model'); $this->global['pageTitle'] = 'Siddharth : Inward Gate Register'; - $data['IGR']= $this->inwardgateregister_model->igrListing($IGRNO,$IGR); - + $data['IGR']= $this->inwardgateregister_model->igrListing(); + //print_r($data['IGR']);//print_r statement is used to get the values $this->loadViews("viewinwardgateregister",$this->global,$data,NULL); } @@ -134,7 +134,8 @@ class inwardgateregister extends BaseController $igr = array(); $igr = array('PONO'=>$PONO,'VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'CourierNo'=>$CourierNo,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt); - //print_r($igr); + //print_r($IGRNO); + //die(); $igrM = $this->inwardgateregister_model->addigrM($igr); @@ -142,9 +143,12 @@ class inwardgateregister extends BaseController $IGRNO = ''; if(count($igrM)>0) { - $IGRNO = $igrM[0]['IGRNO']; + foreach ($igrM as $key ) { + $IGRNO=$key->IGRNO; + } } - //echo $IGRNO; + echo $IGRNO; + $IGRItemStatus = REQITEM_NEW; //echo ("success"); @@ -155,7 +159,6 @@ class inwardgateregister extends BaseController //echo $IGRNO ; $MaterialCode = $this->input->post('MaterialCode'.$i); - $QuantityAsPerInvoice = $this->input->post('ReceivedQuantity'.$i); $Remarks = $this->input->post('Remarks'.$i); @@ -168,8 +171,10 @@ class inwardgateregister extends BaseController $igrDetails = array('IGRNO'=>$IGRNO,'MaterialCode'=>$MaterialCode,'QuantityAsPerInvoice'=>$QuantityAsPerInvoice,'Remarks'=>$Remarks,'IGRItemStatus'=>$IGRItemStatus,'CreatedBy'=>$CreatedBy,'CreatedDate'=>$createddt); //print_r($igrDetails); $igrD = $this->inwardgateregister_model->addigrD($igrDetails); + } + //print_r($IGRNO); diff --git a/application/models/inwardgateregister_model.php b/application/models/inwardgateregister_model.php index e8a79a57..51b117e9 100644 --- a/application/models/inwardgateregister_model.php +++ b/application/models/inwardgateregister_model.php @@ -16,20 +16,25 @@ class inwardgateregister_model extends CI_Model * @param number $segment : This is pagination limit * @return array $result : This is result */ - function igrListing($IGRNO,$IGR) + function igrListing() { - $this->db->select('igr.*,igrd.*,POM.DeliveryDate,sup.SupplierName,MM.MaterialName'); - $this->db->from('T_IGR_Master igr'); + //$this->db->select('igr.*,igrd.*,POM.DeliveryDate,sup.SupplierName,MM.MaterialName'); + //$this->db->from('T_IGR_Master igr'); + //$this->db->join('T_IGR_Details igrd','igrd.IGRNO = igr.IGRNO'); + //$this->db->join('T_PurchaseOrder_Master POM ', 'igr.PONO = POM.PONO'); + //$this->db->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID'); + //$this->db->join('T_MaterialMaster MM', 'MM.MaterialCode = igrd.MaterialCode'); + //$this->db->group_by('igr.IGRNO'); + + $this->db->select('igr.*, igrd.*,PO.DeliveryDate,sup.SupplierName'); + $this->db->from('T_IGR_Master igr'); $this->db->join('T_IGR_Details igrd','igrd.IGRNO = igr.IGRNO','left'); - $this->db->join('T_PurchaseOrder_Master POM ', 'igr.PONO = POM.PONO','left'); - $this->db->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID','left'); - $this->db->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = igr.PONO','left'); - $this->db->join('T_MaterialMaster MM', 'MM.MaterialCode = igrd.MaterialCode','left'); - $this->db->group_by('igr.IGRNO',$IGRNO); + $this->db->join('T_PurchaseOrder_Master PO','igr.PONO = PO.PONO','left'); + $this->db->join('T_MaterialMaster` MM','MM.MaterialCode = igrd.MaterialCode','left'); + $this->db->join('T_SupplierDetailsN` sup','PO.SupplierID = sup.SupplierID','left'); - - + $query = $this->db->get(); //print_r( $this->db->last_query()); $result = $query->result(); @@ -76,7 +81,7 @@ class inwardgateregister_model extends CI_Model function addigrM($igrM) { - $this->db->trans_start(); + $this->db->trans_start(); $this->db->insert('T_IGR_Master', $igrM); $insert_id = $this->db->affected_rows(); $this->db->trans_complete(); @@ -88,7 +93,7 @@ class inwardgateregister_model extends CI_Model $query = $this->db->query($subQuery); - return $query->result_array(); + return $query->result(); } } @@ -105,7 +110,7 @@ class inwardgateregister_model extends CI_Model $query = $this->db->query($subQuery); - return $query->result_array(); + return $query->result(); } } function viewigr($IGRNO) diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php old mode 100644 new mode 100755 index 116ae4b3..2cc829d9 --- a/application/views/inwardgateregister.php +++ b/application/views/inwardgateregister.php @@ -3,34 +3,56 @@ $(document).ready(function(){ $("#PONO").select2(); + //$("#generateIGR").modal('show'); //$("#PurchaseOrderNoview").select2(); + $("#InvoiceDate").datepicker({ //minDate : d, maxDate : 'now', dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); + // $("#Inwardgateregistertable").validate({ + // rules: { + // QuantityAsPerInvoice: "required" + // }, + // messages: { + // QuantityAsPerInvoice: "Please specify your name" + // } + // }) }); - - - - - +
@@ -60,7 +82,7 @@ $PONO = $SI->PONO; -endforeach; + endforeach; } @@ -93,7 +115,7 @@ endforeach;
'Comments','value' => set_value('Comments'),'id'=>'ser', 'class' => 'form-control' ,'readonly' => 'true' , 'rows'=>'3' ,'columns'=> '3'); + $data = array('name' => 'Comments','value' => set_value('Comments'),'id'=>'ser', 'class' => 'form-control' ,'readonly' => 'true' , 'rows'=>'3' ,'columns'=> '3'); echo Form_textarea($data); ?>
@@ -145,15 +167,13 @@ endforeach; Material UOM Ordered Quantity - Received Quantity as per challan + Adviced Quantity Remarks - - + Generate IGR +
+ + + + + + + + + + + + + + + + + + + + - - + - + success:function(data) { + //alert("success function worked");//.... + //console.log(data); + //alert("before if condition"); + if(data){ + // alert("after if condition"); + $('#IGRNO').val(data); + alert("IGRNO"+data); + document.getElementById('finaligr').innerHTML=data; + $('#generateIGR').modal('show'); + //window.location ="inwardgateregister/addNewigr"; + } + else + { + alert("Error"); + } + //var igrvalueno = $(this).serialize(); + + }//success function closed + });//ajax closed + }//validate if closed +}//save function closed + \ No newline at end of file diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php index 59866eac..7c33b607 100644 --- a/application/views/viewinwardgateregister.php +++ b/application/views/viewinwardgateregister.php @@ -40,11 +40,11 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: PO NO Supplier name Invoice No - Date of Invoice - - + Date of Invoice Vechicle No - CourierNo + CourierNo + Action + @@ -58,17 +58,19 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: $index = $index +1; ?> - + IGRNO ?> PONO ?> SupplierName ?> - - DeliveryChellanOrInvoiceNo ?> - DeliveryChellanDate ?> - + DeliveryChellanDate); + echo $date->format('d/m/Y'); ?> VehicleNo ?> CourierNo ?> + + + - +
- +
+
- +
@@ -204,34 +209,35 @@ $("#Igrshow").on("shown.bs.modal", function(e) { $('#content').loader('hide'); var trHTML = ''; - $.each(JSON.parse(data), function (i, item) { - if(igr == item.IGRNO) - { + $.each(JSON.parse(data), function (i, item) { + if(igr == item.IGRNO) + { - $("#IGRNO1").val(item.IGRNO); - //alert(item.IGRNO); - $("#PONo").val(item.PONO); - $("#Supplier").val(item.SupplierName); - - $("#Add1").val(item.Address); - - $("#Invoice_No").val(item.DeliveryChellanOrInvoiceNo); - //alert(item.DeliveryChellanDate); - $("#Invoice_Date").val(item.DeliveryChellanDate); - $("#ser").val(item.ServiceDescription); + $("#IGRNO1").val(item.IGRNO); + //alert(item.IGRNO); + $("#PONo").val(item.PONO); + $("#Supplier").val(item.SupplierName); + $("#Add1").val(item.Address); + $("#Invoice_No").val(item.DeliveryChellanOrInvoiceNo); + //alert(item.DeliveryChellanDate); + var dcd = new Date(item.DeliveryChellanDate); + //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); + var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear()); + $("#Invoice_Date").val(dcd2); + $("#ser").val(item.ServiceDescription); i=i+1; trHTML += '' + - '' + i + '' + + '' + i + '' + '' + item.MaterialCode + '' + '' + item.MaterialName + '' + '' + item.UOM + '' + - '' + item.Quantity + '' + - ''+item.QuantityAsPerInvoice+'' + - + '' + item.Quantity + '' + + ''+item.QuantityAsPerInvoice+'' + ''+ item.Remarks+ '' + ''; + alert(item.QuantityAsPerInvoice); } });