material rcvd date in spl po screen
This commit is contained in:
parent
7478eeba3a
commit
240843e0e2
@ -660,6 +660,9 @@ $RequestedBy = $this->input->post('drpDepartment');
|
|||||||
$DeliveryChellan = $this->input->post('ChallanInvDate');
|
$DeliveryChellan = $this->input->post('ChallanInvDate');
|
||||||
$DeliveryChellanDate = $this->getDateformat($DeliveryChellan);
|
$DeliveryChellanDate = $this->getDateformat($DeliveryChellan);
|
||||||
|
|
||||||
|
$MaterialReceive = $this->input->post('MRC');
|
||||||
|
$MaterialReceivedate = $this->getDateformat($MaterialReceive);
|
||||||
|
|
||||||
$Vehicle = $this->input->post('VehicleNo');
|
$Vehicle = $this->input->post('VehicleNo');
|
||||||
$Courier = $this->input->post('CourierNo');
|
$Courier = $this->input->post('CourierNo');
|
||||||
|
|
||||||
@ -679,7 +682,7 @@ $RequestedBy = $this->input->post('drpDepartment');
|
|||||||
|
|
||||||
$igr = array();
|
$igr = array();
|
||||||
|
|
||||||
$igr = array('PONO'=>$PONO,'VehicleNo'=>$Vehicle,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$DeliveryChellanDate,'CourierNo'=>$Courier,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt);
|
$igr = array('PONO'=>$PONO,'VehicleNo'=>$Vehicle,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanInvoiceNo,'DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$DeliveryChellanDate,'CourierNo'=>$Courier,'IGRStatus'=>$IGRStatus,'CreatedBy'=>$CreatedBy,'CreatedDate' =>$createddt,'MaterialRcvdDate'=>$MaterialReceivedate);
|
||||||
|
|
||||||
//print_r($igr);
|
//print_r($igr);
|
||||||
|
|
||||||
|
|||||||
@ -4165,24 +4165,116 @@ public function enquiry()
|
|||||||
|
|
||||||
}
|
}
|
||||||
/*--------------------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------------------*/
|
||||||
|
// function uploadfile()
|
||||||
|
// {
|
||||||
|
// $bill= $this->input->post('param1');
|
||||||
|
// $oldfile= $this->input->post('param2');
|
||||||
|
|
||||||
|
// if(!empty($_FILES['file']['name']))
|
||||||
|
// {
|
||||||
|
// $Picture = $this->add();
|
||||||
|
// }
|
||||||
|
|
||||||
|
// $uploadfile = $this->purchaseorder_model->updatefile($bill,$Picture,$oldfile);
|
||||||
|
|
||||||
|
// if($uploadfile > 0){
|
||||||
|
// echo "file updated successfully!";
|
||||||
|
// }
|
||||||
|
// else{
|
||||||
|
// echo "file not updated!";
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// function add()
|
||||||
|
// {
|
||||||
|
// $picture = '';
|
||||||
|
// if(!empty($_FILES['file']['name']))
|
||||||
|
// {
|
||||||
|
// $config['upload_path'] = 'uploads/BillFiles/';
|
||||||
|
// $config['allowed_types'] = 'docx|pdf|doc|png|jpg';
|
||||||
|
// $config['file_name'] = $_FILES['file']['name'];
|
||||||
|
// //print_r($config) ;
|
||||||
|
// //Load upload library and initialize configuration
|
||||||
|
// $this->load->library('upload',$config);
|
||||||
|
// $this->upload->initialize($config);
|
||||||
|
// if($this->upload->do_upload('file'))
|
||||||
|
// {
|
||||||
|
// $uploadData = $this->upload->data();
|
||||||
|
// $picture = $uploadData['file_name'];
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// $error = array('error' => $this->upload->display_errors());
|
||||||
|
// $picture = '';
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// $picture = '';
|
||||||
|
// }
|
||||||
|
|
||||||
|
// return $picture ;
|
||||||
|
// }
|
||||||
|
|
||||||
function uploadfile()
|
function uploadfile()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//alert();
|
||||||
$bill= $this->input->post('param1');
|
$bill= $this->input->post('param1');
|
||||||
$oldfile= $this->input->post('param2');
|
$oldfile= $this->input->post('param2');
|
||||||
|
$invno= $this->input->post('param3');
|
||||||
|
$invdate= $this->input->post('param4');
|
||||||
|
$VehicleNo= $this->input->post('param5');
|
||||||
|
$CourierNo= $this->input->post('param6');
|
||||||
|
$MaterialRcvdDate =$this->input->post('param7');
|
||||||
|
|
||||||
|
$invdate = date('Y-m-d',strtotime($invdate));
|
||||||
|
$MaterialRcvdDate =date('Y-m-d',strtotime($MaterialRcvdDate));
|
||||||
|
|
||||||
|
$CreatedBy = $this->session->userdata('userId');
|
||||||
|
|
||||||
|
|
||||||
|
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
|
||||||
|
$createddt = $dt->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
|
|
||||||
|
$billdetails = $this->purchaseorder_model->getigrno($bill);
|
||||||
|
|
||||||
|
//print_r($billdetails);
|
||||||
|
|
||||||
|
|
||||||
|
$PONO = $billdetails[0]['PONO'];
|
||||||
|
|
||||||
|
|
||||||
|
$IGRNo = $billdetails[0]['IGRNO'];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(!empty($_FILES['file']['name']))
|
if(!empty($_FILES['file']['name']))
|
||||||
{
|
|
||||||
$Picture = $this->add();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
$Picture = $this->add();
|
||||||
|
}else{
|
||||||
|
$Picture = $this->input->post('param2');
|
||||||
|
}
|
||||||
|
//echo $Picture;die;
|
||||||
$uploadfile = $this->purchaseorder_model->updatefile($bill,$Picture,$oldfile);
|
$uploadfile = $this->purchaseorder_model->updatefile($bill,$Picture,$oldfile);
|
||||||
|
|
||||||
|
|
||||||
|
$igrMaster = array('VehicleNo'=>$VehicleNo,'DeliveryChellanOrInvoiceNo'=>$invno,'DeliveryChellanDate'=>$invdate, 'MaterialRcvdDate'=>$MaterialRcvdDate,'CourierNo'=>$CourierNo,'UpdateBY'=>$CreatedBy,'UpdatedOn' =>$createddt);
|
||||||
|
|
||||||
|
// print_r($igrMaster);die;
|
||||||
|
// uploadfile();
|
||||||
|
|
||||||
|
$igrM = $this->purchaseorder_model->updateigrM($PONO,$IGRNo,$igrMaster);
|
||||||
|
|
||||||
if($uploadfile > 0){
|
// if($uploadfile > 0){
|
||||||
echo "file updated successfully!";
|
echo "file updated successfully!";
|
||||||
}
|
// }
|
||||||
else{
|
// else{
|
||||||
echo "file not updated!";
|
// echo "updated successfully!";
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
function add()
|
function add()
|
||||||
@ -4201,7 +4293,7 @@ function uploadfile()
|
|||||||
{
|
{
|
||||||
$uploadData = $this->upload->data();
|
$uploadData = $this->upload->data();
|
||||||
$picture = $uploadData['file_name'];
|
$picture = $uploadData['file_name'];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$error = array('error' => $this->upload->display_errors());
|
$error = array('error' => $this->upload->display_errors());
|
||||||
@ -4216,7 +4308,6 @@ function uploadfile()
|
|||||||
return $picture ;
|
return $picture ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -152,7 +152,7 @@ Where IGRM.PONO = ? ';
|
|||||||
function getfunction($pono)
|
function getfunction($pono)
|
||||||
{
|
{
|
||||||
$this->db->distinct();
|
$this->db->distinct();
|
||||||
$this->db->select('bill.PONO,mstr.IGRNO,bill.BillNo,,bill.FilePath,mstr.DeliveryChellanOrInvoiceNo,mstr.DeliveryChellanDate,mstr.VehicleNo,mstr.CourierNo,dtl.QuantityAsPerInvoice,pom.POType');
|
$this->db->select('bill.PONO,mstr.IGRNO,bill.BillNo,mstr.MaterialRcvdDate,bill.FilePath,mstr.DeliveryChellanOrInvoiceNo,mstr.DeliveryChellanDate,mstr.VehicleNo,mstr.CourierNo,dtl.QuantityAsPerInvoice,pom.POType');
|
||||||
$this->db->from('T_PurchaseOrder_BillUpload bill');
|
$this->db->from('T_PurchaseOrder_BillUpload bill');
|
||||||
$this->db->join('T_IGR_Master mstr','bill.PONO = mstr.PONO','left');
|
$this->db->join('T_IGR_Master mstr','bill.PONO = mstr.PONO','left');
|
||||||
$this->db->join('T_IGR_Details dtl','mstr.IGRNO = dtl.IGRNO','left');
|
$this->db->join('T_IGR_Details dtl','mstr.IGRNO = dtl.IGRNO','left');
|
||||||
@ -2339,5 +2339,26 @@ $logpodtl = $this->db->query($SQL);
|
|||||||
|
|
||||||
/*------------------------------------------------------------------------------*/
|
/*------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
function updateigrM($PONO,$IGRNo,$igrMaster){
|
||||||
|
|
||||||
|
//print_r($igrMaster);die;
|
||||||
|
$this->db->where('PONO',$PONO);
|
||||||
|
$this->db->where('IGRNO',$IGRNo);
|
||||||
|
|
||||||
|
$this->db->update('T_IGR_Master',$igrMaster);
|
||||||
|
|
||||||
|
$r = $this->db->affected_rows();
|
||||||
|
return $r;
|
||||||
|
}
|
||||||
|
function getigrno($bill){
|
||||||
|
|
||||||
|
$subQuery ='select bill.BillNo,IGR.IGRNO, IGR.PONO FROM T_IGR_Master IGR
|
||||||
|
join T_PurchaseOrder_BillUpload bill on bill.IGRNO = IGR.IGRNO
|
||||||
|
where bill.BillNO = ? ';
|
||||||
|
|
||||||
|
$query = $this->db->query($subQuery,array($bill));
|
||||||
|
|
||||||
|
return $query->result_array();
|
||||||
|
}
|
||||||
|
/*** ----------------------------- */
|
||||||
}
|
}
|
||||||
|
|||||||
@ -180,14 +180,15 @@ if(!empty($INRSYMBOL))
|
|||||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$("#Date1").datepicker({
|
$("#Date1").datepicker({
|
||||||
// minDate : 'now',
|
// minDate : 'now',
|
||||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#MRC").datepicker({
|
||||||
|
|
||||||
|
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||||
|
});
|
||||||
|
|
||||||
var SelectedMaterialList = {
|
var SelectedMaterialList = {
|
||||||
Mat: []
|
Mat: []
|
||||||
@ -3074,9 +3075,15 @@ function populateValueMainFormForDeleteItem(rowid)
|
|||||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
|
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
|
||||||
<!-- <input type="Date" name="Date1" onkeypress="return onlyAlphabets(event);" maxlength="100" id="Date1" class="form-control" required value="2"> -->
|
<!-- <input type="Date" name="Date1" onkeypress="return onlyAlphabets(event);" maxlength="100" id="Date1" class="form-control" required value="2"> -->
|
||||||
<?php
|
<?php
|
||||||
$data = array('name' => 'Date1','value' => set_value('Date1',$CurrentDate),'id'=>'Date1', 'class' => 'form-control num' ,'required' => 'true');
|
$data = array('name' => 'ChallanInvDate','value' => set_value('ChallanInvDate',$CurrentDate),'id'=>'Date1', 'class' => 'form-control num' ,'required' => 'true');
|
||||||
echo form_input($data);?>
|
echo form_input($data);?>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-4 pad"> <strong>Material Received Date</strong>
|
||||||
|
<?php
|
||||||
|
$data = array('name' => 'MRC','value' => set_value('MRC',$CurrentDate),'id'=>'MRC', 'class' => 'form-control num' ,'required' => 'true');
|
||||||
|
echo form_input($data);?>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- <div class="col-md-4 pad"><strong>Advise Quantity</strong>
|
<!-- <div class="col-md-4 pad"><strong>Advise Quantity</strong>
|
||||||
<input type="text" name="AQuantity" id="AQuantity" maxlength="12" class="form-control" value="" required>
|
<input type="text" name="AQuantity" id="AQuantity" maxlength="12" class="form-control" value="" required>
|
||||||
</div> -->
|
</div> -->
|
||||||
|
|||||||
132
application/views/editRevenuepurchaseorder.php
Executable file → Normal file
132
application/views/editRevenuepurchaseorder.php
Executable file → Normal file
@ -344,6 +344,18 @@ $(function() {
|
|||||||
minDate : 'now',
|
minDate : 'now',
|
||||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#PODate1").datepicker({
|
||||||
|
//minDate : d,
|
||||||
|
//maxDate : 'now',
|
||||||
|
dateFormat: 'dd-mm-yy',changeMonth: false, changeYear: false
|
||||||
|
});
|
||||||
|
|
||||||
|
$("#MaterialRcvdDate").datepicker({
|
||||||
|
//minDate : d,
|
||||||
|
//maxDate : 'now',
|
||||||
|
dateFormat: 'dd-mm-yy',changeMonth: false, changeYear: false
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
$('#drpSupplier').change(function() {
|
$('#drpSupplier').change(function() {
|
||||||
@ -4168,7 +4180,8 @@ function calculateEditTaxValue()
|
|||||||
<th>Bill No </th>
|
<th>Bill No </th>
|
||||||
<!-- <th>Materials</th> -->
|
<!-- <th>Materials</th> -->
|
||||||
<th>Delivery Challan No</th>
|
<th>Delivery Challan No</th>
|
||||||
<th>Delivery Challan Date</th>
|
<th>Delivery Challan Date</th>
|
||||||
|
<th>MaterialReceived Date </th>
|
||||||
<th>Vehicle No</th>
|
<th>Vehicle No</th>
|
||||||
<th>Courier No</th>
|
<th>Courier No</th>
|
||||||
<!-- <th>Quantity</th> -->
|
<!-- <th>Quantity</th> -->
|
||||||
@ -4181,27 +4194,52 @@ function calculateEditTaxValue()
|
|||||||
<?php
|
<?php
|
||||||
if(!empty($getdata))
|
if(!empty($getdata))
|
||||||
{
|
{
|
||||||
foreach($getdata as $gd)
|
foreach($getdata as $row=>$gd)
|
||||||
{
|
{
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr id="lastvalue">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<td><?php echo $gd->BillNo ?></td>
|
<td><?php echo $gd->BillNo ?></td>
|
||||||
<!-- <td><?php echo $gd->MaterialCode ?> - <?php echo $gd->MaterialName ?></td> -->
|
<!-- <td><?php echo $gd->MaterialCode ?> - <?php echo $gd->MaterialName ?></td> -->
|
||||||
<td><?php echo $gd->DeliveryChellanOrInvoiceNo?></td>
|
<td><?php echo $gd->DeliveryChellanOrInvoiceNo?></td>
|
||||||
<td><?php $date = new DateTime($gd->DeliveryChellanDate);
|
<td><?php $date = new DateTime($gd->DeliveryChellanDate);
|
||||||
echo $date->format('d-m-Y'); ?></td>
|
echo $date->format('d-m-Y'); ?></td>
|
||||||
|
<td><?php $date = new DateTime($gd->MaterialRcvdDate);
|
||||||
|
echo $date->format('d-m-Y'); ?></td>
|
||||||
|
|
||||||
<td><?php echo $gd->VehicleNo?></td>
|
<td><?php echo $gd->VehicleNo?></td>
|
||||||
<td><?php echo $gd->CourierNo?></td>
|
<td><?php echo $gd->CourierNo?></td>
|
||||||
|
|
||||||
|
|
||||||
<td><?php echo (!empty($gd->FilePath))?$gd->FilePath:"No File"; ?></td>
|
<td><?php echo (!empty($gd->FilePath))?$gd->FilePath:"No File"; ?></td>
|
||||||
<td><a data-target='#EditRevenueSplPOModel' data-toggle="modal" href="#EditRevenueSplPOModel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></a>
|
|
||||||
|
|
||||||
|
|
||||||
|
<input type="hidden" id="billnos<?=$row?>" value="<?= $gd->BillNo?>">
|
||||||
|
<input type="hidden" id="file<?=$row?>" value="<?=$gd->FilePath?>">
|
||||||
|
<input type="hidden" id="deliveryinvoiceno<?=$row?>" value="<?= $gd->DeliveryChellanOrInvoiceNo?>">
|
||||||
|
<input type="hidden" id="deliverydate<?=$row?>" value="<?=$gd->DeliveryChellanDate?>">
|
||||||
|
<input type="hidden" id="vehicleno<?=$row?>" value="<?= $gd->VehicleNo?>">
|
||||||
|
<input type="hidden" id="courierno<?=$row?>" value="<?=$gd->CourierNo?>">
|
||||||
|
<input type ="hidden" id="MaterialRcvdDate<?=$row?>" value ="<?=$gd->MaterialRcvdDate?>">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <td><a data-target='#EditRevenueSplPOModel' data-toggle="modal" href="#EditRevenueSplPOModel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></a>
|
||||||
<?php if(!empty($gd->FilePath)) { ?>
|
<?php if(!empty($gd->FilePath)) { ?>
|
||||||
<a target="_blank" href="<?php echo base_url().'uploads/BillFiles/'?><?php echo $gd->FilePath ?>"><i class="fa fa-download" ></i></a>
|
<a target="_blank" href="<?php echo base_url().'uploads/BillFiles/'?><?php echo $gd->FilePath ?>"><i class="fa fa-download" ></i></a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</td>
|
</td> -->
|
||||||
|
|
||||||
|
|
||||||
|
<td><span onclick="openmodel(<?=$row?>);"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to Edit the Revenue SplPO details"></i></span>
|
||||||
|
<?php if(!empty($gd->FilePath)) { ?>
|
||||||
|
<a target="_blank" href="<?php echo base_url().'uploads/BillFiles/'?><?php echo $gd->FilePath ?>"><i class="fa fa-download" ></i></a>
|
||||||
|
<?php } ?>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
@ -4297,7 +4335,9 @@ function calculateEditTaxValue()
|
|||||||
<div id="EditRevenueSplPOModel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel" >
|
<div id="EditRevenueSplPOModel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel" >
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<?php $date = new DateTime($getdata[0]->DeliveryChellanDate);
|
<?php $date = new DateTime($getdata[0]->DeliveryChellanDate);
|
||||||
$date = $date->format('d-m-Y'); ?>
|
$date = $date->format('d-m-Y');
|
||||||
|
$mrcdate = new DateTime($getdata[0]->MaterialRcvdDate);
|
||||||
|
$mrcdate = $mrcdate->format('d-m-Y'); ?>
|
||||||
|
|
||||||
|
|
||||||
<div class="modal-content" style="width:950px;">
|
<div class="modal-content" style="width:950px;">
|
||||||
@ -4308,31 +4348,50 @@ function calculateEditTaxValue()
|
|||||||
<div class="modal-body" style="padding:0px;">
|
<div class="modal-body" style="padding:0px;">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
|
<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
|
||||||
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="<?php echo $getdata[0]->DeliveryChellanOrInvoiceNo ?>" readonly onkeypress="return isNumberKey(event)">
|
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="<?php echo $getdata[0]->DeliveryChellanOrInvoiceNo ?>" onkeypress="return isNumberKey(event)">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
|
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
|
||||||
|
<!-- <?php
|
||||||
|
$data = array('name' => 'Date','value' => set_value('Date',$date),'id'=>'Date', 'class' => 'form-control PODate' ); // ,'readonly' => 'true'
|
||||||
|
echo form_input($data);?> -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$data = array('name' => 'Date1','value' => set_value('Date1',$date),'id'=>'Date1', 'class' => 'form-control num' ,'readonly' => 'true');
|
$data = array('name' => 'Date','value' => set_value('PODate',$date),'id'=>'PODate1', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'');
|
||||||
echo form_input($data);?>
|
echo form_input($data);
|
||||||
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-4 pad"> <strong>Material Received Date</strong>
|
||||||
|
<?php
|
||||||
|
$data = array('name' => 'Date','value' => set_value('PODate',$mrcdate),'id'=>'MaterialRcvdDate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'');
|
||||||
|
echo form_input($data);
|
||||||
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<div class="col-md-4 pad"><strong>Vehicle No</strong>
|
<div class="col-md-4 pad"><strong>Vehicle No</strong>
|
||||||
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="<?php echo $getdata[0]->VehicleNo; ?>" readonly>
|
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="<?php echo $getdata[0]->VehicleNo; ?>" >
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 pad"><strong>Courier No</strong>
|
<div class="col-md-4 pad"><strong>Courier No</strong>
|
||||||
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="<?php echo $getdata[0]->CourierNo; ?>" readonly>
|
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="<?php echo $getdata[0]->CourierNo; ?>" >
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
|
<div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
|
||||||
<div class="radio">
|
<div class="radio">
|
||||||
<label><input type="radio" name="Quality" checked="checked" value='0' id="Quality">Yes</label>
|
<label><input type="radio" name="Quality" checked="checked" value='0' id="Quality">Yes</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="radio">
|
<div class="radio">
|
||||||
<label><input type="radio" name="Quality" id="Quality" value='1' >No</label>
|
<label><input type="radio" name="Quality" id="Quality" value='1' >No</label>
|
||||||
</div>
|
</div>
|
||||||
</div> -->
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!--
|
<!--
|
||||||
@ -4348,8 +4407,8 @@ function calculateEditTaxValue()
|
|||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<?php if($getdata[0]->FilePath != '') { ?>
|
<!-- <?php if($getdata[0]->FilePath != '') { ?>
|
||||||
<label for="oldimagename">Old file Name :</label><?php echo $getdata[0]->FilePath; ?> <br/><?php } ?>
|
<label for="oldimagename">Old file Name :</label><?php echo $getdata[0]->FilePath; ?> <br/><?php } ?> -->
|
||||||
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="imag" name="images" onChange="filecheck();"/>
|
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="imag" name="images" onChange="filecheck();"/>
|
||||||
<label for="images">Select file <br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
|
<label for="images">Select file <br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
|
||||||
</div>
|
</div>
|
||||||
@ -4464,6 +4523,24 @@ $("#BudgetType").change(function(){
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function openmodel(i){
|
||||||
|
//alert(i);
|
||||||
|
var file = $("#file"+i).val();
|
||||||
|
|
||||||
|
var Billno = $("#billnos"+i).val();
|
||||||
|
var deliveryinvoiceno = $("#deliveryinvoiceno"+i).val();
|
||||||
|
var deliverydate = $("#deliverydate"+i).val();
|
||||||
|
var vehicleno = $("#vehicleno"+i).val();
|
||||||
|
var courierno = $("#courierno"+i).val();
|
||||||
|
//alert(Billno +'-'+file +'-'+deliveryinvoiceno +'-'+deliverydate +'-'+vehicleno+'-'+courierno);
|
||||||
|
|
||||||
|
|
||||||
|
$("#EditRevenueSplPOModel").modal("show");
|
||||||
|
$(".oldimage").text(file);
|
||||||
|
$("#hideoldfile").val(file);
|
||||||
|
$("#hidebillno").val(Billno);
|
||||||
|
$("#bill").text(Billno);
|
||||||
|
}
|
||||||
|
|
||||||
$("#REVENUE").on("shown.bs.modal", function(e) {
|
$("#REVENUE").on("shown.bs.modal", function(e) {
|
||||||
|
|
||||||
@ -5717,7 +5794,7 @@ $("#insuranceno").val("Yes");
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$("#Date").datepicker();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -5730,10 +5807,28 @@ function splpoupdate(){
|
|||||||
var filename = $("#imag").val();
|
var filename = $("#imag").val();
|
||||||
filename = filename.split('\\');
|
filename = filename.split('\\');
|
||||||
|
|
||||||
|
var param3 =$('#ChallanInvNo').val();
|
||||||
|
var param4 =$('#PODate1').val();
|
||||||
|
//alert(param4);
|
||||||
|
|
||||||
|
|
||||||
|
var param5 =$('#VehicleNo').val();
|
||||||
|
var param6 =$('#CourierNo').val();
|
||||||
|
var param7 =$('#MaterialRcvdDate').val();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
formData.append('file',file);
|
formData.append('file',file);
|
||||||
formData.append('param1',param1);
|
formData.append('param1',param1);
|
||||||
formData.append('param2',param2);
|
formData.append('param2',param2);
|
||||||
|
|
||||||
|
formData.append('param3',param3);
|
||||||
|
formData.append('param4',param4);
|
||||||
|
formData.append('param5',param5);
|
||||||
|
formData.append('param6',param6);
|
||||||
|
formData.append('param7',param7);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('.content').loader('show');
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -5747,7 +5842,7 @@ function splpoupdate(){
|
|||||||
if(data){
|
if(data){
|
||||||
alert(data);
|
alert(data);
|
||||||
$('.content').loader('hide');
|
$('.content').loader('hide');
|
||||||
$('#spl').find('td').eq(5).text(filename[2]);
|
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||||
$('#EditRevenueSplPOModel').modal('hide');
|
$('#EditRevenueSplPOModel').modal('hide');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5756,6 +5851,7 @@ function splpoupdate(){
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function filecheck()
|
function filecheck()
|
||||||
{
|
{
|
||||||
var sizef = document.getElementById('imag').files[0].size;
|
var sizef = document.getElementById('imag').files[0].size;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user