CHANGE_SANJEEV_ISSUE_AND_LISTING_LOADER_ISSUE_CLEAR
This commit is contained in:
parent
511e2e6eea
commit
145af91046
@ -17,13 +17,11 @@ class Purchaseorder_model extends Model
|
|||||||
->where('Req.RequestedDept', $this->session->get('DEPCode'));
|
->where('Req.RequestedDept', $this->session->get('DEPCode'));
|
||||||
|
|
||||||
$query = $builder->get();
|
$query = $builder->get();
|
||||||
|
|
||||||
return $query->getResult();
|
return $query->getResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*------------jun15------------------*/
|
/*------------jun15------------------*/
|
||||||
|
|
||||||
|
|
||||||
@ -405,7 +403,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
|
|||||||
$builder->where('POMast.Status !=', PO_AMENDED);
|
$builder->where('POMast.Status !=', PO_AMENDED);
|
||||||
// $builder->orderBy('POMast.Status !=',PO_AMENDED);
|
// $builder->orderBy('POMast.Status !=',PO_AMENDED);
|
||||||
}
|
}
|
||||||
$builder->orderBy('POMast.PODate', 'desc');
|
$builder->orderBy('POMast.CreatedDate', 'desc');
|
||||||
$query = $builder->get();
|
$query = $builder->get();
|
||||||
|
|
||||||
$result = $query->getResult();
|
$result = $query->getResult();
|
||||||
|
|||||||
@ -276,7 +276,7 @@ $("#machs_category").change(function(){
|
|||||||
$("#machs_pono").change(function(){
|
$("#machs_pono").change(function(){
|
||||||
var machine_pono = $(this).val();
|
var machine_pono = $(this).val();
|
||||||
//alert(machine_pono);
|
//alert(machine_pono);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:machine_pono},
|
data:{id:machine_pono},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -295,6 +295,7 @@ $("#machs_pono").change(function(){
|
|||||||
hist_supplier = arr.SupplierID+'-'+arr.SupplierName;
|
hist_supplier = arr.SupplierID+'-'+arr.SupplierName;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#machs_podate").val(hist_podate);
|
$("#machs_podate").val(hist_podate);
|
||||||
$("#machs_supplier").val(hist_supplier);
|
$("#machs_supplier").val(hist_supplier);
|
||||||
|
|||||||
@ -443,6 +443,7 @@ $("#machs_category").change(function(){
|
|||||||
$("#machs_pono").change(function(){
|
$("#machs_pono").change(function(){
|
||||||
var machine_pono = $(this).val();
|
var machine_pono = $(this).val();
|
||||||
//alert(machine_pono);
|
//alert(machine_pono);
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:machine_pono},
|
data:{id:machine_pono},
|
||||||
@ -462,6 +463,7 @@ $("#machs_pono").change(function(){
|
|||||||
hist_supplier = arr.SupplierID+'-'+arr.SupplierName;
|
hist_supplier = arr.SupplierID+'-'+arr.SupplierName;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#machs_podate").val(hist_podate);
|
$("#machs_podate").val(hist_podate);
|
||||||
$("#machs_supplier").val(hist_supplier);
|
$("#machs_supplier").val(hist_supplier);
|
||||||
@ -520,12 +522,14 @@ function deleted(deleteid) {
|
|||||||
var fileid = $("#hidefileid"+number).val();
|
var fileid = $("#hidefileid"+number).val();
|
||||||
|
|
||||||
var filename = $("#machs_filename"+number).val();
|
var filename = $("#machs_filename"+number).val();
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:fileid,name:filename},
|
data:{id:fileid,name:filename},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/Removefiledetails",
|
url:"<?php echo base_url() ?>batchcard/Removefiledetails",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -592,12 +592,15 @@ function deleted(deleteid) {
|
|||||||
var fileid = $("#hidefileid"+number).val();
|
var fileid = $("#hidefileid"+number).val();
|
||||||
|
|
||||||
var filename = $("#machs_filename"+number).val();
|
var filename = $("#machs_filename"+number).val();
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:fileid,name:filename},
|
data:{id:fileid,name:filename},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/Removefiledetails",
|
url:"<?php echo base_url() ?>batchcard/Removefiledetails",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -514,7 +514,7 @@ function updatemrir()
|
|||||||
{
|
{
|
||||||
if(validate())
|
if(validate())
|
||||||
{
|
{
|
||||||
$('#content').loader('show');
|
$('#loader').show();sss
|
||||||
//alert("update function worked ");
|
//alert("update function worked ");
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:$('.MRIR').serialize(),
|
data:$('.MRIR').serialize(),
|
||||||
@ -524,6 +524,8 @@ function updatemrir()
|
|||||||
|
|
||||||
success:function(data){
|
success:function(data){
|
||||||
//alert("success function worked ");
|
//alert("success function worked ");
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data){
|
if(data){
|
||||||
$('#content').loader('hide');
|
$('#content').loader('hide');
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|||||||
@ -377,6 +377,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -385,6 +386,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -421,6 +424,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -429,6 +433,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2773,6 +2779,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -2781,9 +2788,11 @@ if (!empty($getlogpodtl)) {
|
|||||||
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2967,7 +2976,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
// return false;
|
// return false;
|
||||||
// }
|
// }
|
||||||
else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
|
else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
|
||||||
alert('Please Enter Other Payment Details');
|
alert('Please Enter Payable Terms');
|
||||||
$('#Otherpayment').focus();
|
$('#Otherpayment').focus();
|
||||||
return false;
|
return false;
|
||||||
} else if ($('#editdescofpo').val().trim() == '') {
|
} else if ($('#editdescofpo').val().trim() == '') {
|
||||||
@ -2977,6 +2986,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
} else {
|
} else {
|
||||||
// $('#content').loader('show');
|
// $('#content').loader('show');
|
||||||
var formData = new FormData($('.ServicePO')[0]);
|
var formData = new FormData($('.ServicePO')[0]);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// data: $('.ServicePO').serialize(),
|
// data: $('.ServicePO').serialize(),
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -2987,7 +2997,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
success: function(data) {
|
success: function(data) {
|
||||||
// console.log(data);
|
// console.log(data);
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
@ -2997,7 +3007,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
window.location = "purchaseorderListing";
|
window.location = "purchaseorderListing";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3459,6 +3469,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
// formData.append('param6',param6);
|
// formData.append('param6',param6);
|
||||||
|
|
||||||
// $('.content').loader('show');
|
// $('.content').loader('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -3469,8 +3480,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
|
$('#loader').hide();
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
// $('.content').loader('hide');
|
|
||||||
//$('#spl').find('td').eq(1).text(filename[2]);
|
//$('#spl').find('td').eq(1).text(filename[2]);
|
||||||
$('#EditServiceSplPOModel').modal('hide');
|
$('#EditServiceSplPOModel').modal('hide');
|
||||||
}
|
}
|
||||||
@ -3511,6 +3522,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
// formData.append('igr',igr);
|
// formData.append('igr',igr);
|
||||||
|
|
||||||
// $('.content').loader('show');
|
// $('.content').loader('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
|
|||||||
@ -1158,7 +1158,7 @@ function save(url,name){
|
|||||||
// console.log(span[0].className);
|
// console.log(span[0].className);
|
||||||
// alert(count++);
|
// alert(count++);
|
||||||
count = parseInt(fav_count)+parseInt(count)+1;
|
count = parseInt(fav_count)+parseInt(count)+1;
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
//alert(count);
|
//alert(count);
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
if(count <= 8){
|
if(count <= 8){
|
||||||
@ -1170,7 +1170,7 @@ function save(url,name){
|
|||||||
url:'<?php echo base_url()?>user/favouriteadd',
|
url:'<?php echo base_url()?>user/favouriteadd',
|
||||||
success:function(data){
|
success:function(data){
|
||||||
|
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1186,7 +1186,7 @@ function save(url,name){
|
|||||||
//console.log(span[0].className);
|
//console.log(span[0].className);
|
||||||
//alert("else");
|
//alert("else");
|
||||||
count = parseInt(fav_count)-parseInt(count)-1;
|
count = parseInt(fav_count)-parseInt(count)-1;
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
// count--;
|
// count--;
|
||||||
//alert("else"+count);
|
//alert("else"+count);
|
||||||
@ -1200,7 +1200,7 @@ function save(url,name){
|
|||||||
cache:false,
|
cache:false,
|
||||||
url:'<?php echo base_url()?>user/favouriteadd',
|
url:'<?php echo base_url()?>user/favouriteadd',
|
||||||
success:function(data){
|
success:function(data){
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,85 +1,60 @@
|
|||||||
<?php
|
|
||||||
//echo $CId;
|
|
||||||
?>
|
|
||||||
|
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
[contenteditable=true]:empty:before {
|
[contenteditable=true]:empty:before {
|
||||||
content: attr(placeholder);
|
content: attr(placeholder);
|
||||||
display: block; /* For Firefox */
|
display: block;
|
||||||
|
/* For Firefox */
|
||||||
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
|
|
||||||
var MaxDate = '<?php echo $MaxPoDate; ?>';
|
var MaxDate = '<?php echo $MaxPoDate; ?>';
|
||||||
var d = new Date(MaxDate);
|
var d = new Date(MaxDate);
|
||||||
var t = '<?php echo $CurrentDate; ?>';
|
var t = '<?php echo $CurrentDate; ?>';
|
||||||
var m = new Date(t);
|
var m = new Date(t);
|
||||||
|
|
||||||
$("#Date").datepicker({
|
$("#Date").datepicker({
|
||||||
minDate: d,
|
minDate: d,
|
||||||
//maxDate : 'now',
|
//maxDate : 'now',
|
||||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
|
dateFormat: 'dd-mm-yy',
|
||||||
|
changeMonth: true,
|
||||||
|
changeYear: true,
|
||||||
|
yearRange: '-100:+0'
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content" style="font-size: 12px;">
|
<section class="content" style="font-size: 12px;">
|
||||||
<div id="content"></div>
|
<div id="content"></div>
|
||||||
|
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header">
|
<div class="box-header">
|
||||||
<center><b><h3 class="box-title">ACTION REPORT</h3></b></center>
|
<center><b>
|
||||||
|
<h3 class="box-title">ACTION REPORT</h3>
|
||||||
|
</b></center>
|
||||||
</div>
|
</div>
|
||||||
<!-- /.box-header -->
|
<!-- /.box-header -->
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
|
|
||||||
|
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
|
|
||||||
<div id="content"></div>
|
<div id="content"></div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$attributes = array('class' => 'form-label-left action_report ', 'name' => 'action_report', 'id' => 'action_report');
|
$attributes = array('class' => 'form-label-left action_report ', 'name' => 'action_report', 'id' => 'action_report');
|
||||||
|
|
||||||
echo form_open(base_url() . '/purchaseorder/Action_Report/', $attributes);
|
echo form_open(base_url() . '/purchaseorder/Action_Report/', $attributes);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
||||||
<label>DEPT./FN.</label>
|
<label>DEPT./FN.</label>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// if(!empty($Suplist))
|
// if(!empty($Suplist))
|
||||||
// {
|
// {
|
||||||
// foreach ($Suplist as $SID):
|
// foreach ($Suplist as $SID):
|
||||||
|
|
||||||
|
|
||||||
// $options2[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
|
// $options2[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
|
||||||
|
|
||||||
// endforeach;
|
// endforeach;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// echo form_dropdown('DEPTFN', $options2,set_value('DEPTFN',$SupId),'id="DEPTFN"' ,'required="true"' ,'class="form-control select2');
|
// echo form_dropdown('DEPTFN', $options2,set_value('DEPTFN',$SupId),'id="DEPTFN"' ,'required="true"' ,'class="form-control select2');
|
||||||
|
|
||||||
$data = array('name' => 'Department', 'value' => set_value('Department'), 'id' => 'Department', 'class' => 'form-control', 'required' => 'true');
|
$data = array('name' => 'Department', 'value' => set_value('Department'), 'id' => 'Department', 'class' => 'form-control', 'required' => 'true');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="col-md-3">
|
<!-- <div class="col-md-3">
|
||||||
<label>Date</label>
|
<label>Date</label>
|
||||||
@ -98,7 +73,6 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
||||||
<label>AUDITOR </label>
|
<label>AUDITOR </label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<?php
|
<?php
|
||||||
@ -108,11 +82,8 @@ $(function() {
|
|||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
||||||
<label>AUDITEE </label>
|
<label>AUDITEE </label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<?php
|
<?php
|
||||||
@ -122,12 +93,10 @@ $(function() {
|
|||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
||||||
<label>IQA REF. </label>
|
<label>IQA REF. </label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<?php
|
<?php
|
||||||
@ -137,7 +106,6 @@ $(function() {
|
|||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label>Non Conformance Details, Objective Evidence</label>
|
<label>Non Conformance Details, Objective Evidence</label>
|
||||||
@ -148,7 +116,6 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3" style="display: none;">
|
<div class="col-md-3" style="display: none;">
|
||||||
<label>Attributed</label>
|
<label>Attributed</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -164,30 +131,26 @@ $(function() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div><legend>Disposition Action Plan</legend></div>
|
<div>
|
||||||
|
<legend>Disposition Action Plan</legend>
|
||||||
|
</div>
|
||||||
<table class="table table-bordered" style="border:1px solid #333">
|
<table class="table table-bordered" style="border:1px solid #333">
|
||||||
<div align="right" style="padding-right:10px">
|
<div align="right" style="padding-right:10px">
|
||||||
<div align="right">
|
<div align="right">
|
||||||
|
|
||||||
|
|
||||||
<a type="button" class="btn btn-success btn-md" data-toggle="modal" data-target="#myModal">Add Disposition Action</a>
|
<a type="button" class="btn btn-success btn-md" data-toggle="modal" data-target="#myModal">Add Disposition Action</a>
|
||||||
<!-- Add line Item -->
|
<!-- Add line Item -->
|
||||||
<div class="modal fade" id="myModal" role="dialog">
|
<div class="modal fade" id="myModal" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Add Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Add Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Action</label>
|
<label>Action</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -204,7 +167,6 @@ $(function() {
|
|||||||
$data = array('name' => 'Resp', 'value' => set_value('Resp'), 'id' => 'Resp', 'class' => 'form-control');
|
$data = array('name' => 'Resp', 'value' => set_value('Resp'), 'id' => 'Resp', 'class' => 'form-control');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
@ -216,45 +178,35 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success font addClick" ID="addClick"> <span class="bold">Add</span></a>
|
<a class="btn btn-success font addClick" ID="addClick"> <span class="bold">Add</span></a>
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Edit Line Item -->
|
<!-- Edit Line Item -->
|
||||||
|
|
||||||
<div class="modal fade" id="EditItem" role="dialog">
|
<div class="modal fade" id="EditItem" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Edit Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Edit Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Action</label>
|
<label>Action</label>
|
||||||
<div>
|
<div>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
$data = array('name' => 'EditAction', 'value' => set_value('EditAction'), 'id' => 'EditAction', 'class' => 'form-control');
|
$data = array('name' => 'EditAction', 'value' => set_value('EditAction'), 'id' => 'EditAction', 'class' => 'form-control');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Resp</label>
|
<label>Resp</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -271,27 +223,20 @@ $(function() {
|
|||||||
$data = array('name' => 'EditTarget', 'value' => set_value('EditTarget'), 'id' => 'EditTarget', 'class' => 'form-control');
|
$data = array('name' => 'EditTarget', 'value' => set_value('EditTarget'), 'id' => 'EditTarget', 'class' => 'form-control');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success font EditItem" ID="EditItem"> <span class="bold">Edit</span></a>
|
<a class="btn btn-success font EditItem" ID="EditItem"> <span class="bold">Edit</span></a>
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" style="padding: 0px 15px 0px 10px;">
|
<div class="row" style="padding: 0px 15px 0px 10px;">
|
||||||
<table id="mytable" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:12px;">
|
<table id="mytable" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:12px;">
|
||||||
<thead>
|
<thead>
|
||||||
@ -306,31 +251,29 @@ $(function() {
|
|||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--second table-->
|
<!--second table-->
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div><legend>Root Cause (s)</legend></div>
|
<div>
|
||||||
|
<legend>Root Cause (s)</legend>
|
||||||
|
</div>
|
||||||
<table class="table table-bordered" style="border:1px solid #333">
|
<table class="table table-bordered" style="border:1px solid #333">
|
||||||
<div align="right" style="padding-right:10px">
|
<div align="right" style="padding-right:10px">
|
||||||
<div align="right">
|
<div align="right">
|
||||||
<a type="button" class="btn btn-success btn-md" data-toggle="modal" data-target="#RootCausemodal">Add Root Cause</a><!-- Add line Item -->
|
<a type="button" class="btn btn-success btn-md" data-toggle="modal" data-target="#RootCausemodal">Add Root Cause</a><!-- Add line Item -->
|
||||||
<div class="modal fade" id="RootCausemodal" role="dialog">
|
<div class="modal fade" id="RootCausemodal" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Add Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Add Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Root Cause (s)</label>
|
<label>Root Cause (s)</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -341,29 +284,25 @@ $(function() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success font rootaddClick" ID="rootaddClick"> <span class="bold">Add</span></a>
|
<a class="btn btn-success font rootaddClick" ID="rootaddClick"> <span class="bold">Add</span></a>
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Edit Line Item -->
|
<!-- Edit Line Item -->
|
||||||
|
|
||||||
<div class="modal fade" id="EditRootCausemodal" role="dialog">
|
<div class="modal fade" id="EditRootCausemodal" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Edit Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Edit Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Root Cause (s)</label>
|
<label>Root Cause (s)</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -373,46 +312,37 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success font rootEditItem" ID="rootEditItem"> <span class="bold">Edit</span></a>
|
<a class="btn btn-success font rootEditItem" ID="rootEditItem"> <span class="bold">Edit</span></a>
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" style="padding: 0px 15px 0px 10px;">
|
<div class="row" style="padding: 0px 15px 0px 10px;">
|
||||||
<table id="rootmytable" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:12px;">
|
<table id="rootmytable" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:12px;">
|
||||||
<thead>
|
<thead>
|
||||||
<th>S.No</th>
|
<th>S.No</th>
|
||||||
<th>RootCause</th>
|
<th>RootCause</th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
|
|
||||||
|
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="roottbody">
|
<tbody id="roottbody">
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
|
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--third table-->
|
<!--third table-->
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div><legend>Counter Measure Action Plan</legend></div>
|
<div>
|
||||||
|
<legend>Counter Measure Action Plan</legend>
|
||||||
|
</div>
|
||||||
<table class="table table-bordered" style="border:1px solid #333">
|
<table class="table table-bordered" style="border:1px solid #333">
|
||||||
<div align="right" style="padding-right:10px">
|
<div align="right" style="padding-right:10px">
|
||||||
<div align="right">
|
<div align="right">
|
||||||
@ -420,17 +350,15 @@ $(function() {
|
|||||||
<!-- Add line Item -->
|
<!-- Add line Item -->
|
||||||
<div class="modal fade" id="Counter" role="dialog">
|
<div class="modal fade" id="Counter" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Add Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Add Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Action</label>
|
<label>Action</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -447,7 +375,6 @@ $(function() {
|
|||||||
$data = array('name' => 'CounterResp', 'value' => set_value('CounterResp'), 'id' => 'CounterResp', 'class' => 'form-control');
|
$data = array('name' => 'CounterResp', 'value' => set_value('CounterResp'), 'id' => 'CounterResp', 'class' => 'form-control');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
@ -459,45 +386,35 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success font CounteraddClick" ID="CounteraddClick"> <span class="bold">Add</span></a>
|
<a class="btn btn-success font CounteraddClick" ID="CounteraddClick"> <span class="bold">Add</span></a>
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Edit Line Item -->
|
<!-- Edit Line Item -->
|
||||||
|
|
||||||
<div class="modal fade" id="EditCounter" role="dialog">
|
<div class="modal fade" id="EditCounter" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Edit Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Edit Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<label>Action</label>
|
<label>Action</label>
|
||||||
<div>
|
<div>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
$data = array('name' => 'EditCounterAction', 'value' => set_value('EditCounterAction'), 'id' => 'EditCounterAction', 'class' => 'form-control');
|
$data = array('name' => 'EditCounterAction', 'value' => set_value('EditCounterAction'), 'id' => 'EditCounterAction', 'class' => 'form-control');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<label>Resp</label>
|
<label>Resp</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -514,27 +431,20 @@ $(function() {
|
|||||||
$data = array('name' => 'EditCounterTarget', 'value' => set_value('EditCounterTarget'), 'id' => 'EditCounterTarget', 'class' => 'form-control');
|
$data = array('name' => 'EditCounterTarget', 'value' => set_value('EditCounterTarget'), 'id' => 'EditCounterTarget', 'class' => 'form-control');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success font CounterEditItem" ID="CounterEditItem"> <span class="bold">Edit</span></a>
|
<a class="btn btn-success font CounterEditItem" ID="CounterEditItem"> <span class="bold">Edit</span></a>
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" style="padding: 0px 15px 0px 10px;">
|
<div class="row" style="padding: 0px 15px 0px 10px;">
|
||||||
<table id="mycountertable" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:12px;">
|
<table id="mycountertable" class="table table-bordered table-hover editableTable" style="background-color:#fff;font-size:12px;">
|
||||||
<thead>
|
<thead>
|
||||||
@ -548,13 +458,9 @@ $(function() {
|
|||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<legend>Effectiveness of Corrective Action Taken</legend>
|
<legend>Effectiveness of Corrective Action Taken</legend>
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>Review Details/ Follow up Audit Details </label>
|
<label>Review Details/ Follow up Audit Details </label>
|
||||||
@ -565,7 +471,6 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div><!--end new fields 1 sep-->
|
</div><!--end new fields 1 sep-->
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<lebel><b>NCR Closed</b></lebel>
|
<lebel><b>NCR Closed</b></lebel>
|
||||||
@ -576,11 +481,6 @@ $(function() {
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<label>MANAGEMENT REPRESENTATIVE COMMENTS</label>
|
<label>MANAGEMENT REPRESENTATIVE COMMENTS</label>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@ -590,71 +490,48 @@ $(function() {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div><!--end new fields 1 sep-->
|
</div><!--end new fields 1 sep-->
|
||||||
|
|
||||||
<input type="hidden" name="ActionRow" id="ActionRow">
|
<input type="hidden" name="ActionRow" id="ActionRow">
|
||||||
<input type="hidden" name="RootRow" id="RootRow">
|
<input type="hidden" name="RootRow" id="RootRow">
|
||||||
<input type="hidden" name="CounterRow" id="CounterRow">
|
<input type="hidden" name="CounterRow" id="CounterRow">
|
||||||
<input type="hidden" name="CId" id="CId" value="<?php echo $CId ?>">
|
<input type="hidden" name="CId" id="CId" value="<?php echo $CId ?>">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-2 col-md-offset-11">
|
<div class="col-md-2 col-md-offset-11">
|
||||||
<a class="btn btn-success Save" ID="Save" onclick="Save()"> <span class="bold">Save</span></a>
|
<a class="btn btn-success Save" ID="Save" onclick="Save()"> <span class="bold">Save</span></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div><!--end box-->
|
</div><!--end box-->
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/html" id="actionplan">
|
<script type="text/html" id="actionplan">
|
||||||
<tr id="<%=index%>">
|
<tr id="<%=index%>">
|
||||||
<td align="left"><%=index%></td>
|
<td align="left"><%=index%></td>
|
||||||
<td align="left" id="action<%=index%>"><%=Action%></td>
|
<td align="left" id="action<%=index%>"><%=Action%></td>
|
||||||
<td align="left" id="resp<%=index%>"><%=Resp%></td>
|
<td align="left" id="resp<%=index%>"><%=Resp%></td>
|
||||||
<td align="left" id="target<%=index%>"><%=Target%></td>
|
<td align="left" id="target<%=index%>"><%=Target%></td>
|
||||||
|
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<a data-target='#EditItem' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit details"></i> </a></span></a>
|
<a data-target='#EditItem' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit details"></i> </a></span></a>
|
||||||
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<script type="text/html" id="rootcause">
|
<script type="text/html" id="rootcause">
|
||||||
<tr id="<%=rootindex%>">
|
<tr id="<%=rootindex%>">
|
||||||
<td align="left"><%=rootindex%></td>
|
<td align="left"><%=rootindex%></td>
|
||||||
<td align="left" id="rootcause<%=rootindex%>"><%=RootCause%></td>
|
<td align="left" id="rootcause<%=rootindex%>"><%=RootCause%></td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<a data-target='#EditRootCausemodal' data-id="<%=rootindex%>" data-userid="<%=rootindex%>" data-toggle="modal" href="#EditRootCausemodal"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the details"></i> </a> </span></a>
|
<a data-target='#EditRootCausemodal' data-id="<%=rootindex%>" data-userid="<%=rootindex%>" data-toggle="modal" href="#EditRootCausemodal"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the details"></i> </a> </span></a>
|
||||||
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script type="text/html" id="counter">
|
<script type="text/html" id="counter">
|
||||||
<tr id="<%=counterindex%>">
|
<tr id="<%=counterindex%>">
|
||||||
<td align="left"><%=counterindex%></td>
|
<td align="left"><%=counterindex%></td>
|
||||||
<td align="left" id="counteraction1<%=counterindex%>"><%=Action%></td>
|
<td align="left" id="counteraction1<%=counterindex%>"><%=Action%></td>
|
||||||
<td align="left" id="counterresp1<%=counterindex%>"><%=Resp%></td>
|
<td align="left" id="counterresp1<%=counterindex%>"><%=Resp%></td>
|
||||||
<td align="left" id="countertarget1<%=counterindex%>"><%=Target%></td>
|
<td align="left" id="countertarget1<%=counterindex%>"><%=Target%></td>
|
||||||
|
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<a data-target='#EditCounter' data-id="<%=counterindex%>" data-userid="<%=counterindex%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit details"></i> </a></span></a>
|
<a data-target='#EditCounter' data-id="<%=counterindex%>" data-userid="<%=counterindex%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit details"></i> </a></span></a>
|
||||||
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var index = 1;
|
var index = 1;
|
||||||
var rootindex = 1;
|
var rootindex = 1;
|
||||||
@ -662,54 +539,42 @@ $(function() {
|
|||||||
var userid = '';
|
var userid = '';
|
||||||
var rootuserid = '';
|
var rootuserid = '';
|
||||||
var counteruserid = '';
|
var counteruserid = '';
|
||||||
|
$('.addClick').click(function() {
|
||||||
|
|
||||||
$('.addClick').click(function()
|
|
||||||
{
|
|
||||||
|
|
||||||
var action = $('#Action').val();
|
var action = $('#Action').val();
|
||||||
var resp = $('#Resp').val();
|
var resp = $('#Resp').val();
|
||||||
var target = $('#Target').val();
|
var target = $('#Target').val();
|
||||||
var temp = index
|
var temp = index
|
||||||
index = parseInt(index) + 1;
|
index = parseInt(index) + 1;
|
||||||
var template = jQuery("#actionplan").html();
|
var template = jQuery("#actionplan").html();
|
||||||
|
$('#actionappend').append(_.template(template, {
|
||||||
// alert(template)
|
index: temp,
|
||||||
$('#actionappend').append(_.template(template,{index:temp,Action:action,Resp:resp,Target:target}));
|
Action: action,
|
||||||
|
Resp: resp,
|
||||||
|
Target: target
|
||||||
|
}));
|
||||||
var theForm = $(".action_report");
|
var theForm = $(".action_report");
|
||||||
|
|
||||||
addHidden(theForm, "action" + temp, action);
|
addHidden(theForm, "action" + temp, action);
|
||||||
addHidden(theForm, "resp" + temp, resp);
|
addHidden(theForm, "resp" + temp, resp);
|
||||||
addHidden(theForm, "target" + temp, target);
|
addHidden(theForm, "target" + temp, target);
|
||||||
|
|
||||||
$('#Action').val('');
|
$('#Action').val('');
|
||||||
$('#Resp').val('');
|
$('#Resp').val('');
|
||||||
$('#Target').val('');
|
$('#Target').val('');
|
||||||
$('#ActionRow').val(temp)
|
$('#ActionRow').val(temp)
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function addHidden(theForm, key, value) {
|
||||||
|
|
||||||
|
|
||||||
function addHidden(theForm, key, value)
|
|
||||||
{
|
|
||||||
// Create a hidden input element, and append it to the form:
|
// Create a hidden input element, and append it to the form:
|
||||||
var input = document.createElement('input');
|
var input = document.createElement('input');
|
||||||
input.type = 'hidden';
|
input.type = 'hidden';
|
||||||
input.name = key;'name-as-seen-at-the-server';
|
input.name = key;
|
||||||
input.id = key;'name-as-seen-at-the-server';
|
'name-as-seen-at-the-server';
|
||||||
|
input.id = key;
|
||||||
|
'name-as-seen-at-the-server';
|
||||||
input.value = value;
|
input.value = value;
|
||||||
theForm.append(input);
|
theForm.append(input);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Save() {
|
||||||
|
|
||||||
function Save()
|
|
||||||
{
|
|
||||||
|
|
||||||
var txtactionrow = $('#ActionRow').val();
|
var txtactionrow = $('#ActionRow').val();
|
||||||
var txtrootrow = $('#RootRow').val();
|
var txtrootrow = $('#RootRow').val();
|
||||||
var txtcounterrow = $('#CounterRow').val();
|
var txtcounterrow = $('#CounterRow').val();
|
||||||
@ -718,193 +583,129 @@ function Save()
|
|||||||
var newdate = date.split("-").reverse().join("-");
|
var newdate = date.split("-").reverse().join("-");
|
||||||
var CId = $('#CId').val();
|
var CId = $('#CId').val();
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data: $('.action_report').serialize() + "&txtactionrow=" + txtactionrow + "&txtrootrow=" + txtrootrow + "&txtcounterrow=" + txtcounterrow + "&ncrstatus=" + ncrstatus + "&newdate=" + newdate + "&CId=" + CId,
|
data: $('.action_report').serialize() + "&txtactionrow=" + txtactionrow + "&txtrootrow=" + txtrootrow + "&txtcounterrow=" + txtcounterrow + "&ncrstatus=" + ncrstatus + "&newdate=" + newdate + "&CId=" + CId,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>purchaseorder/Action_Report",
|
url: "<?php echo base_url() ?>purchaseorder/Action_Report",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
|
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
window.location = "ncrlist";
|
window.location = "ncrlist";
|
||||||
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$("#EditItem").on("shown.bs.modal", function(e) {
|
||||||
$("#EditItem").on("shown.bs.modal", function(e)
|
|
||||||
{
|
|
||||||
userid = $(e.relatedTarget).data('userid');
|
userid = $(e.relatedTarget).data('userid');
|
||||||
var tr = document.getElementById(userid);
|
var tr = document.getElementById(userid);
|
||||||
|
|
||||||
$('#EditAction').val($('#action' + userid).val());
|
$('#EditAction').val($('#action' + userid).val());
|
||||||
$('#EditResp').val($('#resp' + userid).val());
|
$('#EditResp').val($('#resp' + userid).val());
|
||||||
$('#EditTarget').val($('#target' + userid).val());
|
$('#EditTarget').val($('#target' + userid).val());
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
$('.EditItem').click(function() {
|
||||||
$('.EditItem').click(function()
|
|
||||||
{
|
|
||||||
var editaction = $("#EditAction").val();
|
var editaction = $("#EditAction").val();
|
||||||
var editresp = $('#EditResp').val();
|
var editresp = $('#EditResp').val();
|
||||||
var edittarget = $('#EditTarget').val();
|
var edittarget = $('#EditTarget').val();
|
||||||
|
|
||||||
var tr = document.getElementById(userid);
|
var tr = document.getElementById(userid);
|
||||||
var cellval = tr.cells;
|
var cellval = tr.cells;
|
||||||
|
|
||||||
cellval[1].innerHTML = editaction;
|
cellval[1].innerHTML = editaction;
|
||||||
cellval[2].innerHTML = editresp;
|
cellval[2].innerHTML = editresp;
|
||||||
cellval[3].innerHTML = edittarget;
|
cellval[3].innerHTML = edittarget;
|
||||||
|
|
||||||
$('#action' + userid).val(editaction);
|
$('#action' + userid).val(editaction);
|
||||||
$('#resp' + userid).val(editresp);
|
$('#resp' + userid).val(editresp);
|
||||||
$('#target' + userid).val(edittarget);
|
$('#target' + userid).val(edittarget);
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('.rootaddClick').click(function() {
|
||||||
$('.rootaddClick').click(function()
|
|
||||||
{
|
|
||||||
|
|
||||||
var rootcause = $('#RootCause').val();
|
var rootcause = $('#RootCause').val();
|
||||||
var temp = rootindex
|
var temp = rootindex
|
||||||
rootindex = parseInt(rootindex) + 1;
|
rootindex = parseInt(rootindex) + 1;
|
||||||
var template = jQuery("#rootcause").html();
|
var template = jQuery("#rootcause").html();
|
||||||
//alert(template)
|
$('#roottbody').append(_.template(template, {
|
||||||
$('#roottbody').append(_.template(template,{rootindex:temp,RootCause:rootcause}));
|
rootindex: temp,
|
||||||
|
RootCause: rootcause
|
||||||
|
}));
|
||||||
var theForm = $(".action_report");
|
var theForm = $(".action_report");
|
||||||
addHidden(theForm, "RootCause" + temp, rootcause);
|
addHidden(theForm, "RootCause" + temp, rootcause);
|
||||||
$('#RootCause').val('');
|
$('#RootCause').val('');
|
||||||
$('#RootRow').val(temp)
|
$('#RootRow').val(temp)
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#EditRootCausemodal").on("shown.bs.modal", function(e) {
|
||||||
$("#EditRootCausemodal").on("shown.bs.modal", function(e)
|
|
||||||
{
|
|
||||||
|
|
||||||
//alert(JSON.stringify(e))
|
|
||||||
rootuserid = $(e.relatedTarget).data('userid');
|
rootuserid = $(e.relatedTarget).data('userid');
|
||||||
var tr = document.getElementById(rootuserid);
|
var tr = document.getElementById(rootuserid);
|
||||||
$('#editRootCause').val($('#RootCause' + rootuserid).val());
|
$('#editRootCause').val($('#RootCause' + rootuserid).val());
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('.rootEditItem').click(function() {
|
||||||
$('.rootEditItem').click(function()
|
|
||||||
{
|
|
||||||
var editroot = $("#editRootCause").val();
|
var editroot = $("#editRootCause").val();
|
||||||
var tr = document.getElementById(rootuserid);
|
var tr = document.getElementById(rootuserid);
|
||||||
var cellval = tr.cells;
|
var cellval = tr.cells; //cellval[1].innerHTML = editroot;
|
||||||
//cellval[1].innerHTML = editroot;
|
|
||||||
|
|
||||||
document.getElementById('rootcause' + rootuserid).innerHTML = editroot;
|
document.getElementById('rootcause' + rootuserid).innerHTML = editroot;
|
||||||
|
|
||||||
$('#RootCause' + rootuserid).val(editroot);
|
$('#RootCause' + rootuserid).val(editroot);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('.CounteraddClick').click(function() {
|
||||||
$('.CounteraddClick').click(function()
|
|
||||||
{
|
|
||||||
|
|
||||||
var action = $('#CounterAction').val();
|
var action = $('#CounterAction').val();
|
||||||
var resp = $('#CounterResp').val();
|
var resp = $('#CounterResp').val();
|
||||||
var target = $('#CounterTarget').val();
|
var target = $('#CounterTarget').val();
|
||||||
var temp = counterindex;
|
var temp = counterindex;
|
||||||
counterindex = parseInt(counterindex) + 1;
|
counterindex = parseInt(counterindex) + 1;
|
||||||
var template = jQuery("#counter").html();
|
var template = jQuery("#counter").html();
|
||||||
|
$('#countertable').append(_.template(template, {
|
||||||
// alert(template)
|
counterindex: temp,
|
||||||
$('#countertable').append(_.template(template,{counterindex:temp,Action:action,Resp:resp,Target:target}));
|
Action: action,
|
||||||
|
Resp: resp,
|
||||||
|
Target: target
|
||||||
|
}));
|
||||||
var theForm = $(".action_report");
|
var theForm = $(".action_report");
|
||||||
|
|
||||||
addHidden(theForm, "counteraction" + temp, action);
|
addHidden(theForm, "counteraction" + temp, action);
|
||||||
addHidden(theForm, "counterresp" + temp, resp);
|
addHidden(theForm, "counterresp" + temp, resp);
|
||||||
addHidden(theForm, "countertarget" + temp, target);
|
addHidden(theForm, "countertarget" + temp, target);
|
||||||
|
|
||||||
$('#CounterAction').val('');
|
$('#CounterAction').val('');
|
||||||
$('#CounterResp').val('');
|
$('#CounterResp').val('');
|
||||||
$('#CounterTarget').val('');
|
$('#CounterTarget').val('');
|
||||||
$('#CounterRow').val(temp)
|
$('#CounterRow').val(temp)
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#EditCounter").on("shown.bs.modal", function(e)
|
$("#EditCounter").on("shown.bs.modal", function(e) {
|
||||||
{
|
|
||||||
|
|
||||||
//alert()
|
|
||||||
cuserid = $(e.relatedTarget).data('userid');
|
cuserid = $(e.relatedTarget).data('userid');
|
||||||
|
|
||||||
var tr = document.getElementById(cuserid);
|
var tr = document.getElementById(cuserid);
|
||||||
|
|
||||||
$('#EditCounterAction').val($('#counteraction' + cuserid).val());
|
$('#EditCounterAction').val($('#counteraction' + cuserid).val());
|
||||||
$('#EditCounterResp').val($('#counterresp' + cuserid).val());
|
$('#EditCounterResp').val($('#counterresp' + cuserid).val());
|
||||||
$('#EditCounterTarget').val($('#countertarget' + cuserid).val());
|
$('#EditCounterTarget').val($('#countertarget' + cuserid).val());
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('.CounterEditItem').click(function() {
|
||||||
$('.CounterEditItem').click(function()
|
|
||||||
{
|
|
||||||
|
|
||||||
var editaction = $("#EditCounterAction").val();
|
var editaction = $("#EditCounterAction").val();
|
||||||
var editresp = $('#EditCounterResp').val();
|
var editresp = $('#EditCounterResp').val();
|
||||||
var edittarget = $('#EditCounterTarget').val();
|
var edittarget = $('#EditCounterTarget').val();
|
||||||
|
|
||||||
var tr = document.getElementById(cuserid);
|
var tr = document.getElementById(cuserid);
|
||||||
var cellval = tr.cells;
|
var cellval = tr.cells;
|
||||||
//alert(cuserid)
|
|
||||||
|
|
||||||
// cellval[1].innerHTML = editaction;
|
// cellval[1].innerHTML = editaction;
|
||||||
// cellval[2].innerHTML = editresp;
|
// cellval[2].innerHTML = editresp;
|
||||||
// cellval[3].innerHTML = edittarget;
|
// cellval[3].innerHTML = edittarget;
|
||||||
|
|
||||||
|
|
||||||
document.getElementById('counteraction1' + cuserid).innerHTML = editaction;
|
document.getElementById('counteraction1' + cuserid).innerHTML = editaction;
|
||||||
document.getElementById('counterresp1' + cuserid).innerHTML = editresp;
|
document.getElementById('counterresp1' + cuserid).innerHTML = editresp;
|
||||||
document.getElementById('countertarget1' + cuserid).innerHTML = edittarget;
|
document.getElementById('countertarget1' + cuserid).innerHTML = edittarget;
|
||||||
|
|
||||||
$('#counteraction' + cuserid).val(editaction);
|
$('#counteraction' + cuserid).val(editaction);
|
||||||
$('#counterresp' + cuserid).val(editresp);
|
$('#counterresp' + cuserid).val(editresp);
|
||||||
$('#countertarget' + cuserid).val(edittarget);
|
$('#countertarget' + cuserid).val(edittarget);
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// function DeleteActionRow(RowId)
|
// function DeleteActionRow(RowId)
|
||||||
// {
|
// {
|
||||||
// alert(RowId)
|
// alert(RowId)
|
||||||
// var id=[];
|
// var id=[];
|
||||||
// var tr = document.getElementById(RowId);
|
// var tr = document.getElementById(RowId);
|
||||||
|
|
||||||
// tr.parentNode.removeChild(tr);
|
// tr.parentNode.removeChild(tr);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1314,6 +1314,7 @@ $("#emailid").change(function() {
|
|||||||
|
|
||||||
var id = $('#emailid').val();
|
var id = $('#emailid').val();
|
||||||
if (validateEmail()) {
|
if (validateEmail()) {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1337,9 +1338,8 @@ $("#emailid").change(function() {
|
|||||||
alert('please edit the emailid in the edit employee screen');
|
alert('please edit the emailid in the edit employee screen');
|
||||||
window.location = 'employeedetails/employeeListing';
|
window.location = 'employeedetails/employeeListing';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -1279,6 +1279,7 @@
|
|||||||
|
|
||||||
var id = $('#emailid').val();
|
var id = $('#emailid').val();
|
||||||
if (validateEmail()) {
|
if (validateEmail()) {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1304,7 +1305,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
@ -1316,6 +1317,7 @@
|
|||||||
|
|
||||||
var id = $('#panno').val();
|
var id = $('#panno').val();
|
||||||
if (id != '') {
|
if (id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1324,6 +1326,7 @@
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>employeePANExist",
|
url: "<?php echo base_url(); ?>employeePANExist",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
// alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number");
|
// alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number");
|
||||||
// $('#panno').val('');
|
// $('#panno').val('');
|
||||||
@ -1358,6 +1361,7 @@
|
|||||||
|
|
||||||
var id = $('#aadharno').val();
|
var id = $('#aadharno').val();
|
||||||
if (id != '') {
|
if (id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1366,6 +1370,7 @@
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>employeecheckAadharNoExist",
|
url: "<?php echo base_url(); ?>employeecheckAadharNoExist",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
// alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number");
|
// alert( data+""+" Employee already exists in the database.Please Change the Aadhar card Number");
|
||||||
// $('#aadharno').val('');
|
// $('#aadharno').val('');
|
||||||
@ -1480,6 +1485,7 @@
|
|||||||
console.log('Combined Form Data:', combinedFormData); // Log the combined form data for debugging
|
console.log('Combined Form Data:', combinedFormData); // Log the combined form data for debugging
|
||||||
|
|
||||||
// Now you can send the combined data via AJAX
|
// Now you can send the combined data via AJAX
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: '<?php echo base_url() ?>addNewEmployee', // Replace with your form submission URL
|
url: '<?php echo base_url() ?>addNewEmployee', // Replace with your form submission URL
|
||||||
@ -1489,6 +1495,7 @@
|
|||||||
success: function(response) {
|
success: function(response) {
|
||||||
console.log('Form submitted successfully:', response);
|
console.log('Form submitted successfully:', response);
|
||||||
// Handle the success scenario
|
// Handle the success scenario
|
||||||
|
$('#loader').hide();
|
||||||
if (response) {
|
if (response) {
|
||||||
window.location.href = '<?php echo base_url("employeeListing"); ?>';
|
window.location.href = '<?php echo base_url("employeeListing"); ?>';
|
||||||
} else {
|
} else {
|
||||||
@ -1496,6 +1503,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(error) {
|
error: function(error) {
|
||||||
|
$('#loader').hide();
|
||||||
console.log('Form submission failed:', error);
|
console.log('Form submission failed:', error);
|
||||||
// Handle the error scenario
|
// Handle the error scenario
|
||||||
}
|
}
|
||||||
|
|||||||
@ -235,7 +235,7 @@
|
|||||||
//material = material.replace(/\s*$/,"");
|
//material = material.replace(/\s*$/,"");
|
||||||
var material = materialname.replace(/ /g, '');
|
var material = materialname.replace(/ /g, '');
|
||||||
//alert(m.length+" "+m+" "+s+" "+s.length);
|
//alert(m.length+" "+m+" "+s+" "+s.length);
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: material
|
id: material
|
||||||
@ -247,7 +247,7 @@
|
|||||||
//alert(count);
|
//alert(count);
|
||||||
|
|
||||||
if (count > 2) {
|
if (count > 2) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert('Material name already existed ! ');
|
alert('Material name already existed ! ');
|
||||||
|
|
||||||
var related_name = "";
|
var related_name = "";
|
||||||
@ -260,13 +260,13 @@
|
|||||||
alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name);
|
alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name);
|
||||||
$("#MaterialName").focus();
|
$("#MaterialName").focus();
|
||||||
} else {
|
} else {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert("empty data");
|
// alert("empty data");
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error Occur");
|
alert("Error Occur");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -260,7 +260,7 @@
|
|||||||
$('#supplierName').change(function() {
|
$('#supplierName').change(function() {
|
||||||
var suppliername = $('#supplierName').val();
|
var suppliername = $('#supplierName').val();
|
||||||
var supplier = suppliername.replace(/ /g, '');
|
var supplier = suppliername.replace(/ /g, '');
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?= base_url() . 'supplierExist' ?>",
|
url: "<?= base_url() . 'supplierExist' ?>",
|
||||||
@ -270,7 +270,7 @@
|
|||||||
success: function(data) {
|
success: function(data) {
|
||||||
var count = data.length;
|
var count = data.length;
|
||||||
if (count > 2) {
|
if (count > 2) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert('supplier already existed ! ');
|
alert('supplier already existed ! ');
|
||||||
var related_supplier = "";
|
var related_supplier = "";
|
||||||
$.each(data, function(i, obj) {
|
$.each(data, function(i, obj) {
|
||||||
@ -279,13 +279,12 @@
|
|||||||
alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier);
|
alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier);
|
||||||
$("#supplierName").focus();
|
$("#supplierName").focus();
|
||||||
} else {
|
} else {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert('This is New Supplier! ');
|
// alert('This is New Supplier! ');
|
||||||
}
|
}
|
||||||
console.log(data);
|
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert("Error Occur");
|
// alert("Error Occur");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -161,6 +161,7 @@
|
|||||||
console.log(empID);
|
console.log(empID);
|
||||||
|
|
||||||
if (empID) {
|
if (empID) {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>fetchEmployeeDetails",
|
url: "<?php echo base_url() ?>fetchEmployeeDetails",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -168,21 +169,20 @@
|
|||||||
EmpID: empID
|
EmpID: empID
|
||||||
},
|
},
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
console.log(data);
|
|
||||||
|
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
console.log(data.userInfo[0].FirstName);
|
|
||||||
|
|
||||||
$("#FirstName").val(data.userInfo[0].FirstName);
|
$("#FirstName").val(data.userInfo[0].FirstName);
|
||||||
$("#LastName").val(data.userInfo[0].LastName);
|
$("#LastName").val(data.userInfo[0].LastName);
|
||||||
$("#Designation").val(data.userInfo[0].Designation);
|
$("#Designation").val(data.userInfo[0].Designation);
|
||||||
$("#MailID").val(data.userInfo[0].EmailId);
|
$("#MailID").val(data.userInfo[0].EmailId);
|
||||||
$("#ContactNo").val(data.userInfo[0].ContactNumber);
|
$("#ContactNo").val(data.userInfo[0].ContactNumber);
|
||||||
|
$('#loader').hide();
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
alert('Employee not found');
|
alert('Employee not found');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
|
$('#loader').hide();
|
||||||
alert('Failed to fetch employee details');
|
alert('Failed to fetch employee details');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -226,6 +226,7 @@
|
|||||||
// alert(PONO);
|
// alert(PONO);
|
||||||
if (PONO) {
|
if (PONO) {
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -233,6 +234,8 @@
|
|||||||
data: 'PONO=' + PONO,
|
data: 'PONO=' + PONO,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
console.log(data);
|
console.log(data);
|
||||||
var line = '';
|
var line = '';
|
||||||
$('#MaterialCode').empty();
|
$('#MaterialCode').empty();
|
||||||
@ -270,14 +273,12 @@
|
|||||||
|
|
||||||
//line +='<option>select Material Code</option>'
|
//line +='<option>select Material Code</option>'
|
||||||
if (line) {
|
if (line) {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url() ?>assetdetails/getline",
|
url: "<?php echo base_url() ?>assetdetails/getline",
|
||||||
data: 'line=' + line,
|
data: 'line=' + line,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$.each(JSON.parse(data), function(i, item) {
|
$.each(JSON.parse(data), function(i, item) {
|
||||||
if (id == item.LineItemNo) {
|
if (id == item.LineItemNo) {
|
||||||
|
|
||||||
@ -324,6 +325,7 @@
|
|||||||
//line ='<option>'+item.LineItemNo+'</option>';
|
//line ='<option>'+item.LineItemNo+'</option>';
|
||||||
|
|
||||||
// $('#POLineItem').append(line);
|
// $('#POLineItem').append(line);
|
||||||
|
$('#loader').hide();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -245,7 +245,7 @@ $actcount = (int)$count + 1;
|
|||||||
var Action = $('#Action').val();
|
var Action = $('#Action').val();
|
||||||
var Remark = $('#Remark').val();
|
var Remark = $('#Remark').val();
|
||||||
//var remarks= $('#Remark').val();
|
//var remarks= $('#Remark').val();
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data: {
|
data: {
|
||||||
@ -261,10 +261,7 @@ $actcount = (int)$count + 1;
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>purchaseorder/SaveComplaint",
|
url: "<?php echo base_url(); ?>purchaseorder/SaveComplaint",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
$('#content').loader('hide');
|
$('#loader').show();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
window.location = "Nonconfirmativelist";
|
window.location = "Nonconfirmativelist";
|
||||||
|
|||||||
@ -250,7 +250,8 @@ function Save()
|
|||||||
var reqqty = $('#ReqQty').val();
|
var reqqty = $('#ReqQty').val();
|
||||||
var supqty = $('#SupQty').val();
|
var supqty = $('#SupQty').val();
|
||||||
var remarks= $('#Remark').val();
|
var remarks= $('#Remark').val();
|
||||||
$('#content').loader('show');
|
// $('#content').loader('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -260,10 +261,8 @@ function Save()
|
|||||||
url:"<?php echo base_url();?>purchaseorder/SaveEnquiry",
|
url:"<?php echo base_url();?>purchaseorder/SaveEnquiry",
|
||||||
success:function(data)
|
success:function(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|||||||
@ -608,16 +608,16 @@ $(document).ready(function(){
|
|||||||
var selectedvalue = $('input[name=merchant]').val();
|
var selectedvalue = $('input[name=merchant]').val();
|
||||||
if(selectedvalue != ' ' )
|
if(selectedvalue != ' ' )
|
||||||
{
|
{
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:selectedvalue},
|
data:{id:selectedvalue},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url();?>cashbook/getSupplierDtls",
|
url:"<?php echo base_url();?>cashbook/getSupplierDtls",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
var supplier_gstno = '';
|
var supplier_gstno = '';
|
||||||
|
$('#loader').hide();
|
||||||
if(data != '')
|
if(data != '')
|
||||||
{
|
{
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
$.each(data,function(i,arr){
|
$.each(data,function(i,arr){
|
||||||
supplier_gstno = arr.GSTNO;
|
supplier_gstno = arr.GSTNO;
|
||||||
@ -790,7 +790,7 @@ $('.AddSupplier').click(function()
|
|||||||
var alternatecont = $('#AlternateContactNumber').val();
|
var alternatecont = $('#AlternateContactNumber').val();
|
||||||
var email = $('#emailid').val();
|
var email = $('#emailid').val();
|
||||||
var Address = $('#Address').val();
|
var Address = $('#Address').val();
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
||||||
@ -799,12 +799,9 @@ $('.AddSupplier').click(function()
|
|||||||
|
|
||||||
success:function(data)
|
success:function(data)
|
||||||
{
|
{
|
||||||
// $('#content').loader('hide');
|
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var alertdata=data;
|
var alertdata=data;
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>cashbook/getAllSupplier",
|
url:"<?php echo base_url() ?>cashbook/getAllSupplier",
|
||||||
success:function(data)
|
success:function(data)
|
||||||
@ -823,16 +820,14 @@ $('.AddSupplier').click(function()
|
|||||||
|
|
||||||
//$("#supplier").append(html);
|
//$("#supplier").append(html);
|
||||||
alert(alertdata);
|
alert(alertdata);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$('#Addsup').modal('hide');
|
$('#Addsup').modal('hide');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,10 @@ $(function() {
|
|||||||
$("#Date").datepicker({
|
$("#Date").datepicker({
|
||||||
// minDate : 'now',
|
// minDate : 'now',
|
||||||
maxDate: 'now',
|
maxDate: 'now',
|
||||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
|
dateFormat: 'dd-mm-yy',
|
||||||
|
changeMonth: true,
|
||||||
|
changeYear: true,
|
||||||
|
yearRange: '-100:+0'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@ -30,8 +33,8 @@ $(function() {
|
|||||||
.num {
|
.num {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
.select2
|
|
||||||
{
|
.select2 {
|
||||||
width: 100% ! important;
|
width: 100% ! important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@ -90,14 +93,12 @@ $(function() {
|
|||||||
$Costs = array("-1" => 'Select Cost Center Name');
|
$Costs = array("-1" => 'Select Cost Center Name');
|
||||||
//print_r( $options);
|
//print_r( $options);
|
||||||
|
|
||||||
if(!empty($cost))
|
if (!empty($cost)) {
|
||||||
{
|
|
||||||
foreach ($cost as $SID):
|
foreach ($cost as $SID):
|
||||||
// echo $SID->ConfigValue;
|
// echo $SID->ConfigValue;
|
||||||
$Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName;
|
$Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName;
|
||||||
|
|
||||||
endforeach;
|
endforeach;
|
||||||
|
|
||||||
}
|
}
|
||||||
echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class="form-control select2"');
|
echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class="form-control select2"');
|
||||||
|
|
||||||
@ -129,7 +130,9 @@ $(function() {
|
|||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Add Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Add Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
@ -140,8 +143,7 @@ $(function() {
|
|||||||
$options = array("-1" => 'Select Material Code');
|
$options = array("-1" => 'Select Material Code');
|
||||||
//print_r( $options);
|
//print_r( $options);
|
||||||
|
|
||||||
if(!empty($MaterialList))
|
if (!empty($MaterialList)) {
|
||||||
{
|
|
||||||
foreach ($MaterialList as $MID):
|
foreach ($MaterialList as $MID):
|
||||||
|
|
||||||
|
|
||||||
@ -216,7 +218,9 @@ $(function() {
|
|||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||||
<center><h4>Edit Line Item </h4></center>
|
<center>
|
||||||
|
<h4>Edit Line Item </h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
<div align="left">
|
<div align="left">
|
||||||
|
|
||||||
@ -358,21 +362,22 @@ $(function() {
|
|||||||
<!--copy script-->
|
<!--copy script-->
|
||||||
<script>
|
<script>
|
||||||
var isExceed = 0;
|
var isExceed = 0;
|
||||||
function isNumberKey(evt)
|
|
||||||
{
|
function isNumberKey(evt) {
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
if (charCode != 46 && charCode > 31
|
if (charCode != 46 && charCode > 31 &&
|
||||||
&& (charCode < 48 || charCode > 57))
|
(charCode < 48 || charCode > 57))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
|
|
||||||
$( ".datePicker" ).datepicker({ dateFormat: 'dd/mm/yy' });
|
$(".datePicker").datepicker({
|
||||||
|
dateFormat: 'dd/mm/yy'
|
||||||
|
});
|
||||||
|
|
||||||
//Initialize Select2 Elements
|
//Initialize Select2 Elements
|
||||||
});
|
});
|
||||||
@ -386,8 +391,7 @@ var id = $('#CostCenter').val();
|
|||||||
|
|
||||||
$.each(y, function(idx, obj) {
|
$.each(y, function(idx, obj) {
|
||||||
// alert(obj.PONO);
|
// alert(obj.PONO);
|
||||||
if(id == obj.CostCenterCode)
|
if (id == obj.CostCenterCode) {
|
||||||
{
|
|
||||||
//alert(obj.BudgetAmount);
|
//alert(obj.BudgetAmount);
|
||||||
|
|
||||||
$("#BudgetAmount").val(obj.BudgetAmount);
|
$("#BudgetAmount").val(obj.BudgetAmount);
|
||||||
@ -397,8 +401,6 @@ var id = $('#CostCenter').val();
|
|||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -422,34 +424,29 @@ $("#UOM").val('');
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
|
|
||||||
function addHidden(theForm, key, value) {
|
function addHidden(theForm, key, value) {
|
||||||
// Create a hidden input element, and append it to the form:
|
// Create a hidden input element, and append it to the form:
|
||||||
var input = document.createElement('input');
|
var input = document.createElement('input');
|
||||||
input.type = 'hidden';
|
input.type = 'hidden';
|
||||||
input.name = key;'name-as-seen-at-the-server';
|
input.name = key;
|
||||||
input.id = key;'name-as-seen-at-the-server';
|
'name-as-seen-at-the-server';
|
||||||
|
input.id = key;
|
||||||
|
'name-as-seen-at-the-server';
|
||||||
input.value = value;
|
input.value = value;
|
||||||
theForm.append(input);
|
theForm.append(input);
|
||||||
}
|
}
|
||||||
function openmodal()
|
|
||||||
{
|
function openmodal() {
|
||||||
if($("option:selected", $("#CostCenter")).val() == '-1')
|
if ($("option:selected", $("#CostCenter")).val() == '-1') {
|
||||||
{
|
|
||||||
alert('Please select the CostCenter ');
|
alert('Please select the CostCenter ');
|
||||||
$("#CostCenter").focus();
|
$("#CostCenter").focus();
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
} else if ($('#Date').val() == '') {
|
||||||
else if($('#Date').val() == '')
|
|
||||||
{
|
|
||||||
alert('Please Enter the Requested Date ');
|
alert('Please Enter the Requested Date ');
|
||||||
$("#Date").focus();
|
$("#Date").focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$('#mypo').modal('show');
|
$('#mypo').modal('show');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -457,17 +454,14 @@ function openmodal()
|
|||||||
|
|
||||||
|
|
||||||
var index = 1;
|
var index = 1;
|
||||||
$('.addClick').click(function()
|
$('.addClick').click(function() {
|
||||||
{
|
|
||||||
|
|
||||||
if ($("#MaterialCode option:selected").val() =='-1' )
|
if ($("#MaterialCode option:selected").val() == '-1') {
|
||||||
{
|
|
||||||
alert('Please Select the MaterialCode ');
|
alert('Please Select the MaterialCode ');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(document.getElementById('Quantity').value == '' )
|
if (document.getElementById('Quantity').value == '') {
|
||||||
{
|
|
||||||
alert('Please Enter the Quantity');
|
alert('Please Enter the Quantity');
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@ -491,7 +485,14 @@ function openmodal()
|
|||||||
var template = jQuery("#tempList").html();
|
var template = jQuery("#tempList").html();
|
||||||
|
|
||||||
|
|
||||||
$('#mytab').append(_.template(template,{index:temp,MaterialCode:MaterialCode,MaterialName:Description,UOM:UOM,Quantity:Quantity,Remarks:Remarks}));
|
$('#mytab').append(_.template(template, {
|
||||||
|
index: temp,
|
||||||
|
MaterialCode: MaterialCode,
|
||||||
|
MaterialName: Description,
|
||||||
|
UOM: UOM,
|
||||||
|
Quantity: Quantity,
|
||||||
|
Remarks: Remarks
|
||||||
|
}));
|
||||||
|
|
||||||
|
|
||||||
var theForm = $(".requistion");
|
var theForm = $(".requistion");
|
||||||
@ -512,8 +513,7 @@ function openmodal()
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function clear()
|
function clear() {
|
||||||
{
|
|
||||||
|
|
||||||
$('#Description').val('');
|
$('#Description').val('');
|
||||||
$('#UOM').val('');
|
$('#UOM').val('');
|
||||||
@ -524,14 +524,12 @@ function clear()
|
|||||||
|
|
||||||
var index = '1';
|
var index = '1';
|
||||||
var userid = '';
|
var userid = '';
|
||||||
function removeHiddenRows(rowcount)
|
|
||||||
{
|
function removeHiddenRows(rowcount) {
|
||||||
var step;
|
var step;
|
||||||
|
|
||||||
if(rowcount > 2)
|
if (rowcount > 2) {
|
||||||
{
|
for (step = 1; step < rowcount; step++) {
|
||||||
for (step = 1; step < rowcount ; step++)
|
|
||||||
{
|
|
||||||
var td = document.getElementById(step);
|
var td = document.getElementById(step);
|
||||||
td.parentNode.removeChild(td);
|
td.parentNode.removeChild(td);
|
||||||
$("#MaterialCode" + step).remove();
|
$("#MaterialCode" + step).remove();
|
||||||
@ -586,47 +584,34 @@ $('.EditItem').click(function(){
|
|||||||
// $('#txtRowCount').val(userid);
|
// $('#txtRowCount').val(userid);
|
||||||
});
|
});
|
||||||
|
|
||||||
function Deleterow(rowid)
|
function Deleterow(rowid) {
|
||||||
{
|
|
||||||
var DelRows = $('#txtDeletedRow').val();
|
var DelRows = $('#txtDeletedRow').val();
|
||||||
var answer = confirm(" Do you want to delete the Item from the List?")
|
var answer = confirm(" Do you want to delete the Item from the List?")
|
||||||
if (answer)
|
if (answer) {
|
||||||
{
|
|
||||||
var td = document.getElementById(rowid);
|
var td = document.getElementById(rowid);
|
||||||
td.parentNode.removeChild(td);
|
td.parentNode.removeChild(td);
|
||||||
|
|
||||||
if(DelRows != '')
|
if (DelRows != '') {
|
||||||
{
|
|
||||||
DelRows = DelRows + ":" + rowid;
|
DelRows = DelRows + ":" + rowid;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
DelRows = "0" + ":" + rowid;
|
DelRows = "0" + ":" + rowid;
|
||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
function validateBeforeAdd()
|
|
||||||
{
|
function validateBeforeAdd() {
|
||||||
|
|
||||||
|
|
||||||
if ($("#CostCenter option:selected").val() =='-1' )
|
if ($("#CostCenter option:selected").val() == '-1') {
|
||||||
{
|
|
||||||
alert('Please Select the CostCenterCode ');
|
alert('Please Select the CostCenterCode ');
|
||||||
$("#CostCenter").focus();
|
$("#CostCenter").focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
} else if (isExceed == '1') {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else if( isExceed == '1')
|
|
||||||
{
|
|
||||||
alert('You dont have available Budget Amount. You cant raise new StoreRequisition');
|
alert('You dont have available Budget Amount. You cant raise new StoreRequisition');
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$('#mypo').modal('show');
|
$('#mypo').modal('show');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -634,19 +619,15 @@ function validateBeforeAdd()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
function Save(status)
|
function Save(status) {
|
||||||
{
|
|
||||||
|
|
||||||
//alert($(json.stringify(MaterialCode).val());
|
//alert($(json.stringify(MaterialCode).val());
|
||||||
var txtRowCount = $('#txtRowCount').val();
|
var txtRowCount = $('#txtRowCount').val();
|
||||||
//var mat = $('#MaterialCode'+txtRowCount).val();
|
//var mat = $('#MaterialCode'+txtRowCount).val();
|
||||||
|
|
||||||
if(status == '0')
|
if (status == '0') {
|
||||||
{
|
|
||||||
stat = '<?php echo STORE_DRAFT; ?>';
|
stat = '<?php echo STORE_DRAFT; ?>';
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
stat = '<?php echo STORE_PENDINGAPPROVAL; ?>';
|
stat = '<?php echo STORE_PENDINGAPPROVAL; ?>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -661,38 +642,30 @@ else
|
|||||||
var splitDepCode = $('#DepartmentName').val();
|
var splitDepCode = $('#DepartmentName').val();
|
||||||
DEPCode = splitDepCode.split('-')[0];
|
DEPCode = splitDepCode.split('-')[0];
|
||||||
|
|
||||||
if (validate())
|
if (validate()) {
|
||||||
{
|
if (document.getElementById('mytable').rows.length < 0) {
|
||||||
if(document.getElementById('mytable').rows.length < 0)
|
|
||||||
{
|
|
||||||
alert('Please Select Line item to Store Requisition');
|
alert('Please Select Line item to Store Requisition');
|
||||||
$('#Deliverydt').focus();
|
$('#Deliverydt').focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: $('.requistion').serialize(),
|
data: $('.requistion').serialize(),
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>storerequisitionlist/addNewRequistion",
|
url: "<?php echo base_url() ?>storerequisitionlist/addNewRequistion",
|
||||||
|
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if(data)
|
$('#loader').hide();
|
||||||
{
|
if (data) {
|
||||||
$('#content').loader('hide');
|
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
|
|
||||||
window.location = "addstore";
|
window.location = "addstore";
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -703,39 +676,25 @@ else
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function validate()
|
|
||||||
{
|
|
||||||
|
|
||||||
if($("option:selected", $("#CostCenter")).val() == '-1')
|
function validate() {
|
||||||
{
|
|
||||||
|
if ($("option:selected", $("#CostCenter")).val() == '-1') {
|
||||||
alert('Please Select CostCenter');
|
alert('Please Select CostCenter');
|
||||||
return false;
|
return false;
|
||||||
}
|
} else if ($("#txtRowCount").val().length < 1) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else if($("#txtRowCount").val().length < 1)
|
|
||||||
{
|
|
||||||
alert('Please Add Line Item');
|
alert('Please Add Line Item');
|
||||||
return false;
|
return false;
|
||||||
}
|
} else if (isExceed == 1) {
|
||||||
else if(isExceed == 1)
|
|
||||||
{
|
|
||||||
alert('You dont have Budget and You cant Raise New StoreRequisition');
|
alert('You dont have Budget and You cant Raise New StoreRequisition');
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$('#Items').DataTable({
|
$('#Items').DataTable({
|
||||||
"paging": false,
|
"paging": false,
|
||||||
@ -748,4 +707,3 @@ function validate()
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@ -1928,6 +1928,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -1936,6 +1937,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: selectedMaterialCode
|
materialcode: selectedMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2022,7 +2024,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
$("#POType").val(input);
|
$("#POType").val(input);
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
input: input
|
input: input
|
||||||
@ -2062,7 +2064,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2078,7 +2080,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
if (id != '0' && ReqType != '-1') {
|
if (id != '0' && ReqType != '-1') {
|
||||||
|
|
||||||
|
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id,
|
id: id,
|
||||||
@ -2088,10 +2090,10 @@ if (!empty($INRSYMBOL)) {
|
|||||||
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
|
$("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
//alert("Error");
|
//alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2129,6 +2131,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -2137,6 +2140,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: selectedRevenueMaterialCode
|
materialcode: selectedRevenueMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -6047,7 +6051,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
function Save() {
|
function Save() {
|
||||||
$('#txtStatus').val('<?php echo PO_DRAFT; ?>');
|
$('#txtStatus').val('<?php echo PO_DRAFT; ?>');
|
||||||
if (validate()) {
|
if (validate()) {
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
var formData = new FormData($('.CreatePO')[0]);
|
var formData = new FormData($('.CreatePO')[0]);
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -6059,7 +6063,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
|
url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
//$('#txtRowCount').val('');
|
//$('#txtRowCount').val('');
|
||||||
//$('#txtDeletedRow').val('');
|
//$('#txtDeletedRow').val('');
|
||||||
@ -6067,6 +6071,8 @@ if (!empty($INRSYMBOL)) {
|
|||||||
//window.location = "Requisition";
|
//window.location = "Requisition";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6266,7 +6272,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
CostArray = '';
|
CostArray = '';
|
||||||
var id = $('#DepartmentName').val();
|
var id = $('#DepartmentName').val();
|
||||||
if (id != '0') {
|
if (id != '0') {
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -6287,10 +6293,11 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6317,7 +6324,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
if (id != '0' && ReqType != '-1') {
|
if (id != '0' && ReqType != '-1') {
|
||||||
|
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id,
|
id: id,
|
||||||
@ -6327,11 +6334,11 @@ if (!empty($INRSYMBOL)) {
|
|||||||
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$("#AvalBuget").val(parseFloat(data).toFixed(2));
|
$("#AvalBuget").val(parseFloat(data).toFixed(2));
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -6354,7 +6361,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
if (id != '0' && ReqType != '-1') {
|
if (id != '0' && ReqType != '-1') {
|
||||||
|
|
||||||
|
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id,
|
id: id,
|
||||||
@ -6364,11 +6371,11 @@ if (!empty($INRSYMBOL)) {
|
|||||||
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
|
$("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -7084,6 +7091,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
// Submit the form using AJAX
|
// Submit the form using AJAX
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewServicePurchaseOrder",
|
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewServicePurchaseOrder",
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -7092,7 +7100,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
contentType: false, // Prevent jQuery from setting the content type header
|
contentType: false, // Prevent jQuery from setting the content type header
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
// Handle the server response
|
// Handle the server response
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
if(data){
|
if(data){
|
||||||
alert(data);
|
alert(data);
|
||||||
}
|
}
|
||||||
@ -7105,7 +7113,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
},
|
},
|
||||||
error: function (xhr, status, error) {
|
error: function (xhr, status, error) {
|
||||||
// Handle errors
|
// Handle errors
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error: " + error);
|
alert("Error: " + error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -7164,6 +7172,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
// Submit the form using AJAX
|
// Submit the form using AJAX
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",
|
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -7173,8 +7182,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
success: function (data) {
|
success: function (data) {
|
||||||
// Handle the server response
|
// Handle the server response
|
||||||
// alert(data);
|
// alert(data);
|
||||||
console.log(data);
|
$('#loader').hide();
|
||||||
|
|
||||||
$('#txtRowCount1').val('');
|
$('#txtRowCount1').val('');
|
||||||
$('#txtDeletedRow1').val('');
|
$('#txtDeletedRow1').val('');
|
||||||
$('#SpcialInstruction').val('');
|
$('#SpcialInstruction').val('');
|
||||||
@ -7276,7 +7284,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
var EditReqType = $('#EditReqNo').val();
|
var EditReqType = $('#EditReqNo').val();
|
||||||
if (getCostId != '0') {
|
if (getCostId != '0') {
|
||||||
|
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: getCostId,
|
id: getCostId,
|
||||||
@ -7286,10 +7294,10 @@ if (!empty($INRSYMBOL)) {
|
|||||||
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$("#EditAvlBudAmt").val(data ? data : 0);
|
$("#EditAvlBudAmt").val(data ? data : 0);
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7319,6 +7327,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -7327,6 +7336,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: editselectedMaterialCode
|
materialcode: editselectedMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -7435,6 +7445,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -7443,6 +7454,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: editselectedMaterialCode
|
materialcode: editselectedMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -244,7 +244,7 @@
|
|||||||
$("#ReqDate").val('');
|
$("#ReqDate").val('');
|
||||||
$("#Desigination").val('');
|
$("#Desigination").val('');
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: ReqId
|
id: ReqId
|
||||||
@ -254,7 +254,7 @@
|
|||||||
url: "<?php echo base_url() ?>storerequisitionlist/ViewRequest",
|
url: "<?php echo base_url() ?>storerequisitionlist/ViewRequest",
|
||||||
success: function(json) {
|
success: function(json) {
|
||||||
//success:function(data) {
|
//success:function(data) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
//alert(json.Requist);
|
//alert(json.Requist);
|
||||||
if (json.Requist != '') {
|
if (json.Requist != '') {
|
||||||
//alert(json.Requist[0]['Requestedby']) ;
|
//alert(json.Requist[0]['Requestedby']) ;
|
||||||
@ -297,7 +297,7 @@
|
|||||||
|
|
||||||
var answer = confirm(strMsg);
|
var answer = confirm(strMsg);
|
||||||
if (answer) {
|
if (answer) {
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id,
|
id: id,
|
||||||
@ -307,10 +307,11 @@
|
|||||||
url: "<?php echo base_url() ?>storerequisitionlist/ApproveRequest?Status=" + Status,
|
url: "<?php echo base_url() ?>storerequisitionlist/ApproveRequest?Status=" + Status,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
location.reload();
|
location.reload();
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,42 +1,37 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
//echo $suppliername;
|
//echo $suppliername;
|
||||||
if(!empty($amountpaid))
|
if (!empty($amountpaid)) {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
|
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -101,7 +96,9 @@ if(!empty($amountpaid))
|
|||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
|
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;; font-size: 18px;">Bank Debit Amount Paid Reports
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;; font-size: 18px;">Bank Debit Amount Paid Reports
|
||||||
<?php if (!empty($fa)) {
|
<?php if (!empty($fa)) {
|
||||||
echo $fa;
|
echo $fa;
|
||||||
}
|
}
|
||||||
@ -113,14 +110,12 @@ if(!empty($amountpaid))
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $m;
|
echo $m;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fdate))
|
<?php if (!empty($fdate)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $fdate;
|
echo $fdate;
|
||||||
}
|
}
|
||||||
@ -131,8 +126,12 @@ if(!empty($amountpaid))
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</p></h3></center>
|
</p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $suppliername;?></span></h4></center>
|
</h3>
|
||||||
|
</center>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $suppliername; ?></span></h4>
|
||||||
|
</center>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6 col-xs-6">
|
<div class="col-md-6 col-xs-6">
|
||||||
|
|
||||||
@ -156,14 +155,13 @@ if(!empty($amountpaid))
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
foreach($finyear as $item):
|
foreach ($finyear as $item): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -260,8 +258,7 @@ if(!empty($amountpaid))
|
|||||||
|
|
||||||
|
|
||||||
if (!empty($bankdebit)) {
|
if (!empty($bankdebit)) {
|
||||||
foreach($bankdebit as $ap)
|
foreach ($bankdebit as $ap) {
|
||||||
{
|
|
||||||
$rate = $ap->Amountpaid;
|
$rate = $ap->Amountpaid;
|
||||||
// $ti=$ap->Totalpoamount-$rate;
|
// $ti=$ap->Totalpoamount-$rate;
|
||||||
// $id=$ap->id;
|
// $id=$ap->id;
|
||||||
@ -285,34 +282,22 @@ if(!empty($amountpaid))
|
|||||||
<td align="left" id="tpoa<?php echo $i ?>"><span><?php echo $ap->Totalpoamount ?></span></td>
|
<td align="left" id="tpoa<?php echo $i ?>"><span><?php echo $ap->Totalpoamount ?></span></td>
|
||||||
<td align="left" id="btp<?php echo $i ?>">
|
<td align="left" id="btp<?php echo $i ?>">
|
||||||
<span><?php
|
<span><?php
|
||||||
if($preIGRNO == $ap->IGRNO)
|
if ($preIGRNO == $ap->IGRNO) {
|
||||||
{
|
if ($preBalance == 0) {
|
||||||
if($preBalance == 0 )
|
|
||||||
{
|
|
||||||
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
$balance = $preBalance - $ap->Amountpaid;
|
$balance = $preBalance - $ap->Amountpaid;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
if($preIGRNO != $ap->IGRNO)
|
if ($preIGRNO != $ap->IGRNO) {
|
||||||
{
|
|
||||||
// $preBalance =0 ;
|
// $preBalance =0 ;
|
||||||
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
} else {
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
else{
|
|
||||||
$balance = $ap->Totalpoamount - $preBalance;
|
$balance = $ap->Totalpoamount - $preBalance;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
// echo 'elseelse';
|
// echo 'elseelse';
|
||||||
@ -331,23 +316,18 @@ if(!empty($amountpaid))
|
|||||||
|
|
||||||
<td align="left" id="ap<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($rate) ?> <?php echo round($rate, 2) ?></span></td>
|
<td align="left" id="ap<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($rate) ?> <?php echo round($rate, 2) ?></span></td>
|
||||||
<?php
|
<?php
|
||||||
if($ap->igrfile !='')
|
if ($ap->igrfile != '') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
<td> <a data-toggle="tooltip"><i class="fa fa-download" data-toggle="tooltip" title="<?php echo $record->pono; ?> -Attachment Available for Download/View" onclick="igrfile(<?php echo $i ?>)"></i></a> </td>
|
<td> <a data-toggle="tooltip"><i class="fa fa-download" data-toggle="tooltip" title="<?php echo $record->pono; ?> -Attachment Available for Download/View" onclick="igrfile(<?php echo $i ?>)"></i></a> </td>
|
||||||
<?php
|
<?php
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<td>N/A</td>
|
<td>N/A</td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
if($ap->pofile !='')
|
if ($ap->pofile != '') {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -356,8 +336,7 @@ if(!empty($amountpaid))
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else
|
} else { ?>
|
||||||
{ ?>
|
|
||||||
<td>N/A</td>
|
<td>N/A</td>
|
||||||
|
|
||||||
|
|
||||||
@ -430,8 +409,7 @@ if(!empty($amountpaid))
|
|||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function podelete(i)
|
function podelete(i) {
|
||||||
{
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#content').loader('show');
|
||||||
|
|
||||||
@ -457,17 +435,25 @@ var mappingid=$('#mapid'+i).val();
|
|||||||
var bankingclear = $('#bankingbalclear' + i).val();
|
var bankingclear = $('#bankingbalclear' + i).val();
|
||||||
|
|
||||||
var clearedbalance = $('#clearbal' + i).val();
|
var clearedbalance = $('#clearbal' + i).val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{mappingid:mappingid,Totalpoamount:totalamount,paidamount:paidamount,balancetopay:balancetopay,pono:pono,igrno:igrno,bankid:bankid,balancetobankingclear:bankingclear,clearbalance:clearedbalance},
|
data: {
|
||||||
|
mappingid: mappingid,
|
||||||
|
Totalpoamount: totalamount,
|
||||||
|
paidamount: paidamount,
|
||||||
|
balancetopay: balancetopay,
|
||||||
|
pono: pono,
|
||||||
|
igrno: igrno,
|
||||||
|
bankid: bankid,
|
||||||
|
balancetobankingclear: bankingclear,
|
||||||
|
clearbalance: clearedbalance
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>DeletePo",
|
url: "<?php echo base_url() ?>DeletePo",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
$('#loader').hide();
|
||||||
//$('#content').loader('hide');
|
|
||||||
|
|
||||||
window.location.href = "amountpaidsupplier";
|
window.location.href = "amountpaidsupplier";
|
||||||
//location.reload();
|
//location.reload();
|
||||||
@ -477,20 +463,23 @@ $.ajax({
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
function igrfile(i)
|
|
||||||
{
|
function igrfile(i) {
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
|
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
@ -501,9 +490,8 @@ $.ajax({
|
|||||||
i = 0;
|
i = 0;
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
|
|
||||||
if(item.file == null)
|
if (item.file == null) {
|
||||||
{ if(item.Remarks ==null)
|
if (item.Remarks == null) {
|
||||||
{
|
|
||||||
//alert()
|
//alert()
|
||||||
PONO = item.PONO;
|
PONO = item.PONO;
|
||||||
BillNO = item.BillNo;
|
BillNO = item.BillNo;
|
||||||
@ -525,8 +513,7 @@ $.ajax({
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(Filename != null)
|
if (Filename != null) {
|
||||||
{
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
i = i - 1;
|
i = i - 1;
|
||||||
trHTML += '<tr id=' + i + '>' +
|
trHTML += '<tr id=' + i + '>' +
|
||||||
@ -544,6 +531,7 @@ $.ajax({
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
@ -551,20 +539,23 @@ $.ajax({
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
function pofile(i)
|
|
||||||
{
|
function pofile(i) {
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
|
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/filelist",
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
@ -584,6 +575,7 @@ function pofile(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
@ -651,12 +643,4 @@ $( function() {
|
|||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,41 +1,37 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
if(!empty($amountpaid))
|
if (!empty($amountpaid)) {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <link rel="stylesheet" .href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
<!-- <link rel="stylesheet" .href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -67,7 +63,9 @@ foreach($financialyear as $item)
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;; font-size: 18px;">Amount Received Reports <?php if(!empty($fa)){
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;; font-size: 18px;">Amount Received Reports <?php if (!empty($fa)) {
|
||||||
echo $fa;
|
echo $fa;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,14 +76,12 @@ foreach($financialyear as $item)
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $m;
|
echo $m;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fdate))
|
<?php if (!empty($fdate)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $fdate;
|
echo $fdate;
|
||||||
}
|
}
|
||||||
@ -95,8 +91,12 @@ foreach($financialyear as $item)
|
|||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?></p></h3></center>
|
?></p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $clientname;?></span></h4></center>
|
</h3>
|
||||||
|
</center>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $clientname; ?></span></h4>
|
||||||
|
</center>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6 col-xs-6">
|
<div class="col-md-6 col-xs-6">
|
||||||
|
|
||||||
@ -135,14 +135,13 @@ foreach($financialyear as $item)
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
foreach($finyear as $item):
|
foreach ($finyear as $item): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -204,16 +203,15 @@ foreach($financialyear as $item)
|
|||||||
<select class="form-control" id="CustomerName" name="CustomerName">
|
<select class="form-control" id="CustomerName" name="CustomerName">
|
||||||
<option value="">Select Customer</option>
|
<option value="">Select Customer</option>
|
||||||
<?php
|
<?php
|
||||||
foreach($getcustomer as $gc):
|
foreach ($getcustomer as $gc): {
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<option value="<?php echo $gc->client_id; ?>"><?php echo $gc->client_name; ?></option>
|
<option value="<?php echo $gc->client_id; ?>"><?php echo $gc->client_name; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>-->
|
</div>-->
|
||||||
@ -262,8 +260,7 @@ foreach($financialyear as $item)
|
|||||||
$preBalance = 0;
|
$preBalance = 0;
|
||||||
$preINV = '';
|
$preINV = '';
|
||||||
if (!empty($amountreceived)) {
|
if (!empty($amountreceived)) {
|
||||||
foreach($amountreceived as $ap)
|
foreach ($amountreceived as $ap) {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
@ -276,7 +273,9 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
<!-- <td align="left" id="date<?php echo $i ?>"><span><?php echo $ap->indate ?></span></td> -->
|
<!-- <td align="left" id="date<?php echo $i ?>"><span><?php echo $ap->indate ?></span></td> -->
|
||||||
|
|
||||||
<td align="left"><?php $Pdt = new DateTime($ap->indate);$Created_Date = $Pdt->format('d-m-Y'); echo $Created_Date?></td>
|
<td align="left"><?php $Pdt = new DateTime($ap->indate);
|
||||||
|
$Created_Date = $Pdt->format('d-m-Y');
|
||||||
|
echo $Created_Date ?></td>
|
||||||
<td align="left" id="bankdate<?php echo $i ?>"><span><?php echo format_date($ap->BankDate, 0, 'd-m-Y'); ?></span></td>
|
<td align="left" id="bankdate<?php echo $i ?>"><span><?php echo format_date($ap->BankDate, 0, 'd-m-Y'); ?></span></td>
|
||||||
|
|
||||||
<td align="left" id="invno<?php echo $i ?>"><a href="<?= base_url() ?>cashbook/mappingcredit?sid=<?php echo $ap->invoiceno; ?>"><span><?php echo $ap->invoiceno ?></span></a></td>
|
<td align="left" id="invno<?php echo $i ?>"><a href="<?= base_url() ?>cashbook/mappingcredit?sid=<?php echo $ap->invoiceno; ?>"><span><?php echo $ap->invoiceno ?></span></a></td>
|
||||||
@ -288,26 +287,18 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
<span>
|
<span>
|
||||||
<?php
|
<?php
|
||||||
if($preINV == $ap->invoiceno)
|
if ($preINV == $ap->invoiceno) {
|
||||||
{
|
if ($preBalance == 0) {
|
||||||
if($preBalance == 0 )
|
|
||||||
{
|
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
$balance = $preBalance - $ap->amountreceived;
|
$balance = $preBalance - $ap->amountreceived;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
if($preINV != $ap->invoiceno)
|
if ($preINV != $ap->invoiceno) {
|
||||||
{
|
|
||||||
// $preBalance =0 ;
|
// $preBalance =0 ;
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
@ -315,14 +306,10 @@ foreach($financialyear as $item)
|
|||||||
// echo 'elseif';
|
// echo 'elseif';
|
||||||
// echo $preINV;
|
// echo $preINV;
|
||||||
|
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else{
|
|
||||||
$balance = $ap->totinvoiceamount - $preBalance;
|
$balance = $ap->totinvoiceamount - $preBalance;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
echo 'elseelse';
|
echo 'elseelse';
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -351,7 +338,6 @@ foreach($financialyear as $item)
|
|||||||
$preINV = $ap->invoiceno;
|
$preINV = $ap->invoiceno;
|
||||||
$preBalance = $balance;
|
$preBalance = $balance;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -434,10 +420,10 @@ $( function() {
|
|||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
function invoice(i)
|
|
||||||
{
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
function invoice(i) {
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
var totinvoiceamount = $('#totinvoiceamount' + i).text();
|
var totinvoiceamount = $('#totinvoiceamount' + i).text();
|
||||||
|
|
||||||
var balancetoreceived = $('#balancetoreceived' + i).text();
|
var balancetoreceived = $('#balancetoreceived' + i).text();
|
||||||
@ -453,14 +439,22 @@ var bankingbalclear=$('#btc'+i).val();
|
|||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{mappingid:mappingid,invoiceno:invoiceno,bankid:bankid,amountreceived:amountreceived,bankingclear:bankingclear,bankingbalclear:bankingbalclear,totinvoiceamount:totinvoiceamount,balancetoreceived:balancetoreceived},
|
data: {
|
||||||
|
mappingid: mappingid,
|
||||||
|
invoiceno: invoiceno,
|
||||||
|
bankid: bankid,
|
||||||
|
amountreceived: amountreceived,
|
||||||
|
bankingclear: bankingclear,
|
||||||
|
bankingbalclear: bankingbalclear,
|
||||||
|
totinvoiceamount: totinvoiceamount,
|
||||||
|
balancetoreceived: balancetoreceived
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>DeleteInvoice",
|
url: "<?php echo base_url() ?>DeleteInvoice",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
window.location.href = "Bankingstatement";
|
window.location.href = "Bankingstatement";
|
||||||
@ -478,7 +472,9 @@ var bankingbalclear=$('#btc'+i).val();
|
|||||||
|
|
||||||
table = $('#req').DataTable({
|
table = $('#req').DataTable({
|
||||||
|
|
||||||
"aaSorting": [[ 0, "desc" ]],
|
"aaSorting": [
|
||||||
|
[0, "desc"]
|
||||||
|
],
|
||||||
"info": true,
|
"info": true,
|
||||||
|
|
||||||
"autoWidth": false,
|
"autoWidth": false,
|
||||||
@ -504,11 +500,4 @@ var bankingbalclear=$('#btc'+i).val();
|
|||||||
]
|
]
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,30 +1,32 @@
|
|||||||
<?php
|
<?php
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -72,7 +74,9 @@ foreach($financialyear as $item)
|
|||||||
<a href="<?php base_url() ?>amountunpaid" class="btn btn-success" value="Back" />Back</a>
|
<a href="<?php base_url() ?>amountunpaid" class="btn btn-success" value="Back" />Back</a>
|
||||||
</div>
|
</div>
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;; font-size: 18px;">Un Paid Reports(<?php if(!empty($fa)){
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;; font-size: 18px;">Un Paid Reports(<?php if (!empty($fa)) {
|
||||||
echo $fa;
|
echo $fa;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,14 +87,12 @@ foreach($financialyear as $item)
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $m;
|
echo $m;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fdate))
|
<?php if (!empty($fdate)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $fdate;
|
echo $fdate;
|
||||||
}
|
}
|
||||||
@ -100,16 +102,21 @@ foreach($financialyear as $item)
|
|||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>)</p></h3></center>
|
?>)</p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $t->SupplierName?></span></h4></center>
|
</h3>
|
||||||
|
</center>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $t->SupplierName ?></span></h4>
|
||||||
|
</center>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
if (!empty($bankunpaid)) {
|
if (!empty($bankunpaid)) {
|
||||||
foreach($bankunpaid as $t)
|
foreach ($bankunpaid as $t) {
|
||||||
{
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $t->supplier_name?></span></h4></center>
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $t->supplier_name ?></span></h4>
|
||||||
|
</center>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -157,14 +164,13 @@ foreach($financialyear as $item)
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
foreach($finyear as $item):
|
foreach ($finyear as $item): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -264,8 +270,7 @@ foreach($financialyear as $item)
|
|||||||
$ti = 0.00;
|
$ti = 0.00;
|
||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($bankunpaid)) {
|
if (!empty($bankunpaid)) {
|
||||||
foreach($bankunpaid as $t)
|
foreach ($bankunpaid as $t) {
|
||||||
{
|
|
||||||
|
|
||||||
$status = $t->Paymentstatus;
|
$status = $t->Paymentstatus;
|
||||||
$balancetopay = $t->Balancetopay;
|
$balancetopay = $t->Balancetopay;
|
||||||
@ -278,14 +283,11 @@ foreach($financialyear as $item)
|
|||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
if($t->DeliveryChellanOrInvoiceNo=='')
|
if ($t->DeliveryChellanOrInvoiceNo == '') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<td>-</td>
|
<td>-</td>
|
||||||
<?php
|
<?php
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<td align="left" id="delivey"><span><?php echo $t->DeliveryChellanOrInvoiceNo ?></span></a></td>
|
<td align="left" id="delivey"><span><?php echo $t->DeliveryChellanOrInvoiceNo ?></span></a></td>
|
||||||
<?php
|
<?php
|
||||||
@ -303,23 +305,19 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
<td align="left" id="tov<?php echo $i ?>"><?php $tot_amount = $tot_amount + round($rate) ?><?php echo round($rate, 2) ?></span></td>
|
<td align="left" id="tov<?php echo $i ?>"><?php $tot_amount = $tot_amount + round($rate) ?><?php echo round($rate, 2) ?></span></td>
|
||||||
<?php
|
<?php
|
||||||
if($t->iwFpath !='')
|
if ($t->iwFpath != '') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
<td style="display:none;"> <a data-toggle="tooltip"><i class="fa fa-download" data-toggle="tooltip" title="<?php echo $record->pono; ?> -Attachment Available for Download/View" onclick="igrfile(<?php echo $i ?>)"></i></a> </td>
|
<td style="display:none;"> <a data-toggle="tooltip"><i class="fa fa-download" data-toggle="tooltip" title="<?php echo $record->pono; ?> -Attachment Available for Download/View" onclick="igrfile(<?php echo $i ?>)"></i></a> </td>
|
||||||
<?php
|
<?php
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<td style="display:none;">NA</td>
|
<td style="display:none;">NA</td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
if($t->poFilePath !='')
|
if ($t->poFilePath != '') {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -328,8 +326,7 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else
|
} else { ?>
|
||||||
{ ?>
|
|
||||||
<td style="display:none;">N/A</td>
|
<td style="display:none;">N/A</td>
|
||||||
|
|
||||||
|
|
||||||
@ -394,20 +391,22 @@ foreach($financialyear as $item)
|
|||||||
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function pofile(i)
|
function pofile(i) {
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
|
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/filelist",
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
@ -427,6 +426,7 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
@ -434,19 +434,22 @@ foreach($financialyear as $item)
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
function igrfile(i)
|
|
||||||
{
|
function igrfile(i) {
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
@ -457,9 +460,8 @@ foreach($financialyear as $item)
|
|||||||
i = 0;
|
i = 0;
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
|
|
||||||
if(item.file == null)
|
if (item.file == null) {
|
||||||
{ if(item.Remarks ==null)
|
if (item.Remarks == null) {
|
||||||
{
|
|
||||||
//alert()
|
//alert()
|
||||||
PONO = item.PONO;
|
PONO = item.PONO;
|
||||||
BillNO = item.BillNo;
|
BillNO = item.BillNo;
|
||||||
@ -481,8 +483,7 @@ foreach($financialyear as $item)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(Filename != null)
|
if (Filename != null) {
|
||||||
{
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
i = i - 1;
|
i = i - 1;
|
||||||
trHTML += '<tr id=' + i + '>' +
|
trHTML += '<tr id=' + i + '>' +
|
||||||
@ -500,7 +501,7 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
}
|
}
|
||||||
@ -554,8 +555,7 @@ foreach($financialyear as $item)
|
|||||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||||
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
||||||
buttons: [
|
buttons: [{
|
||||||
{
|
|
||||||
extend: 'excelHtml5',
|
extend: 'excelHtml5',
|
||||||
footer: 'true',
|
footer: 'true',
|
||||||
messageTop: $('h4').text(),
|
messageTop: $('h4').text(),
|
||||||
@ -570,5 +570,3 @@ foreach($financialyear as $item)
|
|||||||
}); /** datatable closed */
|
}); /** datatable closed */
|
||||||
}); /** ready closed */
|
}); /** ready closed */
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -602,6 +602,7 @@ function Save()
|
|||||||
{
|
{
|
||||||
if(totalvalue<=bankdebitamount)
|
if(totalvalue<=bankdebitamount)
|
||||||
{
|
{
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
{
|
{
|
||||||
data:{date:date,pono:pono,sname:suppliername,tot:totalordervalue,aa:amountpaid,ip:invoicepaymet,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw},
|
data:{date:date,pono:pono,sname:suppliername,tot:totalordervalue,aa:amountpaid,ip:invoicepaymet,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw},
|
||||||
@ -609,6 +610,7 @@ function Save()
|
|||||||
url:"<?php echo base_url() ?>cashbook/receipt",
|
url:"<?php echo base_url() ?>cashbook/receipt",
|
||||||
success:function(data)
|
success:function(data)
|
||||||
{
|
{
|
||||||
|
$('#loader').hide();
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|||||||
@ -18,8 +18,7 @@ $(function() {
|
|||||||
|
|
||||||
//alert(t+'t');
|
//alert(t+'t');
|
||||||
$.each(t, function(i, item) {
|
$.each(t, function(i, item) {
|
||||||
if(item.type == 'RECEIPT')
|
if (item.type == 'RECEIPT') {
|
||||||
{
|
|
||||||
|
|
||||||
$("#accode").append($('<option></option>').val(item.code).html(item.name));
|
$("#accode").append($('<option></option>').val(item.code).html(item.name));
|
||||||
}
|
}
|
||||||
@ -66,18 +65,17 @@ function readURL(input) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
function isNumberKey(evt)
|
|
||||||
{
|
function isNumberKey(evt) {
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
if (charCode != 46 && charCode > 31
|
if (charCode != 46 && charCode > 31 &&
|
||||||
&& (charCode < 48 || charCode > 57))
|
(charCode < 48 || charCode > 57))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(function()
|
$(document).ready(function() {
|
||||||
{
|
|
||||||
$("#supplier").select2();
|
$("#supplier").select2();
|
||||||
/**** autocomplete ****/
|
/**** autocomplete ****/
|
||||||
$('#merchant').autocomplete({
|
$('#merchant').autocomplete({
|
||||||
@ -91,17 +89,17 @@ $('#merchant').autocomplete({
|
|||||||
|
|
||||||
var data = suggestion.SupplierName;
|
var data = suggestion.SupplierName;
|
||||||
var selectedvalue = $('input[name=merchant]').val();
|
var selectedvalue = $('input[name=merchant]').val();
|
||||||
if(selectedvalue != ' ' )
|
if (selectedvalue != ' ') {
|
||||||
{
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:selectedvalue},
|
data: {
|
||||||
|
id: selectedvalue
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>cashbook/getSupplierDtls",
|
url: "<?php echo base_url(); ?>cashbook/getSupplierDtls",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
var supplier_gstno = '';
|
var supplier_gstno = '';
|
||||||
if(data != '')
|
if (data != '') {
|
||||||
{
|
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
$.each(data, function(i, arr) {
|
$.each(data, function(i, arr) {
|
||||||
@ -109,6 +107,7 @@ $('#merchant').autocomplete({
|
|||||||
});
|
});
|
||||||
$("#merchantgst").val(supplier_gstno);
|
$("#merchantgst").val(supplier_gstno);
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -118,8 +117,7 @@ $('#merchant').autocomplete({
|
|||||||
|
|
||||||
var amounttype = localStorage.getItem('typeamount');
|
var amounttype = localStorage.getItem('typeamount');
|
||||||
//alert(amounttype+'atp');
|
//alert(amounttype+'atp');
|
||||||
if(amounttype==0)
|
if (amounttype == 0) {
|
||||||
{
|
|
||||||
|
|
||||||
id = 'myradio1';
|
id = 'myradio1';
|
||||||
var id = id;
|
var id = id;
|
||||||
@ -128,15 +126,13 @@ $('#merchant').autocomplete({
|
|||||||
var inc = [];
|
var inc = [];
|
||||||
t = <?php echo json_encode($dropdownvalues) ?>;
|
t = <?php echo json_encode($dropdownvalues) ?>;
|
||||||
|
|
||||||
if(id == 'myradio1')
|
if (id == 'myradio1') {
|
||||||
{
|
|
||||||
//alert('INCOME clicked');
|
//alert('INCOME clicked');
|
||||||
|
|
||||||
$('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
|
$('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
|
||||||
|
|
||||||
$.each(t, function(i, item) {
|
$.each(t, function(i, item) {
|
||||||
if(item.type == 'RECEIPT')
|
if (item.type == 'RECEIPT') {
|
||||||
{
|
|
||||||
|
|
||||||
$('#receipt').show();
|
$('#receipt').show();
|
||||||
$('#payment').hide();
|
$('#payment').hide();
|
||||||
@ -148,9 +144,7 @@ $('#merchant').autocomplete({
|
|||||||
|
|
||||||
}
|
}
|
||||||
//return true;
|
//return true;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
id = 'myradio2';
|
id = 'myradio2';
|
||||||
var id = id;
|
var id = id;
|
||||||
@ -158,15 +152,13 @@ else
|
|||||||
var ex = [];
|
var ex = [];
|
||||||
var inc = [];
|
var inc = [];
|
||||||
t = <?php echo json_encode($dropdownvalues) ?>;
|
t = <?php echo json_encode($dropdownvalues) ?>;
|
||||||
if(id == 'myradio2')
|
if (id == 'myradio2') {
|
||||||
{
|
|
||||||
//alert('expense clicked');
|
//alert('expense clicked');
|
||||||
|
|
||||||
$('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
|
$('#accode').find('option').remove().end().append('<option value="-1">Select Account Name</option>').val('Select Account Code');
|
||||||
|
|
||||||
$.each(t, function(i, item) {
|
$.each(t, function(i, item) {
|
||||||
if(item.type == 'PAYMENT')
|
if (item.type == 'PAYMENT') {
|
||||||
{
|
|
||||||
$("#myradio2").prop("checked", true);
|
$("#myradio2").prop("checked", true);
|
||||||
$('#payment').show();
|
$('#payment').show();
|
||||||
$('#receipt').hide();
|
$('#receipt').hide();
|
||||||
@ -181,12 +173,9 @@ else
|
|||||||
|
|
||||||
|
|
||||||
//alert(amounttype+'atrtgsg');
|
//alert(amounttype+'atrtgsg');
|
||||||
if(amounttype==0)
|
if (amounttype == 0) {
|
||||||
{
|
|
||||||
atype = 'CREDIT';
|
atype = 'CREDIT';
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
atype = 'DEBIT';
|
atype = 'DEBIT';
|
||||||
}
|
}
|
||||||
var bankiddebit = localStorage.getItem('bankiddebit');
|
var bankiddebit = localStorage.getItem('bankiddebit');
|
||||||
@ -198,11 +187,9 @@ else
|
|||||||
$('#borc').val('Bank');
|
$('#borc').val('Bank');
|
||||||
//alert(alreadyreceived+'arrr');
|
//alert(alreadyreceived+'arrr');
|
||||||
var bankiddebit = bankiddebit.split(',');
|
var bankiddebit = bankiddebit.split(',');
|
||||||
if(amounttype==1)
|
if (amounttype == 1) {
|
||||||
{
|
|
||||||
|
|
||||||
$.each(bankiddebit, function( index, value )
|
$.each(bankiddebit, function(index, value) {
|
||||||
{
|
|
||||||
var type = 'DEBIT';
|
var type = 'DEBIT';
|
||||||
var bankiddebit = value.split('-');
|
var bankiddebit = value.split('-');
|
||||||
var bid = bankiddebit[0];
|
var bid = bankiddebit[0];
|
||||||
@ -225,17 +212,14 @@ else
|
|||||||
document.getElementById("narration").innerHTML = narration;
|
document.getElementById("narration").innerHTML = narration;
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
//alert('receipt');
|
//alert('receipt');
|
||||||
//id='myradio1';
|
//id='myradio1';
|
||||||
//loadAccountType(id);
|
//loadAccountType(id);
|
||||||
|
|
||||||
var bankidcredit = bankidcredit.split(',');
|
var bankidcredit = bankidcredit.split(',');
|
||||||
//var i;
|
//var i;
|
||||||
$.each(bankidcredit, function( index, value )
|
$.each(bankidcredit, function(index, value) {
|
||||||
{
|
|
||||||
var type = 'CREDIT';
|
var type = 'CREDIT';
|
||||||
var bankidcredit = value.split('-');
|
var bankidcredit = value.split('-');
|
||||||
var bidc = bankidcredit[0];
|
var bidc = bankidcredit[0];
|
||||||
@ -260,7 +244,6 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
.autocomplete-suggestion {
|
.autocomplete-suggestion {
|
||||||
@ -270,20 +253,21 @@ else
|
|||||||
outline: 1px solid slategrey;
|
outline: 1px solid slategrey;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal
|
.modal {
|
||||||
{
|
|
||||||
padding-right: 25% ! important;
|
padding-right: 25% ! important;
|
||||||
}
|
}
|
||||||
.dataTables_paginate
|
|
||||||
{
|
.dataTables_paginate {
|
||||||
margin-top: -5%;
|
margin-top: -5%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_wrapper {
|
.dataTables_wrapper {
|
||||||
padding-bottom: 0px;
|
padding-bottom: 0px;
|
||||||
}
|
}
|
||||||
.badge
|
|
||||||
{
|
.badge {
|
||||||
color:red; background-color:#fff;
|
color: red;
|
||||||
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* legend{
|
/* legend{
|
||||||
@ -336,12 +320,22 @@ else
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><p style="margin-left:25px;" id="bankid"></p></td>
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bankid"></p>
|
||||||
|
</td>
|
||||||
<td>Bank</td>
|
<td>Bank</td>
|
||||||
<td><p style="margin-left:25px;" id="type" ></p></td>
|
<td>
|
||||||
<td><p style="margin-left:25px;" id="bamount" ></p></td>
|
<p style="margin-left:25px;" id="type"></p>
|
||||||
<td><p style="margin-left:25px;" id="bdate"></p></td>
|
</td>
|
||||||
<td><p style="margin-left:25px;" id="narration"></p></td>
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bamount"></p>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bdate"></p>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="narration"></p>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@ -433,7 +427,9 @@ else
|
|||||||
<form>
|
<form>
|
||||||
<div class="modal-content" style="width:1030px;font-size:12px;">
|
<div class="modal-content" style="width:1030px;font-size:12px;">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<center><h4> New Supplier Details</h4></center>
|
<center>
|
||||||
|
<h4> New Supplier Details</h4>
|
||||||
|
</center>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -651,9 +647,7 @@ else
|
|||||||
</div><!-- content wrapper div closed -->
|
</div><!-- content wrapper div closed -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
function amountcheck() {
|
||||||
function amountcheck()
|
|
||||||
{
|
|
||||||
|
|
||||||
var bankamount = $('#bamount').text();
|
var bankamount = $('#bamount').text();
|
||||||
|
|
||||||
@ -662,20 +656,16 @@ function amountcheck()
|
|||||||
// alert(number+'number');
|
// alert(number+'number');
|
||||||
var total = $('#totalamount').val();
|
var total = $('#totalamount').val();
|
||||||
//alert(total);
|
//alert(total);
|
||||||
if(parseFloat(bankamount)>=parseFloat(total))
|
if (parseFloat(bankamount) >= parseFloat(total)) {
|
||||||
{
|
|
||||||
validate();
|
validate();
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
alert('your mapping amount is large')
|
alert('your mapping amount is large')
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function validate()
|
function validate() {
|
||||||
{
|
|
||||||
|
|
||||||
//var paidcash=$('#totalbankamount').val();
|
//var paidcash=$('#totalbankamount').val();
|
||||||
var accode = $('#accode').val();
|
var accode = $('#accode').val();
|
||||||
@ -694,35 +684,27 @@ function validate()
|
|||||||
var errorflag = 0;
|
var errorflag = 0;
|
||||||
|
|
||||||
|
|
||||||
if(accode < 0)
|
if (accode < 0) {
|
||||||
{
|
|
||||||
errorflag++;
|
errorflag++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(date == '')
|
if (date == '') {
|
||||||
{
|
|
||||||
errorflag++;
|
errorflag++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(total == '')
|
if (total == '') {
|
||||||
{
|
|
||||||
errorflag++;
|
errorflag++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(towhome == '')
|
if (towhome == '') {
|
||||||
{
|
|
||||||
errorflag++;
|
errorflag++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(gstcheck == true)
|
if (gstcheck == true) {
|
||||||
{
|
|
||||||
|
|
||||||
if((merchant == '') || (mergst == '') || (Invoiceno == '') || (beforegst == '') || (sgst == '') || (cgst == '') || (igst == ''))
|
if ((merchant == '') || (mergst == '') || (Invoiceno == '') || (beforegst == '') || (sgst == '') || (cgst == '') || (igst == '')) {
|
||||||
{
|
|
||||||
errorflag++;
|
errorflag++;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// calculation part
|
// calculation part
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -730,8 +712,7 @@ function validate()
|
|||||||
|
|
||||||
}
|
}
|
||||||
// alert(errorflag);
|
// alert(errorflag);
|
||||||
if(errorflag != 0)
|
if (errorflag != 0) {
|
||||||
{
|
|
||||||
alert("Please Provide All Details..!");
|
alert("Please Provide All Details..!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -742,24 +723,21 @@ function validate()
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function GSTvalue(id)
|
function GSTvalue(id) {
|
||||||
{
|
|
||||||
var sgst = $('#SGST').val();
|
var sgst = $('#SGST').val();
|
||||||
var cgst = $('#CGST').val();
|
var cgst = $('#CGST').val();
|
||||||
var igst = $('#IGST').val();
|
var igst = $('#IGST').val();
|
||||||
var beforegst = $('#valuebeforegST').val();
|
var beforegst = $('#valuebeforegST').val();
|
||||||
|
|
||||||
$('#valuebeforegST').val((parseFloat(beforegst).toFixed(2)));
|
$('#valuebeforegST').val((parseFloat(beforegst).toFixed(2)));
|
||||||
if(id == 'SGST')
|
if (id == 'SGST') {
|
||||||
{
|
|
||||||
$('#CGST').val(parseFloat(sgst).toFixed(2));
|
$('#CGST').val(parseFloat(sgst).toFixed(2));
|
||||||
$('#SGST').val(parseFloat(sgst).toFixed(2));
|
$('#SGST').val(parseFloat(sgst).toFixed(2));
|
||||||
$('#IGST').val('0.00');
|
$('#IGST').val('0.00');
|
||||||
calculateTotal();
|
calculateTotal();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(id == 'IGST')
|
if (id == 'IGST') {
|
||||||
{
|
|
||||||
$('#CGST').val('0.00');
|
$('#CGST').val('0.00');
|
||||||
$('#SGST').val('0.00');
|
$('#SGST').val('0.00');
|
||||||
$('#IGST').val(parseFloat(igst).toFixed(2));
|
$('#IGST').val(parseFloat(igst).toFixed(2));
|
||||||
@ -770,8 +748,7 @@ function GSTvalue(id)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function calculateTotal()
|
function calculateTotal() {
|
||||||
{
|
|
||||||
var sgst = $('#SGST').val();
|
var sgst = $('#SGST').val();
|
||||||
var cgst = $('#CGST').val();
|
var cgst = $('#CGST').val();
|
||||||
var igst = $('#IGST').val();
|
var igst = $('#IGST').val();
|
||||||
@ -800,8 +777,7 @@ function calculateTotal()
|
|||||||
$('#supplier').change(function() {
|
$('#supplier').change(function() {
|
||||||
|
|
||||||
var drpval = $('#supplier').val();
|
var drpval = $('#supplier').val();
|
||||||
if(drpval == 1)
|
if (drpval == 1) {
|
||||||
{
|
|
||||||
//alert()
|
//alert()
|
||||||
$('#Addsup').modal('show');
|
$('#Addsup').modal('show');
|
||||||
}
|
}
|
||||||
@ -809,8 +785,7 @@ $('#supplier').change(function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
function onlyAlphabets(evt)
|
function onlyAlphabets(evt) {
|
||||||
{
|
|
||||||
var charCode;
|
var charCode;
|
||||||
if (window.event)
|
if (window.event)
|
||||||
charCode = window.event.keyCode; //for IE
|
charCode = window.event.keyCode; //for IE
|
||||||
@ -827,42 +802,29 @@ function onlyAlphabets(evt)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getContactNumberValidation()
|
function getContactNumberValidation() {
|
||||||
{
|
|
||||||
|
|
||||||
var contactNumber = $('#ContactNumber').val();
|
var contactNumber = $('#ContactNumber').val();
|
||||||
var telephone = /^[0-9]{3,4}\s[0-9]{8,9}$/.test(contactNumber);
|
var telephone = /^[0-9]{3,4}\s[0-9]{8,9}$/.test(contactNumber);
|
||||||
var regex = /^[0-9]{4,6}\s[0-9]{5,7}$/.test(contactNumber);
|
var regex = /^[0-9]{4,6}\s[0-9]{5,7}$/.test(contactNumber);
|
||||||
var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
|
var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
|
||||||
|
|
||||||
if(contactNumber!='')
|
if (contactNumber != '') {
|
||||||
{
|
|
||||||
|
|
||||||
if(telephone)
|
if (telephone) {
|
||||||
{
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
} else if (regex) {
|
||||||
|
|
||||||
else if(regex)
|
|
||||||
{
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
} else if (mobilephone) {
|
||||||
else if(mobilephone)
|
|
||||||
{
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');
|
alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
alert('please correct format of contact number');
|
alert('please correct format of contact number');
|
||||||
return false;
|
return false;
|
||||||
@ -871,11 +833,10 @@ function getContactNumberValidation()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
function isNumberKey(evt)
|
function isNumberKey(evt) {
|
||||||
{
|
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
if (charCode != 46 && charCode != 32 && charCode >= 33
|
if (charCode != 46 && charCode != 32 && charCode >= 33 &&
|
||||||
&& (charCode < 48 || charCode > 57))
|
(charCode < 48 || charCode > 57))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -886,82 +847,71 @@ function getContactNumberValidation()
|
|||||||
|
|
||||||
var email = $('#emailid').val();
|
var email = $('#emailid').val();
|
||||||
|
|
||||||
if(email != '')
|
if (email != '') {
|
||||||
{
|
if (reg.test(email) == false) {
|
||||||
if (reg.test(email) == false)
|
|
||||||
{
|
|
||||||
alert('Please Enter Valid Email Address');
|
alert('Please Enter Valid Email Address');
|
||||||
return (false);
|
return (false);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
alert('Please Enter email id');
|
alert('Please Enter email id');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function validatesup()
|
function validatesup() {
|
||||||
{
|
|
||||||
// var a= $('#supplierName').val();
|
// var a= $('#supplierName').val();
|
||||||
// alert(a);
|
// alert(a);
|
||||||
|
|
||||||
if($("#supplierName").val().length < 1)
|
if ($("#supplierName").val().length < 1) {
|
||||||
{
|
|
||||||
alert('Please Enter Supplier Name');
|
alert('Please Enter Supplier Name');
|
||||||
$("#supplierName").focus();
|
$("#supplierName").focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!getContactNumberValidation())
|
if (!getContactNumberValidation()) {
|
||||||
{
|
|
||||||
$("#ContactNumber").focus();
|
$("#ContactNumber").focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!validateEmail())
|
if (!validateEmail()) {
|
||||||
{
|
|
||||||
$('#emailid').focus();
|
$('#emailid').focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($("#Address").val().length < 1)
|
if ($("#Address").val().length < 1) {
|
||||||
{
|
|
||||||
alert('Please Enter Address');
|
alert('Please Enter Address');
|
||||||
$("#Address").focus();
|
$("#Address").focus();
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$('.AddSupplier').click(function()
|
$('.AddSupplier').click(function() {
|
||||||
{
|
if (validatesup()) {
|
||||||
if(validatesup())
|
|
||||||
{
|
|
||||||
var suppliername = $('#supplierName').val();
|
var suppliername = $('#supplierName').val();
|
||||||
var contact = $('#ContactNumber').val();
|
var contact = $('#ContactNumber').val();
|
||||||
var alternatecont = $('#AlternateContactNumber').val();
|
var alternatecont = $('#AlternateContactNumber').val();
|
||||||
var email = $('#emailid').val();
|
var email = $('#emailid').val();
|
||||||
var Address = $('#Address').val();
|
var Address = $('#Address').val();
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
data: {
|
||||||
|
suppliername: suppliername,
|
||||||
|
contact: contact,
|
||||||
|
alternatecont: alternatecont,
|
||||||
|
email: email,
|
||||||
|
Address: Address
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/addNewSupplierCash",
|
url: "<?php echo base_url() ?>cashbook/addNewSupplierCash",
|
||||||
|
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
// alert(data);
|
// alert(data);
|
||||||
// location.reload();
|
// location.reload();
|
||||||
@ -973,13 +923,11 @@ $('.AddSupplier').click(function()
|
|||||||
|
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/getAllSupplier",
|
url: "<?php echo base_url() ?>cashbook/getAllSupplier",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
var html = '';
|
var html = '';
|
||||||
$('#supplier').find('option:not(:first)').remove();
|
$('#supplier').find('option:not(:first)').remove();
|
||||||
|
|
||||||
$.each(JSON.parse(data), function (supDet, supobj)
|
$.each(JSON.parse(data), function(supDet, supobj) {
|
||||||
{
|
|
||||||
|
|
||||||
// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
|
// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
|
||||||
|
|
||||||
@ -990,7 +938,7 @@ $('.AddSupplier').click(function()
|
|||||||
//$("#supplier").append(html);
|
//$("#supplier").append(html);
|
||||||
alert(alertdata);
|
alert(alertdata);
|
||||||
// $('#supplier option[value="<?php echo $supplier ?>"]').prop('selected', true);
|
// $('#supplier option[value="<?php echo $supplier ?>"]').prop('selected', true);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$('#Addsup').modal('hide');
|
$('#Addsup').modal('hide');
|
||||||
|
|
||||||
|
|
||||||
@ -1007,11 +955,4 @@ $('.AddSupplier').click(function()
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,51 +1,40 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
foreach($cash as $c)
|
foreach ($cash as $c) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach($bankid as $i)
|
foreach ($bankid as $i) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
|
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <link rel="stylesheet". href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
<!-- <link rel="stylesheet". href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
@ -71,7 +60,11 @@
|
|||||||
|
|
||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Cashbook Receipt Report</b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>Cashbook Receipt Report</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -106,14 +99,13 @@
|
|||||||
<select class="form-control" id="SupplierName" name="SupplierName">
|
<select class="form-control" id="SupplierName" name="SupplierName">
|
||||||
<option value="">Select Supplier</option>
|
<option value="">Select Supplier</option>
|
||||||
<?php
|
<?php
|
||||||
foreach($supplier as $gs):
|
foreach ($supplier as $gs): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $gs->SupplierName; ?>"><?php echo $gs->SupplierName; ?></option>
|
<option value="<?php echo $gs->SupplierName; ?>"><?php echo $gs->SupplierName; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -171,13 +163,11 @@
|
|||||||
if (!empty($receiptdata)) {
|
if (!empty($receiptdata)) {
|
||||||
//print_r($bankdepit);
|
//print_r($bankdepit);
|
||||||
//die();
|
//die();
|
||||||
foreach($receiptdata as $t)
|
foreach ($receiptdata as $t) {
|
||||||
{
|
|
||||||
$status = $t->Paymentstatus;
|
$status = $t->Paymentstatus;
|
||||||
$balancetopay = $t->Balancetopay;
|
$balancetopay = $t->Balancetopay;
|
||||||
//print_r($$status);
|
//print_r($$status);
|
||||||
if($status !='ST057')
|
if ($status != 'ST057') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
@ -302,22 +292,20 @@ var intex=1;
|
|||||||
var row = 0;
|
var row = 0;
|
||||||
var j = 1;
|
var j = 1;
|
||||||
var tott = 0;
|
var tott = 0;
|
||||||
function GetPayment(i)
|
|
||||||
{
|
function GetPayment(i) {
|
||||||
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
||||||
//alert(x);
|
//alert(x);
|
||||||
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
||||||
var negative = 0;
|
var negative = 0;
|
||||||
if(amount<0)
|
if (amount < 0) {
|
||||||
{
|
|
||||||
negative = 1;
|
negative = 1;
|
||||||
alert("Invalid Amount")
|
alert("Invalid Amount")
|
||||||
$('#invoicepaymet' + i).val('');
|
$('#invoicepaymet' + i).val('');
|
||||||
|
|
||||||
}
|
}
|
||||||
temp = intex;
|
temp = intex;
|
||||||
if(x==true)
|
if (x == true) {
|
||||||
{
|
|
||||||
//alert(x);
|
//alert(x);
|
||||||
row = parseInt(row) + 1;
|
row = parseInt(row) + 1;
|
||||||
//alert(row);
|
//alert(row);
|
||||||
@ -383,12 +371,10 @@ if(x==true)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(negative==1)
|
if (negative == 1) {
|
||||||
{
|
|
||||||
// alert()
|
// alert()
|
||||||
|
|
||||||
for(o=1;o<j;o++)
|
for (o = 1; o < j; o++) {
|
||||||
{
|
|
||||||
$('#qw1' + o).val('')
|
$('#qw1' + o).val('')
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -397,8 +383,7 @@ if(x==true)
|
|||||||
j = parseInt(j) + 1;
|
j = parseInt(j) + 1;
|
||||||
|
|
||||||
var to = 0;
|
var to = 0;
|
||||||
for(t=1;t<j;t++)
|
for (t = 1; t < j; t++) {
|
||||||
{
|
|
||||||
//var tt= $('#inv_amount'+t).val();
|
//var tt= $('#inv_amount'+t).val();
|
||||||
var tt = parseFloat($('#qw1' + t).val() == '' ? '0.00' : $('#qw1' + t).val());
|
var tt = parseFloat($('#qw1' + t).val() == '' ? '0.00' : $('#qw1' + t).val());
|
||||||
//alert(tt)
|
//alert(tt)
|
||||||
@ -414,10 +399,7 @@ if(x==true)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//alert(i)
|
//alert(i)
|
||||||
var rr = $('#Rowid').val();
|
var rr = $('#Rowid').val();
|
||||||
var ro = parseInt(rr) - 1;
|
var ro = parseInt(rr) - 1;
|
||||||
@ -427,13 +409,11 @@ else
|
|||||||
|
|
||||||
var Inid = document.getElementById('pono' + i).innerText
|
var Inid = document.getElementById('pono' + i).innerText
|
||||||
//alert(Inid)
|
//alert(Inid)
|
||||||
for(s=1;s<=j;s++)
|
for (s = 1; s <= j; s++) {
|
||||||
{
|
|
||||||
|
|
||||||
var ch = $('#pono1' + s).val();
|
var ch = $('#pono1' + s).val();
|
||||||
//alert(ch);
|
//alert(ch);
|
||||||
if(Inid==ch)
|
if (Inid == ch) {
|
||||||
{
|
|
||||||
|
|
||||||
var w = s;
|
var w = s;
|
||||||
delamount = $('#qw1' + w).val();
|
delamount = $('#qw1' + w).val();
|
||||||
@ -469,8 +449,8 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
function isNumberKey(evt)
|
|
||||||
{
|
function isNumberKey(evt) {
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
// Added to allow decimal, period, or delete
|
// Added to allow decimal, period, or delete
|
||||||
if (charCode == 110 || charCode == 190 || charCode == 46)
|
if (charCode == 110 || charCode == 190 || charCode == 46)
|
||||||
@ -481,21 +461,19 @@ function isNumberKey(evt)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
function GetAmount(i)
|
|
||||||
{
|
function GetAmount(i) {
|
||||||
//alert("hai");
|
//alert("hai");
|
||||||
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
||||||
//alert(amount);
|
//alert(amount);
|
||||||
var negative = 0;
|
var negative = 0;
|
||||||
if(amount<0)
|
if (amount < 0) {
|
||||||
{
|
|
||||||
negative = 1;
|
negative = 1;
|
||||||
alert("Invalid Amount")
|
alert("Invalid Amount")
|
||||||
$('#invoicepaymet' + i).val('');
|
$('#invoicepaymet' + i).val('');
|
||||||
}
|
}
|
||||||
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
||||||
if(x==true && negative == 0)
|
if (x == true && negative == 0) {
|
||||||
{
|
|
||||||
//alert(x);
|
//alert(x);
|
||||||
var date = document.getElementById("date" + i).innerText;
|
var date = document.getElementById("date" + i).innerText;
|
||||||
var pono = document.getElementById("pono" + i).innerText;
|
var pono = document.getElementById("pono" + i).innerText;
|
||||||
@ -505,14 +483,12 @@ function GetAmount(i)
|
|||||||
//var advanceamount =document.getElementById ( "aa"+i ).innerText;
|
//var advanceamount =document.getElementById ( "aa"+i ).innerText;
|
||||||
var balancetopay = document.getElementById("qw" + i).innerText;
|
var balancetopay = document.getElementById("qw" + i).innerText;
|
||||||
|
|
||||||
for(k=1;k<=j-1;k++)
|
for (k = 1; k <= j - 1; k++) {
|
||||||
{
|
|
||||||
//alert(k)
|
//alert(k)
|
||||||
var idcheck = $('#pono1' + k).val();
|
var idcheck = $('#pono1' + k).val();
|
||||||
// alert(idcheck)
|
// alert(idcheck)
|
||||||
|
|
||||||
if(pono==idcheck)
|
if (pono == idcheck) {
|
||||||
{
|
|
||||||
var cid = k;
|
var cid = k;
|
||||||
//alert(cid+'if');
|
//alert(cid+'if');
|
||||||
//die();
|
//die();
|
||||||
@ -523,8 +499,7 @@ function GetAmount(i)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(amount<=totalordervalue)
|
if (amount <= totalordervalue) {
|
||||||
{
|
|
||||||
$('#date1').val(date);
|
$('#date1').val(date);
|
||||||
$('#pono1' + cid).val(pono);
|
$('#pono1' + cid).val(pono);
|
||||||
$('#sn1' + cid).val(supname);
|
$('#sn1' + cid).val(supname);
|
||||||
@ -533,10 +508,7 @@ function GetAmount(i)
|
|||||||
var totalvalue = $('#addvalue').val();
|
var totalvalue = $('#addvalue').val();
|
||||||
var bid = $('#bankid').val();
|
var bid = $('#bankid').val();
|
||||||
//$('#inv_total'+cid).val(invoicepayment);
|
//$('#inv_total'+cid).val(invoicepayment);
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
alert('You are exceeding the payment get!!');
|
alert('You are exceeding the payment get!!');
|
||||||
$('#invoicepaymet' + i).val(amount)
|
$('#invoicepaymet' + i).val(amount)
|
||||||
location.reload();
|
location.reload();
|
||||||
@ -544,8 +516,7 @@ function GetAmount(i)
|
|||||||
}
|
}
|
||||||
|
|
||||||
var tot11 = 0
|
var tot11 = 0
|
||||||
for(l=1;l<j;l++)
|
for (l = 1; l < j; l++) {
|
||||||
{
|
|
||||||
//var Payingamount= $('#inv_amount'+l).val();
|
//var Payingamount= $('#inv_amount'+l).val();
|
||||||
|
|
||||||
var Payingamount = parseFloat($('#qw1' + l).val() == '' ? '0.00' : $('#qw1' + l).val());
|
var Payingamount = parseFloat($('#qw1' + l).val() == '' ? '0.00' : $('#qw1' + l).val());
|
||||||
@ -564,8 +535,7 @@ function GetAmount(i)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function Save()
|
function Save() {
|
||||||
{
|
|
||||||
//alert('j'+j);
|
//alert('j'+j);
|
||||||
var totalvalue = $('#addvalue').val();
|
var totalvalue = $('#addvalue').val();
|
||||||
var rowCount = $('#Rowid').val();
|
var rowCount = $('#Rowid').val();
|
||||||
@ -573,8 +543,7 @@ function Save()
|
|||||||
//die();
|
//die();
|
||||||
var check = 0;
|
var check = 0;
|
||||||
var rw = 0;
|
var rw = 0;
|
||||||
for(i=1;i<=rowCount;i++)
|
for (i = 1; i <= rowCount; i++) {
|
||||||
{
|
|
||||||
//alert(i);
|
//alert(i);
|
||||||
rw = parseFloat(rw) + 1;
|
rw = parseFloat(rw) + 1;
|
||||||
check = parseFloat(check) + 1;
|
check = parseFloat(check) + 1;
|
||||||
@ -594,19 +563,29 @@ function Save()
|
|||||||
var payment = parseFloat(amountpaid);
|
var payment = parseFloat(amountpaid);
|
||||||
//alert(rowCount);
|
//alert(rowCount);
|
||||||
|
|
||||||
if(payment<=totalordervalue)
|
if (payment <= totalordervalue) {
|
||||||
{
|
if (totalvalue <= bankdebitamount) {
|
||||||
if(totalvalue<=bankdebitamount)
|
$('#loader').show();
|
||||||
{
|
$.ajax({
|
||||||
$.ajax(
|
data: {
|
||||||
{
|
date: date,
|
||||||
data:{date:date,pono:pono,sname:suppliername,tot:totalordervalue,aa:amountpaid,ip:invoicepaymet,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw},
|
pono: pono,
|
||||||
|
sname: suppliername,
|
||||||
|
tot: totalordervalue,
|
||||||
|
aa: amountpaid,
|
||||||
|
ip: invoicepaymet,
|
||||||
|
rc: rowCount,
|
||||||
|
tpv: totalvalue,
|
||||||
|
bda: bankdebitamount,
|
||||||
|
bi: bid,
|
||||||
|
check: check,
|
||||||
|
rw: rw
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/receipt",
|
url: "<?php echo base_url() ?>cashbook/receipt",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
$('#loader').hide();
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
alert(data);
|
alert(data);
|
||||||
location.reload();
|
location.reload();
|
||||||
|
|
||||||
@ -614,14 +593,12 @@ function Save()
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
|
|
||||||
alert('You are payment exceeding');
|
alert('You are payment exceeding');
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
|
|
||||||
alert('You are payment exceedingsave');
|
alert('You are payment exceedingsave');
|
||||||
location.reload();
|
location.reload();
|
||||||
@ -656,9 +633,6 @@ function Save()
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
@ -699,5 +673,3 @@ $( function() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,30 +1,32 @@
|
|||||||
<?php
|
<?php
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -40,7 +42,11 @@ foreach($financialyear as $item)
|
|||||||
<a href="<?php base_url() ?>Bankingstatement" class="btn btn-success" value="Back" />Back</a>
|
<a href="<?php base_url() ?>Bankingstatement" class="btn btn-success" value="Back" />Back</a>
|
||||||
</div>
|
</div>
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>View Purchase </b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>View Purchase </b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<table class="table table-bordered table-hover" style="table-layout:auto;">
|
<table class="table table-bordered table-hover" style="table-layout:auto;">
|
||||||
<thead>
|
<thead>
|
||||||
@ -57,11 +63,19 @@ foreach($financialyear as $item)
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><p style="margin-left:25px;" id="bid"></p></td>
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bid"></p>
|
||||||
|
</td>
|
||||||
<td>Bank</td>
|
<td>Bank</td>
|
||||||
<td><p style="margin-left:25px;" id="bamount" ></p></td>
|
<td>
|
||||||
<td><p style="margin-left:25px;" id="bdate"></p></td>
|
<p style="margin-left:25px;" id="bamount"></p>
|
||||||
<td><p style="margin-left:25px;" id="narration"></p></td>
|
</td>
|
||||||
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bdate"></p>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="narration"></p>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@ -123,10 +137,10 @@ foreach($financialyear as $item)
|
|||||||
</label>
|
</label>
|
||||||
<select class="form-control" id="SupplierName" name="SupplierName">
|
<select class="form-control" id="SupplierName" name="SupplierName">
|
||||||
<option value="">Select Supplier</option>
|
<option value="">Select Supplier</option>
|
||||||
<?php foreach($getsupplier as $gs):
|
<?php foreach ($getsupplier as $gs): { ?>
|
||||||
{?>
|
|
||||||
<option value="<?php echo $gs->SupplierName; ?>"><?php echo $gs->SupplierName; ?></option>
|
<option value="<?php echo $gs->SupplierName; ?>"><?php echo $gs->SupplierName; ?></option>
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -171,8 +185,7 @@ foreach($financialyear as $item)
|
|||||||
$ti = 0.00;
|
$ti = 0.00;
|
||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($bankdepitpaid)) {
|
if (!empty($bankdepitpaid)) {
|
||||||
foreach($bankdepitpaid as $t)
|
foreach ($bankdepitpaid as $t) {
|
||||||
{
|
|
||||||
|
|
||||||
$status = $t->Paymentstatus;
|
$status = $t->Paymentstatus;
|
||||||
$balancetopay = $t->Balancetopay;
|
$balancetopay = $t->Balancetopay;
|
||||||
@ -180,8 +193,7 @@ foreach($financialyear as $item)
|
|||||||
$rate = $t->total;
|
$rate = $t->total;
|
||||||
$Amountpaid = $t->Amountpaid;
|
$Amountpaid = $t->Amountpaid;
|
||||||
//$rate=$t->TotalOrderValue;
|
//$rate=$t->TotalOrderValue;
|
||||||
if($status !='ST057')
|
if ($status != 'ST057') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
@ -284,8 +296,7 @@ foreach($financialyear as $item)
|
|||||||
// alert(document.getElementById("bdate").innerHTML='Payment date:'+cashdate);
|
// alert(document.getElementById("bdate").innerHTML='Payment date:'+cashdate);
|
||||||
var res1 = res.split(',');
|
var res1 = res.split(',');
|
||||||
var i;
|
var i;
|
||||||
$.each(res1, function( index, value )
|
$.each(res1, function(index, value) {
|
||||||
{
|
|
||||||
var res2 = value.split('-');
|
var res2 = value.split('-');
|
||||||
var bid = res2[0];
|
var bid = res2[0];
|
||||||
var bam = res2[1];
|
var bam = res2[1];
|
||||||
@ -297,8 +308,7 @@ foreach($financialyear as $item)
|
|||||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||||
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
||||||
buttons: [
|
buttons: [{
|
||||||
{
|
|
||||||
extend: 'excelHtml5',
|
extend: 'excelHtml5',
|
||||||
footer: 'true',
|
footer: 'true',
|
||||||
messageTop: $('h3').text(),
|
messageTop: $('h3').text(),
|
||||||
@ -318,8 +328,7 @@ var tempTotal = []; // tempTotal - This array for get value from "temppo" to ca
|
|||||||
var intex = 1;
|
var intex = 1;
|
||||||
var row = 0;
|
var row = 0;
|
||||||
|
|
||||||
function GetPayment(i)
|
function GetPayment(i) {
|
||||||
{
|
|
||||||
var bankdebitamount = $('#debitamount').val();
|
var bankdebitamount = $('#debitamount').val();
|
||||||
var totalvalue = $('#addvalue').val();
|
var totalvalue = $('#addvalue').val();
|
||||||
var balanceamount = bankdebitamount - totalvalue;
|
var balanceamount = bankdebitamount - totalvalue;
|
||||||
@ -329,16 +338,14 @@ function GetPayment(i)
|
|||||||
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
||||||
|
|
||||||
var negative = 0;
|
var negative = 0;
|
||||||
if(amount<0)
|
if (amount < 0) {
|
||||||
{
|
|
||||||
negative = 1;
|
negative = 1;
|
||||||
alert('Invalid Amount');
|
alert('Invalid Amount');
|
||||||
}
|
}
|
||||||
|
|
||||||
temp = intex;
|
temp = intex;
|
||||||
|
|
||||||
if(x==true)
|
if (x == true) {
|
||||||
{
|
|
||||||
|
|
||||||
row = parseInt(row) + 1;
|
row = parseInt(row) + 1;
|
||||||
$('#Rowid').val(row);
|
$('#Rowid').val(row);
|
||||||
@ -438,10 +445,7 @@ function GetPayment(i)
|
|||||||
// $(".checkboxcheckbox").prop("disabled", true);
|
// $(".checkboxcheckbox").prop("disabled", true);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var rr = $('#Rowid').val();
|
var rr = $('#Rowid').val();
|
||||||
@ -463,8 +467,7 @@ else
|
|||||||
temppo.splice(a, 1);
|
temppo.splice(a, 1);
|
||||||
console.log(temppo);
|
console.log(temppo);
|
||||||
}
|
}
|
||||||
if(b!=-1)
|
if (b != -1) {
|
||||||
{
|
|
||||||
tempTotal.splice(ponovalue, 1);
|
tempTotal.splice(ponovalue, 1);
|
||||||
//console.log(tempTotal);
|
//console.log(tempTotal);
|
||||||
}
|
}
|
||||||
@ -500,8 +503,8 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
function isNumberKey(evt)
|
|
||||||
{
|
function isNumberKey(evt) {
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
// Added to allow decimal, period, or delete
|
// Added to allow decimal, period, or delete
|
||||||
if (charCode == 110 || charCode == 190 || charCode == 46)
|
if (charCode == 110 || charCode == 190 || charCode == 46)
|
||||||
@ -512,15 +515,14 @@ function isNumberKey(evt)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
function GetAmount(i)
|
|
||||||
{
|
function GetAmount(i) {
|
||||||
|
|
||||||
//alert("onchnage function getamount"+i);
|
//alert("onchnage function getamount"+i);
|
||||||
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
var amount = parseFloat($('#invoicepaymet' + i).val() == '' ? '0.00' : $('#invoicepaymet' + i).val())
|
||||||
//alert(amount+'amount');
|
//alert(amount+'amount');
|
||||||
var negative = 0;
|
var negative = 0;
|
||||||
if(amount<0)
|
if (amount < 0) {
|
||||||
{
|
|
||||||
negative = 1;
|
negative = 1;
|
||||||
alert("Invalid Amount")
|
alert("Invalid Amount")
|
||||||
$('#invoicepaymet' + i).val('');
|
$('#invoicepaymet' + i).val('');
|
||||||
@ -529,8 +531,7 @@ function GetAmount(i)
|
|||||||
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
||||||
|
|
||||||
|
|
||||||
if(x==true )
|
if (x == true) {
|
||||||
{
|
|
||||||
|
|
||||||
var date = document.getElementById("date" + i).innerText;
|
var date = document.getElementById("date" + i).innerText;
|
||||||
var pono1 = document.getElementById("pono" + i).innerText;
|
var pono1 = document.getElementById("pono" + i).innerText;
|
||||||
@ -546,14 +547,12 @@ function GetAmount(i)
|
|||||||
var balancetopay1 = document.getElementById("qw" + i).innerText;
|
var balancetopay1 = document.getElementById("qw" + i).innerText;
|
||||||
var balancetopay = balancetopay1.trim();
|
var balancetopay = balancetopay1.trim();
|
||||||
//alert(balancetopay+'eee');
|
//alert(balancetopay+'eee');
|
||||||
for(k=1;k<=i;k++)
|
for (k = 1; k <= i; k++) {
|
||||||
{
|
|
||||||
//alert(k);
|
//alert(k);
|
||||||
var idcheck = $('#hideigrno' + k).val();
|
var idcheck = $('#hideigrno' + k).val();
|
||||||
//var idcheck=idcheck1.trim();
|
//var idcheck=idcheck1.trim();
|
||||||
|
|
||||||
if(igrno == idcheck)
|
if (igrno == idcheck) {
|
||||||
{
|
|
||||||
var cid = k;
|
var cid = k;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -576,17 +575,14 @@ function GetAmount(i)
|
|||||||
var totalvalue = $('#addvalue').val();
|
var totalvalue = $('#addvalue').val();
|
||||||
var bid = $('#bankid').val();
|
var bid = $('#bankid').val();
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
alert('You are exceeding the payment get!!');
|
alert('You are exceeding the payment get!!');
|
||||||
$('#invoicepaymet' + i).val(amount)
|
$('#invoicepaymet' + i).val(amount)
|
||||||
// location.reload();
|
// location.reload();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$.each(temppo, function( index, value )
|
$.each(temppo, function(index, value) {
|
||||||
{
|
|
||||||
var res2 = value.split(',');
|
var res2 = value.split(',');
|
||||||
if (res2[1] == igrno) {
|
if (res2[1] == igrno) {
|
||||||
|
|
||||||
@ -605,8 +601,7 @@ function GetAmount(i)
|
|||||||
function calculategrandtotal() {
|
function calculategrandtotal() {
|
||||||
|
|
||||||
|
|
||||||
$.each(temppo, function( index, value )
|
$.each(temppo, function(index, value) {
|
||||||
{
|
|
||||||
|
|
||||||
var res2 = value.split(',');
|
var res2 = value.split(',');
|
||||||
tempTotal[index] = parseFloat(res2[2]);
|
tempTotal[index] = parseFloat(res2[2]);
|
||||||
@ -624,18 +619,15 @@ function calculategrandtotal(){
|
|||||||
// console.log(tempTotal);
|
// console.log(tempTotal);
|
||||||
}
|
}
|
||||||
|
|
||||||
function Save()
|
function Save() {
|
||||||
{
|
|
||||||
var bankamount = $('#debitamount').val();
|
var bankamount = $('#debitamount').val();
|
||||||
var totalamount = $('#addvalue').val();
|
var totalamount = $('#addvalue').val();
|
||||||
if(parseFloat(bankamount)>=parseFloat(totalamount))
|
if (parseFloat(bankamount) >= parseFloat(totalamount)) {
|
||||||
{
|
$('#loader').show();
|
||||||
$('#content').loader('show');
|
|
||||||
var rowCount = $('#Rowid').val();
|
var rowCount = $('#Rowid').val();
|
||||||
var check = 0;
|
var check = 0;
|
||||||
var rw = 0;
|
var rw = 0;
|
||||||
for(i=1;i<=rowCount;i++)
|
for (i = 1; i <= rowCount; i++) {
|
||||||
{
|
|
||||||
var arrval = temppo[i - 1];
|
var arrval = temppo[i - 1];
|
||||||
var number = arrval.split(',');
|
var number = arrval.split(',');
|
||||||
number = number[0];
|
number = number[0];
|
||||||
@ -668,17 +660,30 @@ function Save()
|
|||||||
var balnceamount = bankdebitamount - totalvalue;
|
var balnceamount = bankdebitamount - totalvalue;
|
||||||
|
|
||||||
|
|
||||||
$.ajax(
|
$.ajax({
|
||||||
{
|
data: {
|
||||||
data:{bankdate:bankdate,podate:date,pono:pono,igrno:igrno,sname:suppliername,sid:supplierid,tot:totalordervalue,aa:amountpaid,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw},
|
bankdate: bankdate,
|
||||||
|
podate: date,
|
||||||
|
pono: pono,
|
||||||
|
igrno: igrno,
|
||||||
|
sname: suppliername,
|
||||||
|
sid: supplierid,
|
||||||
|
tot: totalordervalue,
|
||||||
|
aa: amountpaid,
|
||||||
|
rc: rowCount,
|
||||||
|
tpv: totalvalue,
|
||||||
|
bda: bankdebitamount,
|
||||||
|
bi: bid,
|
||||||
|
check: check,
|
||||||
|
rw: rw
|
||||||
|
},
|
||||||
//alert(data);
|
//alert(data);
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/receipt",
|
url: "<?php echo base_url() ?>cashbook/receipt",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
//$('#content').loader('hide');
|
//$('#content').loader('hide');
|
||||||
//alert(data);
|
//alert(data);
|
||||||
window.location.href = "Bankingstatement";
|
window.location.href = "Bankingstatement";
|
||||||
@ -692,14 +697,12 @@ function Save()
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
|
|
||||||
alert('Your Amount Is Not Match');
|
alert('Your Amount Is Not Match');
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
@ -740,5 +743,3 @@ $( function() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,31 +1,32 @@
|
|||||||
<?php
|
<?php
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -45,7 +46,11 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
|
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>View Invoice</b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>View Invoice</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
|
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<table class="table table-bordered table-hover" style="table-layout:auto;">
|
<table class="table table-bordered table-hover" style="table-layout:auto;">
|
||||||
@ -63,11 +68,19 @@ foreach($financialyear as $item)
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><p style="margin-left:25px;" id="bid"></p></td>
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bid"></p>
|
||||||
|
</td>
|
||||||
<td>Bank</td>
|
<td>Bank</td>
|
||||||
<td><p style="margin-left:25px;" id="bamount" ></p></td>
|
<td>
|
||||||
<td><p style="margin-left:25px;" id="bdate"></p></td>
|
<p style="margin-left:25px;" id="bamount"></p>
|
||||||
<td><p style="margin-left:25px;" id="narration"></p></td>
|
</td>
|
||||||
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="bdate"></p>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<p style="margin-left:25px;" id="narration"></p>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@ -122,11 +135,11 @@ foreach($financialyear as $item)
|
|||||||
<select class="form-control" id="Customer" name="Customer">
|
<select class="form-control" id="Customer" name="Customer">
|
||||||
<option value="">Select Customer</option>
|
<option value="">Select Customer</option>
|
||||||
<?php
|
<?php
|
||||||
foreach($getcustomer as $gc):
|
foreach ($getcustomer as $gc): { ?>
|
||||||
{?>
|
|
||||||
<option value="<?php echo $gc->client_id; ?>"><?php echo $gc->client_name; ?></option>
|
<option value="<?php echo $gc->client_id; ?>"><?php echo $gc->client_name; ?></option>
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -170,14 +183,11 @@ foreach($financialyear as $item)
|
|||||||
$ti = 0.00;
|
$ti = 0.00;
|
||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($bankinvoicedata)) {
|
if (!empty($bankinvoicedata)) {
|
||||||
foreach($bankinvoicedata as $t)
|
foreach ($bankinvoicedata as $t) {
|
||||||
|
|
||||||
{
|
|
||||||
//print_r($bankinvoicedata);
|
//print_r($bankinvoicedata);
|
||||||
$status = $t->Paymentstatus;
|
$status = $t->Paymentstatus;
|
||||||
$balancetopay = $t->Balancetopay;
|
$balancetopay = $t->Balancetopay;
|
||||||
if($status !='ST057')
|
if ($status != 'ST057') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
@ -274,8 +284,7 @@ foreach($financialyear as $item)
|
|||||||
document.getElementById("narration").innerHTML = narration;
|
document.getElementById("narration").innerHTML = narration;
|
||||||
var res1 = res.split(',');
|
var res1 = res.split(',');
|
||||||
var i;
|
var i;
|
||||||
$.each(res1, function(index, value)
|
$.each(res1, function(index, value) {
|
||||||
{
|
|
||||||
var res2 = value.split('-');
|
var res2 = value.split('-');
|
||||||
var bid = res2[0];
|
var bid = res2[0];
|
||||||
var bam = res2[1];
|
var bam = res2[1];
|
||||||
@ -289,8 +298,7 @@ foreach($financialyear as $item)
|
|||||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||||
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
||||||
buttons: [
|
buttons: [{
|
||||||
{
|
|
||||||
extend: 'excelHtml5',
|
extend: 'excelHtml5',
|
||||||
footer: 'true',
|
footer: 'true',
|
||||||
messageTop: $('h3').text(),
|
messageTop: $('h3').text(),
|
||||||
@ -311,8 +319,7 @@ var tempTotal = []; // tempTotal - This array for get value from "tempinvoice"
|
|||||||
var row = 0;
|
var row = 0;
|
||||||
var intex = 1;
|
var intex = 1;
|
||||||
|
|
||||||
function GetPayment(i)
|
function GetPayment(i) {
|
||||||
{
|
|
||||||
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
||||||
|
|
||||||
|
|
||||||
@ -327,8 +334,7 @@ var negative=0;
|
|||||||
|
|
||||||
// }
|
// }
|
||||||
temp = intex;
|
temp = intex;
|
||||||
if(x==true)
|
if (x == true) {
|
||||||
{
|
|
||||||
|
|
||||||
row = parseInt(row) + 1;
|
row = parseInt(row) + 1;
|
||||||
$('#Rowid').val(row);
|
$('#Rowid').val(row);
|
||||||
@ -387,8 +393,7 @@ if(x==true)
|
|||||||
value: invoicereceived
|
value: invoicereceived
|
||||||
}).appendTo('#HideInvoiceRecdDiv');
|
}).appendTo('#HideInvoiceRecdDiv');
|
||||||
|
|
||||||
if(negative==1)
|
if (negative == 1) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
for (o = 1; o < i; o++) //need to ask
|
for (o = 1; o < i; o++) //need to ask
|
||||||
@ -409,10 +414,7 @@ if(x==true)
|
|||||||
intex = parseInt(intex) + 1;
|
intex = parseInt(intex) + 1;
|
||||||
|
|
||||||
|
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
var rr = $('#Rowid').val();
|
var rr = $('#Rowid').val();
|
||||||
row = parseInt(rr) - 1;
|
row = parseInt(rr) - 1;
|
||||||
@ -426,13 +428,11 @@ else
|
|||||||
var a = tempinvoice.indexOf(invoicevalue);
|
var a = tempinvoice.indexOf(invoicevalue);
|
||||||
var b = tempTotal.indexOf(Payment);
|
var b = tempTotal.indexOf(Payment);
|
||||||
|
|
||||||
if(a!=-1)
|
if (a != -1) {
|
||||||
{
|
|
||||||
tempinvoice.splice(a, 1);
|
tempinvoice.splice(a, 1);
|
||||||
//console.log(tempinvoice);
|
//console.log(tempinvoice);
|
||||||
}
|
}
|
||||||
if(b!=-1)
|
if (b != -1) {
|
||||||
{
|
|
||||||
tempTotal.splice(a, 1);
|
tempTotal.splice(a, 1);
|
||||||
//console.log(tempTotal);
|
//console.log(tempTotal);
|
||||||
}
|
}
|
||||||
@ -460,8 +460,8 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
function isNumberKey(evt)
|
|
||||||
{
|
function isNumberKey(evt) {
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
// Added to allow decimal, period, or delete
|
// Added to allow decimal, period, or delete
|
||||||
if (charCode == 110 || charCode == 190 || charCode == 46)
|
if (charCode == 110 || charCode == 190 || charCode == 46)
|
||||||
@ -472,15 +472,14 @@ function isNumberKey(evt)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
function GetAmount(i)
|
|
||||||
{
|
function GetAmount(i) {
|
||||||
|
|
||||||
var amount = parseFloat($('#invoicereceived' + i).val() == '' ? '0.00' : $('#invoicereceived' + i).val());
|
var amount = parseFloat($('#invoicereceived' + i).val() == '' ? '0.00' : $('#invoicereceived' + i).val());
|
||||||
|
|
||||||
|
|
||||||
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
var x = document.getElementById('checkboxcheckbox' + i).checked;
|
||||||
if(x==true )
|
if (x == true) {
|
||||||
{
|
|
||||||
|
|
||||||
var date = document.getElementById("invoicedate" + i).innerText;
|
var date = document.getElementById("invoicedate" + i).innerText;
|
||||||
var invid1 = document.getElementById("invoice_id" + i).innerText;
|
var invid1 = document.getElementById("invoice_id" + i).innerText;
|
||||||
@ -492,11 +491,9 @@ function GetAmount(i)
|
|||||||
|
|
||||||
var invoicereceived = document.getElementById("invoice_balance" + i).innerText;
|
var invoicereceived = document.getElementById("invoice_balance" + i).innerText;
|
||||||
|
|
||||||
for(k=1;k<=i;k++)
|
for (k = 1; k <= i; k++) {
|
||||||
{
|
|
||||||
var idcheck = $('#hideinvoiceid' + k).val();
|
var idcheck = $('#hideinvoiceid' + k).val();
|
||||||
if(invid==idcheck)
|
if (invid == idcheck) {
|
||||||
{
|
|
||||||
var cid = k;
|
var cid = k;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -518,8 +515,7 @@ function GetAmount(i)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$.each(tempinvoice, function( index, value )
|
$.each(tempinvoice, function(index, value) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var res2 = value.split(',')
|
var res2 = value.split(',')
|
||||||
@ -534,9 +530,7 @@ function GetAmount(i)
|
|||||||
|
|
||||||
tempinvoice[index] = i + ',' + invid + ',' + amount;
|
tempinvoice[index] = i + ',' + invid + ',' + amount;
|
||||||
|
|
||||||
}
|
} else if (as == invid) {
|
||||||
|
|
||||||
else if( as == invid){
|
|
||||||
|
|
||||||
|
|
||||||
tempinvoice[index] = i + ',' + invid + ',' + amount;
|
tempinvoice[index] = i + ',' + invid + ',' + amount;
|
||||||
@ -551,8 +545,7 @@ tempinvoice[index] = i+','+invid+','+amount;
|
|||||||
|
|
||||||
function calculategrandtotal() {
|
function calculategrandtotal() {
|
||||||
|
|
||||||
$.each(tempinvoice, function( index, value )
|
$.each(tempinvoice, function(index, value) {
|
||||||
{
|
|
||||||
|
|
||||||
var res2 = value.split(',');
|
var res2 = value.split(',');
|
||||||
|
|
||||||
@ -564,9 +557,7 @@ function calculategrandtotal(){
|
|||||||
tempTotal[index] = parseFloat(res2[2]);
|
tempTotal[index] = parseFloat(res2[2]);
|
||||||
|
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
tempTotal[index] = parseFloat(res2[3]);
|
tempTotal[index] = parseFloat(res2[3]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -591,22 +582,19 @@ function calculategrandtotal(){
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function Save()
|
function Save() {
|
||||||
{
|
|
||||||
|
|
||||||
var totalamount = $('#addvalue').val();
|
var totalamount = $('#addvalue').val();
|
||||||
var bankamount = $('#debitamount').val();
|
var bankamount = $('#debitamount').val();
|
||||||
if(parseFloat(bankamount) >= parseFloat(totalamount))
|
if (parseFloat(bankamount) >= parseFloat(totalamount)) {
|
||||||
{
|
$('#loader').show();
|
||||||
$('#content').loader('show');
|
|
||||||
var totalvalue = $('#addvalue').val();
|
var totalvalue = $('#addvalue').val();
|
||||||
|
|
||||||
var rowCount = $('#Rowid').val();
|
var rowCount = $('#Rowid').val();
|
||||||
|
|
||||||
var check = 0;
|
var check = 0;
|
||||||
var rw = 0;
|
var rw = 0;
|
||||||
for(i=1;i<=rowCount;i++)
|
for (i = 1; i <= rowCount; i++) {
|
||||||
{
|
|
||||||
|
|
||||||
var arrval = tempinvoice[i - 1];
|
var arrval = tempinvoice[i - 1];
|
||||||
var number = arrval.split(',');
|
var number = arrval.split(',');
|
||||||
@ -638,15 +626,28 @@ function Save()
|
|||||||
|
|
||||||
//var payment = parseFloat(invoiceamount);
|
//var payment = parseFloat(invoiceamount);
|
||||||
|
|
||||||
$.ajax(
|
$.ajax({
|
||||||
{
|
data: {
|
||||||
data:{bankdate:bankdate,date:date,invid:invid,cname:customername,cid:customerid,invamount:invoiceamount,ar:amountreceived,rc:rowCount,tpv:totalvalue,bda:bankdebitamount,bi:bid,check:check,rw:rw,invrec:invoicereceived},
|
bankdate: bankdate,
|
||||||
|
date: date,
|
||||||
|
invid: invid,
|
||||||
|
cname: customername,
|
||||||
|
cid: customerid,
|
||||||
|
invamount: invoiceamount,
|
||||||
|
ar: amountreceived,
|
||||||
|
rc: rowCount,
|
||||||
|
tpv: totalvalue,
|
||||||
|
bda: bankdebitamount,
|
||||||
|
bi: bid,
|
||||||
|
check: check,
|
||||||
|
rw: rw,
|
||||||
|
invrec: invoicereceived
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/invoiceamount1",
|
url: "<?php echo base_url() ?>cashbook/invoiceamount1",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
$('#loader').hide();
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
//alert('Saved Successfully');
|
//alert('Saved Successfully');
|
||||||
window.location.href = "Bankingstatement";
|
window.location.href = "Bankingstatement";
|
||||||
|
|
||||||
@ -656,9 +657,7 @@ function Save()
|
|||||||
|
|
||||||
// j=j+1;
|
// j=j+1;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
alert('Your Amount Is Not Match');
|
alert('Your Amount Is Not Match');
|
||||||
location.reload();
|
location.reload();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,44 +1,39 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
if(!empty($debitmapping))
|
if (!empty($debitmapping)) {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
|
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <link rel="stylesheet." href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
<!-- <link rel="stylesheet." href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
@ -53,28 +48,21 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
<?php
|
<?php
|
||||||
if (!empty($mappingiv)) {
|
if (!empty($mappingiv)) {
|
||||||
foreach($mappingiv as $ap)
|
foreach ($mappingiv as $ap) {
|
||||||
{
|
|
||||||
$bankid = $ap->bankid;
|
$bankid = $ap->bankid;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!empty($mappingcashbook))
|
if (!empty($mappingcashbook)) {
|
||||||
{
|
foreach ($mappingcashbook as $mc) {
|
||||||
foreach($mappingcashbook as $mc)
|
|
||||||
{
|
|
||||||
$bankid = $mc->bankid;
|
$bankid = $mc->bankid;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!empty($paidcbook)) {
|
if (!empty($paidcbook)) {
|
||||||
|
|
||||||
foreach($paidcbook as $pc)
|
foreach ($paidcbook as $pc) {
|
||||||
{
|
|
||||||
$pcamount = $pc->total;
|
$pcamount = $pc->total;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,24 +70,17 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
$bankclear = $clearbalance;
|
$bankclear = $clearbalance;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
if (!empty($balancetoclear)) {
|
if (!empty($balancetoclear)) {
|
||||||
|
|
||||||
|
|
||||||
$bankbaltoclear = $balancetoclear;
|
$bankbaltoclear = $balancetoclear;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!empty($invoiceramount))
|
if (!empty($invoiceramount)) {
|
||||||
{
|
foreach ($invoiceramount as $ia) {
|
||||||
foreach($invoiceramount as $ia)
|
|
||||||
{
|
|
||||||
$inamount = $ia->amountreceived;
|
$inamount = $ia->amountreceived;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,7 +89,11 @@ foreach($financialyear as $item)
|
|||||||
//echo $totalamount;
|
//echo $totalamount;
|
||||||
?>
|
?>
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Bank Credit Amount Paid Report</b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>Bank Credit Amount Paid Report</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
@ -166,8 +151,7 @@ foreach($financialyear as $item)
|
|||||||
$preINV = '';
|
$preINV = '';
|
||||||
|
|
||||||
if (!empty($mappingiv)) {
|
if (!empty($mappingiv)) {
|
||||||
foreach($mappingiv as $ap)
|
foreach ($mappingiv as $ap) {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
@ -188,26 +172,18 @@ foreach($financialyear as $item)
|
|||||||
<td align="left" id="balancetoreceived<?php echo $i ?>">
|
<td align="left" id="balancetoreceived<?php echo $i ?>">
|
||||||
<span>
|
<span>
|
||||||
<?php
|
<?php
|
||||||
if($preINV == $ap->invoiceno)
|
if ($preINV == $ap->invoiceno) {
|
||||||
{
|
if ($preBalance == 0) {
|
||||||
if($preBalance == 0 )
|
|
||||||
{
|
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
$balance = $preBalance - $ap->amountreceived;
|
$balance = $preBalance - $ap->amountreceived;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
if($preINV != $ap->invoiceno)
|
if ($preINV != $ap->invoiceno) {
|
||||||
{
|
|
||||||
// $preBalance =0 ;
|
// $preBalance =0 ;
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
@ -215,14 +191,10 @@ foreach($financialyear as $item)
|
|||||||
// echo 'elseif';
|
// echo 'elseif';
|
||||||
// echo $preINV;
|
// echo $preINV;
|
||||||
|
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else{
|
|
||||||
$balance = $ap->totinvoiceamount - $preBalance;
|
$balance = $ap->totinvoiceamount - $preBalance;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
echo 'elseelse';
|
echo 'elseelse';
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -252,16 +224,17 @@ foreach($financialyear as $item)
|
|||||||
$i++;
|
$i++;
|
||||||
$preINV = $ap->invoiceno;
|
$preINV = $ap->invoiceno;
|
||||||
$preBalance = $balance;
|
$preBalance = $balance;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Cashbook Reports</b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>Cashbook Reports</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
<br>
|
<br>
|
||||||
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
||||||
<thead>
|
<thead>
|
||||||
@ -285,8 +258,7 @@ foreach($financialyear as $item)
|
|||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($mappingcashbook)) {
|
if (!empty($mappingcashbook)) {
|
||||||
|
|
||||||
foreach($mappingcashbook as $mc)
|
foreach ($mappingcashbook as $mc) {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
@ -312,7 +284,6 @@ foreach($financialyear as $item)
|
|||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -339,10 +310,9 @@ foreach($financialyear as $item)
|
|||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
function invoice(i)
|
function invoice(i) {
|
||||||
{
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
var totinvoiceamount = $('#totinvoiceamount' + i).text();
|
var totinvoiceamount = $('#totinvoiceamount' + i).text();
|
||||||
|
|
||||||
var balancetoreceived = $('#balancetoreceived' + i).text();
|
var balancetoreceived = $('#balancetoreceived' + i).text();
|
||||||
@ -360,14 +330,23 @@ var bankingbalclear=$('#bankingbalclear'+i).val();
|
|||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{credit:credit,mappingid:mappingid,invoiceno:invoiceno,bankid:bankid,amountreceived:amountreceived,bankingclear:bankingclear,bankingbalclear:bankingbalclear,totinvoiceamount:totinvoiceamount,balancetoreceived:balancetoreceived},
|
data: {
|
||||||
|
credit: credit,
|
||||||
|
mappingid: mappingid,
|
||||||
|
invoiceno: invoiceno,
|
||||||
|
bankid: bankid,
|
||||||
|
amountreceived: amountreceived,
|
||||||
|
bankingclear: bankingclear,
|
||||||
|
bankingbalclear: bankingbalclear,
|
||||||
|
totinvoiceamount: totinvoiceamount,
|
||||||
|
balancetoreceived: balancetoreceived
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>DeleteInvoice",
|
url: "<?php echo base_url() ?>DeleteInvoice",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
|
|
||||||
window.location.href = "Bankingstatement";
|
window.location.href = "Bankingstatement";
|
||||||
//location.reload();
|
//location.reload();
|
||||||
|
|||||||
@ -1,43 +1,38 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
if(!empty($mapping))
|
if (!empty($mapping)) {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
|
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <link rel="sty.lesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
<!-- <link rel="sty.lesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -109,28 +104,22 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
$bankamount = $clearbalance;
|
$bankamount = $clearbalance;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
if(!empty($balancetoclear))
|
if (!empty($balancetoclear)) {
|
||||||
{
|
|
||||||
$balancetoclear = $balancetoclear;
|
$balancetoclear = $balancetoclear;
|
||||||
}
|
}
|
||||||
if (!empty($mappingcashbook)) {
|
if (!empty($mappingcashbook)) {
|
||||||
|
|
||||||
foreach($mappingcashbook as $mc)
|
foreach ($mappingcashbook as $mc) {
|
||||||
{
|
|
||||||
$bankid = $mc->bankid;
|
$bankid = $mc->bankid;
|
||||||
// $totalbankamount=$mc->totalbankamount;
|
// $totalbankamount=$mc->totalbankamount;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!empty($mapping)) {
|
if (!empty($mapping)) {
|
||||||
foreach($mapping as $ap)
|
foreach ($mapping as $ap) {
|
||||||
{
|
|
||||||
$bankid = $ap->mid;
|
$bankid = $ap->mid;
|
||||||
$id = $ap->id;
|
$id = $ap->id;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,17 +128,13 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
if (!empty($paidcbook)) {
|
if (!empty($paidcbook)) {
|
||||||
|
|
||||||
foreach($paidcbook as $pc)
|
foreach ($paidcbook as $pc) {
|
||||||
{
|
|
||||||
$pcamount = $pc->total;
|
$pcamount = $pc->total;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!empty($paidpoamount)) {
|
if (!empty($paidpoamount)) {
|
||||||
foreach($paidpoamount as $pa)
|
foreach ($paidpoamount as $pa) {
|
||||||
{
|
|
||||||
$poamount = $pa->amountpaid;
|
$poamount = $pa->amountpaid;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,7 +144,11 @@ if(!empty($mapping))
|
|||||||
?>
|
?>
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
|
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Bank Debit Amount Paid Report</b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>Bank Debit Amount Paid Report</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
@ -180,7 +169,8 @@ if(!empty($mapping))
|
|||||||
<td><?php echo $bankid ?></td>
|
<td><?php echo $bankid ?></td>
|
||||||
<td>Bank</td>
|
<td>Bank</td>
|
||||||
|
|
||||||
<td><?php echo $paymentamount ?></p></td>
|
<td><?php echo $paymentamount ?></p>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@ -228,14 +218,13 @@ if(!empty($mapping))
|
|||||||
<select class="form-control" id="SupplierName" name="SupplierName">
|
<select class="form-control" id="SupplierName" name="SupplierName">
|
||||||
<option value="">Select Supplier</option>
|
<option value="">Select Supplier</option>
|
||||||
<?php
|
<?php
|
||||||
foreach($supplier as $gs):
|
foreach ($supplier as $gs): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $gs->SupplierName; ?>"><?php echo $gs->SupplierName; ?></option>
|
<option value="<?php echo $gs->SupplierName; ?>"><?php echo $gs->SupplierName; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -274,8 +263,7 @@ if(!empty($mapping))
|
|||||||
$preBalance = 0;
|
$preBalance = 0;
|
||||||
$preIGRNO = '';
|
$preIGRNO = '';
|
||||||
if (!empty($mapping)) {
|
if (!empty($mapping)) {
|
||||||
foreach($mapping as $ap)
|
foreach ($mapping as $ap) {
|
||||||
{
|
|
||||||
$total = $ap->Amountpaid; //print_r($ap);
|
$total = $ap->Amountpaid; //print_r($ap);
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
@ -295,26 +283,18 @@ if(!empty($mapping))
|
|||||||
<!-- <td align="left" id="aa<?php echo $i ?>"><span><?php echo $ap->Totalpoamount - $ap->Amountpaid; ?></span></td>-->
|
<!-- <td align="left" id="aa<?php echo $i ?>"><span><?php echo $ap->Totalpoamount - $ap->Amountpaid; ?></span></td>-->
|
||||||
<td align="left" id="aa<?php echo $i ?>">
|
<td align="left" id="aa<?php echo $i ?>">
|
||||||
<span><?php
|
<span><?php
|
||||||
if($preIGRNO == $ap->IGRNO)
|
if ($preIGRNO == $ap->IGRNO) {
|
||||||
{
|
if ($preBalance == 0) {
|
||||||
if($preBalance == 0 )
|
|
||||||
{
|
|
||||||
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
$balance = $preBalance - $ap->Amountpaid;
|
$balance = $preBalance - $ap->Amountpaid;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
if($preIGRNO != $ap->IGRNO)
|
if ($preIGRNO != $ap->IGRNO) {
|
||||||
{
|
|
||||||
// $preBalance =0 ;
|
// $preBalance =0 ;
|
||||||
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
$balance = $ap->Totalpoamount - $ap->Amountpaid;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
@ -322,9 +302,7 @@ if(!empty($mapping))
|
|||||||
// echo 'elseif';
|
// echo 'elseif';
|
||||||
// echo $prePONO;
|
// echo $prePONO;
|
||||||
|
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else{
|
|
||||||
$balance = $ap->Totalpoamount - $preBalance;
|
$balance = $ap->Totalpoamount - $preBalance;
|
||||||
echo $balance;
|
echo $balance;
|
||||||
// echo 'elseelse';
|
// echo 'elseelse';
|
||||||
@ -343,17 +321,13 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
<td align="left" id="aa<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($total); ?><?php echo round($total, 2) ?></span></td>
|
<td align="left" id="aa<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($total); ?><?php echo round($total, 2) ?></span></td>
|
||||||
<?php
|
<?php
|
||||||
if($ap->file !='')
|
if ($ap->file != '') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
|
||||||
<td> <a data-toggle="tooltip"><i class="fa fa-download" data-toggle="tooltip" title="<?php echo $record->pono; ?> -Attachment Available for Download/View" onclick="igrno(<?php echo $i ?>)"></i></a> </td>
|
<td> <a data-toggle="tooltip"><i class="fa fa-download" data-toggle="tooltip" title="<?php echo $record->pono; ?> -Attachment Available for Download/View" onclick="igrno(<?php echo $i ?>)"></i></a> </td>
|
||||||
<?php
|
<?php
|
||||||
}
|
} else if ($ap->Fpath != '') {
|
||||||
|
|
||||||
else if($ap->Fpath !='')
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -362,22 +336,17 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else
|
} else { ?>
|
||||||
{ ?>
|
|
||||||
<td>N/A</td>
|
<td>N/A</td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php }
|
<?php }
|
||||||
if($ap->FilePath=='')
|
if ($ap->FilePath == '') {
|
||||||
{
|
|
||||||
?>
|
?>
|
||||||
<td>N/A</td>
|
<td>N/A</td>
|
||||||
<?php
|
<?php
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -404,7 +373,6 @@ if(!empty($mapping))
|
|||||||
$preBalance = $balance;
|
$preBalance = $balance;
|
||||||
$preIGRNO = $ap->IGRNO;
|
$preIGRNO = $ap->IGRNO;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -428,7 +396,11 @@ if(!empty($mapping))
|
|||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Cashbook Reports</b></p></h3></center>
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>Cashbook Reports</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
<br>
|
<br>
|
||||||
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
||||||
<thead>
|
<thead>
|
||||||
@ -456,8 +428,7 @@ if(!empty($mapping))
|
|||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($mappingcashbook)) {
|
if (!empty($mappingcashbook)) {
|
||||||
|
|
||||||
foreach($mappingcashbook as $mc)
|
foreach ($mappingcashbook as $mc) {
|
||||||
{
|
|
||||||
$id = $mc->id;
|
$id = $mc->id;
|
||||||
$total = $mc->total;
|
$total = $mc->total;
|
||||||
?>
|
?>
|
||||||
@ -492,7 +463,6 @@ if(!empty($mapping))
|
|||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -537,23 +507,24 @@ if(!empty($mapping))
|
|||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
function pono(i) {
|
||||||
function pono(i)
|
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
// alert(igrno);
|
// alert(igrno);
|
||||||
// alert(pono);
|
// alert(pono);
|
||||||
// return false;
|
// return false;
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/filelist",
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
@ -573,6 +544,7 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
@ -606,19 +578,21 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
function igrno(i)
|
function igrno(i) {
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
@ -629,9 +603,8 @@ function pono(i)
|
|||||||
|
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
|
|
||||||
if(item.file ==null)
|
if (item.file == null) {
|
||||||
{ if(item.Remarks ==null)
|
if (item.Remarks == null) {
|
||||||
{
|
|
||||||
//alert()
|
//alert()
|
||||||
PONO = item.PONO;
|
PONO = item.PONO;
|
||||||
BillNO = item.BillNo;
|
BillNO = item.BillNo;
|
||||||
@ -652,8 +625,7 @@ function pono(i)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(Filename != null)
|
if (Filename != null) {
|
||||||
{
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
i = i - 1;
|
i = i - 1;
|
||||||
trHTML += '<tr id=' + i + '>' +
|
trHTML += '<tr id=' + i + '>' +
|
||||||
@ -671,6 +643,7 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
|
|||||||
@ -1,43 +1,38 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
if(!empty($mapping))
|
if (!empty($mapping)) {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
|
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <link rel="stylesheet." href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
<!-- <link rel="stylesheet." href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -79,7 +74,9 @@ if(!empty($mapping))
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;; font-size: 18px;">Cashbook Reports
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;; font-size: 18px;">Cashbook Reports
|
||||||
<?php if (!empty($fa)) {
|
<?php if (!empty($fa)) {
|
||||||
echo $fa;
|
echo $fa;
|
||||||
}
|
}
|
||||||
@ -91,14 +88,12 @@ if(!empty($mapping))
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $m;
|
echo $m;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fdate))
|
<?php if (!empty($fdate)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $fdate;
|
echo $fdate;
|
||||||
}
|
}
|
||||||
@ -108,8 +103,12 @@ if(!empty($mapping))
|
|||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?></p></h3></center>
|
?></p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $accountname;?></span></h4></center>
|
</h3>
|
||||||
|
</center>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $accountname; ?></span></h4>
|
||||||
|
</center>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
||||||
@ -147,14 +146,13 @@ if(!empty($mapping))
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
foreach($finyear as $item):
|
foreach ($finyear as $item): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -251,8 +249,7 @@ if(!empty($mapping))
|
|||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($bankmappingcash)) {
|
if (!empty($bankmappingcash)) {
|
||||||
|
|
||||||
foreach($bankmappingcash as $mc)
|
foreach ($bankmappingcash as $mc) {
|
||||||
{
|
|
||||||
$id = $mc->id;
|
$id = $mc->id;
|
||||||
$rate = $mc->total;
|
$rate = $mc->total;
|
||||||
?>
|
?>
|
||||||
@ -330,23 +327,24 @@ if(!empty($mapping))
|
|||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
function pono(i) {
|
||||||
function pono(i)
|
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
// alert(igrno);
|
// alert(igrno);
|
||||||
// alert(pono);
|
// alert(pono);
|
||||||
// return false;
|
// return false;
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/filelist",
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
@ -366,6 +364,7 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
@ -399,19 +398,21 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
function igrno(i)
|
function igrno(i) {
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
@ -422,9 +423,8 @@ function pono(i)
|
|||||||
|
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
|
|
||||||
if(item.file ==null)
|
if (item.file == null) {
|
||||||
{ if(item.Remarks ==null)
|
if (item.Remarks == null) {
|
||||||
{
|
|
||||||
//alert()
|
//alert()
|
||||||
PONO = item.PONO;
|
PONO = item.PONO;
|
||||||
BillNO = item.BillNo;
|
BillNO = item.BillNo;
|
||||||
@ -445,8 +445,7 @@ function pono(i)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(Filename != null)
|
if (Filename != null) {
|
||||||
{
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
i = i - 1;
|
i = i - 1;
|
||||||
trHTML += '<tr id=' + i + '>' +
|
trHTML += '<tr id=' + i + '>' +
|
||||||
@ -464,6 +463,7 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
|
|||||||
@ -1,43 +1,38 @@
|
|||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
if(!empty($mapping))
|
if (!empty($mapping)) {
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($financialyear as $item)
|
foreach ($financialyear as $item) {
|
||||||
|
|
||||||
{
|
|
||||||
$finyear = $item->financial_year;
|
$finyear = $item->financial_year;
|
||||||
|
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <link rel.="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
<!-- <link rel.="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"> -->
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {
|
||||||
|
padding: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.dt-buttons {
|
div.dt-buttons {
|
||||||
position: relative;
|
position: relative;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
@ -80,7 +75,9 @@ if(!empty($mapping))
|
|||||||
<div class="col-md-1 col-md-offset-11">
|
<div class="col-md-1 col-md-offset-11">
|
||||||
<a href="<?php base_url() ?>bankreceivedsupp" class="btn btn-success" value="Back" />Back</a>
|
<a href="<?php base_url() ?>bankreceivedsupp" class="btn btn-success" value="Back" />Back</a>
|
||||||
</div>
|
</div>
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;; font-size: 18px;">Cashbook Reports <?php if(!empty($fa)){
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;; font-size: 18px;">Cashbook Reports <?php if (!empty($fa)) {
|
||||||
echo $fa;
|
echo $fa;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,14 +88,12 @@ if(!empty($mapping))
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $m;
|
echo $m;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fdate))
|
<?php if (!empty($fdate)) {
|
||||||
{
|
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $fdate;
|
echo $fdate;
|
||||||
}
|
}
|
||||||
@ -108,8 +103,12 @@ if(!empty($mapping))
|
|||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?></p></h3></center>
|
?></p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $accountname;?></span></h4></center>
|
</h3>
|
||||||
|
</center>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $accountname; ?></span></h4>
|
||||||
|
</center>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
||||||
@ -147,14 +146,13 @@ if(!empty($mapping))
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
foreach($finyear as $item):
|
foreach ($finyear as $item): { ?>
|
||||||
|
|
||||||
{?>
|
|
||||||
|
|
||||||
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
|
||||||
|
|
||||||
|
|
||||||
<?php } endforeach; ?>
|
<?php }
|
||||||
|
endforeach; ?>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
@ -251,8 +249,7 @@ if(!empty($mapping))
|
|||||||
$tvt = 0.00;
|
$tvt = 0.00;
|
||||||
if (!empty($bankmappingcashreceived)) {
|
if (!empty($bankmappingcashreceived)) {
|
||||||
|
|
||||||
foreach($bankmappingcashreceived as $mc)
|
foreach ($bankmappingcashreceived as $mc) {
|
||||||
{
|
|
||||||
$id = $mc->id;
|
$id = $mc->id;
|
||||||
$rate = $mc->total;
|
$rate = $mc->total;
|
||||||
?>
|
?>
|
||||||
@ -330,23 +327,24 @@ if(!empty($mapping))
|
|||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
function pono(i) {
|
||||||
function pono(i)
|
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
// alert(igrno);
|
// alert(igrno);
|
||||||
// alert(pono);
|
// alert(pono);
|
||||||
// return false;
|
// return false;
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/filelist",
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
@ -366,6 +364,7 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
@ -399,19 +398,21 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
function igrno(i)
|
function igrno(i) {
|
||||||
{
|
|
||||||
var igrno = $('#igrno' + i).text();
|
var igrno = $('#igrno' + i).text();
|
||||||
var pono = $('#pono' + i).text();
|
var pono = $('#pono' + i).text();
|
||||||
$("#Fileshow").modal('show');
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
success:function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
@ -422,9 +423,8 @@ function pono(i)
|
|||||||
|
|
||||||
$.each($.parseJSON(data), function(i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
|
|
||||||
if(item.file ==null)
|
if (item.file == null) {
|
||||||
{ if(item.Remarks ==null)
|
if (item.Remarks == null) {
|
||||||
{
|
|
||||||
//alert()
|
//alert()
|
||||||
PONO = item.PONO;
|
PONO = item.PONO;
|
||||||
BillNO = item.BillNo;
|
BillNO = item.BillNo;
|
||||||
@ -445,8 +445,7 @@ function pono(i)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(Filename != null)
|
if (Filename != null) {
|
||||||
{
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
i = i - 1;
|
i = i - 1;
|
||||||
trHTML += '<tr id=' + i + '>' +
|
trHTML += '<tr id=' + i + '>' +
|
||||||
@ -464,6 +463,7 @@ function pono(i)
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
|
|||||||
@ -2514,6 +2514,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -2522,6 +2523,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2562,6 +2564,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -2570,6 +2573,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -3203,7 +3207,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
var Subtotal = $('#Subtotal').val();
|
var Subtotal = $('#Subtotal').val();
|
||||||
|
|
||||||
var AfterIgst = $('#AfterIgstInt').val();
|
// var AfterIgst = $('#AfterIgstInt').val();
|
||||||
var Dutyimpact = $('#DutyImpact').val();
|
var Dutyimpact = $('#DutyImpact').val();
|
||||||
var ClearingCharges = $('#ClearingCharges').val();
|
var ClearingCharges = $('#ClearingCharges').val();
|
||||||
var Nett = $('#Nett').val();
|
var Nett = $('#Nett').val();
|
||||||
@ -3215,7 +3219,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
var beforeCustomEDCess = $('#CustomEDcess').val();
|
var beforeCustomEDCess = $('#CustomEDcess').val();
|
||||||
var beforeCustomSHCess = $('#CustomSHcess').val();
|
var beforeCustomSHCess = $('#CustomSHcess').val();
|
||||||
var Igst = $('#IgstInt').val();
|
// var Igst = $('#IgstInt').val();
|
||||||
var PurQuantity = $('#PurQuantity').val();
|
var PurQuantity = $('#PurQuantity').val();
|
||||||
|
|
||||||
var FreightType = $("#drpFreight").val();
|
var FreightType = $("#drpFreight").val();
|
||||||
@ -4095,7 +4099,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
$('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
|
$('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
|
||||||
//$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
|
//$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
|
||||||
|
|
||||||
|
console.log($('#Igst' + userid).val());
|
||||||
|
|
||||||
$('#EdittxtTotalOrderValue').val(cellval[9].innerHTML);
|
$('#EdittxtTotalOrderValue').val(cellval[9].innerHTML);
|
||||||
$('#EditCgst').val($('#Cgst' + userid).val());
|
$('#EditCgst').val($('#Cgst' + userid).val());
|
||||||
@ -4309,7 +4313,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
var formData = new FormData($('.CapitalPO')[0]);
|
var formData = new FormData($('.CapitalPO')[0]);
|
||||||
formData.append('ExchangeRateOn', ExchangeRateOn);
|
formData.append('ExchangeRateOn', ExchangeRateOn);
|
||||||
formData.append('PaymentMethod', PaymentMethod);
|
formData.append('PaymentMethod', PaymentMethod);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
processData: false,
|
processData: false,
|
||||||
@ -4319,6 +4323,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
url: "<?php echo base_url() ?>purchaseorder/addNewCapitalPurchaseOrder",
|
url: "<?php echo base_url() ?>purchaseorder/addNewCapitalPurchaseOrder",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
|
|
||||||
|
|||||||
@ -211,7 +211,7 @@ $('#Add').click(function(){
|
|||||||
function saveAll()
|
function saveAll()
|
||||||
{
|
{
|
||||||
|
|
||||||
$('#loadingcontent').loader('show');
|
$('#loader').show();
|
||||||
var tablevalue = $('#cashbooktable').tableToJSON(); // Convert the table into a javascript object
|
var tablevalue = $('#cashbooktable').tableToJSON(); // Convert the table into a javascript object
|
||||||
var value = JSON.stringify(tablevalue);
|
var value = JSON.stringify(tablevalue);
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -221,7 +221,7 @@ $('#Add').click(function(){
|
|||||||
url:"<?php echo base_url() ?>cashbook/cashbookdtl",
|
url:"<?php echo base_url() ?>cashbook/cashbookdtl",
|
||||||
|
|
||||||
success:function(data){
|
success:function(data){
|
||||||
$('#loadingcontent').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
window.location.href="addNewIncomeExpenseLoad";
|
window.location.href="addNewIncomeExpenseLoad";
|
||||||
}//success function closed
|
}//success function closed
|
||||||
|
|||||||
@ -790,6 +790,7 @@ if (!empty($filenames)) {
|
|||||||
function deletefile(filename) {
|
function deletefile(filename) {
|
||||||
var answer = confirm(" Do you want to delete the user from the List?")
|
var answer = confirm(" Do you want to delete the user from the List?")
|
||||||
if (answer) {
|
if (answer) {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: filename
|
id: filename
|
||||||
@ -797,6 +798,7 @@ if (!empty($filenames)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>companycontroller/deletefile",
|
url: "<?php echo base_url() ?>companycontroller/deletefile",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
alert(data);
|
alert(data);
|
||||||
@ -986,7 +988,7 @@ if (!empty($filenames)) {
|
|||||||
|
|
||||||
//if(bankname != '' || ifsccode != '' || bankaddress != '' )
|
//if(bankname != '' || ifsccode != '' || bankaddress != '' )
|
||||||
//{
|
//{
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data: {
|
data: {
|
||||||
@ -997,7 +999,7 @@ if (!empty($filenames)) {
|
|||||||
|
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -183,13 +183,15 @@
|
|||||||
id: $('#id').val(),
|
id: $('#id').val(),
|
||||||
CostCenterName: $('#CostCenterName').val()
|
CostCenterName: $('#CostCenterName').val()
|
||||||
};
|
};
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url(); ?>fetchCostCenterDetails",
|
url: "<?php echo base_url(); ?>fetchCostCenterDetails",
|
||||||
data: formData,
|
data: formData,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (response.status) {
|
if (response.status) {
|
||||||
alert(response.message);
|
alert(response.message);
|
||||||
$('#ccwizard').modal('hide');
|
$('#ccwizard').modal('hide');
|
||||||
|
|||||||
@ -351,7 +351,7 @@
|
|||||||
$("#RequisitionDtlsModal").on("shown.bs.modal", function(e) {
|
$("#RequisitionDtlsModal").on("shown.bs.modal", function(e) {
|
||||||
var ReqId = $(e.relatedTarget).data('userid');
|
var ReqId = $(e.relatedTarget).data('userid');
|
||||||
$('#SelReqNo').html(ReqId);
|
$('#SelReqNo').html(ReqId);
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: ReqId
|
id: ReqId
|
||||||
@ -360,7 +360,7 @@
|
|||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
url: "<?php echo base_url() ?>requisitionform/ViewRequest",
|
url: "<?php echo base_url() ?>requisitionform/ViewRequest",
|
||||||
success: function(json) {
|
success: function(json) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
var getAvalAmt = json.AvilBudAmount;
|
var getAvalAmt = json.AvilBudAmount;
|
||||||
getAvalAmt = getAvalAmt.replace(/\,/g, '');
|
getAvalAmt = getAvalAmt.replace(/\,/g, '');
|
||||||
$("#ReqType").val(json.Requist[0]['ReqType']);
|
$("#ReqType").val(json.Requist[0]['ReqType']);
|
||||||
|
|||||||
@ -1101,7 +1101,7 @@ $(function(){
|
|||||||
monthnumber--;}
|
monthnumber--;}
|
||||||
//alert(monthnumber);
|
//alert(monthnumber);
|
||||||
//alert(currentmonth[1]);
|
//alert(currentmonth[1]);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:monthnumber,param2:currentmonth[1],param3:currentyearmonth},
|
data:{param1:monthnumber,param2:currentmonth[1],param3:currentyearmonth},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -1109,7 +1109,7 @@ $(function(){
|
|||||||
success:function(data){
|
success:function(data){
|
||||||
//alert(data);
|
//alert(data);
|
||||||
var data = JSON.parse(data);
|
var data = JSON.parse(data);
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
//alert(data.length);
|
//alert(data.length);
|
||||||
|
|
||||||
if(data.length != 0){
|
if(data.length != 0){
|
||||||
@ -1232,13 +1232,13 @@ $(function(){
|
|||||||
date = currentmonth[1]+'-'+monthnumber+'-'+d;
|
date = currentmonth[1]+'-'+monthnumber+'-'+d;
|
||||||
var jsondata = $('#abstracttable').tableToJSON();
|
var jsondata = $('#abstracttable').tableToJSON();
|
||||||
jsondata = JSON.stringify(jsondata);
|
jsondata = JSON.stringify(jsondata);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:date,param2:jsondata},
|
data:{param1:date,param2:jsondata},
|
||||||
type:'POST',
|
type:'POST',
|
||||||
url:"<?php echo base_url().'batchcard/saveAbstractReport'?>",
|
url:"<?php echo base_url().'batchcard/saveAbstractReport'?>",
|
||||||
success:function(data){
|
success:function(data){
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
if(data){
|
if(data){
|
||||||
alert(data)
|
alert(data)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -524,7 +524,7 @@ function keyValidate(e)
|
|||||||
var rd = v;
|
var rd = v;
|
||||||
if(rd != '')
|
if(rd != '')
|
||||||
{
|
{
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:rd},
|
data:{param1:rd},
|
||||||
@ -556,7 +556,7 @@ function keyValidate(e)
|
|||||||
$('#description').val(data.start+'-'+data.stop);
|
$('#description').val(data.start+'-'+data.stop);
|
||||||
}
|
}
|
||||||
else{$('#description').val('0'+'-'+'0');}
|
else{$('#description').val('0'+'-'+'0');}
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -581,6 +581,7 @@ function keyValidate(e)
|
|||||||
$('#Maint_Append').empty();
|
$('#Maint_Append').empty();
|
||||||
var Index = 1 ;
|
var Index = 1 ;
|
||||||
//alert(rd);
|
//alert(rd);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id1:rd},
|
data:{id1:rd},
|
||||||
method:"POST",
|
method:"POST",
|
||||||
@ -670,6 +671,7 @@ function keyValidate(e)
|
|||||||
$('#less_break_down_hrs').val(0);
|
$('#less_break_down_hrs').val(0);
|
||||||
$('#less_maintenance').val(0);
|
$('#less_maintenance').val(0);
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -88,7 +88,7 @@ if (!empty($EmpCount)) {
|
|||||||
function synczohobooks() {
|
function synczohobooks() {
|
||||||
|
|
||||||
var sync = true
|
var sync = true
|
||||||
$('#loader_wrapper').css("display", "block");
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// $('#loadingDiv').show();
|
// $('#loadingDiv').show();
|
||||||
|
|
||||||
@ -100,13 +100,17 @@ if (!empty($EmpCount)) {
|
|||||||
|
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Sync Completed");
|
alert("Sync Completed");
|
||||||
},
|
},
|
||||||
failure: function(data) {
|
failure: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Failed");
|
alert("Failed");
|
||||||
},
|
},
|
||||||
complete: function() {
|
complete: function() {
|
||||||
$('#loader_wrapper').css("display", "none");
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -333,7 +337,7 @@ if (!empty($EmpCount)) {
|
|||||||
$("#yearabs").val('');
|
$("#yearabs").val('');
|
||||||
|
|
||||||
if (id != 0) {
|
if (id != 0) {
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
@ -345,7 +349,7 @@ if (!empty($EmpCount)) {
|
|||||||
success: function(json) {
|
success: function(json) {
|
||||||
console.log(json);
|
console.log(json);
|
||||||
// alert(json.workeds);
|
// alert(json.workeds);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$('#totaldays').text(json.totaldays);
|
$('#totaldays').text(json.totaldays);
|
||||||
$('#worked').text(json.workeds)
|
$('#worked').text(json.workeds)
|
||||||
//alert(json.MatDetail);
|
//alert(json.MatDetail);
|
||||||
@ -532,7 +536,7 @@ if (!empty($EmpCount)) {
|
|||||||
$("#monthabs").val('');
|
$("#monthabs").val('');
|
||||||
|
|
||||||
if (id != 0) {
|
if (id != 0) {
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
@ -544,7 +548,7 @@ if (!empty($EmpCount)) {
|
|||||||
success: function(json) {
|
success: function(json) {
|
||||||
console.log(json);
|
console.log(json);
|
||||||
|
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
//alert(json.MatDetail);
|
//alert(json.MatDetail);
|
||||||
$("#present").text(json.values);
|
$("#present").text(json.values);
|
||||||
$("#total_days").text(json.CUR_month);
|
$("#total_days").text(json.CUR_month);
|
||||||
@ -585,7 +589,7 @@ if (!empty($EmpCount)) {
|
|||||||
var id = $(this).val();
|
var id = $(this).val();
|
||||||
//alert(id);
|
//alert(id);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -609,6 +613,8 @@ if (!empty($EmpCount)) {
|
|||||||
$("#values").text(json.values);
|
$("#values").text(json.values);
|
||||||
$("#today_salary").text(json.employeeSalary);
|
$("#today_salary").text(json.employeeSalary);
|
||||||
$("#totalSalary").text(json.totalSalary);
|
$("#totalSalary").text(json.totalSalary);
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -190,7 +190,7 @@
|
|||||||
?>
|
?>
|
||||||
<style>
|
<style>
|
||||||
.modal {
|
.modal {
|
||||||
padding-right: 35% ! important;
|
/* padding-right: 35% ! important; */
|
||||||
}
|
}
|
||||||
|
|
||||||
.dataTables_paginate {
|
.dataTables_paginate {
|
||||||
@ -425,7 +425,7 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="page-title-box page-title-box-alt">
|
<div class="page-title-box page-title-box-alt">
|
||||||
<h4><?= "Amended Capital Purchase Order - $PONO "; ?></h4>
|
<h4><?= "Amended Capital Purchase - $PONO "; ?></h4>
|
||||||
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
|
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -618,7 +618,7 @@
|
|||||||
<label>Purchase Order Date</label>
|
<label>Purchase Order Date</label>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
$data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
@ -1373,7 +1373,7 @@
|
|||||||
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
|
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
|
||||||
|
|
||||||
|
|
||||||
<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
|
<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';" style="margin-right:10px">
|
||||||
<a class="btn btn-success Save" ID="Submit" onclick="Save()"> <span class="bold">Submit</span></a>
|
<a class="btn btn-success Save" ID="Submit" onclick="Save()"> <span class="bold">Submit</span></a>
|
||||||
|
|
||||||
|
|
||||||
@ -1475,7 +1475,7 @@
|
|||||||
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
|
|
||||||
<div class="form-group col-md-4">
|
<div class="form-group col-md-2">
|
||||||
<label>Req No</label>
|
<label>Req No</label>
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
@ -1496,7 +1496,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-4">
|
<div class="form-group col-md-2">
|
||||||
<label>Department Name</label>
|
<label>Department Name</label>
|
||||||
<div>
|
<div>
|
||||||
<?php
|
<?php
|
||||||
@ -1507,7 +1507,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="form-group col-md-4">
|
<div class="form-group col-md-2">
|
||||||
<label>Cost Center Code</label>
|
<label>Cost Center Code</label>
|
||||||
<div>
|
<div>
|
||||||
<?php
|
<?php
|
||||||
@ -1518,7 +1518,7 @@
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-4">
|
<div class="form-group col-md-2">
|
||||||
<label>Avail Bud Amount<?php echo "($INR)" ?></label>
|
<label>Avail Bud Amount<?php echo "($INR)" ?></label>
|
||||||
<?php
|
<?php
|
||||||
$data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true');
|
$data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true');
|
||||||
@ -1585,10 +1585,10 @@
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
|
||||||
<div id="EDITCAPdiv">
|
<div id="EDITCAPdiv">
|
||||||
<div class="form-row"> <!--<div class="form-group col-md-4">
|
<div class="form-row">
|
||||||
</div>-->
|
<div class="form-group col-md-3">
|
||||||
|
</div>
|
||||||
<div class="form-group col-md-3">
|
<div class="form-group col-md-3">
|
||||||
<label>Discount Type </label>
|
<label>Discount Type </label>
|
||||||
<div>
|
<div>
|
||||||
@ -1626,6 +1626,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
|
<div class="form-group col-md-3">
|
||||||
|
</div>
|
||||||
<div class="form-group col-md-3">
|
<div class="form-group col-md-3">
|
||||||
<label>Freight Type </label>
|
<label>Freight Type </label>
|
||||||
<?php
|
<?php
|
||||||
@ -1732,7 +1734,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
|
<div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
|
||||||
<div class="col-md-9" align="right">
|
<div class="form-group col-md-9" align="right">
|
||||||
<label>Other Allowances <?php echo "($INR)" ?></label>
|
<label>Other Allowances <?php echo "($INR)" ?></label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -1743,8 +1745,8 @@
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" id="EDITCAPdiv4" style="display:block;"><!--EDITCAPdiv4 -->
|
<div class="form-row" id="EDITCAPdiv4" style="display:flex;"><!--EDITCAPdiv4 -->
|
||||||
<div class="col-md-9" align="right">
|
<div class="form-group col-md-9" align="right">
|
||||||
<label>Total Order Value <?php echo "($INR)" ?></label>
|
<label>Total Order Value <?php echo "($INR)" ?></label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -2051,10 +2053,9 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-row" style="text-align: left;">
|
<div class="form-row" style="text-align: left;">
|
||||||
<div class="form-group">
|
<div class="form-group col-md-11">
|
||||||
<label>Capital Description </label>
|
<label>Capital Description </label>
|
||||||
<?php
|
<?php
|
||||||
$data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
$data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
||||||
@ -2064,7 +2065,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
|
||||||
<a class="btn btn-success font EditCapital" ID="UpdateCapital"> <span class="bold">Update Capital</span></a>
|
<a class="btn btn-success font EditCapital" ID="UpdateCapital"> <span class="bold">Update Capital</span></a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@ -2315,6 +2316,7 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -2323,6 +2325,7 @@
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2363,6 +2366,8 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -2371,6 +2376,7 @@
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -3183,6 +3189,7 @@
|
|||||||
formData.append('PaymentMethod', PaymentMethod);
|
formData.append('PaymentMethod', PaymentMethod);
|
||||||
formData.append('PayableAT', PayableAT);
|
formData.append('PayableAT', PayableAT);
|
||||||
formData.append('PaymentDate', PaymentDate);
|
formData.append('PaymentDate', PaymentDate);
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate,
|
// data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate,
|
||||||
@ -3195,7 +3202,7 @@
|
|||||||
// console.log(data);
|
// console.log(data);
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
@ -3204,7 +3211,7 @@
|
|||||||
window.location = "amendmentpurchaseorder";
|
window.location = "amendmentpurchaseorder";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3642,7 +3649,7 @@
|
|||||||
|
|
||||||
|
|
||||||
populateValueMainFormForEditCapitalTax();
|
populateValueMainFormForEditCapitalTax();
|
||||||
|
$('#EDITCAPITAL').modal('hide');
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -3751,6 +3751,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -3759,6 +3761,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -3799,6 +3802,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -3807,6 +3811,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -5128,6 +5133,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
@ -5136,6 +5142,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
alert(data);
|
alert(data);
|
||||||
@ -5677,6 +5685,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -5685,6 +5695,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -5790,7 +5801,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
//alert('else');
|
//alert('else');
|
||||||
|
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
//alert('ss');
|
//alert('ss');
|
||||||
var formData = new FormData($('.CapitalPO')[0]);
|
var formData = new FormData($('.CapitalPO')[0]);
|
||||||
formData.append('ExchangeRateOn', ExchangeRateOn);
|
formData.append('ExchangeRateOn', ExchangeRateOn);
|
||||||
@ -5813,6 +5824,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
url: "<?php echo base_url() ?>purchaseorder/EditCapitalPurchaseOrder",
|
url: "<?php echo base_url() ?>purchaseorder/EditCapitalPurchaseOrder",
|
||||||
|
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
// console.log(data);
|
// console.log(data);
|
||||||
alert(data);
|
alert(data);
|
||||||
@ -6196,8 +6208,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
var Assessable = $("#EditAfterAssessable").val();
|
var Assessable = $("#EditAfterAssessable").val();
|
||||||
var SubTotal = $("#EditSubtotal").val();
|
var SubTotal = $("#EditSubtotal").val();
|
||||||
var Igst = $("#EditIgstInt").val();
|
// var Igst = $("#EditIgstInt").val();
|
||||||
var AfterIgst = $("#EditAfterIgstInt").val();
|
// var AfterIgst = $("#EditAfterIgstInt").val();
|
||||||
var DutyImpact = $("#EditDutyImpact").val();
|
var DutyImpact = $("#EditDutyImpact").val();
|
||||||
var ClearingCharges = $('#EditClearingCharges').val();
|
var ClearingCharges = $('#EditClearingCharges').val();
|
||||||
var Nett = $('#EditNett').val();
|
var Nett = $('#EditNett').val();
|
||||||
|
|||||||
@ -554,7 +554,7 @@ function keyValidate(e)
|
|||||||
var rd = v;
|
var rd = v;
|
||||||
if(rd != '')
|
if(rd != '')
|
||||||
{
|
{
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:rd},
|
data:{param1:rd},
|
||||||
@ -586,10 +586,12 @@ function keyValidate(e)
|
|||||||
}
|
}
|
||||||
else{$('#description').val('0'+'-'+'0');}
|
else{$('#description').val('0'+'-'+'0');}
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert('No Power Consumption OR Start and Stop Data Available');
|
alert('No Power Consumption OR Start and Stop Data Available');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1533,6 +1533,8 @@ function appendFilesFileds(data) {
|
|||||||
|
|
||||||
function removeContact(button) {
|
function removeContact(button) {
|
||||||
if (button.id != '') {
|
if (button.id != '') {
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: button.id
|
id: button.id
|
||||||
@ -1540,6 +1542,8 @@ function removeContact(button) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url();?>deleteEmployeeFile",
|
url: "<?php echo base_url();?>deleteEmployeeFile",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
alert("File removed");
|
alert("File removed");
|
||||||
return false;
|
return false;
|
||||||
@ -1566,6 +1570,7 @@ $("#email").change(function() {
|
|||||||
|
|
||||||
var id = $('#email').val();
|
var id = $('#email').val();
|
||||||
if (validateEmail()) {
|
if (validateEmail()) {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1574,6 +1579,7 @@ $("#email").change(function() {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url();?>employeedetails/CheckEmail",
|
url: "<?php echo base_url();?>employeedetails/CheckEmail",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data + "" +
|
alert(data + "" +
|
||||||
" Employee already exists in the database.Please Change the mail id");
|
" Employee already exists in the database.Please Change the mail id");
|
||||||
@ -1590,6 +1596,7 @@ $('#panno').change(function() {
|
|||||||
|
|
||||||
var id = $('#panno').val();
|
var id = $('#panno').val();
|
||||||
if (id != '') {
|
if (id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1598,6 +1605,7 @@ $('#panno').change(function() {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url();?>employeedetails/checkPAN",
|
url: "<?php echo base_url();?>employeedetails/checkPAN",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data + "" +
|
alert(data + "" +
|
||||||
" Employee already exists in the database.Please Change the Pan Card Number"
|
" Employee already exists in the database.Please Change the Pan Card Number"
|
||||||
@ -1617,6 +1625,7 @@ $('#aadharno').change(function() {
|
|||||||
|
|
||||||
var id = $('#aadharno').val();
|
var id = $('#aadharno').val();
|
||||||
if (id != '') {
|
if (id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1624,6 +1633,7 @@ $('#aadharno').change(function() {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url();?>employeedetails/checkAadharNo",
|
url: "<?php echo base_url();?>employeedetails/checkAadharNo",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data + "" +
|
alert(data + "" +
|
||||||
" Employee already exists in the database.Please Change the Aadhar card Number"
|
" Employee already exists in the database.Please Change the Aadhar card Number"
|
||||||
|
|||||||
@ -1597,6 +1597,7 @@ if (!empty($EmpDetails)) {
|
|||||||
|
|
||||||
function removeContact(button) {
|
function removeContact(button) {
|
||||||
if (button.id != '') {
|
if (button.id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: button.id
|
id: button.id
|
||||||
@ -1604,6 +1605,7 @@ if (!empty($EmpDetails)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>deleteEmployeeFile",
|
url: "<?php echo base_url(); ?>deleteEmployeeFile",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert("File removed");
|
alert("File removed");
|
||||||
return false;
|
return false;
|
||||||
@ -1630,6 +1632,8 @@ if (!empty($EmpDetails)) {
|
|||||||
|
|
||||||
var id = $('#email').val();
|
var id = $('#email').val();
|
||||||
if (validateEmail()) {
|
if (validateEmail()) {
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1638,6 +1642,8 @@ if (!empty($EmpDetails)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>employeedetails/CheckEmail",
|
url: "<?php echo base_url(); ?>employeedetails/CheckEmail",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data + "" +
|
alert(data + "" +
|
||||||
" Employee already exists in the database.Please Change the mail id");
|
" Employee already exists in the database.Please Change the mail id");
|
||||||
@ -1654,6 +1660,7 @@ if (!empty($EmpDetails)) {
|
|||||||
|
|
||||||
var id = $('#panno').val();
|
var id = $('#panno').val();
|
||||||
if (id != '') {
|
if (id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1662,6 +1669,7 @@ if (!empty($EmpDetails)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>employeedetails/checkPAN",
|
url: "<?php echo base_url(); ?>employeedetails/checkPAN",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data + "" +
|
alert(data + "" +
|
||||||
" Employee already exists in the database.Please Change the Pan Card Number"
|
" Employee already exists in the database.Please Change the Pan Card Number"
|
||||||
@ -1681,6 +1689,7 @@ if (!empty($EmpDetails)) {
|
|||||||
|
|
||||||
var id = $('#aadharno').val();
|
var id = $('#aadharno').val();
|
||||||
if (id != '') {
|
if (id != '') {
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -1688,6 +1697,7 @@ if (!empty($EmpDetails)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>employeedetails/checkAadharNo",
|
url: "<?php echo base_url(); ?>employeedetails/checkAadharNo",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data + "" +
|
alert(data + "" +
|
||||||
" Employee already exists in the database.Please Change the Aadhar card Number"
|
" Employee already exists in the database.Please Change the Aadhar card Number"
|
||||||
@ -1801,6 +1811,7 @@ if (!empty($EmpDetails)) {
|
|||||||
console.log('Form Data Prepared:', combinedFormData); // Log for debugging
|
console.log('Form Data Prepared:', combinedFormData); // Log for debugging
|
||||||
|
|
||||||
// Send the combined data via AJAX
|
// Send the combined data via AJAX
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: '<?php echo base_url() ?>employeedetails/UpdateEmployee', // Replace with your form submission URL
|
url: '<?php echo base_url() ?>employeedetails/UpdateEmployee', // Replace with your form submission URL
|
||||||
@ -1808,9 +1819,7 @@ if (!empty($EmpDetails)) {
|
|||||||
processData: false, // Prevent jQuery from processing the data
|
processData: false, // Prevent jQuery from processing the data
|
||||||
contentType: false, // Prevent jQuery from setting the content type
|
contentType: false, // Prevent jQuery from setting the content type
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
console.log(response);
|
$('#loader').hide();
|
||||||
|
|
||||||
console.log('Form submitted successfully:', response == 'true');
|
|
||||||
if (response == 'true') {
|
if (response == 'true') {
|
||||||
window.location.href = '<?php echo base_url("employeeListing"); ?>';
|
window.location.href = '<?php echo base_url("employeeListing"); ?>';
|
||||||
} else {
|
} else {
|
||||||
@ -1818,6 +1827,7 @@ if (!empty($EmpDetails)) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(error) {
|
error: function(error) {
|
||||||
|
$('#loader').hide();
|
||||||
console.log('Form submission failed:', error);
|
console.log('Form submission failed:', error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -2749,6 +2749,7 @@ $('#rawmaterialcode').change(function()
|
|||||||
|
|
||||||
var materialcode = $('#rawmaterialcode').val();
|
var materialcode = $('#rawmaterialcode').val();
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -2756,6 +2757,7 @@ $('#rawmaterialcode').change(function()
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/get_Product_Supplier",
|
url:"<?php echo base_url() ?>batchcard/get_Product_Supplier",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -2802,6 +2804,7 @@ $('#rawmaterialcode').change(function()
|
|||||||
|
|
||||||
if(rawSupplier !=0)
|
if(rawSupplier !=0)
|
||||||
{
|
{
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -2809,6 +2812,7 @@ $('#rawmaterialcode').change(function()
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -2866,6 +2870,7 @@ $('#rawSupplier').change(function()
|
|||||||
var type = "rawmaterial";
|
var type = "rawmaterial";
|
||||||
if(rawSupplier !=0)
|
if(rawSupplier !=0)
|
||||||
{
|
{
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -2873,6 +2878,7 @@ $('#rawSupplier').change(function()
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -2916,6 +2922,7 @@ $('#consumaterialcode').change(function()
|
|||||||
var materialcode = $('#consumaterialcode').val();
|
var materialcode = $('#consumaterialcode').val();
|
||||||
|
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -2923,6 +2930,7 @@ $('#consumaterialcode').change(function()
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/get_Product_Supplier",
|
url:"<?php echo base_url() ?>batchcard/get_Product_Supplier",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -2970,6 +2978,7 @@ $('#consumaterialcode').change(function()
|
|||||||
if(consusupplier !=0)
|
if(consusupplier !=0)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -2978,6 +2987,7 @@ $('#consumaterialcode').change(function()
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3039,6 +3049,7 @@ $('#consuSupplier').change(function()
|
|||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -3046,6 +3057,7 @@ $('#consuSupplier').change(function()
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3089,6 +3101,7 @@ $('#packumaterialcode').change(function()
|
|||||||
|
|
||||||
var materialcode = $('#packumaterialcode').val();
|
var materialcode = $('#packumaterialcode').val();
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -3096,6 +3109,7 @@ $.ajax({
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/get_Product_Supplier",
|
url:"<?php echo base_url() ?>batchcard/get_Product_Supplier",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3148,6 +3162,7 @@ $.ajax({
|
|||||||
if(packSupplier !=0)
|
if(packSupplier !=0)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -3155,6 +3170,7 @@ $.ajax({
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3370,7 +3386,7 @@ function ResultantQty(materialtype)
|
|||||||
//alert(today)
|
//alert(today)
|
||||||
//today = mm+'-'+dd+'-'+yyyy;
|
//today = mm+'-'+dd+'-'+yyyy;
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:materialcode,Supplier:supplier,date:today},
|
data:{materialcode:materialcode,Supplier:supplier,date:today},
|
||||||
@ -3379,7 +3395,7 @@ function ResultantQty(materialtype)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var qty= '';
|
var qty= '';
|
||||||
var addqty = 0;
|
var addqty = 0;
|
||||||
@ -3476,6 +3492,7 @@ function ResultantQty(materialtype)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -3483,6 +3500,7 @@ function ResultantQty(materialtype)
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3567,7 +3585,7 @@ function ResultantQty(materialtype)
|
|||||||
//alert(today)
|
//alert(today)
|
||||||
//today = mm+'-'+dd+'-'+yyyy;
|
//today = mm+'-'+dd+'-'+yyyy;
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:materialcode,Supplier:supplier,date:today},
|
data:{materialcode:materialcode,Supplier:supplier,date:today},
|
||||||
@ -3576,7 +3594,7 @@ function ResultantQty(materialtype)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var qty= '';
|
var qty= '';
|
||||||
var addqty = 0;
|
var addqty = 0;
|
||||||
@ -3664,6 +3682,7 @@ function ResultantQty(materialtype)
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -3672,6 +3691,7 @@ function ResultantQty(materialtype)
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3756,7 +3776,7 @@ function ResultantQty(materialtype)
|
|||||||
//alert(today)
|
//alert(today)
|
||||||
//today = mm+'-'+dd+'-'+yyyy;
|
//today = mm+'-'+dd+'-'+yyyy;
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:materialcode,Supplier:supplier,date:today},
|
data:{materialcode:materialcode,Supplier:supplier,date:today},
|
||||||
@ -3765,7 +3785,7 @@ function ResultantQty(materialtype)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var qty= '';
|
var qty= '';
|
||||||
var addqty = 0;
|
var addqty = 0;
|
||||||
@ -3853,6 +3873,7 @@ function ResultantQty(materialtype)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -3860,6 +3881,7 @@ function ResultantQty(materialtype)
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
@ -3937,7 +3959,7 @@ function EditResultantQty(materialtype)
|
|||||||
//alert(today)
|
//alert(today)
|
||||||
//today = mm+'-'+dd+'-'+yyyy;
|
//today = mm+'-'+dd+'-'+yyyy;
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
|
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
|
||||||
@ -3946,7 +3968,7 @@ function EditResultantQty(materialtype)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var qty= '';
|
var qty= '';
|
||||||
var addqty = 0;
|
var addqty = 0;
|
||||||
@ -4030,7 +4052,7 @@ function EditResultantQty(materialtype)
|
|||||||
//alert(today)
|
//alert(today)
|
||||||
//today = mm+'-'+dd+'-'+yyyy;
|
//today = mm+'-'+dd+'-'+yyyy;
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
|
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
|
||||||
@ -4039,7 +4061,7 @@ function EditResultantQty(materialtype)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var qty= '';
|
var qty= '';
|
||||||
var addqty = 0;
|
var addqty = 0;
|
||||||
@ -4123,7 +4145,7 @@ function EditResultantQty(materialtype)
|
|||||||
//alert(today)
|
//alert(today)
|
||||||
//today = mm+'-'+dd+'-'+yyyy;
|
//today = mm+'-'+dd+'-'+yyyy;
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
|
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
|
||||||
@ -4132,7 +4154,7 @@ function EditResultantQty(materialtype)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
var qty= '';
|
var qty= '';
|
||||||
var addqty = 0;
|
var addqty = 0;
|
||||||
@ -4192,7 +4214,7 @@ function Save()
|
|||||||
var date=$('#Date').val();
|
var date=$('#Date').val();
|
||||||
var newdate = date.split("-").reverse().join("-");
|
var newdate = date.split("-").reverse().join("-");
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:$('.final_product').serialize()+"&Date="+newdate,
|
data:$('.final_product').serialize()+"&Date="+newdate,
|
||||||
@ -4203,7 +4225,7 @@ function Save()
|
|||||||
{
|
{
|
||||||
|
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
window.location = "FinalProductlisting";
|
window.location = "FinalProductlisting";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1895,6 +1895,8 @@ if (!empty($RequistionDetails)) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -1903,6 +1905,8 @@ if (!empty($RequistionDetails)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2917,7 +2921,7 @@ if (!empty($RequistionDetails)) {
|
|||||||
$('#Deliverydt').focus();
|
$('#Deliverydt').focus();
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
var formData = new FormData($('.ImportPO')[0]);
|
var formData = new FormData($('.ImportPO')[0]);
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -2929,6 +2933,8 @@ if (!empty($RequistionDetails)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO",
|
url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|||||||
@ -691,7 +691,7 @@ function calculateMaster1(id,pid)
|
|||||||
formData.append('param16',param16);
|
formData.append('param16',param16);
|
||||||
formData.append('param17',param17);
|
formData.append('param17',param17);
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:formData,
|
data:formData,
|
||||||
//dataType:"json",{param1:testreportdata,param2:testloidata,param3:testafsdata,param4:invoiceno,param5:batchno,param6:approvedby,param7:fullQuality}
|
//dataType:"json",{param1:testreportdata,param2:testloidata,param3:testafsdata,param4:invoiceno,param5:batchno,param6:approvedby,param7:fullQuality}
|
||||||
@ -704,7 +704,7 @@ function calculateMaster1(id,pid)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data){
|
if(data){
|
||||||
alert(data);
|
alert(data);
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
window.location = "<?php echo base_url().'inprocess';?>";
|
window.location = "<?php echo base_url().'inprocess';?>";
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -198,7 +198,7 @@ if (!empty($EmpList)) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
Eid: Eid
|
Eid: Eid
|
||||||
@ -208,7 +208,7 @@ if (!empty($EmpList)) {
|
|||||||
url: "<?php echo base_url() ?>user/Adduserdepartment",
|
url: "<?php echo base_url() ?>user/Adduserdepartment",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
|
|
||||||
@ -217,7 +217,7 @@ if (!empty($EmpList)) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -257,7 +257,7 @@ if (!empty($EmpList)) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
Eid: Eid
|
Eid: Eid
|
||||||
@ -266,7 +266,7 @@ if (!empty($EmpList)) {
|
|||||||
url: "<?php echo base_url() ?>user/Deleteuserdepartment",
|
url: "<?php echo base_url() ?>user/Deleteuserdepartment",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ if (!empty($EmpList)) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
//$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -304,6 +304,7 @@ if (!empty($assetList)) {
|
|||||||
// alert(PONO);
|
// alert(PONO);
|
||||||
if (PONO) {
|
if (PONO) {
|
||||||
//alert("INSIDE IF");
|
//alert("INSIDE IF");
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url() ?>assetdetails/getpodetails",
|
url: "<?php echo base_url() ?>assetdetails/getpodetails",
|
||||||
@ -330,6 +331,7 @@ if (!empty($assetList)) {
|
|||||||
|
|
||||||
$('#MaterialCode').append(line);
|
$('#MaterialCode').append(line);
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -353,6 +355,8 @@ if (!empty($assetList)) {
|
|||||||
|
|
||||||
//line +='<option>select Material Code</option>'
|
//line +='<option>select Material Code</option>'
|
||||||
if (line) {
|
if (line) {
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url() ?>assetdetails/getline",
|
url: "<?php echo base_url() ?>assetdetails/getline",
|
||||||
@ -391,14 +395,6 @@ if (!empty($assetList)) {
|
|||||||
$('#depcode').val(item.Departmentcode);
|
$('#depcode').val(item.Departmentcode);
|
||||||
$('#AssetDept').val(item.DepartmentName);
|
$('#AssetDept').val(item.DepartmentName);
|
||||||
|
|
||||||
console.log("supplier information");
|
|
||||||
console.log(item.SupplierName);
|
|
||||||
console.log(item.SupplierID);
|
|
||||||
|
|
||||||
console.log("department information");
|
|
||||||
console.log(item.DepartmentName);
|
|
||||||
console.log(item.Departmentcode);
|
|
||||||
|
|
||||||
$('#PODescription').val(item.MaterialName);
|
$('#PODescription').val(item.MaterialName);
|
||||||
|
|
||||||
$('#Assetvalue').val(item.TotalValue);
|
$('#Assetvalue').val(item.TotalValue);
|
||||||
@ -413,6 +409,7 @@ if (!empty($assetList)) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
//line ='<option>'+item.LineItemNo+'</option>';
|
//line ='<option>'+item.LineItemNo+'</option>';
|
||||||
|
|
||||||
|
|||||||
@ -844,12 +844,15 @@ $("#save").click(function(){
|
|||||||
|
|
||||||
if(calculateSalary())
|
if(calculateSalary())
|
||||||
{
|
{
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:$("#editpayslip").serialize(),
|
data:$("#editpayslip").serialize(),
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url();?>payslip/updatePayslip",
|
url:"<?php echo base_url();?>payslip/updatePayslip",
|
||||||
success:function(result) {
|
success:function(result) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(result)
|
if(result)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@ -355,7 +355,7 @@ if ($total <= $reorder) {
|
|||||||
//material = material.replace(/\s*$/,"");
|
//material = material.replace(/\s*$/,"");
|
||||||
var material = materialname.replace(/ /g, '');
|
var material = materialname.replace(/ /g, '');
|
||||||
//alert(m.length+" "+m+" "+s+" "+s.length);
|
//alert(m.length+" "+m+" "+s+" "+s.length);
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: material
|
id: material
|
||||||
@ -367,7 +367,7 @@ if ($total <= $reorder) {
|
|||||||
//alert(count);
|
//alert(count);
|
||||||
|
|
||||||
if (count > 2) {
|
if (count > 2) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert('Material name already existed ! ');
|
alert('Material name already existed ! ');
|
||||||
|
|
||||||
var related_name = "";
|
var related_name = "";
|
||||||
@ -380,13 +380,13 @@ if ($total <= $reorder) {
|
|||||||
alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name);
|
alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name);
|
||||||
$("#MaterialName").focus();
|
$("#MaterialName").focus();
|
||||||
} else {
|
} else {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert("empty data");
|
// alert("empty data");
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error Occur");
|
alert("Error Occur");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2330,6 +2330,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
var totalAmount = parseFloat($('#TotalOrderValue' + i).val());
|
var totalAmount = parseFloat($('#TotalOrderValue' + i).val());
|
||||||
var avalbudAmt = '';
|
var avalbudAmt = '';
|
||||||
//alert('before Ajax');
|
//alert('before Ajax');
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: costcode,
|
id: costcode,
|
||||||
@ -2338,6 +2339,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
avalbudAmt = parseFloat(data);
|
avalbudAmt = parseFloat(data);
|
||||||
// if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
|
// if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
|
||||||
@ -2402,7 +2404,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
//alert('final else for store data');
|
//alert('final else for store data');
|
||||||
// $('.content').loader('show');
|
// $('.content').loader('show');
|
||||||
var formData = new FormData($('.CreatePO')[0]);
|
var formData = new FormData($('.CreatePO')[0]);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// data:$('.CreatePO').serialize(),
|
// data:$('.CreatePO').serialize(),
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -2413,7 +2415,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
success: function(data) {
|
success: function(data) {
|
||||||
// console.log(data);
|
// console.log(data);
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('.content').loader('hide');
|
$('#loader').hide();
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
$('#txtStatus').val('');
|
$('#txtStatus').val('');
|
||||||
@ -2422,7 +2424,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
window.location = "amendmentpurchaseorder";
|
window.location = "amendmentpurchaseorder";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// $('.content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -455,6 +455,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -463,6 +464,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -496,6 +498,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -504,6 +507,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').show();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -4570,6 +4574,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
var basicAmountRate = parseFloat($('#basicval' + i).val());
|
var basicAmountRate = parseFloat($('#basicval' + i).val());
|
||||||
var totalAmount = parseFloat($('#TotalOrderValue' + i).val());
|
var totalAmount = parseFloat($('#TotalOrderValue' + i).val());
|
||||||
var avalbudAmt = '';
|
var avalbudAmt = '';
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: costcode,
|
id: costcode,
|
||||||
@ -4578,6 +4583,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').show();
|
||||||
if (data) {
|
if (data) {
|
||||||
//alert(data);
|
//alert(data);
|
||||||
avalbudAmt = parseFloat(data);
|
avalbudAmt = parseFloat(data);
|
||||||
@ -4665,7 +4671,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
DelRows = "0" + ":" + rowid;
|
DelRows = "0" + ":" + rowid;
|
||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -4673,6 +4679,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|
||||||
@ -4985,6 +4992,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
var formData = new FormData($('.CreatePO')[0]);
|
var formData = new FormData($('.CreatePO')[0]);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
|
url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
|
||||||
@ -4993,6 +5001,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
contentType: false,
|
contentType: false,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
// console.log(data);
|
// console.log(data);
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
@ -5222,7 +5231,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
formData.append('param1', param1);
|
formData.append('param1', param1);
|
||||||
formData.append('param2', param2);
|
formData.append('param2', param2);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -5232,7 +5241,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
processData: false,
|
processData: false,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
console.log(data);
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
// $('#spl').find('td').eq(5).text(filename[2]);
|
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||||
@ -5266,7 +5275,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
formData.append('param6', param6);
|
formData.append('param6', param6);
|
||||||
formData.append('param7', param7);
|
formData.append('param7', param7);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -5276,7 +5285,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
processData: false,
|
processData: false,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
console.log(data);
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
// $('#spl').find('td').eq(5).text(filename[2]);
|
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||||
@ -5300,7 +5309,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
formData.append('PONO', PONO);
|
formData.append('PONO', PONO);
|
||||||
formData.append('count', counter);
|
formData.append('count', counter);
|
||||||
formData.append('igr', igr);
|
formData.append('igr', igr);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -5310,7 +5319,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
processData: false,
|
processData: false,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
console.log(data);
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
// $('#spl').find('td').eq(5).text(filename[2]);
|
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||||
|
|||||||
@ -405,6 +405,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -413,6 +414,8 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -448,6 +451,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var d = $('#drpSupplier').val();
|
var d = $('#drpSupplier').val();
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -456,6 +460,8 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
materialcode: id
|
materialcode: id
|
||||||
},
|
},
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2028,6 +2034,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -2036,9 +2043,10 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2205,6 +2213,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
} else {
|
} else {
|
||||||
// $('#content').loader('show');
|
// $('#content').loader('show');
|
||||||
var formData = new FormData($('.ServicePO')[0]);
|
var formData = new FormData($('.ServicePO')[0]);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// data: $('.ServicePO').serialize(),
|
// data: $('.ServicePO').serialize(),
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -2214,7 +2223,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
contentType: false,
|
contentType: false,
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
@ -2223,7 +2232,7 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
$('#txtDeliveryAddress').val('')
|
$('#txtDeliveryAddress').val('')
|
||||||
window.location = "amendmentpurchaseorder";
|
window.location = "amendmentpurchaseorder";
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -524,7 +524,7 @@ if (!empty($supplier)) {
|
|||||||
$('#supplierName').change(function() {
|
$('#supplierName').change(function() {
|
||||||
var suppliername = $('#supplierName').val();
|
var suppliername = $('#supplierName').val();
|
||||||
var supplier = suppliername.replace(/ /g, '');
|
var supplier = suppliername.replace(/ /g, '');
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?= base_url() . 'supplierExist' ?>",
|
url: "<?= base_url() . 'supplierExist' ?>",
|
||||||
@ -534,7 +534,7 @@ if (!empty($supplier)) {
|
|||||||
success: function(data) {
|
success: function(data) {
|
||||||
var count = data.length;
|
var count = data.length;
|
||||||
if (count > 2) {
|
if (count > 2) {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert('supplier already existed ! ');
|
alert('supplier already existed ! ');
|
||||||
var related_supplier = "";
|
var related_supplier = "";
|
||||||
$.each(data, function(i, obj) {
|
$.each(data, function(i, obj) {
|
||||||
@ -543,13 +543,13 @@ if (!empty($supplier)) {
|
|||||||
alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier);
|
alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier);
|
||||||
$("#supplierName").focus();
|
$("#supplierName").focus();
|
||||||
} else {
|
} else {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert('This is New Supplier! ');
|
// alert('This is New Supplier! ');
|
||||||
}
|
}
|
||||||
console.log(data);
|
console.log(data);
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert("Error Occur");
|
// alert("Error Occur");
|
||||||
console.log("an error occur supplierExist")
|
console.log("an error occur supplierExist")
|
||||||
|
|
||||||
|
|||||||
@ -824,13 +824,15 @@ function Save()
|
|||||||
var newdate = date.split("-").reverse().join("-");
|
var newdate = date.split("-").reverse().join("-");
|
||||||
|
|
||||||
//alert(newdate)
|
//alert(newdate)
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:$('.action_report').serialize()+"&txtactionrow="+txtactionrow+"&txtrootrow="+txtrootrow+"&txtcounterrow="+txtcounterrow+"&ncrstatus="+ncrstatus+"&newdate="+newdate,
|
data:$('.action_report').serialize()+"&txtactionrow="+txtactionrow+"&txtrootrow="+txtrootrow+"&txtcounterrow="+txtcounterrow+"&ncrstatus="+ncrstatus+"&newdate="+newdate,
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>purchaseorder/UpdateAction_Report",
|
url:"<?php echo base_url() ?>purchaseorder/UpdateAction_Report",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -1046,6 +1048,7 @@ function DeleteactionRow(rowId)
|
|||||||
$('#target'+rowId).val('')
|
$('#target'+rowId).val('')
|
||||||
|
|
||||||
//alert(delactionId)
|
//alert(delactionId)
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -1053,6 +1056,8 @@ function DeleteactionRow(rowId)
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>purchaseorder/DeleteAction_Report",
|
url:"<?php echo base_url() ?>purchaseorder/DeleteAction_Report",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
alert(data);
|
alert(data);
|
||||||
@ -1084,6 +1089,7 @@ function DeleteRootRow(rowId)
|
|||||||
tr.parentNode.removeChild(tr);
|
tr.parentNode.removeChild(tr);
|
||||||
|
|
||||||
// alert(delactionId)
|
// alert(delactionId)
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -1091,6 +1097,8 @@ function DeleteRootRow(rowId)
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>purchaseorder/DeleteRoot_Cause",
|
url:"<?php echo base_url() ?>purchaseorder/DeleteRoot_Cause",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
alert(data);
|
alert(data);
|
||||||
@ -1121,6 +1129,7 @@ function DeleteCounterRow(rowId)
|
|||||||
$('#countertarget'+rowId).val('');
|
$('#countertarget'+rowId).val('');
|
||||||
|
|
||||||
//alert(delactionId)
|
//alert(delactionId)
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
@ -1128,6 +1137,8 @@ function DeleteCounterRow(rowId)
|
|||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>purchaseorder/DeleteCounter_Row",
|
url:"<?php echo base_url() ?>purchaseorder/DeleteCounter_Row",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|||||||
@ -24,10 +24,8 @@ $UOM = '';
|
|||||||
$MaterialName = '';
|
$MaterialName = '';
|
||||||
$DeliveryDate = '';
|
$DeliveryDate = '';
|
||||||
$DDate = '';
|
$DDate = '';
|
||||||
if(!empty($assetList))
|
if (!empty($assetList)) {
|
||||||
{
|
foreach ($assetList as $Asset) {
|
||||||
foreach ($assetList as $Asset)
|
|
||||||
{
|
|
||||||
//print_r($Asset);die();
|
//print_r($Asset);die();
|
||||||
$AssetCode = $Asset->AssetCode;
|
$AssetCode = $Asset->AssetCode;
|
||||||
$AssetName = $Asset->AssetName;
|
$AssetName = $Asset->AssetName;
|
||||||
@ -42,16 +40,14 @@ if(!empty($assetList))
|
|||||||
if ($DateOfPurchase != '' && $DateOfPurchase != '0000-00-00 00:00:00') {
|
if ($DateOfPurchase != '' && $DateOfPurchase != '0000-00-00 00:00:00') {
|
||||||
$PODate = new DateTime($DateOfPurchase);
|
$PODate = new DateTime($DateOfPurchase);
|
||||||
$DateOfPurchase = $PODate->format('d-m-Y');
|
$DateOfPurchase = $PODate->format('d-m-Y');
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$DateOfPurchase = '';
|
$DateOfPurchase = '';
|
||||||
}
|
}
|
||||||
$DateOfCommison = $Asset->DateOfCommison;
|
$DateOfCommison = $Asset->DateOfCommison;
|
||||||
if ($DateOfCommison != '' && $DateOfCommison != '0000-00-00 00:00:00') {
|
if ($DateOfCommison != '' && $DateOfCommison != '0000-00-00 00:00:00') {
|
||||||
$DateOfCommission = new DateTime($Asset->DateOfCommison, new DateTimeZone('Asia/Kolkata'));
|
$DateOfCommission = new DateTime($Asset->DateOfCommison, new DateTimeZone('Asia/Kolkata'));
|
||||||
$DateOfCommison = $DateOfCommission->format('d-m-Y');
|
$DateOfCommison = $DateOfCommission->format('d-m-Y');
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$DateOfCommison = '';
|
$DateOfCommison = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,21 +64,16 @@ if(!empty($assetList))
|
|||||||
if ($DDt != '' && $DDt != '0000-00-00 00:00:00') {
|
if ($DDt != '' && $DDt != '0000-00-00 00:00:00') {
|
||||||
$DDate = new DateTime($DDt, new DateTimeZone('Asia/Kolkata'));
|
$DDate = new DateTime($DDt, new DateTimeZone('Asia/Kolkata'));
|
||||||
$DeliveryDate = $DDate->format('d-m-Y');
|
$DeliveryDate = $DDate->format('d-m-Y');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$DeliveryDate = '';
|
$DeliveryDate = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$Remarks = $Asset->Remarks;
|
$Remarks = $Asset->Remarks;
|
||||||
$chk = $Asset->IsActive;
|
$chk = $Asset->IsActive;
|
||||||
|
|
||||||
if($chk == 1)
|
if ($chk == 1) {
|
||||||
{
|
|
||||||
$IsActive = 'checked';
|
$IsActive = 'checked';
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$IsActive = '';
|
$IsActive = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,10 +138,8 @@ if(!empty($assetList))
|
|||||||
<label class="col-form-label" for="PONO">Purchase Order Number<span class="badge">*</span></label>
|
<label class="col-form-label" for="PONO">Purchase Order Number<span class="badge">*</span></label>
|
||||||
<select class="form-control select2" id="PONO" name="PONO">
|
<select class="form-control select2" id="PONO" name="PONO">
|
||||||
<option value="<?php echo $PONO; ?>"><?php echo $PONO; ?></option>
|
<option value="<?php echo $PONO; ?>"><?php echo $PONO; ?></option>
|
||||||
<?php if(!empty($purchaseOrder))
|
<?php if (!empty($purchaseOrder)) {
|
||||||
{
|
foreach ($purchaseOrder as $order) { ?>
|
||||||
foreach($purchaseOrder as $order)
|
|
||||||
{ ?>
|
|
||||||
<option value="<?php echo $order->purchase_orderno; ?>"><?php echo $order->purchase_orderno; ?></option>
|
<option value="<?php echo $order->purchase_orderno; ?>"><?php echo $order->purchase_orderno; ?></option>
|
||||||
<?php }
|
<?php }
|
||||||
} ?>
|
} ?>
|
||||||
@ -160,10 +149,8 @@ if(!empty($assetList))
|
|||||||
<label class="col-form-label" for="Category">Asset Category<span class="badge">*</span></label>
|
<label class="col-form-label" for="Category">Asset Category<span class="badge">*</span></label>
|
||||||
<select class="form-control select2" id="Category" name="Category">
|
<select class="form-control select2" id="Category" name="Category">
|
||||||
<option value="<?php echo $Category; ?>"><?php echo $CategoryName; ?></option>
|
<option value="<?php echo $Category; ?>"><?php echo $CategoryName; ?></option>
|
||||||
<?php if(!empty($categories))
|
<?php if (!empty($categories)) {
|
||||||
{
|
foreach ($categories as $cat) { ?>
|
||||||
foreach($categories as $cat)
|
|
||||||
{ ?>
|
|
||||||
<option value="<?php echo $cat->id; ?>"><?php echo $cat->name; ?></option>
|
<option value="<?php echo $cat->id; ?>"><?php echo $cat->name; ?></option>
|
||||||
<?php }
|
<?php }
|
||||||
} ?>
|
} ?>
|
||||||
@ -195,10 +182,8 @@ if(!empty($assetList))
|
|||||||
<label class="col-form-label" for="Vendor">Vendor<span class="badge">*</span></label>
|
<label class="col-form-label" for="Vendor">Vendor<span class="badge">*</span></label>
|
||||||
<select class="form-control select2" id="Vendor" name="Vendor">
|
<select class="form-control select2" id="Vendor" name="Vendor">
|
||||||
<option value="<?php echo $Vendor; ?>"><?php echo $VendorName; ?></option>
|
<option value="<?php echo $Vendor; ?>"><?php echo $VendorName; ?></option>
|
||||||
<?php if(!empty($vendors))
|
<?php if (!empty($vendors)) {
|
||||||
{
|
foreach ($vendors as $vendor) { ?>
|
||||||
foreach($vendors as $vendor)
|
|
||||||
{ ?>
|
|
||||||
<option value="<?php echo $vendor->id; ?>"><?php echo $vendor->name; ?></option>
|
<option value="<?php echo $vendor->id; ?>"><?php echo $vendor->name; ?></option>
|
||||||
<?php }
|
<?php }
|
||||||
} ?>
|
} ?>
|
||||||
@ -223,10 +208,8 @@ if(!empty($assetList))
|
|||||||
<label class="col-form-label" for="AssetOwner">Asset Owner</label>
|
<label class="col-form-label" for="AssetOwner">Asset Owner</label>
|
||||||
<select class="form-control select2" id="AssetOwner" name="AssetOwner">
|
<select class="form-control select2" id="AssetOwner" name="AssetOwner">
|
||||||
<option value="<?php echo $AssetOwner; ?>"><?php echo $AssetOwnerName; ?></option>
|
<option value="<?php echo $AssetOwner; ?>"><?php echo $AssetOwnerName; ?></option>
|
||||||
<?php if(!empty($owners))
|
<?php if (!empty($owners)) {
|
||||||
{
|
foreach ($owners as $owner) { ?>
|
||||||
foreach($owners as $owner)
|
|
||||||
{ ?>
|
|
||||||
<option value="<?php echo $owner->id; ?>"><?php echo $owner->name; ?></option>
|
<option value="<?php echo $owner->id; ?>"><?php echo $owner->name; ?></option>
|
||||||
<?php }
|
<?php }
|
||||||
} ?>
|
} ?>
|
||||||
@ -283,7 +266,6 @@ if(!empty($assetList))
|
|||||||
<script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
|
<script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$("#PONO").select2();
|
$("#PONO").select2();
|
||||||
$("#SelectMaterialCode").select2();
|
$("#SelectMaterialCode").select2();
|
||||||
@ -316,11 +298,10 @@ $(function() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function isNumberKey(evt)
|
function isNumberKey(evt) {
|
||||||
{
|
|
||||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
if (charCode != 46 && charCode > 31
|
if (charCode != 46 && charCode > 31 &&
|
||||||
&& (charCode < 48 || charCode > 57))
|
(charCode < 48 || charCode > 57))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -344,6 +325,8 @@ $(function() {
|
|||||||
// alert(PONO);
|
// alert(PONO);
|
||||||
if (PONO) {
|
if (PONO) {
|
||||||
//alert("INSIDE IF");
|
//alert("INSIDE IF");
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url() ?>assetdetails/getpodetails",
|
url: "<?php echo base_url() ?>assetdetails/getpodetails",
|
||||||
@ -351,6 +334,7 @@ $(function() {
|
|||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
//alert(data);
|
//alert(data);
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
var line = '';
|
var line = '';
|
||||||
$('#SelectMaterialCode').empty();
|
$('#SelectMaterialCode').empty();
|
||||||
@ -388,6 +372,8 @@ $(function() {
|
|||||||
var line = $(this).val();
|
var line = $(this).val();
|
||||||
//line +='<option>select Material Code</option>'
|
//line +='<option>select Material Code</option>'
|
||||||
if (line) {
|
if (line) {
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url() ?>assetdetails/getline",
|
url: "<?php echo base_url() ?>assetdetails/getline",
|
||||||
@ -400,17 +386,13 @@ $(function() {
|
|||||||
if (id == item.LineItemNo) {
|
if (id == item.LineItemNo) {
|
||||||
|
|
||||||
$('#DateOfPurchase').val(item.PODate);
|
$('#DateOfPurchase').val(item.PODate);
|
||||||
if(item.DeliveryDate != null )
|
if (item.DeliveryDate != null) {
|
||||||
{
|
|
||||||
var date = new Date(item.DeliveryDate);
|
var date = new Date(item.DeliveryDate);
|
||||||
var date1 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear());
|
var date1 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear());
|
||||||
|
|
||||||
if(item.DeliveryDate == '0000-00-00' || item.DeliveryDate == '30-11--0001')
|
if (item.DeliveryDate == '0000-00-00' || item.DeliveryDate == '30-11--0001') {
|
||||||
{
|
|
||||||
$('#DeliveryDate').val('');
|
$('#DeliveryDate').val('');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
//alert(item.DeliveryDate+ ',' + date1);
|
//alert(item.DeliveryDate+ ',' + date1);
|
||||||
$("#DeliveryDate").val(date1);
|
$("#DeliveryDate").val(date1);
|
||||||
}
|
}
|
||||||
@ -418,9 +400,7 @@ $(function() {
|
|||||||
//var correctDate = [DDate.getDate(),DDate.getMonth()+1,DDate.getFullYear()].join("/");
|
//var correctDate = [DDate.getDate(),DDate.getMonth()+1,DDate.getFullYear()].join("/");
|
||||||
//alert(correctDate);
|
//alert(correctDate);
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$('#DeliveryDate').val('');
|
$('#DeliveryDate').val('');
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -444,6 +424,7 @@ $(function() {
|
|||||||
var date3 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear());
|
var date3 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear());
|
||||||
$("#DateOfPurchase").val(date3);
|
$("#DateOfPurchase").val(date3);
|
||||||
}
|
}
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
//line ='<option>'+item.LineItemNo+'</option>';
|
//line ='<option>'+item.LineItemNo+'</option>';
|
||||||
@ -458,5 +439,4 @@ $(function() {
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@ -278,7 +278,7 @@ function Save()
|
|||||||
var Remark = $('#Remark').val();
|
var Remark = $('#Remark').val();
|
||||||
var CId = $('#CId').val();
|
var CId = $('#CId').val();
|
||||||
//var remarks= $('#Remark').val();
|
//var remarks= $('#Remark').val();
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -288,7 +288,7 @@ function Save()
|
|||||||
url:"<?php echo base_url();?>purchaseorder/UpdateComplaint",
|
url:"<?php echo base_url();?>purchaseorder/UpdateComplaint",
|
||||||
success:function(data)
|
success:function(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -384,13 +384,15 @@ if (!empty($master)) {
|
|||||||
$(".editConfig").submit(function(e) {
|
$(".editConfig").submit(function(e) {
|
||||||
if (validate()) {
|
if (validate()) {
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: $('.editConfig').serialize(),
|
data: $('.editConfig').serialize(),
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
url: "<?php echo base_url(); ?>configurationctrl/configedit",
|
url: "<?php echo base_url(); ?>configurationctrl/configedit",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
//alert(data);
|
//alert(data);
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
$('#content').loader('hide');
|
$('#content').loader('hide');
|
||||||
//alert(data);
|
//alert(data);
|
||||||
|
|||||||
@ -275,7 +275,7 @@ function Save()
|
|||||||
var remarks= $('#Remark').val();
|
var remarks= $('#Remark').val();
|
||||||
var id= $('#enqid').val();
|
var id= $('#enqid').val();
|
||||||
//alert(id)
|
//alert(id)
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax(
|
$.ajax(
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -286,7 +286,7 @@ function Save()
|
|||||||
success:function(data)
|
success:function(data)
|
||||||
{
|
{
|
||||||
|
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -5176,6 +5176,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
DelRows = "0" + ":" + rowid;
|
DelRows = "0" + ":" + rowid;
|
||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
@ -5184,6 +5185,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
alert(data);
|
alert(data);
|
||||||
@ -5357,6 +5360,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
formData.append('txtRowCount', Row);
|
formData.append('txtRowCount', Row);
|
||||||
formData.append('txtDeletedRow', txtDeletedRow);
|
formData.append('txtDeletedRow', txtDeletedRow);
|
||||||
formData.append('textStatus', stat);
|
formData.append('textStatus', stat);
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// data:$('.ImportPO').serialize()+"&txtRowCount="+Row+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat,
|
// data:$('.ImportPO').serialize()+"&txtRowCount="+Row+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat,
|
||||||
data: formData,
|
data: formData,
|
||||||
@ -5366,6 +5371,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
|
url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
// console.log(data);
|
// console.log(data);
|
||||||
if (data) {
|
if (data) {
|
||||||
// // $('#content').loader('hide');
|
// // $('#content').loader('hide');
|
||||||
|
|||||||
@ -147,12 +147,15 @@ $('#merchant').autocomplete({
|
|||||||
var selectedvalue = $('input[name=merchant]').val();
|
var selectedvalue = $('input[name=merchant]').val();
|
||||||
if(selectedvalue != ' ' )
|
if(selectedvalue != ' ' )
|
||||||
{
|
{
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:selectedvalue},
|
data:{id:selectedvalue},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url();?>cashbook/getSupplierDtls",
|
url:"<?php echo base_url();?>cashbook/getSupplierDtls",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
var supplier_gstno = '';
|
var supplier_gstno = '';
|
||||||
if(data != '')
|
if(data != '')
|
||||||
{
|
{
|
||||||
@ -828,11 +831,15 @@ function GSTvalue(id)
|
|||||||
var id2= $('#id1').val();
|
var id2= $('#id1').val();
|
||||||
//alert(file);
|
//alert(file);
|
||||||
//alert(id2);
|
//alert(id2);
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:file,ide:id2},
|
data:{id:file,ide:id2},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>cashbook/deletefile",
|
url:"<?php echo base_url() ?>cashbook/deletefile",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data==1)
|
if(data==1)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#content').loader('hide');
|
||||||
@ -1031,7 +1038,7 @@ $('.AddSupplier').click(function()
|
|||||||
var alternatecont = $('#AlternateContactNumber').val();
|
var alternatecont = $('#AlternateContactNumber').val();
|
||||||
var email = $('#emailid').val();
|
var email = $('#emailid').val();
|
||||||
var Address = $('#Address').val();
|
var Address = $('#Address').val();
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
||||||
@ -1067,7 +1074,7 @@ $('.AddSupplier').click(function()
|
|||||||
//$("#supplier").append(html);
|
//$("#supplier").append(html);
|
||||||
alert(alertdata);
|
alert(alertdata);
|
||||||
$('#supplier option[value="<?php echo $supplier?>"]').prop('selected', true);
|
$('#supplier option[value="<?php echo $supplier?>"]').prop('selected', true);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
$('#Addsup').modal('hide');
|
$('#Addsup').modal('hide');
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -340,7 +340,7 @@ $('.getdetails').click(function()
|
|||||||
var materialcode =$('#materialcode').val();
|
var materialcode =$('#materialcode').val();
|
||||||
var date = $('#date').val();
|
var date = $('#date').val();
|
||||||
var Supplier = $('#supplier').val();
|
var Supplier = $('#supplier').val();
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data:{materialcode:materialcode,date:date,Supplier:Supplier},
|
data:{materialcode:materialcode,date:date,Supplier:Supplier},
|
||||||
@ -348,7 +348,7 @@ $('.getdetails').click(function()
|
|||||||
url:"<?php echo base_url();?>batchcard/getQuantity",
|
url:"<?php echo base_url();?>batchcard/getQuantity",
|
||||||
success:function(data)
|
success:function(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
//console.log(data);
|
//console.log(data);
|
||||||
var addqty = '';
|
var addqty = '';
|
||||||
var reduceqty = '';
|
var reduceqty = '';
|
||||||
|
|||||||
@ -531,8 +531,7 @@ td {
|
|||||||
if (id != '-1') {
|
if (id != '-1') {
|
||||||
|
|
||||||
if ((converttext != 'SERVICE')) {
|
if ((converttext != 'SERVICE')) {
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -541,7 +540,7 @@ td {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url(); ?>getMaterialDetails",
|
url: "<?php echo base_url(); ?>getMaterialDetails",
|
||||||
success: function(json) {
|
success: function(json) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
//alert(json.MatDetail);
|
//alert(json.MatDetail);
|
||||||
$("#Description").val(json.MatDetail[0]['MaterialName']);
|
$("#Description").val(json.MatDetail[0]['MaterialName']);
|
||||||
$("#UOM").val(json.MatDetail[0]['UOM']);
|
$("#UOM").val(json.MatDetail[0]['UOM']);
|
||||||
@ -551,7 +550,7 @@ td {
|
|||||||
} else {
|
} else {
|
||||||
$('#otherDescription').show();
|
$('#otherDescription').show();
|
||||||
}
|
}
|
||||||
//$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
} else {
|
} else {
|
||||||
alert('Please select the RequestType');
|
alert('Please select the RequestType');
|
||||||
return false;
|
return false;
|
||||||
@ -630,13 +629,14 @@ td {
|
|||||||
var servicePeriod = '';
|
var servicePeriod = '';
|
||||||
var noOfService = '';
|
var noOfService = '';
|
||||||
}
|
}
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: $('.requistion').serialize() + "&serviceSchedule=" + serviceSchedule + "&servicePeriod=" + servicePeriod + "&noOfService=" + noOfService,
|
data: $('.requistion').serialize() + "&serviceSchedule=" + serviceSchedule + "&servicePeriod=" + servicePeriod + "&noOfService=" + noOfService,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>EditRequisition",
|
url: "<?php echo base_url() ?>EditRequisition",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
@ -644,6 +644,8 @@ td {
|
|||||||
window.location = "Requisition";
|
window.location = "Requisition";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -720,7 +722,7 @@ td {
|
|||||||
DelRows = "0" + ":" + rowid;
|
DelRows = "0" + ":" + rowid;
|
||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -728,6 +730,7 @@ td {
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>DeleteRequistionForm",
|
url: "<?php echo base_url() ?>DeleteRequistionForm",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
if (data) {
|
if (data) {
|
||||||
// $('#content').loader('hide');
|
// $('#content').loader('hide');
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|||||||
@ -538,7 +538,7 @@ $('#igrnos').change(function(){
|
|||||||
var html = '<option value = -1>Select IGRItemNo</option>';
|
var html = '<option value = -1>Select IGRItemNo</option>';
|
||||||
var igrno = $('#igrnos').val();
|
var igrno = $('#igrnos').val();
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -546,7 +546,7 @@ $('#igrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -583,7 +583,7 @@ if(p == -1 || c == -1)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:p,param2:c,param3:type},
|
data:{param1:p,param2:c,param3:type},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -601,7 +601,7 @@ if(p == -1 || c == -1)
|
|||||||
htmlspec = '';
|
htmlspec = '';
|
||||||
flag = 1;
|
flag = 1;
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
$.each(data,function(i,item){
|
$.each(data,function(i,item){
|
||||||
|
|
||||||
|
|
||||||
@ -646,7 +646,7 @@ if(p == -1 || c == -1)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
alert('No Master Records Found..!');
|
alert('No Master Records Found..!');
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1257,7 +1257,7 @@ console.log(listopsforstore+'-'+oldops);
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:formData,
|
data:formData,
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -1269,7 +1269,7 @@ console.log(listopsforstore+'-'+oldops);
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data){
|
if(data){
|
||||||
alert(data);
|
alert(data);
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
window.location = "<?php echo base_url().'resinbatchcard/resinBatchCardLisitng';?>";
|
window.location = "<?php echo base_url().'resinbatchcard/resinBatchCardLisitng';?>";
|
||||||
}
|
}
|
||||||
@ -1381,7 +1381,7 @@ $('#igrnos').change(function(){
|
|||||||
var html = '<option value = -1>Select IGRItemNo</option>';
|
var html = '<option value = -1>Select IGRItemNo</option>';
|
||||||
var igrno = $('#igrnos').val();
|
var igrno = $('#igrnos').val();
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
|
|
||||||
@ -1389,7 +1389,7 @@ $('#igrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -1416,7 +1416,7 @@ $('#Resinigrnos').change(function(){
|
|||||||
var igrno = $('#Resinigrnos').val();
|
var igrno = $('#Resinigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -1424,7 +1424,7 @@ $('#Resinigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -1451,7 +1451,7 @@ $('#Hexamineigrnos').change(function(){
|
|||||||
var igrno = $('#Hexamineigrnos').val();
|
var igrno = $('#Hexamineigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -1459,7 +1459,7 @@ $('#Hexamineigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -1485,7 +1485,7 @@ $('#CSigrnos').change(function(){
|
|||||||
var igrno = $('#CSigrnos').val();
|
var igrno = $('#CSigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -1493,7 +1493,7 @@ $('#CSigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -1519,7 +1519,7 @@ $('#Catalystigrnos').change(function(){
|
|||||||
var igrno = $('#Catalystigrnos').val();
|
var igrno = $('#Catalystigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -1527,7 +1527,7 @@ $('#Catalystigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -1553,7 +1553,7 @@ $('#bagsigrnos').change(function(){
|
|||||||
var igrno = $('#bagsigrnos').val();
|
var igrno = $('#bagsigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -1561,7 +1561,7 @@ $('#bagsigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -1587,7 +1587,7 @@ $('#tonigrnos').change(function(){
|
|||||||
var igrno = $('#tonigrnos').val();
|
var igrno = $('#tonigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -1595,7 +1595,7 @@ $('#tonigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
|
|||||||
@ -864,6 +864,7 @@ function Deleterow(rowid)
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:id},
|
data:{id:id},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -871,7 +872,7 @@ function Deleterow(rowid)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|
||||||
|
|
||||||
@ -879,6 +880,8 @@ function Deleterow(rowid)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -951,6 +954,7 @@ function Deleterow(rowid)
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{id:id},
|
data:{id:id},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -958,7 +962,7 @@ function Deleterow(rowid)
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
|
|
||||||
|
|
||||||
@ -966,6 +970,8 @@ function Deleterow(rowid)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1047,7 +1053,7 @@ else
|
|||||||
{
|
{
|
||||||
console.log($('.requistion').serialize());
|
console.log($('.requistion').serialize());
|
||||||
|
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:$('.requistion').serialize(),
|
data:$('.requistion').serialize(),
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -1056,7 +1062,7 @@ else
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data)
|
if(data)
|
||||||
{
|
{
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert(data);
|
alert(data);
|
||||||
$('#txtRowCount').val('');
|
$('#txtRowCount').val('');
|
||||||
$('#txtDeletedRow').val('');
|
$('#txtDeletedRow').val('');
|
||||||
@ -1066,6 +1072,8 @@ else
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -327,6 +327,7 @@
|
|||||||
});
|
});
|
||||||
formActionUrl = '<?php echo base_url() . 'editExpense' ?>'; // Set action URL for adding
|
formActionUrl = '<?php echo base_url() . 'editExpense' ?>'; // Set action URL for adding
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: '<?php echo base_url() . 'getExpenseDetails'; ?>',
|
url: '<?php echo base_url() . 'getExpenseDetails'; ?>',
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -369,6 +370,7 @@
|
|||||||
$('#transporterfile_name').val(''); // Clear hidden input if no file
|
$('#transporterfile_name').val(''); // Clear hidden input if no file
|
||||||
}
|
}
|
||||||
togglePaymentMethodEdit();
|
togglePaymentMethodEdit();
|
||||||
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
@ -410,6 +412,7 @@
|
|||||||
var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload
|
var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload
|
||||||
console.log(formActionUrl);
|
console.log(formActionUrl);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: formActionUrl,
|
url: formActionUrl,
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -420,15 +423,19 @@
|
|||||||
console.log(response);
|
console.log(response);
|
||||||
|
|
||||||
if (response) {
|
if (response) {
|
||||||
$('#expenseModal').modal('hide');
|
$('#loader').hide();
|
||||||
$('#expenseForm')[0].reset();
|
$('#expenseForm')[0].reset();
|
||||||
$('#file-name-display').text(''); // Clear the file name display
|
$('#file-name-display').text(''); // Clear the file name display
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
console.log(response);
|
console.log(response);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(xhr, status, error) {
|
error: function(xhr, status, error) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert('An error occurred: ' + error);
|
alert('An error occurred: ' + error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -522,6 +529,7 @@
|
|||||||
var fileName = $(this).data('file');
|
var fileName = $(this).data('file');
|
||||||
var expenseId = $(this).data('value');
|
var expenseId = $(this).data('value');
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: '<?php echo base_url('deleteFile'); ?>',
|
url: '<?php echo base_url('deleteFile'); ?>',
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -534,16 +542,22 @@
|
|||||||
|
|
||||||
var result = JSON.parse(response);
|
var result = JSON.parse(response);
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert('File deleted successfully.');
|
alert('File deleted successfully.');
|
||||||
$('#currentFileName').text('');
|
$('#currentFileName').text('');
|
||||||
$('#transporterfile_name').val('');
|
$('#transporterfile_name').val('');
|
||||||
$('#deleteFile').remove(); // Remove the delete button
|
$('#deleteFile').remove(); // Remove the delete button
|
||||||
$('#transporterfile').next('a').remove(); // Remove the download link
|
$('#transporterfile').next('a').remove(); // Remove the download link
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert('Failed to delete the file: ' + result.message);
|
alert('Failed to delete the file: ' + result.message);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function() {
|
error: function() {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert('Error deleting the file.');
|
alert('Error deleting the file.');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -538,7 +538,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
|||||||
<label>Exchange Rate On</label>
|
<label>Exchange Rate On</label>
|
||||||
<div>
|
<div>
|
||||||
<?php
|
<?php
|
||||||
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $CurrentDate), 'id' => 'Exchangerateon', 'class' => 'form-control num date_range form-date-search', 'required' => 'true', 'onkeypress' => 'return false;');
|
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $CurrentDate), 'id' => 'Exchangerateon', 'class' => 'form-control num form-date-search', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||||
echo form_input($data);
|
echo form_input($data);
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
@ -2072,7 +2072,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
|||||||
//alert();
|
//alert();
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
$('#Exchangerateon').addClass('date_range form-date-search');
|
$('#Exchangerateon').addClass(' form-date-search');
|
||||||
|
|
||||||
}, 1000);
|
}, 1000);
|
||||||
$('#Date').click(function() {
|
$('#Date').click(function() {
|
||||||
|
|||||||
@ -71,6 +71,8 @@
|
|||||||
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
|
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
.modal { overflow: auto !important; }
|
||||||
|
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
height: 5px;
|
height: 5px;
|
||||||
|
|||||||
@ -459,7 +459,7 @@ $('#igrnos').change(function(){
|
|||||||
var html = '<option value = -1>Select IGRItemNo</option>';
|
var html = '<option value = -1>Select IGRItemNo</option>';
|
||||||
var igrno = $('#igrnos').val();
|
var igrno = $('#igrnos').val();
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
|
|
||||||
@ -467,7 +467,7 @@ $('#igrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -493,7 +493,7 @@ $('#Resinigrnos').change(function(){
|
|||||||
var igrno = $('#Resinigrnos').val();
|
var igrno = $('#Resinigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -501,7 +501,7 @@ $('#Resinigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -528,7 +528,7 @@ $('#Hexamineigrnos').change(function(){
|
|||||||
var igrno = $('#Hexamineigrnos').val();
|
var igrno = $('#Hexamineigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -536,7 +536,7 @@ $('#Hexamineigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -562,7 +562,7 @@ $('#CSigrnos').change(function(){
|
|||||||
var igrno = $('#CSigrnos').val();
|
var igrno = $('#CSigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -570,7 +570,7 @@ $('#CSigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -596,7 +596,7 @@ $('#Catalystigrnos').change(function(){
|
|||||||
var igrno = $('#Catalystigrnos').val();
|
var igrno = $('#Catalystigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -604,7 +604,7 @@ $('#Catalystigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -630,7 +630,7 @@ $('#bagsigrnos').change(function(){
|
|||||||
var igrno = $('#bagsigrnos').val();
|
var igrno = $('#bagsigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -638,7 +638,7 @@ $('#bagsigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -664,7 +664,7 @@ $('#tonigrnos').change(function(){
|
|||||||
var igrno = $('#tonigrnos').val();
|
var igrno = $('#tonigrnos').val();
|
||||||
|
|
||||||
//alert(igrno);
|
//alert(igrno);
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:igrno},
|
data:{param1:igrno},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -672,7 +672,7 @@ $('#tonigrnos').change(function(){
|
|||||||
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
url:"<?php echo base_url() ?>resinbatchcard/getIGRLineNo",
|
||||||
success:function(data) {
|
success:function(data) {
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
// alert(data);
|
// alert(data);
|
||||||
|
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
@ -709,7 +709,7 @@ if(p == -1 || c == -1)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:p,param2:c,param3:type},
|
data:{param1:p,param2:c,param3:type},
|
||||||
//dataType:"json",
|
//dataType:"json",
|
||||||
@ -731,7 +731,7 @@ if(p == -1 || c == -1)
|
|||||||
htmlspec = '';
|
htmlspec = '';
|
||||||
flag = 1;
|
flag = 1;
|
||||||
|
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
$.each(data,function(i,item){
|
$.each(data,function(i,item){
|
||||||
|
|
||||||
|
|
||||||
@ -806,7 +806,7 @@ if(p == -1 || c == -1)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
alert('No Master Records Found..!');
|
alert('No Master Records Found..!');
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1411,7 +1411,7 @@ listopsforstore = [];
|
|||||||
formData.append('param22',param22);
|
formData.append('param22',param22);
|
||||||
|
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:formData,
|
data:formData,
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -1423,7 +1423,7 @@ listopsforstore = [];
|
|||||||
success:function(data) {
|
success:function(data) {
|
||||||
if(data){
|
if(data){
|
||||||
alert(data);
|
alert(data);
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
window.location = "<?php echo base_url().'resinbatchcard/resinBatchCardLisitng';?>";
|
window.location = "<?php echo base_url().'resinbatchcard/resinBatchCardLisitng';?>";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -61,6 +61,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
.modal { overflow: auto !important; }
|
||||||
/* #packagingcalmodel {
|
/* #packagingcalmodel {
|
||||||
margin-top: 200px;
|
margin-top: 200px;
|
||||||
z-index: 1080 !important;
|
z-index: 1080 !important;
|
||||||
@ -656,16 +657,10 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
if (FreightType == "PER TRIP") {
|
if (FreightType == "PER TRIP") {
|
||||||
$('#TripsValue').show();
|
$('#TripsValue').show();
|
||||||
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
|
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
|
||||||
$('#NOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
|
|
||||||
$('#txtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
|
|
||||||
$('#edittxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
|
|
||||||
} else {
|
} else {
|
||||||
$('#TripsValue').hide();
|
$('#TripsValue').hide();
|
||||||
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
|
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
|
||||||
$('#NOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
|
|
||||||
$('#txtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
|
|
||||||
$('#txtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
|
|
||||||
}
|
}
|
||||||
if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
|
if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
|
||||||
selValue = $("#drpFreight").val();
|
selValue = $("#drpFreight").val();
|
||||||
@ -709,16 +704,10 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
if (FreightType == "PER TRIP") {
|
if (FreightType == "PER TRIP") {
|
||||||
$('#EditTripsValue').show();
|
$('#EditTripsValue').show();
|
||||||
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
|
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
|
||||||
$('#EditNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
|
|
||||||
$('#txtEditFreight').parent().removeClass('col-md-3').addClass('col-md-2');
|
|
||||||
$('#txtEditAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
|
|
||||||
} else {
|
} else {
|
||||||
$('#EditTripsValue').hide();
|
$('#EditTripsValue').hide();
|
||||||
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
|
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
|
||||||
$('#EditNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
|
|
||||||
$('#txtEditFreight').parent().removeClass('col-md-2').addClass('col-md-3');
|
|
||||||
$('#txtEditAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
|
|
||||||
}
|
}
|
||||||
if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
|
if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
|
||||||
selValue = $("#drpEditFreight").val();
|
selValue = $("#drpEditFreight").val();
|
||||||
|
|||||||
@ -9,15 +9,13 @@ background-color:#eeffcc ! important;
|
|||||||
//color:red ! important;
|
//color:red ! important;
|
||||||
|
|
||||||
$invoicenos = array(-1 => 'Select Invoice No');
|
$invoicenos = array(-1 => 'Select Invoice No');
|
||||||
foreach($records as $rec)
|
foreach ($records as $rec) {
|
||||||
{
|
|
||||||
$invoicenos[$rec->invoice_number] = $rec->invoice_number;
|
$invoicenos[$rec->invoice_number] = $rec->invoice_number;
|
||||||
}
|
}
|
||||||
|
|
||||||
//print_r($emplist);
|
//print_r($emplist);
|
||||||
$approvedby = array(-1 => 'Select Approver Name');
|
$approvedby = array(-1 => 'Select Approver Name');
|
||||||
foreach($emplist as $r)
|
foreach ($emplist as $r) {
|
||||||
{
|
|
||||||
$approvedby[$r->FirstName . ' ' . $r->LastName] = $r->FirstName . ' ' . $r->LastName . '-' . $r->shortName;
|
$approvedby[$r->FirstName . ' ' . $r->LastName] = $r->FirstName . ' ' . $r->LastName . '-' . $r->shortName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -26,8 +24,6 @@ foreach($emplist as $r)
|
|||||||
th {
|
th {
|
||||||
text-align: center !important;
|
text-align: center !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
|
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
|
||||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
||||||
@ -109,7 +105,15 @@ th{
|
|||||||
|
|
||||||
<th width="3px">SNO</th>
|
<th width="3px">SNO</th>
|
||||||
<th>Description</th>
|
<th>Description</th>
|
||||||
<th width="5px">Specification</br>Min</th><th width="5px">Specification</br>Max</th><th width="5px">Specification</br>UOM</th><th>ACT X1</th><th>ACT X2</th><th>ACT X3</th><th width="5px">Average</th><th width="5px">Results</th><th>Remarks</th>
|
<th width="5px">Specification</br>Min</th>
|
||||||
|
<th width="5px">Specification</br>Max</th>
|
||||||
|
<th width="5px">Specification</br>UOM</th>
|
||||||
|
<th>ACT X1</th>
|
||||||
|
<th>ACT X2</th>
|
||||||
|
<th>ACT X3</th>
|
||||||
|
<th width="5px">Average</th>
|
||||||
|
<th width="5px">Results</th>
|
||||||
|
<th>Remarks</th>
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
@ -123,7 +127,8 @@ th{
|
|||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<div class="col-md-3"><b> L.O.I Details </b></div> <div class="col-md-1 col-md-offset-8 text-right"><i class="fa fa-expand" id="loibutton"></i></div>
|
<div class="col-md-3"><b> L.O.I Details </b></div>
|
||||||
|
<div class="col-md-1 col-md-offset-8 text-right"><i class="fa fa-expand" id="loibutton"></i></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="loiarea">
|
<div id="loiarea">
|
||||||
@ -131,7 +136,31 @@ th{
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<th><center>SNO</center></th><th><center>Heating Time</center></br><center>start</center></th><th><center>Heating Time</center></br><center>end</center></th><th>Temp *c</th><th><center>Crucible Weight</center></br> <center>w1(g)<center></th><th><center>Before Heating</center></br><center>w2(g)</center></th><th><center>After Heating<center></br>w3(g)</center></th><th>L.O.I %</th><th>Remarks</th>
|
<th>
|
||||||
|
<center>SNO</center>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<center>Heating Time</center></br>
|
||||||
|
<center>start</center>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<center>Heating Time</center></br>
|
||||||
|
<center>end</center>
|
||||||
|
</th>
|
||||||
|
<th>Temp *c</th>
|
||||||
|
<th>
|
||||||
|
<center>Crucible Weight</center></br>
|
||||||
|
<center>w1(g)<center>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<center>Before Heating</center></br>
|
||||||
|
<center>w2(g)</center>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<center>After Heating<center></br>w3(g)</center>
|
||||||
|
</th>
|
||||||
|
<th>L.O.I %</th>
|
||||||
|
<th>Remarks</th>
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
@ -146,7 +175,8 @@ th{
|
|||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<div class="col-md-3"><b> AFS Details </b></div> <div class="col-md-1 col-md-offset-8 text-right"><i class="fa fa-expand" id="afsbutton"></i></div>
|
<div class="col-md-3"><b> AFS Details </b></div>
|
||||||
|
<div class="col-md-1 col-md-offset-8 text-right"><i class="fa fa-expand" id="afsbutton"></i></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="afsarea">
|
<div id="afsarea">
|
||||||
@ -154,31 +184,121 @@ th{
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<th>NO</th><th>Sieve Size µm</th><th>Sand Weight</th><th>Percentage</th><th>Multiplier</th><th>Product</th>
|
<th>NO</th>
|
||||||
|
<th>Sieve Size µm</th>
|
||||||
|
<th>Sand Weight</th>
|
||||||
|
<th>Percentage</th>
|
||||||
|
<th>Multiplier</th>
|
||||||
|
<th>Product</th>
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="afsAppend">
|
<tbody id="afsAppend">
|
||||||
<tr id="1"> <td>1</td> <td id="1size">1700</td> <td id="1sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="1p">0.00</td><td id="1m">5</td><td id="1pt">0.0000</td></tr>
|
<tr id="1">
|
||||||
<tr id="2"> <td>2</td> <td id="2size">850</td> <td id="2sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="2p">0.00</td><td id="2m">10</td><td id="2pt">0.0000</td></tr>
|
<td>1</td>
|
||||||
<tr id="3"> <td>3</td> <td id="3size">600</td> <td id="3sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="3p">0.00</td><td id="3m">20</td><td id="3pt">0.0000</td></tr>
|
<td id="1size">1700</td>
|
||||||
<tr id="4"> <td>4</td> <td id="4size">425</td> <td id="4sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="4p">0.00</td><td id="4m">30</td><td id="4pt">0.0000</td></tr>
|
<td id="1sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
<tr id="5"> <td>5</td> <td id="5size">300</td> <td id="5sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="5p">0.00</td><td id="5m">40</td><td id="5pt">0.0000</td></tr>
|
<td id="1p">0.00</td>
|
||||||
<tr id="6"> <td>6</td> <td id="6size">212</td> <td id="6sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="6p">0.00</td><td id="6m">50</td><td id="6pt">0.0000</td></tr>
|
<td id="1m">5</td>
|
||||||
<tr id="7"> <td>7</td> <td id="7size">150</td> <td id="7sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="7p">0.00</td><td id="7m">70</td><td id="7pt">0.0000</td></tr>
|
<td id="1pt">0.0000</td>
|
||||||
<tr id="8"> <td>8</td> <td id="8size">106</td> <td id="8sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="8p">0.00</td><td id="8m">100</td><td id="8pt">0.0000</td></tr>
|
</tr>
|
||||||
<tr id="9"> <td>9</td> <td id="9size">75</td> <td id="9sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="9p">0.00</td><td id="9m">140</td><td id="9pt">0.0000</td></tr>
|
<tr id="2">
|
||||||
<tr id="10"> <td>10</td> <td id="10size">53</td> <td id="10sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="10p">0.00</td><td id="10m">200</td><td id="10pt">0.0000</td></tr>
|
<td>2</td>
|
||||||
<tr id="11"> <td>11</td> <td id="11size">pan</td> <td id="11sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td><td id="11p">0.00</td><td id="11m">300</td><td id="11pt">0.0000</td></tr>
|
<td id="2size">850</td>
|
||||||
<tr id="12"> <td> </td> <td><b>Total</b></td> <td id="12sw">0.00</td><td id="12p">0.00</td><td id="12m"> </td><td id="12pt">0.0000</td></tr>
|
<td id="2sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="2p">0.00</td>
|
||||||
|
<td id="2m">10</td>
|
||||||
|
<td id="2pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="3">
|
||||||
|
<td>3</td>
|
||||||
|
<td id="3size">600</td>
|
||||||
|
<td id="3sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="3p">0.00</td>
|
||||||
|
<td id="3m">20</td>
|
||||||
|
<td id="3pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="4">
|
||||||
|
<td>4</td>
|
||||||
|
<td id="4size">425</td>
|
||||||
|
<td id="4sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="4p">0.00</td>
|
||||||
|
<td id="4m">30</td>
|
||||||
|
<td id="4pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="5">
|
||||||
|
<td>5</td>
|
||||||
|
<td id="5size">300</td>
|
||||||
|
<td id="5sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="5p">0.00</td>
|
||||||
|
<td id="5m">40</td>
|
||||||
|
<td id="5pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="6">
|
||||||
|
<td>6</td>
|
||||||
|
<td id="6size">212</td>
|
||||||
|
<td id="6sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="6p">0.00</td>
|
||||||
|
<td id="6m">50</td>
|
||||||
|
<td id="6pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="7">
|
||||||
|
<td>7</td>
|
||||||
|
<td id="7size">150</td>
|
||||||
|
<td id="7sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="7p">0.00</td>
|
||||||
|
<td id="7m">70</td>
|
||||||
|
<td id="7pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="8">
|
||||||
|
<td>8</td>
|
||||||
|
<td id="8size">106</td>
|
||||||
|
<td id="8sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="8p">0.00</td>
|
||||||
|
<td id="8m">100</td>
|
||||||
|
<td id="8pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="9">
|
||||||
|
<td>9</td>
|
||||||
|
<td id="9size">75</td>
|
||||||
|
<td id="9sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="9p">0.00</td>
|
||||||
|
<td id="9m">140</td>
|
||||||
|
<td id="9pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="10">
|
||||||
|
<td>10</td>
|
||||||
|
<td id="10size">53</td>
|
||||||
|
<td id="10sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="10p">0.00</td>
|
||||||
|
<td id="10m">200</td>
|
||||||
|
<td id="10pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="11">
|
||||||
|
<td>11</td>
|
||||||
|
<td id="11size">pan</td>
|
||||||
|
<td id="11sw" class="edit" contenteditable="true" onkeyup="calculateAFS(this.parentNode.id,this.textContent,this.id);">0.00</td>
|
||||||
|
<td id="11p">0.00</td>
|
||||||
|
<td id="11m">300</td>
|
||||||
|
<td id="11pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
|
<tr id="12">
|
||||||
|
<td> </td>
|
||||||
|
<td><b>Total</b></td>
|
||||||
|
<td id="12sw">0.00</td>
|
||||||
|
<td id="12p">0.00</td>
|
||||||
|
<td id="12m"> </td>
|
||||||
|
<td id="12pt">0.0000</td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<div class="col-md-3"><b>AFS CHART </b></div> <div class="col-md-1 col-md-offset-8 text-right"><i class="fa fa-expand" id="chartbutton"></i></div>
|
<div class="col-md-3"><b>AFS CHART </b></div>
|
||||||
|
<div class="col-md-1 col-md-offset-8 text-right"><i class="fa fa-expand" id="chartbutton"></i></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="chartarea">
|
<div id="chartarea">
|
||||||
@ -243,13 +363,14 @@ th{
|
|||||||
"lengthChange": true,
|
"lengthChange": true,
|
||||||
"searching": true,
|
"searching": true,
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"aaSorting": [[ 0, "asc" ]],
|
"aaSorting": [
|
||||||
|
[0, "asc"]
|
||||||
|
],
|
||||||
"info": true,
|
"info": true,
|
||||||
"autoWidth": true
|
"autoWidth": true
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -267,7 +388,10 @@ $(document).ready(function(){
|
|||||||
$('#reportdate').datepicker({
|
$('#reportdate').datepicker({
|
||||||
//minDate : 'year+16',
|
//minDate : 'year+16',
|
||||||
maxDate: 'now',
|
maxDate: 'now',
|
||||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
dateFormat: 'dd-mm-yy',
|
||||||
|
changeMonth: true,
|
||||||
|
changeYear: true,
|
||||||
|
yearRange: '0:+10'
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -288,8 +412,7 @@ $(document).ready(function(){
|
|||||||
$.each(jsrecords, function(index, value) {
|
$.each(jsrecords, function(index, value) {
|
||||||
// console.log(index+'-'+value['invoice_id']);
|
// console.log(index+'-'+value['invoice_id']);
|
||||||
|
|
||||||
if(invoiceid == value['invoice_number'])
|
if (invoiceid == value['invoice_number']) {
|
||||||
{
|
|
||||||
|
|
||||||
$('#testreport tbody').remove();
|
$('#testreport tbody').remove();
|
||||||
$('#testreport').append('<tbody id="specAppend"></tbody>');
|
$('#testreport').append('<tbody id="specAppend"></tbody>');
|
||||||
@ -306,7 +429,9 @@ $(document).ready(function(){
|
|||||||
$('#productid').val(value['item_product_id']);
|
$('#productid').val(value['item_product_id']);
|
||||||
$('#qty').val(value['item_quantity']);
|
$('#qty').val(value['item_quantity']);
|
||||||
var batchno = 0;
|
var batchno = 0;
|
||||||
if(value['invoice_custom_fieldvalue'] != ''){ batchno = value['invoice_custom_fieldvalue'];}
|
if (value['invoice_custom_fieldvalue'] != '') {
|
||||||
|
batchno = value['invoice_custom_fieldvalue'];
|
||||||
|
}
|
||||||
$('#batchno').val(batchno);
|
$('#batchno').val(batchno);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -314,14 +439,17 @@ $(document).ready(function(){
|
|||||||
var productid = $('#productid').val();
|
var productid = $('#productid').val();
|
||||||
var customerid = $('#customerid').val();
|
var customerid = $('#customerid').val();
|
||||||
var type = 'OUTWARD';
|
var type = 'OUTWARD';
|
||||||
$('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data:{param1:productid,param2:customerid,param3:type},
|
data: {
|
||||||
|
param1: productid,
|
||||||
|
param2: customerid,
|
||||||
|
param3: type
|
||||||
|
},
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>quality/getAllSpecforReport",
|
url: "<?php echo base_url() ?>quality/getAllSpecforReport",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
//alert(data);
|
//alert(data);
|
||||||
var jsdata = data;
|
var jsdata = data;
|
||||||
var jsdata = JSON.parse(jsdata);
|
var jsdata = JSON.parse(jsdata);
|
||||||
@ -340,23 +468,17 @@ $(document).ready(function(){
|
|||||||
|
|
||||||
html += '<tr id=' + index + '><td>' + index + '</td><td id=' + index + 'description>' + test + '</td><td id=' + index + 'min>' + min + '</td><td id=' + index + 'max>' + max + '</td><td>' + uom + '</td>';
|
html += '<tr id=' + index + '><td>' + index + '</td><td id=' + index + 'description>' + test + '</td><td id=' + index + 'min>' + min + '</td><td id=' + index + 'max>' + max + '</td><td>' + uom + '</td>';
|
||||||
|
|
||||||
if(test != 'AFS' && test != 'LOI')
|
if (test != 'AFS' && test != 'LOI') {
|
||||||
{
|
|
||||||
html += '<td class="edit" contenteditable="true" onkeyup="calculateMaster(this.id);" id=' + index + 'act1>0.00</td> <td class="edit" contenteditable="true" onkeyup="calculateMaster(this.id);" id=' + index + 'act2>0.00</td> <td class="edit" contenteditable="true" onkeyup="calculateMaster(this.id);" id=' + index + 'act3>0.00</td>';
|
html += '<td class="edit" contenteditable="true" onkeyup="calculateMaster(this.id);" id=' + index + 'act1>0.00</td> <td class="edit" contenteditable="true" onkeyup="calculateMaster(this.id);" id=' + index + 'act2>0.00</td> <td class="edit" contenteditable="true" onkeyup="calculateMaster(this.id);" id=' + index + 'act3>0.00</td>';
|
||||||
}
|
} else if (test == 'AFS') {
|
||||||
else if(test == 'AFS')
|
|
||||||
{
|
|
||||||
html += '<td colspan="3" id="AFS" onkeyup="calculateMaster(this.id);">0.00</td>';
|
html += '<td colspan="3" id="AFS" onkeyup="calculateMaster(this.id);">0.00</td>';
|
||||||
}
|
} else if (test == 'LOI') {
|
||||||
else if(test == 'LOI')
|
|
||||||
{
|
|
||||||
html += '<td onkeyup="calculateMaster(this.id);" id=1loi' + index + '>0.00</td> <td onkeyup="calculateMaster(this.id);" id=2loi' + index + '>0.00</td> <td onkeyup="calculateMaster(this.id);" id=3loi' + index + '>0.00</td>';
|
html += '<td onkeyup="calculateMaster(this.id);" id=1loi' + index + '>0.00</td> <td onkeyup="calculateMaster(this.id);" id=2loi' + index + '>0.00</td> <td onkeyup="calculateMaster(this.id);" id=3loi' + index + '>0.00</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '<td id=' + index + 'avg>0.00</td><td id=' + index + 'result>-</td><td contenteditable="true"></td></tr>';
|
html += '<td id=' + index + 'avg>0.00</td><td id=' + index + 'result>-</td><td contenteditable="true"></td></tr>';
|
||||||
|
|
||||||
if(test == 'LOI')
|
if (test == 'LOI') {
|
||||||
{
|
|
||||||
for (i = 1; i <= 3; i++) {
|
for (i = 1; i <= 3; i++) {
|
||||||
html2 += '<tr id=' + i + '> <td>' + i + '</td> <td class="edit" contenteditable="true" id=' + i + 'start onkeyup="calculateMaster(this.id);">0.00</td> <td class="edit" contenteditable="true" id=' + i + 'end onkeyup="calculateMaster(this.id);">0.00</td> <td id=' + i + 'temp>' + temp + '</td>';
|
html2 += '<tr id=' + i + '> <td>' + i + '</td> <td class="edit" contenteditable="true" id=' + i + 'start onkeyup="calculateMaster(this.id);">0.00</td> <td class="edit" contenteditable="true" id=' + i + 'end onkeyup="calculateMaster(this.id);">0.00</td> <td id=' + i + 'temp>' + temp + '</td>';
|
||||||
html2 += '<td class="edit" contenteditable="true" id=' + i + 'w1 onkeyup="calculateMaster(this.id);">0.00</td> <td class="edit" contenteditable="true" id=' + i + 'w2 onkeyup="calculateMaster(this.id);">0.00</td> <td class="edit" contenteditable="true" id=' + i + 'w3 onkeyup="calculateMaster(this.id);">0.00</td> <td id=' + i + 'loi>0.00</td> <td contenteditable="true"></td> </tr>';
|
html2 += '<td class="edit" contenteditable="true" id=' + i + 'w1 onkeyup="calculateMaster(this.id);">0.00</td> <td class="edit" contenteditable="true" id=' + i + 'w2 onkeyup="calculateMaster(this.id);">0.00</td> <td class="edit" contenteditable="true" id=' + i + 'w3 onkeyup="calculateMaster(this.id);">0.00</td> <td id=' + i + 'loi>0.00</td> <td contenteditable="true"></td> </tr>';
|
||||||
@ -369,8 +491,7 @@ $(document).ready(function(){
|
|||||||
|
|
||||||
$("#testreport tbody").append(html);
|
$("#testreport tbody").append(html);
|
||||||
$("#loitable tbody").append(html2);
|
$("#loitable tbody").append(html2);
|
||||||
$('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -381,23 +502,19 @@ $(document).ready(function(){
|
|||||||
}); //End of invoice change funciton
|
}); //End of invoice change funciton
|
||||||
|
|
||||||
|
|
||||||
$('.edit').bind('keypress', function(e)
|
$('.edit').bind('keypress', function(e) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
if(((e.which || e.keyCode) == 8) || ((e.which || e.keyCode) == 9) || ((e.which || e.keyCode) == 46) || ((e.which || e.keyCode) == 37) || ((e.which || e.keyCode) == 39))
|
if (((e.which || e.keyCode) == 8) || ((e.which || e.keyCode) == 9) || ((e.which || e.keyCode) == 46) || ((e.which || e.keyCode) == 37) || ((e.which || e.keyCode) == 39)) {
|
||||||
{
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
if(e.keyCode == 13)
|
if (e.keyCode == 13) {
|
||||||
{
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if(((e.which || e.keyCode) < 48) || ((e.which || e.keyCode) > 57))
|
if (((e.which || e.keyCode) < 48) || ((e.which || e.keyCode) > 57)) {
|
||||||
{
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -408,27 +525,23 @@ $(document).ready(function(){
|
|||||||
|
|
||||||
}); // End of document on ready funciton
|
}); // End of document on ready funciton
|
||||||
|
|
||||||
function calculateMaster(id)
|
function calculateMaster(id) {
|
||||||
{
|
|
||||||
if (document.getElementById('12sw')) {
|
if (document.getElementById('12sw')) {
|
||||||
var SW12 = document.getElementById('12sw').textContent;
|
var SW12 = document.getElementById('12sw').textContent;
|
||||||
if(SW12 != 100)
|
if (SW12 != 100) {
|
||||||
{
|
|
||||||
alert('AFS Details Sand Weight Total Should be 100..!');
|
alert('AFS Details Sand Weight Total Should be 100..!');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($('#invoiceno').val() == -1)
|
if ($('#invoiceno').val() == -1) {
|
||||||
{
|
|
||||||
alert('Select Invoice No');
|
alert('Select Invoice No');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
var cid = id;
|
var cid = id;
|
||||||
if (document.getElementById(id)) {
|
if (document.getElementById(id)) {
|
||||||
var cvalue = document.getElementById(id).textContent;
|
var cvalue = document.getElementById(id).textContent;
|
||||||
if(cvalue == 0 )
|
if (cvalue == 0) {
|
||||||
{
|
|
||||||
document.getElementById(id).textContent = '';
|
document.getElementById(id).textContent = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -437,52 +550,62 @@ function calculateMaster(id)
|
|||||||
size = size - 5;
|
size = size - 5;
|
||||||
var LOIROWNO = 0;
|
var LOIROWNO = 0;
|
||||||
|
|
||||||
for(i=1;i<=size;i++)
|
for (i = 1; i <= size; i++) {
|
||||||
{
|
|
||||||
var Row = $('#testreport').find('tr').eq(i).find('td');
|
var Row = $('#testreport').find('tr').eq(i).find('td');
|
||||||
//console.log(Row);
|
//console.log(Row);
|
||||||
var desc = ''; var min =''; var max = ''; var act1 = ''; var act2 = ''; var act3 = ''; var avg = ''; var res = '';
|
var desc = '';
|
||||||
|
var min = '';
|
||||||
|
var max = '';
|
||||||
|
var act1 = '';
|
||||||
|
var act2 = '';
|
||||||
|
var act3 = '';
|
||||||
|
var avg = '';
|
||||||
|
var res = '';
|
||||||
|
|
||||||
|
|
||||||
$.each(Row, function(index, value) {
|
$.each(Row, function(index, value) {
|
||||||
|
|
||||||
//console.log(index);
|
//console.log(index);
|
||||||
|
|
||||||
if(index != 0 && index != 4 && index != 10)
|
if (index != 0 && index != 4 && index != 10) {
|
||||||
{
|
|
||||||
//console.log('**************************************');
|
//console.log('**************************************');
|
||||||
//console.log(value.id+'-'+value.textContent);
|
//console.log(value.id+'-'+value.textContent);
|
||||||
if(index == 1){ desc = value.textContent; }
|
if (index == 1) {
|
||||||
if(index == 2){ min = value.textContent; }
|
desc = value.textContent;
|
||||||
if(index == 3){ max = value.textContent; }
|
}
|
||||||
if(index == 5){ act1 = value.textContent; }
|
if (index == 2) {
|
||||||
if(index == 6){ act2 = value.textContent; }
|
min = value.textContent;
|
||||||
if(index == 7){ act3 = value.textContent; }
|
}
|
||||||
|
if (index == 3) {
|
||||||
|
max = value.textContent;
|
||||||
|
}
|
||||||
|
if (index == 5) {
|
||||||
|
act1 = value.textContent;
|
||||||
|
}
|
||||||
|
if (index == 6) {
|
||||||
|
act2 = value.textContent;
|
||||||
|
}
|
||||||
|
if (index == 7) {
|
||||||
|
act3 = value.textContent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
if(desc == 'LOI')
|
if (desc == 'LOI') {
|
||||||
{
|
|
||||||
LOIROWNO = i;
|
LOIROWNO = i;
|
||||||
}
|
}
|
||||||
if(desc != 'AFS')
|
if (desc != 'AFS') {
|
||||||
{
|
if (isNaN(act1) || act1 == '' || act1 == null) {
|
||||||
if(isNaN(act1) || act1 == '' || act1 == null)
|
|
||||||
{
|
|
||||||
act1 = 0.00;
|
act1 = 0.00;
|
||||||
}
|
}
|
||||||
if(isNaN(act2) || act2 == '' || act2 == null)
|
if (isNaN(act2) || act2 == '' || act2 == null) {
|
||||||
{
|
|
||||||
act2 = 0.00;
|
act2 = 0.00;
|
||||||
}
|
}
|
||||||
if(isNaN(act3) || act3 == '' || act3 == null)
|
if (isNaN(act3) || act3 == '' || act3 == null) {
|
||||||
{
|
|
||||||
act3 = 0.00;
|
act3 = 0.00;
|
||||||
}
|
}
|
||||||
avg = ((parseFloat(act1) + parseFloat(act2) + parseFloat(act3)) / 3);
|
avg = ((parseFloat(act1) + parseFloat(act2) + parseFloat(act3)) / 3);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
avg = document.getElementById('AFS').textContent;
|
avg = document.getElementById('AFS').textContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -493,37 +616,23 @@ function calculateMaster(id)
|
|||||||
|
|
||||||
var curavgid = i + 'avg';
|
var curavgid = i + 'avg';
|
||||||
document.getElementById(curavgid).textContent = parseFloat(avg).toFixed(2);
|
document.getElementById(curavgid).textContent = parseFloat(avg).toFixed(2);
|
||||||
if($.isNumeric(min) && $.isNumeric(max))
|
if ($.isNumeric(min) && $.isNumeric(max)) {
|
||||||
{
|
if (avg >= min && avg <= max) {
|
||||||
if(avg >= min && avg <= max)
|
|
||||||
{
|
|
||||||
res = 'OK';
|
res = 'OK';
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
res = 'NG';
|
res = 'NG';
|
||||||
}
|
}
|
||||||
}
|
} else if ($.isNumeric(min) && !($.isNumeric(max))) {
|
||||||
else if($.isNumeric(min) && !($.isNumeric(max)))
|
if (avg >= min) {
|
||||||
{
|
|
||||||
if(avg >= min)
|
|
||||||
{
|
|
||||||
res = 'OK';
|
res = 'OK';
|
||||||
//alert(res);
|
//alert(res);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
res = 'NG';
|
res = 'NG';
|
||||||
}
|
}
|
||||||
}
|
} else if (!$.isNumeric(min) && $.isNumeric(max)) {
|
||||||
else if(!$.isNumeric(min) && $.isNumeric(max))
|
if (avg <= max) {
|
||||||
{
|
|
||||||
if(avg <= max)
|
|
||||||
{
|
|
||||||
res = 'OK';
|
res = 'OK';
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
res = 'NG';
|
res = 'NG';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -532,24 +641,44 @@ function calculateMaster(id)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
for(j=1;j<=3;j++)
|
for (j = 1; j <= 3; j++) {
|
||||||
{
|
|
||||||
var loiRow = $('#loitable').find('tr').eq(j).find('td');
|
var loiRow = $('#loitable').find('tr').eq(j).find('td');
|
||||||
var start = ''; var end =''; var temp = ''; var act1 = ''; var w1 = ''; var w2 = ''; var w3 = ''; var loiid = '';var loi = 0;
|
var start = '';
|
||||||
|
var end = '';
|
||||||
|
var temp = '';
|
||||||
|
var act1 = '';
|
||||||
|
var w1 = '';
|
||||||
|
var w2 = '';
|
||||||
|
var w3 = '';
|
||||||
|
var loiid = '';
|
||||||
|
var loi = 0;
|
||||||
$.each(loiRow, function(iter, rec) {
|
$.each(loiRow, function(iter, rec) {
|
||||||
|
|
||||||
|
|
||||||
if(iter != 0 && iter != 8)
|
if (iter != 0 && iter != 8) {
|
||||||
{
|
|
||||||
//console.log('**************************************');
|
//console.log('**************************************');
|
||||||
//console.log(iter+'-'+rec.id+'-'+rec.textContent);
|
//console.log(iter+'-'+rec.id+'-'+rec.textContent);
|
||||||
if(iter == 1){ start = rec.textContent; }
|
if (iter == 1) {
|
||||||
if(iter == 2){ end = rec.textContent; }
|
start = rec.textContent;
|
||||||
if(iter == 3){ temp = rec.textContent; }
|
}
|
||||||
if(iter == 4){ w1 = rec.textContent; }
|
if (iter == 2) {
|
||||||
if(iter == 5){ w2 = rec.textContent; }
|
end = rec.textContent;
|
||||||
if(iter == 6){ w3 = rec.textContent; }
|
}
|
||||||
if(iter == 7){ loiid = rec.id; }
|
if (iter == 3) {
|
||||||
|
temp = rec.textContent;
|
||||||
|
}
|
||||||
|
if (iter == 4) {
|
||||||
|
w1 = rec.textContent;
|
||||||
|
}
|
||||||
|
if (iter == 5) {
|
||||||
|
w2 = rec.textContent;
|
||||||
|
}
|
||||||
|
if (iter == 6) {
|
||||||
|
w3 = rec.textContent;
|
||||||
|
}
|
||||||
|
if (iter == 7) {
|
||||||
|
loiid = rec.id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -563,14 +692,12 @@ function calculateMaster(id)
|
|||||||
loi = isNaN(loi) ? 0.00 : parseFloat(loi).toFixed(2);
|
loi = isNaN(loi) ? 0.00 : parseFloat(loi).toFixed(2);
|
||||||
//console.log(w1+'-'+w2+'-'+w3+'-'+loi);
|
//console.log(w1+'-'+w2+'-'+w3+'-'+loi);
|
||||||
var curid = j + 'loi';
|
var curid = j + 'loi';
|
||||||
if(document.getElementById(curid))
|
if (document.getElementById(curid)) {
|
||||||
{
|
|
||||||
document.getElementById(curid).textContent = parseFloat(loi).toFixed(2);
|
document.getElementById(curid).textContent = parseFloat(loi).toFixed(2);
|
||||||
}
|
}
|
||||||
var curid = j + 'loi' + LOIROWNO;
|
var curid = j + 'loi' + LOIROWNO;
|
||||||
//console.log(curid);
|
//console.log(curid);
|
||||||
if(document.getElementById(curid))
|
if (document.getElementById(curid)) {
|
||||||
{
|
|
||||||
document.getElementById(curid).textContent = parseFloat(loi).toFixed(2);
|
document.getElementById(curid).textContent = parseFloat(loi).toFixed(2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -580,8 +707,7 @@ function calculateMaster(id)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAllData()
|
function getAllData() {
|
||||||
{
|
|
||||||
|
|
||||||
calculateMaster();
|
calculateMaster();
|
||||||
var Rows = $('#testreport').find('tr');
|
var Rows = $('#testreport').find('tr');
|
||||||
@ -590,32 +716,27 @@ function calculateMaster(id)
|
|||||||
size = size - 5;
|
size = size - 5;
|
||||||
|
|
||||||
|
|
||||||
if($('#invoiceno').val() == -1 || $('#reportdate').val() == '')
|
if ($('#invoiceno').val() == -1 || $('#reportdate').val() == '') {
|
||||||
{
|
|
||||||
alert('Select Invoice No and Batch Date');
|
alert('Select Invoice No and Batch Date');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(z=1;z<=size;z++)
|
for (z = 1; z <= size; z++) {
|
||||||
{
|
|
||||||
var ide = z + 'result';
|
var ide = z + 'result';
|
||||||
var res = document.getElementById(ide).textContent;
|
var res = document.getElementById(ide).textContent;
|
||||||
//console.log(res)
|
//console.log(res)
|
||||||
if(res != 'OK')
|
if (res != 'OK') {
|
||||||
{
|
|
||||||
flag++;
|
flag++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// alert(flag);
|
// alert(flag);
|
||||||
var total_sandweight = parseFloat(document.getElementById('12sw').textContent);
|
var total_sandweight = parseFloat(document.getElementById('12sw').textContent);
|
||||||
if(flag != 0 || (total_sandweight!=100) )
|
if (flag != 0 || (total_sandweight != 100)) {
|
||||||
{
|
|
||||||
alert('Test Failed, Cant Save Test Report!');
|
alert('Test Failed, Cant Save Test Report!');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($('#approvedby').val() == -1)
|
if ($('#approvedby').val() == -1) {
|
||||||
{
|
|
||||||
alert('Enter Approver Name');
|
alert('Enter Approver Name');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -639,11 +760,9 @@ function calculateMaster(id)
|
|||||||
|
|
||||||
var product = $('#product').val();
|
var product = $('#product').val();
|
||||||
var customer = $('#customer').val();
|
var customer = $('#customer').val();
|
||||||
if(product == -1 || customer == -1)
|
if (product == -1 || customer == -1) {
|
||||||
{
|
|
||||||
alert('Please Select Product and Customer.');
|
alert('Please Select Product and Customer.');
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
|
|
||||||
var c = document.getElementById("myCanvas");
|
var c = document.getElementById("myCanvas");
|
||||||
var fullQuality = c.toDataURL('image/png', 1.0);
|
var fullQuality = c.toDataURL('image/png', 1.0);
|
||||||
@ -667,7 +786,7 @@ function calculateMaster(id)
|
|||||||
formData.append('param6', param6);
|
formData.append('param6', param6);
|
||||||
formData.append('param7', param7);
|
formData.append('param7', param7);
|
||||||
|
|
||||||
$('.content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
//dataType:"json",{param1:testreportdata,param2:testloidata,param3:testafsdata,param4:invoiceno,param5:batchno,param6:approvedby,param7:fullQuality}
|
//dataType:"json",{param1:testreportdata,param2:testloidata,param3:testafsdata,param4:invoiceno,param5:batchno,param6:approvedby,param7:fullQuality}
|
||||||
@ -680,7 +799,7 @@ function calculateMaster(id)
|
|||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
alert(data);
|
alert(data);
|
||||||
$('.content').loader('hide');
|
$('#loader').hide();
|
||||||
window.location = "<?php echo base_url() . 'qualityreportlist'; ?>";
|
window.location = "<?php echo base_url() . 'qualityreportlist'; ?>";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -696,11 +815,9 @@ function calculateMaster(id)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
function calculateAFS(pid,cvalue,cid)
|
function calculateAFS(pid, cvalue, cid) {
|
||||||
{
|
|
||||||
|
|
||||||
if($('#invoiceno').val() == -1)
|
if ($('#invoiceno').val() == -1) {
|
||||||
{
|
|
||||||
alert('Select Invoice No');
|
alert('Select Invoice No');
|
||||||
//return false;
|
//return false;
|
||||||
}
|
}
|
||||||
@ -730,31 +847,25 @@ function calculateMaster(id)
|
|||||||
sandweight = item.textContent;
|
sandweight = item.textContent;
|
||||||
sandweightid = item.id;
|
sandweightid = item.id;
|
||||||
//console.log('sanweight'+item.textContent);
|
//console.log('sanweight'+item.textContent);
|
||||||
}
|
} else if (index == 3) {
|
||||||
else if(index == 3){
|
|
||||||
percentageid = item.id;
|
percentageid = item.id;
|
||||||
percentage = item.textContent;
|
percentage = item.textContent;
|
||||||
}
|
} else if (index == 4) {
|
||||||
|
|
||||||
else if(index == 4){
|
|
||||||
multiplierid = item.id;
|
multiplierid = item.id;
|
||||||
multiplier = item.textContent;
|
multiplier = item.textContent;
|
||||||
}
|
} else if (index == 5) {
|
||||||
else if(index == 5){
|
|
||||||
product = item.textContent;
|
product = item.textContent;
|
||||||
productid = item.id;
|
productid = item.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if(isNaN(sandweight) || sandweight == '' || sandweight == null)
|
if (isNaN(sandweight) || sandweight == '' || sandweight == null) {
|
||||||
{
|
|
||||||
sandweight = 0.00;
|
sandweight = 0.00;
|
||||||
}
|
}
|
||||||
|
|
||||||
//console.log('sanweight'+sandweight);
|
//console.log('sanweight'+sandweight);
|
||||||
if(isNaN(cvalue) || cvalue == '' || cvalue == null)
|
if (isNaN(cvalue) || cvalue == '' || cvalue == null) {
|
||||||
{
|
|
||||||
cvalue = 0.00;
|
cvalue = 0.00;
|
||||||
}
|
}
|
||||||
document.getElementById(percentageid).textContent = parseFloat(sandweight).toFixed(2);
|
document.getElementById(percentageid).textContent = parseFloat(sandweight).toFixed(2);
|
||||||
@ -762,12 +873,10 @@ function calculateMaster(id)
|
|||||||
document.getElementById(productid).textContent = parseFloat(prodcut).toFixed(4);
|
document.getElementById(productid).textContent = parseFloat(prodcut).toFixed(4);
|
||||||
var totalsandweight = 0;
|
var totalsandweight = 0;
|
||||||
var totalproduct = 0;
|
var totalproduct = 0;
|
||||||
for(i=1;i<=11;i++)
|
for (i = 1; i <= 11; i++) {
|
||||||
{
|
|
||||||
var id = i + 'sw';
|
var id = i + 'sw';
|
||||||
var temp = parseFloat(document.getElementById(id).textContent);
|
var temp = parseFloat(document.getElementById(id).textContent);
|
||||||
if(isNaN(temp) || temp == '' || temp == null)
|
if (isNaN(temp) || temp == '' || temp == null) {
|
||||||
{
|
|
||||||
temp = 0.00;
|
temp = 0.00;
|
||||||
}
|
}
|
||||||
totalsandweight = totalsandweight + temp;
|
totalsandweight = totalsandweight + temp;
|
||||||
@ -778,27 +887,23 @@ function calculateMaster(id)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isNaN(totalsandweight) || totalsandweight == '' || totalsandweight == null)
|
if (isNaN(totalsandweight) || totalsandweight == '' || totalsandweight == null) {
|
||||||
{
|
|
||||||
totalsandweight = 0.00;
|
totalsandweight = 0.00;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isNaN(totalproduct) || totalproduct == '' || totalproduct == null)
|
if (isNaN(totalproduct) || totalproduct == '' || totalproduct == null) {
|
||||||
{
|
|
||||||
totalproduct = 0.00;
|
totalproduct = 0.00;
|
||||||
}
|
}
|
||||||
|
|
||||||
document.getElementById('12sw').textContent = parseFloat(totalsandweight).toFixed(2);
|
document.getElementById('12sw').textContent = parseFloat(totalsandweight).toFixed(2);
|
||||||
document.getElementById('12p').textContent = parseFloat(totalsandweight).toFixed(2);
|
document.getElementById('12p').textContent = parseFloat(totalsandweight).toFixed(2);
|
||||||
document.getElementById('12pt').textContent = parseFloat(totalproduct).toFixed(3);
|
document.getElementById('12pt').textContent = parseFloat(totalproduct).toFixed(3);
|
||||||
if(document.getElementById('AFS') != null)
|
if (document.getElementById('AFS') != null) {
|
||||||
{
|
|
||||||
document.getElementById('AFS').textContent = isNaN(totalproduct) ? '0.00' : parseFloat((totalproduct / totalsandweight)).toFixed(2);
|
document.getElementById('AFS').textContent = isNaN(totalproduct) ? '0.00' : parseFloat((totalproduct / totalsandweight)).toFixed(2);
|
||||||
}
|
}
|
||||||
var dataset = [];
|
var dataset = [];
|
||||||
var datalabel = [];
|
var datalabel = [];
|
||||||
for(x=1;x<=11;x++)
|
for (x = 1; x <= 11; x++) {
|
||||||
{
|
|
||||||
var swid = x + 'p';
|
var swid = x + 'p';
|
||||||
var sanddata = document.getElementById(swid).textContent;
|
var sanddata = document.getElementById(swid).textContent;
|
||||||
dataset.push(sanddata);
|
dataset.push(sanddata);
|
||||||
@ -817,8 +922,7 @@ function calculateMaster(id)
|
|||||||
|
|
||||||
var id = e.target.id;
|
var id = e.target.id;
|
||||||
var value = document.getElementById(id).textContent;
|
var value = document.getElementById(id).textContent;
|
||||||
if(value == 0 )
|
if (value == 0) {
|
||||||
{
|
|
||||||
document.getElementById(id).textContent = '';
|
document.getElementById(id).textContent = '';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -828,8 +932,7 @@ function calculateMaster(id)
|
|||||||
var id = e.target.id;
|
var id = e.target.id;
|
||||||
|
|
||||||
var value = document.getElementById(id).textContent;
|
var value = document.getElementById(id).textContent;
|
||||||
if(value == '' )
|
if (value == '') {
|
||||||
{
|
|
||||||
document.getElementById(id).textContent = parseFloat(0.00).toFixed(2);
|
document.getElementById(id).textContent = parseFloat(0.00).toFixed(2);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -956,11 +1059,13 @@ var finallocationofY = [];
|
|||||||
var finallocationofX = [];
|
var finallocationofX = [];
|
||||||
for (i = 1; i <= xlabelscount; i++) //Exact chart Data Draw red points
|
for (i = 1; i <= xlabelscount; i++) //Exact chart Data Draw red points
|
||||||
{
|
{
|
||||||
ctx.beginPath();
|
ctx.beginPath(); <
|
||||||
<!-- ctx.arc((parseFloat(dataset_locationsX[i-1])),((startingpointY - parseFloat(dataset[i-1]) * 7)),4,0,2*Math.PI); -->
|
!--ctx.arc((parseFloat(dataset_locationsX[i - 1])), ((startingpointY - parseFloat(dataset[i - 1]) * 7)), 4, 0, 2 * Math.PI);
|
||||||
|
-- >
|
||||||
ctx.fillStyle = "red";
|
ctx.fillStyle = "red";
|
||||||
ctx.lineCap = 'round';
|
ctx.lineCap = 'round'; <
|
||||||
<!-- ctx.fill(); -->
|
!--ctx.fill();
|
||||||
|
-- >
|
||||||
ctx.fillRect((parseFloat(dataset_locationsX[i - 1]) - 5), ((startingpointY - parseFloat(dataset[i - 1]) * 7) - 5), 10, 10)
|
ctx.fillRect((parseFloat(dataset_locationsX[i - 1]) - 5), ((startingpointY - parseFloat(dataset[i - 1]) * 7) - 5), 10, 10)
|
||||||
finallocationofY.push((startingpointY - parseFloat(dataset[i - 1]) * 7));
|
finallocationofY.push((startingpointY - parseFloat(dataset[i - 1]) * 7));
|
||||||
finallocationofX.push(parseFloat(dataset_locationsX[i - 1]));
|
finallocationofX.push(parseFloat(dataset_locationsX[i - 1]));
|
||||||
@ -1002,9 +1107,3 @@ ctx.setLineDash([]);
|
|||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user