SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues for deliver and spo file

Browse Source
This commit is contained in:
venbatechnologies 2018-06-14 13:23:50 +05:30
parent 088f8212bd
commit 35c456618c
7 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/controllers/emergencypurchaseorder.php
View File

@ -473,6 +473,7 @@ function add($pathname)
$constant = $this->input->post('hideconstants');
$arr = [];
for($i=1;$i<=$constant;$i++){
$pathname = 'browseFiles'.$i;
@ -486,6 +487,8 @@ function add($pathname)
}
}
//print_r($arr);
if(!empty($arr))
{
foreach($arr as $ma){
@ -496,7 +499,7 @@ function add($pathname)
$filename = $value;
}
}
$myfile = array('FilePath'=>$filename,'PONO'=>$PONO);
$this->purchaseorder_model->fileupload($myfile);
@ -504,7 +507,7 @@ $myfile = array('FilePath'=>$filename,'PONO'=>$PONO);
}
}
}
@ -981,7 +984,7 @@ $RequestedBy = $this->input->post('drpDepartment');
$constants = $this->input->post('hideconstant');
$arr = [];
for($i=1;$i<=$constants;$i++){
$pathname = 'browseFiles'.$i;
@ -998,6 +1001,9 @@ $RequestedBy = $this->input->post('drpDepartment');
}
//print_r($arr);
if(!empty($arr))
{
foreach($arr as $ma){
@ -1023,7 +1029,8 @@ $RequestedBy = $this->input->post('drpDepartment');
}
}
}
}

1
application/controllers/purchaseorder.php
View File

@ -4173,6 +4173,7 @@ function addloadfile()
$Picture ='';
}
//echo $Picture;die;
$filelist =array('PONO'=>$pono,'IGRNO'=>$igr,'FilePath'=>$Picture);

3
application/models/purchaseorder_model.php
View File

@ -914,11 +914,12 @@ function GetPOType($ReqNo)
function GetServicePurchaseOrder($PONO = '')
{
$this->db->distinct();
$this->db->select('ReqNo,POMast.PONO,POMast.PaymentTerms,POMast.PaymentOtherDescription,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode,POMast.ServiceWorkStatus,POMast.*,POMast.TotalOrderValue,POMast.BudgetType');
$this->db->select('ReqNo,POMast.PONO,POMast.PaymentTerms,POMast.PaymentOtherDescription,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode,POMast.ServiceWorkStatus,POMast.*,POMast.TotalOrderValue,POMast.BudgetType,IGR.IGRNO');
$this->db->from('T_PurchaseOrder_Master POMast');
$this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID');
$this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status');
$this->db->join('T_PurchaseOrder_LineItem LineItem', 'POMast.PONO = LineItem.PONO');
$this->db->join('T_IGR_Master IGR','POMast.PONO = IGR.PONO');
$this->db->where('POMast.PONO', $PONO);
$query = $this->db->get();

2
application/models/user_model.php
View File

@ -3,7 +3,7 @@
class User_model extends CI_Model
{
/**
* This function is used to get the user listing count
* @param string $searchText : This is optional search text

10
application/views/alterpurchaseorder.php
View File

@ -8712,6 +8712,9 @@ var counterConstant = 0;
$("#addmorebutton").click(function(){
//alert('sda');
if(counter>4){
@ -8726,7 +8729,7 @@ else{
var div = document.createElement('div');
div.id = "divid"+counterConstant;
div.className="row";
div.innerHTML='<div class="col-md-12">'+
div.innerHTML='<div class="col-md-15">'+
// '<div class="col-md-3">'+
// '<label>File Name</label>'+
// '<input type="text" id="maint_filename'+counterConstant+'" name="filename'+counterConstant+'" class="form-control" onkeypress="return false;" readonly/>'+
@ -8739,6 +8742,7 @@ div.innerHTML='<div class="col-md-12">'+
'<label><br><br></label>'+
'<button class="btn btn-danger remove remove_this" id="removebtn'+counterConstant+'" onclick="removeRow(this.id)"><i class="fa fa-trash"></i> Remove</button></div>'+
'</div>'+
'</div>';
$('#newdiv').append(div);
@ -8747,6 +8751,8 @@ div.innerHTML='<div class="col-md-12">'+
$('#hideconstant').val(counterConstant);
}
});
@ -8842,7 +8848,7 @@ div.innerHTML='<div class="col-md-12">'+
'<div class="col-md-4">'+
'<label><br></label>'+
'<input type="file" id="images1" name="browseFiles'+counterConstants+'" onchange="Copyfilenames(this.name);"><br>'+
'</div>'+
'</div>'+
'<div class="col-md-3">'+
'<label><br><br></label>'+
'<button class="btn btn-danger remove remove_this" id="removebtn'+counterConstants+'" onclick="removeRows(this.id)"><i class="fa fa-trash"></i> Remove</button></div>'+

4
application/views/deliver_perform.php
View File

@ -1,6 +1,6 @@
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style>
.dataTables_filter input {padding: 4px;}
@ -187,7 +187,7 @@
<td style="text-align:right;"><?php
$OrderedQuantity= round($rel->qty);
$DispatchQuantity= round($rel->qty);
$Rating =empty($DispatchQuantity)?"":$DispatchQuantity / empty($OrderedQuantity)?"":$OrderedQuantity *100;
$Rating =@($DispatchQuantity / $OrderedQuantity )*100;
echo number_format($Rating, 2, '.', ' ') ; ?></td>

11
application/views/editRevenuepurchaseorder.php
View File

@ -103,6 +103,7 @@ $otherPayment = $Req->PaymentOtherDescription;
$insurencestatus = $Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber;
$BudgetType = $Req->BudgetType;
$IGRNO =$Req->IGRNO;
// echo $insurenceno;
// echo $otherPayment;
}
@ -3830,7 +3831,7 @@ return tot;
{
$index = $index + 1;
?>
<tr id="<?php echo $index ; ?>">
<tr id="<?php echo $index ; ?>">
<td align="left"><?php echo $index ; ?></td>
<td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->MaterialCode ?></td>
@ -4097,6 +4098,7 @@ return tot;
<div id="newdiv"></div>
<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
<input type ="hidden" name ="hiddenIGRNO" id="hiddenIGRNO" value ="<?php echo $IGRNO;?>" />
</div>
<thead style="background-color:#ddf">
@ -4121,7 +4123,7 @@ return tot;
<td><?php echo $gd->BillNo ?></td>
<td ><?php echo (!empty($gd->FilePath))?$gd->FilePath:"No File"; ?></td>
<input type="hidden" id="hiddenigrno" value="<?= $gd->IGRNO?>">
<!-- <input type="hidden" id="hiddenigrno" value="<?php $gd->IGRNO?>"> -->
<input type="hidden" id="billnos<?=$index?>" value="<?= $gd->BillNo?>">
<input type="hidden" id="file<?=$index?>" name ='file' value="<?=$gd->FilePath?>">
@ -5713,8 +5715,9 @@ return tot;
// console.log(file);
var PONO =$('#txtPONO').val();
var igr =$('#hiddenigrno').val();
//alert(igr);
var igr =$('#hiddenIGRNO').val();
formData.append('file',file);
formData.append('PONO',PONO);
formData.append('count',counter);