Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
c4276fb215
@ -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,8 +514,8 @@ 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(),
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -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);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2803,6 +2809,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
id: id
|
id: id
|
||||||
@ -2811,9 +2818,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");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2997,7 +3006,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() == '') {
|
||||||
@ -3007,6 +3016,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",
|
||||||
@ -3017,7 +3027,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('');
|
||||||
@ -3027,7 +3037,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
window.location = "purchaseorderListing";
|
window.location = "purchaseorderListing";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3489,7 +3499,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
// formData.append('param6',param6);
|
// formData.append('param6',param6);
|
||||||
|
|
||||||
// $('.content').loader('show');
|
// $('.content').loader('show');
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>servicepurchaseorder/uploadfile",
|
url: "<?php echo base_url() ?>servicepurchaseorder/uploadfile",
|
||||||
@ -3499,8 +3510,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');
|
||||||
}
|
}
|
||||||
@ -3541,7 +3552,8 @@ if (!empty($getlogpodtl)) {
|
|||||||
// formData.append('igr',igr);
|
// formData.append('igr',igr);
|
||||||
|
|
||||||
// $('.content').loader('show');
|
// $('.content').loader('show');
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
data: formData,
|
data: formData,
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>servicepurchaseorder/addfileuplod",
|
url: "<?php echo base_url() ?>servicepurchaseorder/addfileuplod",
|
||||||
|
|||||||
@ -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,8 +1170,8 @@ 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();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -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();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1934,6 +1934,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',
|
||||||
@ -1942,6 +1943,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: selectedMaterialCode
|
materialcode: selectedMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -2028,7 +2030,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
|
||||||
@ -2068,7 +2070,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2084,7 +2086,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,
|
||||||
@ -2094,10 +2096,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");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2135,6 +2137,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',
|
||||||
@ -2143,6 +2146,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: selectedRevenueMaterialCode
|
materialcode: selectedRevenueMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -6106,7 +6110,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({
|
||||||
@ -6118,14 +6122,16 @@ 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('');
|
||||||
|
|
||||||
//window.location = "Requisition";
|
//window.location = "Requisition";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6325,7 +6331,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({
|
||||||
@ -6346,10 +6352,11 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
// $('#content').loader('hide');
|
$('#loader').hide();
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
$('#loader').hide();
|
||||||
alert("Error");
|
alert("Error");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6376,7 +6383,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,
|
||||||
@ -6386,11 +6393,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");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -6413,7 +6420,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,
|
||||||
@ -6423,11 +6430,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");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -7143,6 +7150,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",
|
||||||
@ -7151,7 +7159,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);
|
||||||
}
|
}
|
||||||
@ -7164,7 +7172,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);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -7223,6 +7231,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",
|
||||||
@ -7232,8 +7241,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('');
|
||||||
@ -7335,7 +7343,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,
|
||||||
@ -7345,10 +7353,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");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7378,6 +7386,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',
|
||||||
@ -7386,6 +7395,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
materialcode: editselectedMaterialCode
|
materialcode: editselectedMaterialCode
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
$('#loader').hide();
|
||||||
if (response) alert(response);
|
if (response) alert(response);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -7494,6 +7504,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',
|
||||||
@ -7502,6 +7513,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,8 +254,8 @@
|
|||||||
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']) ;
|
||||||
$("#Requestedby").val(json.Requist[0]['FirstName']);
|
$("#Requestedby").val(json.Requist[0]['FirstName']);
|
||||||
@ -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");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,47 +1,43 @@
|
|||||||
|
|
||||||
|
|
||||||
<?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 {
|
|
||||||
width: 50%;
|
|
||||||
float: right;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
div.dt-buttons {
|
|
||||||
position: relative;
|
|
||||||
float: right;
|
|
||||||
|
|
||||||
}
|
.dataTables_paginate {
|
||||||
|
width: 50%;
|
||||||
|
float: right;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.dt-buttons {
|
||||||
|
position: relative;
|
||||||
|
float: right;
|
||||||
|
|
||||||
</style>
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!--<div class="row">
|
<!--<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div id="container"></div>
|
<div id="container"></div>
|
||||||
|
|
||||||
@ -51,63 +47,67 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<!-- Left col -->
|
<!-- Left col -->
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<!-- TABLE: LATEST ORDERS -->
|
<!-- TABLE: LATEST ORDERS -->
|
||||||
<div class="box box-info">
|
<div class="box box-info">
|
||||||
<div class="box box-info" id="content">
|
<div class="box box-info" id="content">
|
||||||
<!--<div class="box-header with-border">-->
|
<!--<div class="box-header with-border">-->
|
||||||
<!--<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>-->
|
||||||
<!--</div>-->
|
<!--</div>-->
|
||||||
<!-- /.box-header -->
|
<!-- /.box-header -->
|
||||||
<div class="col-md-1 col-md-offset-11">
|
<div class="col-md-1 col-md-offset-11">
|
||||||
<a href="<?php base_url() ?>Bankamountreceived" class="btn btn-success" value="Back"/>Back</a>
|
<a href="<?php base_url() ?>Bankamountreceived" 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;">Amount Received Reports <?php if(!empty($fa)){
|
<center>
|
||||||
echo $fa;
|
<h3 class="box-title">
|
||||||
}
|
<p style="color: #00d976;; font-size: 18px;">Amount Received Reports <?php if (!empty($fa)) {
|
||||||
|
echo $fa;
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fa)){
|
<?php if (!empty($fa)) {
|
||||||
echo '-';
|
echo '-';
|
||||||
echo $aa;
|
echo $aa;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
echo '/';
|
||||||
echo '/';
|
echo $m;
|
||||||
echo $m;
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php if (!empty($fdate)) {
|
||||||
<?php if(!empty($fdate))
|
echo '/';
|
||||||
{
|
echo $fdate;
|
||||||
echo '/';
|
}
|
||||||
echo $fdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
?><?php if(!empty($tdate)){
|
?><?php if (!empty($tdate)) {
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?></p></h3></center>
|
?></p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $clientname;?></span></h4></center>
|
</h3>
|
||||||
<div class="row">
|
</center>
|
||||||
<div class="col-md-6 col-xs-6">
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $clientname; ?></span></h4>
|
||||||
|
</center>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 col-xs-6">
|
||||||
|
|
||||||
<input type="hidden" class="form-control required" id="customer" name="customer" value="<?php echo $clientname;?>" ></textarea>
|
<input type="hidden" class="form-control required" id="customer" name="customer" value="<?php echo $clientname; ?>"></textarea>
|
||||||
<input type="hidden" class="form-control required" id="clientid" name="clientid" value="<?php echo $clientid;?>" ></textarea>
|
<input type="hidden" class="form-control required" id="clientid" name="clientid" value="<?php echo $clientid; ?>"></textarea>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<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;">-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -115,105 +115,103 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
||||||
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
||||||
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
||||||
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
||||||
<p style="margin-left:25px;" id="bamount" </p>
|
<p style="margin-left:25px;" id="bamount" </p>
|
||||||
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
||||||
|
|
||||||
|
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Year'; ?>
|
<?php echo 'Year'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="financialyear" name="financialyear">
|
<select class="form-control" id="financialyear" name="financialyear">
|
||||||
<option value="">Select Year</option>
|
<option value="">Select Year</option>
|
||||||
<?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>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Month'; ?>
|
<?php echo 'Month'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="month" name="month">
|
<select class="form-control" id="month" name="month">
|
||||||
<option value="">Select Month</option>
|
<option value="">Select Month</option>
|
||||||
<option value="January">January</option>
|
<option value="January">January</option>
|
||||||
<option value="February">February</option>
|
<option value="February">February</option>
|
||||||
<option value="March">March</option>
|
<option value="March">March</option>
|
||||||
<option value="April">April</option>
|
<option value="April">April</option>
|
||||||
<option value="May">May</option>
|
<option value="May">May</option>
|
||||||
<option value="June">June</option>
|
<option value="June">June</option>
|
||||||
<option value="July">July</option>
|
<option value="July">July</option>
|
||||||
<option value="August">August</option>
|
<option value="August">August</option>
|
||||||
<option value="September">September</option>
|
<option value="September">September</option>
|
||||||
<option value="October">October</option>
|
<option value="October">October</option>
|
||||||
<option value="November">November</option>
|
<option value="November">November</option>
|
||||||
<option value="December">December</option>
|
<option value="December">December</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="from_date">
|
<label for="from_date">
|
||||||
<?php echo 'From Date'; ?>
|
<?php echo 'From Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="from_date" id="max-date" class="form-control datepicker">
|
<input name="from_date" id="max-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'To Date'; ?>
|
<?php echo 'To Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="to_date" id="min-date" class="form-control datepicker">
|
<input name="to_date" id="min-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!--<div class="col-md-2" >
|
<!--<div class="col-md-2" >
|
||||||
<label for="from_date">
|
<label for="from_date">
|
||||||
<?php echo 'Customer'; ?>
|
<?php echo 'Customer'; ?>
|
||||||
</label>
|
</label>
|
||||||
<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>-->
|
||||||
@ -221,122 +219,111 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-2" style="margin-top:23px;">
|
<div class="col-md-2" style="margin-top:23px;">
|
||||||
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
||||||
<input type="submit" class="btn btn-success" name="btn_submit" value="View Received" >
|
<input type="submit" class="btn btn-success" name="btn_submit" value="View Received">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<br>
|
<br>
|
||||||
<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>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th>BankDate</th>
|
<th>BankDate</th>
|
||||||
<th>INVOICENO</th>
|
<th>INVOICENO</th>
|
||||||
<!--<th>Supplier Name</th>-->
|
<!--<th>Supplier Name</th>-->
|
||||||
<th>Total Invoice Amount (₹)</th>
|
<th>Total Invoice Amount (₹)</th>
|
||||||
<!--<th>Advance PO Amount (₹)</th>-->
|
<!--<th>Advance PO Amount (₹)</th>-->
|
||||||
<th>Balance To Received (₹)</th>
|
<th>Balance To Received (₹)</th>
|
||||||
<th>Amount Received (₹)</th>
|
<th>Amount Received (₹)</th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php
|
<?php
|
||||||
$tot_amount=0;
|
$tot_amount = 0;
|
||||||
$i=1;
|
$i = 1;
|
||||||
$ti=0.00;
|
$ti = 0.00;
|
||||||
$tvt=0.00;
|
$tvt = 0.00;
|
||||||
$preBalance =0;
|
$preBalance = 0;
|
||||||
$preINV ='';
|
$preINV = '';
|
||||||
if(!empty($amountreceived)){
|
if (!empty($amountreceived)) {
|
||||||
foreach($amountreceived as $ap)
|
foreach ($amountreceived as $ap) {
|
||||||
{
|
?>
|
||||||
?>
|
<tr>
|
||||||
<tr>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<input type="hidden" name="bankid" id="bankid<?php echo $i ?>" value="<?php echo $ap->bankid ?>"/>
|
<input type="hidden" name="bankid" id="bankid<?php echo $i ?>" value="<?php echo $ap->bankid ?>" />
|
||||||
<input type="hidden" name="ccbalance" id="ccbalance<?php echo $i ?>" value="<?php echo $ap->cclearbalance?>"/>
|
<input type="hidden" name="ccbalance" id="ccbalance<?php echo $i ?>" value="<?php echo $ap->cclearbalance ?>" />
|
||||||
<input type="hidden" name="btc" id="btc<?php echo $i ?>" value="<?php echo $ap->cbalancetocleared?>"/>
|
<input type="hidden" name="btc" id="btc<?php echo $i ?>" value="<?php echo $ap->cbalancetocleared ?>" />
|
||||||
<input type="hidden" name="mapid" id="mapid<?php echo $i ?>" value="<?php echo $ap->ID?>?>"/>
|
<input type="hidden" name="mapid" id="mapid<?php echo $i ?>" value="<?php echo $ap->ID ?>?>" />
|
||||||
|
|
||||||
<!-- <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);
|
||||||
<td align="left" id="bankdate<?php echo $i ?>"><span><?php echo format_date($ap->BankDate,0,'d-m-Y'); ?></span></td>
|
$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="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>
|
||||||
<!--<td align="left"><a href="<?= base_url() ?>cashbook/bankreceipt?sid=<?php echo $t->PONO;?>"><span><?php echo $t->PONO?></span></a></td>-->
|
<!--<td align="left"><a href="<?= base_url() ?>cashbook/bankreceipt?sid=<?php echo $t->PONO; ?>"><span><?php echo $t->PONO ?></span></a></td>-->
|
||||||
|
|
||||||
<!--<td align="left" id="sn<?php echo $i ?>"><span><?php echo $ap->customername?></span></td>-->
|
<!--<td align="left" id="sn<?php echo $i ?>"><span><?php echo $ap->customername ?></span></td>-->
|
||||||
<td align="left" id="totinvoiceamount<?php echo $i ?>"><span><?php echo $ap->totinvoiceamount?></span></td>
|
<td align="left" id="totinvoiceamount<?php echo $i ?>"><span><?php echo $ap->totinvoiceamount ?></span></td>
|
||||||
<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;
|
||||||
{
|
echo $balance;
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
} else {
|
||||||
echo $balance;
|
|
||||||
|
|
||||||
}
|
$balance = $preBalance - $ap->amountreceived;
|
||||||
else
|
echo $balance;
|
||||||
{
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
$balance = $preBalance - $ap->amountreceived;
|
if ($preINV != $ap->invoiceno) {
|
||||||
echo $balance;
|
// $preBalance =0 ;
|
||||||
|
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
||||||
|
echo $balance;
|
||||||
|
// echo $ap->invoiceno;
|
||||||
|
// echo 'elseif';
|
||||||
|
// echo $preINV;
|
||||||
|
|
||||||
}
|
} else {
|
||||||
}
|
$balance = $ap->totinvoiceamount - $preBalance;
|
||||||
else {
|
echo $balance;
|
||||||
|
echo 'elseelse';
|
||||||
if($preINV != $ap->invoiceno)
|
}
|
||||||
{
|
}
|
||||||
// $preBalance =0 ;
|
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
|
||||||
echo $balance;
|
|
||||||
// echo $ap->invoiceno;
|
|
||||||
// echo 'elseif';
|
|
||||||
// echo $preINV;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
else{
|
|
||||||
$balance = $ap->totinvoiceamount - $preBalance;
|
|
||||||
echo $balance;
|
|
||||||
echo 'elseelse';
|
|
||||||
|
|
||||||
|
|
||||||
}
|
?>
|
||||||
}
|
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
|
||||||
?>
|
<td align="left" id="amountreceived<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($ap->amountreceived) ?><?php echo $ap->amountreceived ?></span></td>
|
||||||
|
<td>
|
||||||
</span>
|
<a data-toggle="tooltip"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details" onclick="invoice(<?php echo $i ?>)"></i> </a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|
||||||
<td align="left" id="amountreceived<?php echo $i ?>"><span><?php $tot_amount=$tot_amount+round( $ap->amountreceived)?><?php echo $ap->amountreceived?></span></td>
|
|
||||||
<td>
|
|
||||||
<a data-toggle="tooltip" ><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details" onclick="invoice(<?php echo $i ?>)"></i> </a>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -345,17 +332,16 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
$preINV = $ap->invoiceno;
|
$preINV = $ap->invoiceno;
|
||||||
$preBalance = $balance;
|
$preBalance = $balance;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
?>
|
||||||
?>
|
</tbody>
|
||||||
</tbody>
|
<tfoot width="100%">
|
||||||
<tfoot width="100%">
|
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:left;"><strong>Total</strong></td>
|
<td style="text-align:left;"><strong>Total</strong></td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
@ -363,152 +349,155 @@ foreach($financialyear as $item)
|
|||||||
<td> </td>
|
<td> </td>
|
||||||
|
|
||||||
<td> </td>
|
<td> </td>
|
||||||
<td class="amount"><strong>
|
<td class="amount"><strong>
|
||||||
<?php echo $tot_amount; ?>
|
<?php echo $tot_amount; ?>
|
||||||
</strong></td>
|
</strong></td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<!-- /.box -->
|
|
||||||
</div>
|
|
||||||
<!-- /.col -->
|
|
||||||
</section>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- /.box -->
|
||||||
|
</div>
|
||||||
|
<!-- /.col -->
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
||||||
<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 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() {
|
$(function() {
|
||||||
//var dateFormat = "mm/dd/yy",
|
//var dateFormat = "mm/dd/yy",
|
||||||
from = $( "#min-date" )
|
from = $("#min-date")
|
||||||
.datepicker({
|
.datepicker({
|
||||||
dateFormat: "dd-mm-yy",
|
|
||||||
defaultDate: "+0d",
|
|
||||||
changeMonth: true,
|
|
||||||
//numberOfMonths: 1
|
|
||||||
|
|
||||||
})
|
|
||||||
.on( "change", function() {
|
|
||||||
to.datepicker("option", "minDate", getDate( this ) );
|
|
||||||
}),
|
|
||||||
to = $( "#max-date" ).datepicker({
|
|
||||||
dateFormat: "dd-mm-yy",
|
dateFormat: "dd-mm-yy",
|
||||||
defaultDate: "+0d",
|
defaultDate: "+0d",
|
||||||
changeMonth: true,
|
changeMonth: true,
|
||||||
//numberOfMonths: 1
|
//numberOfMonths: 1
|
||||||
|
|
||||||
})
|
})
|
||||||
.on( "change", function() {
|
.on("change", function() {
|
||||||
from.datepicker( "option", "maxDate", getDate( this ) );
|
to.datepicker("option", "minDate", getDate(this));
|
||||||
|
}),
|
||||||
|
to = $("#max-date").datepicker({
|
||||||
|
dateFormat: "dd-mm-yy",
|
||||||
|
defaultDate: "+0d",
|
||||||
|
changeMonth: true,
|
||||||
|
//numberOfMonths: 1
|
||||||
|
|
||||||
|
})
|
||||||
|
.on("change", function() {
|
||||||
|
from.datepicker("option", "maxDate", getDate(this));
|
||||||
});
|
});
|
||||||
|
|
||||||
function getDate( element ) {
|
function getDate(element) {
|
||||||
var date;
|
var date;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
date = $.datepicker.parseDate( dateFormat, element.value );
|
date = $.datepicker.parseDate(dateFormat, element.value);
|
||||||
|
|
||||||
} catch( error ) {
|
} catch (error) {
|
||||||
date = null;
|
date = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
} );
|
});
|
||||||
function invoice(i)
|
|
||||||
{
|
|
||||||
|
|
||||||
$('#content').loader('show');
|
function invoice(i) {
|
||||||
var totinvoiceamount=$('#totinvoiceamount'+i).text();
|
|
||||||
|
|
||||||
var balancetoreceived=$('#balancetoreceived'+i).text();
|
$('#loader').show();
|
||||||
var invoiceno=$('#invno'+i).text();
|
var totinvoiceamount = $('#totinvoiceamount' + i).text();
|
||||||
var amountreceived=$('#amountreceived'+i).text();
|
|
||||||
|
|
||||||
var bankid=$('#bankid'+i).val();
|
var balancetoreceived = $('#balancetoreceived' + i).text();
|
||||||
var mappingid=$('#mapid'+i).val();
|
var invoiceno = $('#invno' + i).text();
|
||||||
|
var amountreceived = $('#amountreceived' + i).text();
|
||||||
|
|
||||||
var bankingclear=$('#ccbalance'+i).val();
|
var bankid = $('#bankid' + i).val();
|
||||||
var bankingbalclear=$('#btc'+i).val();
|
var mappingid = $('#mapid' + i).val();
|
||||||
|
|
||||||
$.ajax(
|
var bankingclear = $('#ccbalance' + i).val();
|
||||||
|
var bankingbalclear = $('#btc' + i).val();
|
||||||
|
|
||||||
{
|
$.ajax(
|
||||||
data:{mappingid:mappingid,invoiceno:invoiceno,bankid:bankid,amountreceived:amountreceived,bankingclear:bankingclear,bankingbalclear:bankingbalclear,totinvoiceamount:totinvoiceamount,balancetoreceived:balancetoreceived},
|
|
||||||
type:"POST",
|
|
||||||
url:"<?php echo base_url() ?>DeleteInvoice",
|
|
||||||
success:function(data)
|
|
||||||
{
|
|
||||||
|
|
||||||
if(data)
|
{
|
||||||
{
|
data: {
|
||||||
|
mappingid: mappingid,
|
||||||
|
invoiceno: invoiceno,
|
||||||
|
bankid: bankid,
|
||||||
|
amountreceived: amountreceived,
|
||||||
|
bankingclear: bankingclear,
|
||||||
|
bankingbalclear: bankingbalclear,
|
||||||
|
totinvoiceamount: totinvoiceamount,
|
||||||
|
balancetoreceived: balancetoreceived
|
||||||
|
},
|
||||||
|
type: "POST",
|
||||||
|
url: "<?php echo base_url() ?>DeleteInvoice",
|
||||||
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
|
if (data) {
|
||||||
|
|
||||||
|
|
||||||
window.location.href ="Bankingstatement";
|
window.location.href = "Bankingstatement";
|
||||||
//location.reload();
|
//location.reload();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
$.fn.dataTable.moment('DD-MM-YYYY');
|
||||||
|
|
||||||
table = $('#req').DataTable( {
|
table = $('#req').DataTable({
|
||||||
|
|
||||||
"aaSorting": [[ 0, "desc" ]],
|
"aaSorting": [
|
||||||
"info": true,
|
[0, "desc"]
|
||||||
|
],
|
||||||
|
"info": true,
|
||||||
|
|
||||||
"autoWidth": false,
|
"autoWidth": false,
|
||||||
orderCellsTop: true,
|
orderCellsTop: true,
|
||||||
|
|
||||||
"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(),
|
||||||
title: 'Amount Received Reports',
|
title: 'Amount Received Reports',
|
||||||
exportOptions: {
|
exportOptions: {
|
||||||
columns: ':visible'
|
columns: ':visible'
|
||||||
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
'colvis'
|
|
||||||
]
|
|
||||||
} );
|
|
||||||
} );
|
|
||||||
|
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
'colvis'
|
||||||
|
]
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,135 +1,142 @@
|
|||||||
<?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 {
|
|
||||||
width: 50%;
|
|
||||||
float: right;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
div.dt-buttons {
|
|
||||||
position: relative;
|
|
||||||
float: right;
|
|
||||||
|
|
||||||
}
|
.dataTables_paginate {
|
||||||
|
width: 50%;
|
||||||
|
float: right;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.dt-buttons {
|
||||||
|
position: relative;
|
||||||
|
float: right;
|
||||||
|
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- Left col -->
|
<!-- Left col -->
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="modal fade" id="Fileshow" role="dialog">
|
<div class="modal fade" id="Fileshow" role="dialog">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<!-- Modal. content-->
|
<!-- Modal. content-->
|
||||||
<form>
|
<form>
|
||||||
<div class="modal-content" style="width:800px;">
|
<div class="modal-content" style="width:800px;">
|
||||||
|
|
||||||
<!-- Table to show the line item of po -->
|
<!-- Table to show the line item of po -->
|
||||||
<div id="content" > </div>
|
<div id="content"> </div>
|
||||||
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
|
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
|
||||||
<!-- <thead style="background-color:#ffffff;"> -->
|
<!-- <thead style="background-color:#ffffff;"> -->
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>SNo</th>
|
<th>SNo</th>
|
||||||
<th>BillNO</th>
|
<th>BillNO</th>
|
||||||
<th>PONO</th>
|
<th>PONO</th>
|
||||||
<th>FileName</th>
|
<th>FileName</th>
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="tbleAppend1">
|
<tbody id="tbleAppend1">
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- TABLE: LATEST ORDERS -->
|
||||||
|
<div class="box box-info" id="content">
|
||||||
|
<br>
|
||||||
|
<div class="col-md-1 col-md-offset-11">
|
||||||
|
<a href="<?php base_url() ?>amountunpaid" class="btn btn-success" value="Back" />Back</a>
|
||||||
|
</div>
|
||||||
|
<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)) {
|
||||||
|
echo $fa;
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
<?php if (!empty($fa)) {
|
||||||
|
echo '-';
|
||||||
|
echo $aa;
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
<?php if (!empty($m)) {
|
||||||
|
echo '/';
|
||||||
|
echo $m;
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<?php if (!empty($fdate)) {
|
||||||
|
echo '/';
|
||||||
|
echo $fdate;
|
||||||
|
}
|
||||||
|
|
||||||
|
?><?php if (!empty($tdate)) {
|
||||||
|
echo '/';
|
||||||
|
echo $tdate;
|
||||||
|
}
|
||||||
|
|
||||||
|
?>)</p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $t->SupplierName ?></span></h4>
|
||||||
|
</center>
|
||||||
|
<?php
|
||||||
|
|
||||||
|
if (!empty($bankunpaid)) {
|
||||||
|
foreach ($bankunpaid as $t) {
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<center>
|
||||||
|
<h4 style="color: #00d976;"><span><?php echo $t->supplier_name ?></span></h4>
|
||||||
|
</center>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 col-xs-6">
|
||||||
|
|
||||||
|
<input type="hidden" class="form-control required" id="supplier" name="supplier" value="<?php echo $suppliername; ?>"></textarea>
|
||||||
|
|
||||||
<div class="modal-footer">
|
|
||||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- TABLE: LATEST ORDERS -->
|
|
||||||
<div class="box box-info" id="content">
|
|
||||||
<br>
|
|
||||||
<div class="col-md-1 col-md-offset-11">
|
|
||||||
<a href="<?php base_url() ?>amountunpaid" class="btn btn-success" value="Back"/>Back</a>
|
|
||||||
</div>
|
|
||||||
<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)){
|
|
||||||
echo $fa;
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
<div class="box-body">
|
||||||
<?php if(!empty($fa)){
|
|
||||||
echo '-';
|
|
||||||
echo $aa;
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
<br>
|
||||||
<?php if(!empty($m))
|
|
||||||
{
|
|
||||||
echo '/';
|
|
||||||
echo $m;
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<?php if(!empty($fdate))
|
|
||||||
{
|
|
||||||
echo '/';
|
|
||||||
echo $fdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
?><?php if(!empty($tdate)){
|
|
||||||
echo '/';
|
|
||||||
echo $tdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
?>)</p></h3></center>
|
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $t->SupplierName?></span></h4></center>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
if(!empty($bankunpaid)){
|
|
||||||
foreach($bankunpaid as $t)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $t->supplier_name?></span></h4></center>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-6 col-xs-6">
|
|
||||||
|
|
||||||
<input type="hidden" class="form-control required" id="supplier" name="supplier" value="<?php echo $suppliername;?>" ></textarea>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="box-body">
|
|
||||||
|
|
||||||
<br>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<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;">-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -137,222 +144,212 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
||||||
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
||||||
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
||||||
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
||||||
<p style="margin-left:25px;" id="bamount" </p>
|
<p style="margin-left:25px;" id="bamount" </p>
|
||||||
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
||||||
|
|
||||||
|
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Year'; ?>
|
<?php echo 'Year'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="financialyear" name="financialyear">
|
<select class="form-control" id="financialyear" name="financialyear">
|
||||||
<option value="">Select Year</option>
|
<option value="">Select Year</option>
|
||||||
<?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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Month'; ?>
|
<?php echo 'Month'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="month" name="month">
|
<select class="form-control" id="month" name="month">
|
||||||
<option value="">Select Month</option>
|
<option value="">Select Month</option>
|
||||||
<option value="January">January</option>
|
<option value="January">January</option>
|
||||||
<option value="February">February</option>
|
<option value="February">February</option>
|
||||||
<option value="March">March</option>
|
<option value="March">March</option>
|
||||||
<option value="April">April</option>
|
<option value="April">April</option>
|
||||||
<option value="May">May</option>
|
<option value="May">May</option>
|
||||||
<option value="June">June</option>
|
<option value="June">June</option>
|
||||||
<option value="July">July</option>
|
<option value="July">July</option>
|
||||||
<option value="August">August</option>
|
<option value="August">August</option>
|
||||||
<option value="September">September</option>
|
<option value="September">September</option>
|
||||||
<option value="October">October</option>
|
<option value="October">October</option>
|
||||||
<option value="November">November</option>
|
<option value="November">November</option>
|
||||||
<option value="December">December</option>
|
<option value="December">December</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="from_date">
|
<label for="from_date">
|
||||||
<?php echo 'From Date'; ?>
|
<?php echo 'From Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="from_date" id="max-date" class="form-control datepicker">
|
<input name="from_date" id="max-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'To Date'; ?>
|
<?php echo 'To Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="to_date" id="min-date" class="form-control datepicker">
|
<input name="to_date" id="min-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-3" style="margin-top:20px;">
|
<div class="col-md-3" style="margin-top:20px;">
|
||||||
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
||||||
<input type="submit" class="btn btn-success" name="btn_submit" value="View Payable">
|
<input type="submit" class="btn btn-success" name="btn_submit" value="View Payable">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
<input type="hidden" name="Rowid" id="Rowid" placeholder="Row Id" readonly>
|
<input type="hidden" name="Rowid" id="Rowid" placeholder="Row Id" readonly>
|
||||||
<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 style="background: #00c068;"> -->
|
<!-- <thead style="background: #00c068;"> -->
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Invoice No</th>
|
<th>Invoice No</th>
|
||||||
<!--delivery challandate /igrmaster -->
|
<!--delivery challandate /igrmaster -->
|
||||||
<th>PONO</th>
|
<th>PONO</th>
|
||||||
<th>IGRNO</th>
|
<th>IGRNO</th>
|
||||||
<th>IGR Created Date</th><!-- IGRCreatedDate /igrmaster -->
|
<th>IGR Created Date</th><!-- IGRCreatedDate /igrmaster -->
|
||||||
<th>Material Received Date</th><!--MaterialReceivedDate -->
|
<th>Material Received Date</th><!--MaterialReceivedDate -->
|
||||||
|
|
||||||
<!--<th>IGR Item No</th>-->
|
<!--<th>IGR Item No</th>-->
|
||||||
<th>PO Amount (₹)</th>
|
<th>PO Amount (₹)</th>
|
||||||
<th style="display:none;">IGR File</th>
|
<th style="display:none;">IGR File</th>
|
||||||
<th style="display:none;">PO File</th>
|
<th style="display:none;">PO File</th>
|
||||||
<!--<th>Over Due Days</th>DATEDIFF(CURDATE(),t_igr_master.MaterialReceivedDate)as days-->
|
<!--<th>Over Due Days</th>DATEDIFF(CURDATE(),t_igr_master.MaterialReceivedDate)as days-->
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php
|
|
||||||
$i=1;
|
|
||||||
$tot_amount = 0;
|
|
||||||
$ti=0.00;
|
|
||||||
$tvt=0.00;
|
|
||||||
if(!empty($bankunpaid)){
|
|
||||||
foreach($bankunpaid as $t)
|
|
||||||
{
|
|
||||||
|
|
||||||
$status=$t->Paymentstatus;
|
|
||||||
$balancetopay=$t->Balancetopay;
|
|
||||||
$ReceivedQuantity=$t->ReceivedQuantity;
|
|
||||||
$rate=$t->total;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
if($t->DeliveryChellanOrInvoiceNo=='')
|
|
||||||
{
|
|
||||||
?>
|
|
||||||
<td>-</td>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
?>
|
|
||||||
<td align="left" id="delivey"><span><?php echo $t->DeliveryChellanOrInvoiceNo?></span></a></td>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<td align="left" id="pono<?php echo $i ?>"><span><?php echo $t->pono?></span></a></td>
|
|
||||||
<td align="left" id="igrno<?php echo $i ?>"><span><?php echo $t->igrn?></span></a></td>
|
|
||||||
<td align="left" id="Ddate<?php echo $i ?>"><span><?php echo format_date($t->created_date,0,'d-m-Y');?></span></td>
|
|
||||||
<td align="left" id="Ddate<?php echo $i ?>"><span><?php echo format_date($t->materialrcvddate,0,'d-m-Y');?></span></td>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!--<td align="left" id="igrlineitem<?php echo $i ?>" ><span><?php echo $t->IGRItemNo?></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
|
|
||||||
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>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
?>
|
|
||||||
<td style="display:none;" >NA</td>
|
|
||||||
<?php
|
<?php
|
||||||
}
|
$i = 1;
|
||||||
|
$tot_amount = 0;
|
||||||
|
$ti = 0.00;
|
||||||
|
$tvt = 0.00;
|
||||||
|
if (!empty($bankunpaid)) {
|
||||||
|
foreach ($bankunpaid as $t) {
|
||||||
|
|
||||||
|
$status = $t->Paymentstatus;
|
||||||
|
$balancetopay = $t->Balancetopay;
|
||||||
|
$ReceivedQuantity = $t->ReceivedQuantity;
|
||||||
|
$rate = $t->total;
|
||||||
|
|
||||||
if($t->poFilePath !='')
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
<tr>
|
||||||
|
|
||||||
<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="pofile(<?php echo $i ?>)"></i></a> </td>
|
<?php
|
||||||
|
if ($t->DeliveryChellanOrInvoiceNo == '') {
|
||||||
|
?>
|
||||||
<?php
|
<td>-</td>
|
||||||
} else
|
<?php
|
||||||
{ ?>
|
} else {
|
||||||
<td style="display:none;" >N/A</td>
|
?>
|
||||||
|
<td align="left" id="delivey"><span><?php echo $t->DeliveryChellanOrInvoiceNo ?></span></a></td>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<td align="left" id="pono<?php echo $i ?>"><span><?php echo $t->pono ?></span></a></td>
|
||||||
|
<td align="left" id="igrno<?php echo $i ?>"><span><?php echo $t->igrn ?></span></a></td>
|
||||||
|
<td align="left" id="Ddate<?php echo $i ?>"><span><?php echo format_date($t->created_date, 0, 'd-m-Y'); ?></span></td>
|
||||||
|
<td align="left" id="Ddate<?php echo $i ?>"><span><?php echo format_date($t->materialrcvddate, 0, 'd-m-Y'); ?></span></td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<?php }
|
|
||||||
|
<!--<td align="left" id="igrlineitem<?php echo $i ?>" ><span><?php echo $t->IGRItemNo ?></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
|
||||||
|
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>
|
||||||
|
<?php
|
||||||
|
} else {
|
||||||
|
?>
|
||||||
|
<td style="display:none;">NA</td>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($t->poFilePath != '') {
|
||||||
|
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
<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="pofile(<?php echo $i ?>)"></i></a> </td>
|
||||||
|
|
||||||
|
|
||||||
|
<?php
|
||||||
|
} else { ?>
|
||||||
|
<td style="display:none;">N/A</td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!--<td align="left" id="tov<?php echo $i ?>" ><span><?php echo $t->days?></span></td>-->
|
<?php }
|
||||||
|
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
<!--<td align="left" id="tov<?php echo $i ?>" ><span><?php echo $t->days ?></span></td>-->
|
||||||
<?php
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
}
|
</tr>
|
||||||
?>
|
<?php
|
||||||
</tbody>
|
$i++;
|
||||||
<tfoot width="100%">
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</tbody>
|
||||||
|
<tfoot width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:left;"><strong>Total</strong></td>
|
<td style="text-align:left;"><strong>Total</strong></td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
@ -361,214 +358,215 @@ foreach($financialyear as $item)
|
|||||||
<td> </td>
|
<td> </td>
|
||||||
|
|
||||||
|
|
||||||
<td class="amount"><strong>
|
<td class="amount"><strong>
|
||||||
<?php echo $tot_amount; ?>
|
<?php echo $tot_amount; ?>
|
||||||
</strong></td>
|
</strong></td>
|
||||||
|
|
||||||
<td style="display:none;" > </td>
|
<td style="display:none;"> </td>
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
|
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div><!-- /.box -->
|
||||||
</div><!-- /.box -->
|
</div><!-- /.col -->
|
||||||
</div><!-- /.col -->
|
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
||||||
<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 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');
|
||||||
$.ajax(
|
$('#loader').show();
|
||||||
|
$.ajax(
|
||||||
|
|
||||||
{
|
{
|
||||||
data:{igrno:igrno,pono:pono},
|
data: {
|
||||||
type:"POST",
|
igrno: igrno,
|
||||||
url:"<?php echo base_url() ?>cashbook/filelist",
|
pono: pono
|
||||||
success:function(data)
|
},
|
||||||
{
|
type: "POST",
|
||||||
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
|
success: function(data) {
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
$.each($.parseJSON(data),function (i, item) {
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
i=i+1;
|
i = i + 1;
|
||||||
trHTML += '<tr>' +
|
trHTML += '<tr>' +
|
||||||
'<td align="right">' + i + '</td>' +
|
'<td align="right">' + i + '</td>' +
|
||||||
|
|
||||||
'<td>' + item.BillNo+ '</td>' +
|
'<td>' + item.BillNo + '</td>' +
|
||||||
'<td>' + item.PONO+ '</td>' +
|
'<td>' + item.PONO + '</td>' +
|
||||||
|
|
||||||
'<td><a target="_blank" href = <?php echo base_url()?>public/uploads/BillFiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
|
'<td><a target="_blank" href = <?php echo base_url() ?>public/uploads/BillFiles/' + item.FilePath + '>' + item.FilePath + '</a></td>' +
|
||||||
|
|
||||||
// '<td>' +item.FilePath+"<?php echo base_url().'public/uploads/BillFiles/'?>"> +'</td>'
|
// '<td>' +item.FilePath+"<?php echo base_url() . 'public/uploads/BillFiles/' ?>"> +'</td>'
|
||||||
|
|
||||||
'</tr>';
|
'</tr>';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
function igrfile(i)
|
|
||||||
{
|
|
||||||
var igrno=$('#igrno'+i).text();
|
|
||||||
var pono=$('#pono'+i).text();
|
|
||||||
$("#Fileshow").modal('show');
|
|
||||||
$.ajax(
|
|
||||||
|
|
||||||
{
|
function igrfile(i) {
|
||||||
data:{igrno:igrno,pono:pono},
|
var igrno = $('#igrno' + i).text();
|
||||||
type:"POST",
|
var pono = $('#pono' + i).text();
|
||||||
url:"<?php echo base_url()?>cashbook/IGRFilelist",
|
$("#Fileshow").modal('show');
|
||||||
success:function(data)
|
$('#loader').show();
|
||||||
{
|
$.ajax(
|
||||||
|
|
||||||
|
{
|
||||||
|
data: {
|
||||||
|
igrno: igrno,
|
||||||
|
pono: pono
|
||||||
|
},
|
||||||
|
type: "POST",
|
||||||
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
|
success: function(data) {
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
var FilePath ='';
|
var FilePath = '';
|
||||||
var Filename = '';
|
var Filename = '';
|
||||||
var PONO ='';
|
var PONO = '';
|
||||||
var BillNO ='';
|
var BillNO = '';
|
||||||
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;
|
Filename = item.FilePath;
|
||||||
Filename =item.FilePath;
|
FilePath = "<?php echo base_url() ?>public/uploads/Igrfiles/" + item.FilePath;
|
||||||
FilePath = "<?php echo base_url()?>public/uploads/Igrfiles/"+item.FilePath;
|
} else {
|
||||||
}else{
|
Filename = "BillDetails";
|
||||||
Filename ="BillDetails";
|
PONO = item.PONO;
|
||||||
PONO =item.PONO;
|
BillNO = item.BillNo;
|
||||||
BillNO =item.BillNo;
|
FilePath = item.FilePath;
|
||||||
FilePath = item.FilePath;
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Filename = item.file;
|
||||||
|
PONO = item.pono;
|
||||||
|
BillNO = '-';
|
||||||
|
|
||||||
|
FilePath = "<?php echo base_url() ?>" + item.file;
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
|
||||||
Filename = item.file;
|
|
||||||
PONO =item.pono;
|
|
||||||
BillNO = '-';
|
|
||||||
|
|
||||||
FilePath ="<?php echo base_url()?>"+item.file;
|
if (Filename != null) {
|
||||||
}
|
i = i + 1;
|
||||||
|
i = i - 1;
|
||||||
|
trHTML += '<tr id=' + i + '>' +
|
||||||
|
'<td align="right">' + i + '</td>' +
|
||||||
|
'<td id="billno' + i + '">' + BillNO + '</td>' +
|
||||||
|
'<td>' + PONO + '</td>' +
|
||||||
|
|
||||||
|
'<td id="file' + i + '"><a target="_blank" href = ' + FilePath + '>' + Filename + '</a></td>' +
|
||||||
|
|
||||||
if(Filename != null)
|
// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
|
||||||
{
|
'</tr>';
|
||||||
i=i+1;
|
|
||||||
i=i-1;
|
|
||||||
trHTML += '<tr id='+i+'>' +
|
|
||||||
'<td align="right">' + i + '</td>' +
|
|
||||||
'<td id="billno'+i+'">' + BillNO+ '</td>' +
|
|
||||||
'<td>' + PONO+ '</td>' +
|
|
||||||
|
|
||||||
'<td id="file'+i+'"><a target="_blank" href = '+FilePath+'>'+ Filename +'</a></td>' +
|
}
|
||||||
|
|
||||||
// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
|
|
||||||
'</tr>';
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
$("#tbleAppend1").empty();
|
||||||
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
}
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
/** jquery on ready for DataPicker. */
|
/** jquery on ready for DataPicker. */
|
||||||
$( function() {
|
$(function() {
|
||||||
//var dateFormat = "mm/dd/yy",
|
//var dateFormat = "mm/dd/yy",
|
||||||
from = $( "#min-date" )
|
from = $("#min-date")
|
||||||
.datepicker({
|
.datepicker({
|
||||||
dateFormat: "dd-mm-yy",
|
|
||||||
defaultDate: "+0d",
|
|
||||||
changeMonth: true,
|
|
||||||
//numberOfMonths: 1
|
|
||||||
|
|
||||||
})
|
|
||||||
.on( "change", function() {
|
|
||||||
to.datepicker("option", "minDate", getDate( this ) );
|
|
||||||
}),
|
|
||||||
to = $( "#max-date" ).datepicker({
|
|
||||||
dateFormat: "dd-mm-yy",
|
dateFormat: "dd-mm-yy",
|
||||||
defaultDate: "+0d",
|
defaultDate: "+0d",
|
||||||
changeMonth: true,
|
changeMonth: true,
|
||||||
//numberOfMonths: 1
|
//numberOfMonths: 1
|
||||||
|
|
||||||
})
|
})
|
||||||
.on( "change", function() {
|
.on("change", function() {
|
||||||
from.datepicker( "option", "maxDate", getDate( this ) );
|
to.datepicker("option", "minDate", getDate(this));
|
||||||
|
}),
|
||||||
|
to = $("#max-date").datepicker({
|
||||||
|
dateFormat: "dd-mm-yy",
|
||||||
|
defaultDate: "+0d",
|
||||||
|
changeMonth: true,
|
||||||
|
//numberOfMonths: 1
|
||||||
|
|
||||||
|
})
|
||||||
|
.on("change", function() {
|
||||||
|
from.datepicker("option", "maxDate", getDate(this));
|
||||||
});
|
});
|
||||||
|
|
||||||
function getDate( element ) {
|
function getDate(element) {
|
||||||
var date;
|
var date;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
date = $.datepicker.parseDate( dateFormat, element.value );
|
date = $.datepicker.parseDate(dateFormat, element.value);
|
||||||
|
|
||||||
} catch( error ) {
|
} catch (error) {
|
||||||
date = null;
|
date = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
} );
|
});
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
|
|
||||||
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
$.fn.dataTable.moment('DD-MM-YYYY');
|
||||||
table = $('#req').DataTable( {
|
table = $('#req').DataTable({
|
||||||
"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(),
|
title: 'Unpaid Purchase Order Report',
|
||||||
title: 'Unpaid Purchase Order Report',
|
exportOptions: {
|
||||||
exportOptions: {
|
columns: ':visible'
|
||||||
columns: ':visible'
|
}
|
||||||
}
|
},
|
||||||
},
|
|
||||||
|
|
||||||
'colvis'
|
'colvis'
|
||||||
]
|
]
|
||||||
} );/** 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);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,243 +1,215 @@
|
|||||||
|
|
||||||
|
|
||||||
<?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 {
|
|
||||||
width: 50%;
|
|
||||||
float: right;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
div.dt-buttons {
|
|
||||||
position: relative;
|
|
||||||
float: right;
|
|
||||||
|
|
||||||
}
|
.dataTables_paginate {
|
||||||
|
width: 50%;
|
||||||
|
float: right;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.dt-buttons {
|
||||||
|
position: relative;
|
||||||
|
float: right;
|
||||||
|
|
||||||
</style>
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<!-- Left col -->
|
<!-- Left col -->
|
||||||
<div class="col-md-12" >
|
<div class="col-md-12">
|
||||||
<!-- TABLE: LATEST ORDERS -->
|
<!-- TABLE: LATEST ORDERS -->
|
||||||
<div class="box box-info">
|
<div class="box box-info">
|
||||||
<div class="box box-info" id="content">
|
<div class="box box-info" id="content">
|
||||||
|
|
||||||
<?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))
|
|
||||||
{
|
|
||||||
foreach($mappingcashbook as $mc)
|
|
||||||
{
|
|
||||||
$bankid=$mc->bankid;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(!empty($paidcbook)){
|
|
||||||
|
|
||||||
foreach($paidcbook as $pc)
|
|
||||||
{
|
|
||||||
$pcamount=$pc->total;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if (!empty($mappingcashbook)) {
|
||||||
if(!empty($clearbalance)){
|
foreach ($mappingcashbook as $mc) {
|
||||||
|
$bankid = $mc->bankid;
|
||||||
|
}
|
||||||
$bankclear=$clearbalance;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
if(!empty($balancetoclear)){
|
|
||||||
|
|
||||||
|
|
||||||
$bankbaltoclear=$balancetoclear;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!empty($invoiceramount))
|
if (!empty($paidcbook)) {
|
||||||
{
|
|
||||||
foreach($invoiceramount as $ia)
|
|
||||||
{
|
|
||||||
$inamount=$ia->amountreceived;
|
|
||||||
|
|
||||||
}
|
foreach ($paidcbook as $pc) {
|
||||||
}
|
$pcamount = $pc->total;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($clearbalance)) {
|
||||||
|
|
||||||
|
|
||||||
$totalamount=$pcamount+$inamount;
|
$bankclear = $clearbalance;
|
||||||
//echo $totalamount;
|
}
|
||||||
?>
|
if (!empty($balancetoclear)) {
|
||||||
<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>
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="box-body">
|
$bankbaltoclear = $balancetoclear;
|
||||||
<table class="table table-bordered table-hover" style="table-layout:auto;">
|
}
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
<th>Payment ID</th>
|
|
||||||
<th>Payment Mode</th>
|
|
||||||
<th>Payment Amount (₹)</th>
|
|
||||||
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td><?php echo $bankid?></td>
|
|
||||||
<td>Bank</td>
|
|
||||||
<td><?php echo $bankclear ?></td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
if (!empty($invoiceramount)) {
|
||||||
<br>
|
foreach ($invoiceramount as $ia) {
|
||||||
<br>
|
$inamount = $ia->amountreceived;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
$totalamount = $pcamount + $inamount;
|
||||||
<thead>
|
//echo $totalamount;
|
||||||
<tr>
|
?>
|
||||||
<th>Date</th>
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<th>INVOICE NO</th>
|
<center>
|
||||||
<th>Customer Name</th>
|
<h3 class="box-title">
|
||||||
<th>Total Amount (₹)</th>
|
<p style="color: #00d976;"><b>Bank Credit Amount Paid Report</b></p>
|
||||||
<th>Received Amount</th>
|
</h3>
|
||||||
<th>Balance To Received</th>
|
</center>
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
|
||||||
<th>Action</th>
|
|
||||||
|
<div class="box-body">
|
||||||
|
<table class="table table-bordered table-hover" style="table-layout:auto;">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
|
||||||
|
<th>Payment ID</th>
|
||||||
|
<th>Payment Mode</th>
|
||||||
|
<th>Payment Amount (₹)</th>
|
||||||
|
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td><?php echo $bankid ?></td>
|
||||||
|
<td>Bank</td>
|
||||||
|
<td><?php echo $bankclear ?></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Date</th>
|
||||||
|
<th>INVOICE NO</th>
|
||||||
|
<th>Customer Name</th>
|
||||||
|
<th>Total Amount (₹)</th>
|
||||||
|
<th>Received Amount</th>
|
||||||
|
<th>Balance To Received</th>
|
||||||
|
|
||||||
|
<th>Action</th>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php
|
<?php
|
||||||
$i=1;
|
$i = 1;
|
||||||
$ti=0.00;
|
$ti = 0.00;
|
||||||
$tvt=0.00;
|
$tvt = 0.00;
|
||||||
$preBalance =0;
|
$preBalance = 0;
|
||||||
$preINV ='';
|
$preINV = '';
|
||||||
|
|
||||||
if(!empty($mappingiv)){
|
if (!empty($mappingiv)) {
|
||||||
foreach($mappingiv as $ap)
|
foreach ($mappingiv as $ap) {
|
||||||
{
|
?>
|
||||||
?>
|
<tr>
|
||||||
<tr>
|
|
||||||
|
|
||||||
|
|
||||||
<input type="hidden" name="mappingid" id="mappingid<?php echo $i ?>" value="<?php echo $ap->ID?>"/>
|
<input type="hidden" name="mappingid" id="mappingid<?php echo $i ?>" value="<?php echo $ap->ID ?>" />
|
||||||
<input type="hidden" name="credit" id="credit<?php echo $i ?>" value="<?php echo $ap->Credit?>"/>
|
<input type="hidden" name="credit" id="credit<?php echo $i ?>" value="<?php echo $ap->Credit ?>" />
|
||||||
<input type="hidden" name="bankingbalclear" id="bankingbalclear<?php echo $i ?>" value="<?php echo $bankbaltoclear; ?>"/>
|
<input type="hidden" name="bankingbalclear" id="bankingbalclear<?php echo $i ?>" value="<?php echo $bankbaltoclear; ?>" />
|
||||||
<input type="hidden" name="bankingclear" id="bankingclear<?php echo $i ?>" value="<?php echo $bankclear; ?>"/>
|
<input type="hidden" name="bankingclear" id="bankingclear<?php echo $i ?>" value="<?php echo $bankclear; ?>" />
|
||||||
<input type="hidden" name="bankingid" id="bankingid<?php echo $i ?>" value="<?php echo $ap->bankid; ?>"/>
|
<input type="hidden" name="bankingid" id="bankingid<?php echo $i ?>" value="<?php echo $ap->bankid; ?>" />
|
||||||
<td align="left" id="tov<?php echo $i ?>"><span><?php echo format_date($ap->indate,0,'d-m-Y');?></span></td>
|
<td align="left" id="tov<?php echo $i ?>"><span><?php echo format_date($ap->indate, 0, 'd-m-Y'); ?></span></td>
|
||||||
<td align="left" id="invno<?php echo $i ?>"><?php echo $ap->invoiceno?></span></td>
|
<td align="left" id="invno<?php echo $i ?>"><?php echo $ap->invoiceno ?></span></td>
|
||||||
<td align="left" id="aa<?php echo $i ?>"><span><?php echo $ap->customername?></span></td>
|
<td align="left" id="aa<?php echo $i ?>"><span><?php echo $ap->customername ?></span></td>
|
||||||
<td align="left" id="totinvoiceamount<?php echo $i ?>"><span><?php echo $ap->totinvoiceamount?></span></td>
|
<td align="left" id="totinvoiceamount<?php echo $i ?>"><span><?php echo $ap->totinvoiceamount ?></span></td>
|
||||||
<td align="left" id="amountreceived<?php echo $i ?>"><span><?php echo $ap->amountreceived?></span></td>
|
<td align="left" id="amountreceived<?php echo $i ?>"><span><?php echo $ap->amountreceived ?></span></td>
|
||||||
|
|
||||||
<!--<td align="left" id="balancetoreceived<?php echo $i ?>"><span><?php echo $ap->totinvoiceamount-$ap->amountreceived?></span></td>-->
|
<!--<td align="left" id="balancetoreceived<?php echo $i ?>"><span><?php echo $ap->totinvoiceamount - $ap->amountreceived ?></span></td>-->
|
||||||
|
|
||||||
<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;
|
||||||
{
|
echo $balance;
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
} else {
|
||||||
echo $balance;
|
|
||||||
|
|
||||||
}
|
$balance = $preBalance - $ap->amountreceived;
|
||||||
else
|
echo $balance;
|
||||||
{
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
$balance = $preBalance - $ap->amountreceived;
|
if ($preINV != $ap->invoiceno) {
|
||||||
echo $balance;
|
// $preBalance =0 ;
|
||||||
|
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
||||||
|
echo $balance;
|
||||||
|
// echo $ap->invoiceno;
|
||||||
|
// echo 'elseif';
|
||||||
|
// echo $preINV;
|
||||||
|
|
||||||
}
|
} else {
|
||||||
}
|
$balance = $ap->totinvoiceamount - $preBalance;
|
||||||
else {
|
echo $balance;
|
||||||
|
echo 'elseelse';
|
||||||
if($preINV != $ap->invoiceno)
|
}
|
||||||
{
|
}
|
||||||
// $preBalance =0 ;
|
|
||||||
$balance = $ap->totinvoiceamount - $ap->amountreceived;
|
|
||||||
echo $balance;
|
|
||||||
// echo $ap->invoiceno;
|
|
||||||
// echo 'elseif';
|
|
||||||
// echo $preINV;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
else{
|
|
||||||
$balance = $ap->totinvoiceamount - $preBalance;
|
|
||||||
echo $balance;
|
|
||||||
echo 'elseelse';
|
|
||||||
|
|
||||||
|
|
||||||
}
|
?>
|
||||||
}
|
|
||||||
|
|
||||||
|
</span>
|
||||||
?>
|
</td>
|
||||||
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<a data-toggle="tooltip" ><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details" onclick="invoice(<?php echo $i ?>)"></i> </a>
|
<a data-toggle="tooltip"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details" onclick="invoice(<?php echo $i ?>)"></i> </a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -247,85 +219,84 @@ foreach($financialyear as $item)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
$preINV = $ap->invoiceno;
|
$preINV = $ap->invoiceno;
|
||||||
$preBalance = $balance;
|
$preBalance = $balance;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
|
</table>
|
||||||
|
<center>
|
||||||
|
<h3 class="box-title">
|
||||||
|
<p style="color: #00d976;"><b>Cashbook Reports</b></p>
|
||||||
|
</h3>
|
||||||
|
</center>
|
||||||
|
<br>
|
||||||
|
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
|
||||||
}
|
<th>Date</th>
|
||||||
|
<th>Account Name</th>
|
||||||
|
<th>Bankid</th>
|
||||||
|
<th>Amount Type</th>
|
||||||
|
<th>Total Amount (₹)</th>
|
||||||
|
<!--<th>Advance PO Amount (₹)</th>-->
|
||||||
|
<th>Option (₹)</th>
|
||||||
|
<th>Action</th>
|
||||||
|
|
||||||
}
|
</tr>
|
||||||
?>
|
</thead>
|
||||||
</tbody>
|
<tbody>
|
||||||
|
<?php
|
||||||
|
$i = 1;
|
||||||
|
$ti = 0.00;
|
||||||
|
$tvt = 0.00;
|
||||||
|
if (!empty($mappingcashbook)) {
|
||||||
|
|
||||||
</table>
|
foreach ($mappingcashbook as $mc) {
|
||||||
<center><h3 class="box-title"><p style="color: #00d976;"><b>Cashbook Reports</b></p></h3></center>
|
?>
|
||||||
<br>
|
<tr>
|
||||||
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
<th>Date</th>
|
|
||||||
<th>Account Name</th>
|
|
||||||
<th>Bankid</th>
|
|
||||||
<th>Amount Type</th>
|
|
||||||
<th>Total Amount (₹)</th>
|
|
||||||
<!--<th>Advance PO Amount (₹)</th>-->
|
|
||||||
<th>Option (₹)</th>
|
|
||||||
<th>Action</th>
|
|
||||||
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<?php
|
|
||||||
$i=1;
|
|
||||||
$ti=0.00;
|
|
||||||
$tvt=0.00;
|
|
||||||
if(!empty($mappingcashbook)){
|
|
||||||
|
|
||||||
foreach($mappingcashbook as $mc)
|
|
||||||
{
|
|
||||||
?>
|
|
||||||
<tr>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<td align="left" id="date"><span><?php echo $mc->date?></span></td>
|
<td align="left" id="date"><span><?php echo $mc->date ?></span></td>
|
||||||
<td align="left" id="date"><span><?php echo $mc->name?></span></td>
|
<td align="left" id="date"><span><?php echo $mc->name ?></span></td>
|
||||||
<!--<td align="left" id="pono"><a href="<?= base_url() ?>cashbook/receipt?sid=<?php echo $ap->PONO;?>"><span><?php echo $ap->PONO?></span></a></td>-->
|
<!--<td align="left" id="pono"><a href="<?= base_url() ?>cashbook/receipt?sid=<?php echo $ap->PONO; ?>"><span><?php echo $ap->PONO ?></span></a></td>-->
|
||||||
<!--<td align="left"><a href="<?= base_url() ?>cashbook/bankreceipt?sid=<?php echo $t->PONO;?>"><span><?php echo $t->PONO?></span></a></td>-->
|
<!--<td align="left"><a href="<?= base_url() ?>cashbook/bankreceipt?sid=<?php echo $t->PONO; ?>"><span><?php echo $t->PONO ?></span></a></td>-->
|
||||||
|
|
||||||
<td align="left" id="bankid"><span><?php echo $mc->bankid?></span></td>
|
<td align="left" id="bankid"><span><?php echo $mc->bankid ?></span></td>
|
||||||
<td align="left" id="tov"><span><?php echo $mc->amounttype?></span></td>
|
<td align="left" id="tov"><span><?php echo $mc->amounttype ?></span></td>
|
||||||
<td align="left" id="aa"><span><?php echo $mc->total?></span></td>
|
<td align="left" id="aa"><span><?php echo $mc->total ?></span></td>
|
||||||
<td align="left" id="aa"><span><?php echo $mc->cashtype?></span></td>
|
<td align="left" id="aa"><span><?php echo $mc->cashtype ?></span></td>
|
||||||
<td>
|
<td>
|
||||||
<a data-toggle="tooltip" href="<?php echo base_url().'Deleteinvoiceurl?bankid='.$mc->bankid; ?>&id=<?php echo $mc->id?>&amount=<?php echo $mc->total?>&balancetoclear=<?php echo $balancetoclear?>&clearbalance=<?php echo $bankclear?>&accountname=<?php echo $mc->name?>&amounttype=<?php echo $mc->amounttype?>"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details"></i> </a>
|
<a data-toggle="tooltip" href="<?php echo base_url() . 'Deleteinvoiceurl?bankid=' . $mc->bankid; ?>&id=<?php echo $mc->id ?>&amount=<?php echo $mc->total ?>&balancetoclear=<?php echo $balancetoclear ?>&clearbalance=<?php echo $bankclear ?>&accountname=<?php echo $mc->name ?>&amounttype=<?php echo $mc->amounttype ?>"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details"></i> </a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
}
|
</table>
|
||||||
?>
|
</div>
|
||||||
</tbody>
|
</div>
|
||||||
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<!-- /.box -->
|
<!-- /.box -->
|
||||||
|
|
||||||
<!-- /.col -->
|
<!-- /.col -->
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -339,64 +310,72 @@ 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();
|
||||||
var invoiceno=$('#invno'+i).text();
|
var invoiceno = $('#invno' + i).text();
|
||||||
//alert(invoiceno);
|
//alert(invoiceno);
|
||||||
var bankid=$('#bankingid'+i).val();
|
var bankid = $('#bankingid' + i).val();
|
||||||
var amountreceived=$('#amountreceived'+i).text();
|
var amountreceived = $('#amountreceived' + i).text();
|
||||||
|
|
||||||
var bankingclear=$('#bankingclear'+i).val();
|
var bankingclear = $('#bankingclear' + i).val();
|
||||||
var mappingid=$('#mappingid'+i).val();
|
var mappingid = $('#mappingid' + i).val();
|
||||||
var credit=$('#credit'+i).val();
|
var credit = $('#credit' + i).val();
|
||||||
var bankingbalclear=$('#bankingbalclear'+i).val();
|
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: {
|
||||||
type:"POST",
|
credit: credit,
|
||||||
url:"<?php echo base_url() ?>DeleteInvoice",
|
mappingid: mappingid,
|
||||||
success:function(data)
|
invoiceno: invoiceno,
|
||||||
{
|
bankid: bankid,
|
||||||
|
amountreceived: amountreceived,
|
||||||
|
bankingclear: bankingclear,
|
||||||
|
bankingbalclear: bankingbalclear,
|
||||||
|
totinvoiceamount: totinvoiceamount,
|
||||||
|
balancetoreceived: balancetoreceived
|
||||||
|
},
|
||||||
|
type: "POST",
|
||||||
|
url: "<?php echo base_url() ?>DeleteInvoice",
|
||||||
|
success: function(data) {
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
if(data)
|
if (data) {
|
||||||
{
|
|
||||||
|
|
||||||
window.location.href ="Bankingstatement";
|
window.location.href = "Bankingstatement";
|
||||||
//location.reload();
|
//location.reload();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
table = $('#req').DataTable( {
|
table = $('#req').DataTable({
|
||||||
"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(),
|
||||||
title: 'cashbook Overall Report',
|
title: 'cashbook Overall Report',
|
||||||
exportOptions: {
|
exportOptions: {
|
||||||
columns: ':visible'
|
columns: ':visible'
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
'colvis'
|
'colvis'
|
||||||
]
|
]
|
||||||
} );
|
});
|
||||||
} );
|
});
|
||||||
</script>
|
</script>
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,49 +1,44 @@
|
|||||||
|
|
||||||
|
|
||||||
<?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 {
|
|
||||||
width: 50%;
|
|
||||||
float: right;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
div.dt-buttons {
|
|
||||||
position: relative;
|
|
||||||
float: right;
|
|
||||||
|
|
||||||
}
|
.dataTables_paginate {
|
||||||
|
width: 50%;
|
||||||
|
float: right;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.dt-buttons {
|
||||||
|
position: relative;
|
||||||
|
float: right;
|
||||||
|
|
||||||
</style>
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!--<div class="row">
|
<!--<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div id="container"></div>
|
<div id="container"></div>
|
||||||
|
|
||||||
@ -52,225 +47,227 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- Left col -->
|
<!-- Left col -->
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<!-- TABLE: LATEST ORDERS -->
|
<!-- TABLE: LATEST ORDERS -->
|
||||||
<div class="box box-info">
|
<div class="box box-info">
|
||||||
<!--<div class="box-header with-border">-->
|
<!--<div class="box-header with-border">-->
|
||||||
<!--<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>-->
|
||||||
<!--</div>-->
|
<!--</div>-->
|
||||||
<!-- /.box-header -->
|
<!-- /.box-header -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
|
|
||||||
|
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<div class="col-md-1 col-md-offset-11">
|
<div class="col-md-1 col-md-offset-11">
|
||||||
<a href="<?php base_url() ?>amountpaidsupplier" class="btn btn-success" value="Back"/>Back</a>
|
<a href="<?php base_url() ?>amountpaidsupplier" 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;">Cashbook Reports
|
<center>
|
||||||
<?php if(!empty($fa)){
|
<h3 class="box-title">
|
||||||
echo $fa;
|
<p style="color: #00d976;; font-size: 18px;">Cashbook Reports
|
||||||
}
|
<?php if (!empty($fa)) {
|
||||||
|
echo $fa;
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fa)){
|
<?php if (!empty($fa)) {
|
||||||
echo '-';
|
echo '-';
|
||||||
echo $aa;
|
echo $aa;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
echo '/';
|
||||||
echo '/';
|
echo $m;
|
||||||
echo $m;
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php if (!empty($fdate)) {
|
||||||
<?php if(!empty($fdate))
|
echo '/';
|
||||||
{
|
echo $fdate;
|
||||||
echo '/';
|
}
|
||||||
echo $fdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
?><?php if(!empty($tdate)){
|
?><?php if (!empty($tdate)) {
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?></p></h3></center>
|
?></p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $accountname;?></span></h4></center>
|
</h3>
|
||||||
<div class="box-body">
|
</center>
|
||||||
<div class="row">
|
<center>
|
||||||
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
<h4 style="color: #00d976;"><span><?php echo $accountname; ?></span></h4>
|
||||||
<div class="row">
|
</center>
|
||||||
<div class="col-md-6 col-xs-6">
|
<div class="box-body">
|
||||||
|
<div class="row">
|
||||||
|
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 col-xs-6">
|
||||||
|
|
||||||
<input type="hidden" class="form-control required" id="accountcode" name="accountcode" value="<?php echo $accountcode;?>" ></textarea>
|
<input type="hidden" class="form-control required" id="accountcode" name="accountcode" value="<?php echo $accountcode; ?>"></textarea>
|
||||||
<input type="hidden" class="form-control required" id="accountname" name="accountname" value="<?php echo $accountname;?>" ></textarea>
|
<input type="hidden" class="form-control required" id="accountname" name="accountname" value="<?php echo $accountname; ?>"></textarea>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
||||||
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
||||||
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
||||||
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
||||||
<p style="margin-left:25px;" id="bamount" </p>
|
<p style="margin-left:25px;" id="bamount" </p>
|
||||||
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
||||||
|
|
||||||
|
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Year'; ?>
|
<?php echo 'Year'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="financialyear" name="financialyear">
|
<select class="form-control" id="financialyear" name="financialyear">
|
||||||
<option value="">Select Year</option>
|
<option value="">Select Year</option>
|
||||||
<?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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Month'; ?>
|
<?php echo 'Month'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="month" name="month">
|
<select class="form-control" id="month" name="month">
|
||||||
<option value="">Select Month</option>
|
<option value="">Select Month</option>
|
||||||
<option value="January">January</option>
|
<option value="January">January</option>
|
||||||
<option value="February">February</option>
|
<option value="February">February</option>
|
||||||
<option value="March">March</option>
|
<option value="March">March</option>
|
||||||
<option value="April">April</option>
|
<option value="April">April</option>
|
||||||
<option value="May">May</option>
|
<option value="May">May</option>
|
||||||
<option value="June">June</option>
|
<option value="June">June</option>
|
||||||
<option value="July">July</option>
|
<option value="July">July</option>
|
||||||
<option value="August">August</option>
|
<option value="August">August</option>
|
||||||
<option value="September">September</option>
|
<option value="September">September</option>
|
||||||
<option value="October">October</option>
|
<option value="October">October</option>
|
||||||
<option value="November">November</option>
|
<option value="November">November</option>
|
||||||
<option value="December">December</option>
|
<option value="December">December</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="from_date">
|
<label for="from_date">
|
||||||
<?php echo 'From Date'; ?>
|
<?php echo 'From Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="from_date" id="max-date" class="form-control datepicker">
|
<input name="from_date" id="max-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'To Date'; ?>
|
<?php echo 'To Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="to_date" id="min-date" class="form-control datepicker">
|
<input name="to_date" id="min-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-3" style="margin-top:20px;">
|
<div class="col-md-3" style="margin-top:20px;">
|
||||||
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
||||||
<input type="submit" class="btn btn-success" name="btn_submit" value="View cashbook">
|
<input type="submit" class="btn btn-success" name="btn_submit" value="View cashbook">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
<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>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th>Account Name</th>
|
<th>Account Name</th>
|
||||||
<th>Supplier Name</th>
|
<th>Supplier Name</th>
|
||||||
<!-- <th>Bankid</th>-->
|
<!-- <th>Bankid</th>-->
|
||||||
<!--<th>Amount Type</th>-->
|
<!--<th>Amount Type</th>-->
|
||||||
<th>Total Amount (₹)</th>
|
<th>Total Amount (₹)</th>
|
||||||
<!--<th>Advance PO Amount (₹)</th>-->
|
<!--<th>Advance PO Amount (₹)</th>-->
|
||||||
<!--<th>Option (₹)</th>-->
|
<!--<th>Option (₹)</th>-->
|
||||||
<!--<th>Action</th>-->
|
<!--<th>Action</th>-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php
|
<?php
|
||||||
$tot_amount=0;
|
$tot_amount = 0;
|
||||||
$i=1;
|
$i = 1;
|
||||||
$ti=0.00;
|
$ti = 0.00;
|
||||||
$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;
|
?>
|
||||||
?>
|
<tr>
|
||||||
<tr>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->date?></span></td>
|
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->date ?></span></td>
|
||||||
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->name?></span></td>
|
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->name ?></span></td>
|
||||||
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->SupplierName?></span></td>
|
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->SupplierName ?></span></td>
|
||||||
<!--<td align="left" id="sn<?php echo $i ?>"><span><?php echo $mc->bankid?></span></td>-->
|
<!--<td align="left" id="sn<?php echo $i ?>"><span><?php echo $mc->bankid ?></span></td>-->
|
||||||
<!--<td align="left" id="tov<?php echo $i ?>"><span><?php echo $mc->amounttype?></span></td>-->
|
<!--<td align="left" id="tov<?php echo $i ?>"><span><?php echo $mc->amounttype ?></span></td>-->
|
||||||
<td align="left" id="aa<?php echo $i ?>"><span><?php $tot_amount=$tot_amount+round($rate);?> <?php echo round($rate,2)?></span></td>
|
<td align="left" id="aa<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($rate); ?> <?php echo round($rate, 2) ?></span></td>
|
||||||
<!--<td align="left" id="aa<?php echo $i ?>"><span><?php echo $mc->cashtype?></span></td>-->
|
<!--<td align="left" id="aa<?php echo $i ?>"><span><?php echo $mc->cashtype ?></span></td>-->
|
||||||
<!--<td>
|
<!--<td>
|
||||||
<a data-toggle="tooltip" href="<?php echo base_url().'cashbook/Deletemappingcashbook?bankid='.$mc->bankid; ?>&amount=<?php echo $mc->total?>&id=<?php echo $id?>&balancetoclear=<?php echo $balancetoclear?>&bankamount=<?php echo $bankamount?>&accountname=<?php echo $mc->name?>&amounttype=<?php echo $mc->amounttype?>"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details"></i> </a>
|
<a data-toggle="tooltip" href="<?php echo base_url() . 'cashbook/Deletemappingcashbook?bankid=' . $mc->bankid; ?>&amount=<?php echo $mc->total ?>&id=<?php echo $id ?>&balancetoclear=<?php echo $balancetoclear ?>&bankamount=<?php echo $bankamount ?>&accountname=<?php echo $mc->name ?>&amounttype=<?php echo $mc->amounttype ?>"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details"></i> </a>
|
||||||
</td> -->
|
</td> -->
|
||||||
|
|
||||||
|
|
||||||
@ -280,41 +277,41 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
<tfoot width="100%">
|
<tfoot width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:left;"><strong>Total</strong></td>
|
<td style="text-align:left;"><strong>Total</strong></td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
|
|
||||||
<td class="amount"><strong>
|
<td class="amount"><strong>
|
||||||
<?php echo $tot_amount; ?>
|
<?php echo $tot_amount; ?>
|
||||||
</strong></td>
|
</strong></td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!-- /.box -->
|
<!-- /.box -->
|
||||||
</div>
|
</div>
|
||||||
<!-- /.col -->
|
<!-- /.col -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -322,190 +319,193 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
<!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
|
<!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
||||||
<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) {
|
||||||
|
var igrno = $('#igrno' + i).text();
|
||||||
|
var pono = $('#pono' + i).text();
|
||||||
|
// alert(igrno);
|
||||||
|
// alert(pono);
|
||||||
|
// return false;
|
||||||
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
|
$.ajax(
|
||||||
|
|
||||||
function pono(i)
|
{
|
||||||
{
|
data: {
|
||||||
var igrno=$('#igrno'+i).text();
|
igrno: igrno,
|
||||||
var pono =$('#pono'+i).text();
|
pono: pono
|
||||||
// alert(igrno);
|
},
|
||||||
// alert(pono);
|
type: "POST",
|
||||||
// return false;
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
$("#Fileshow").modal('show');
|
success: function(data) {
|
||||||
$.ajax(
|
|
||||||
|
|
||||||
{
|
var trHTML = '';
|
||||||
data:{igrno:igrno,pono:pono},
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
type:"POST",
|
i = i + 1;
|
||||||
url:"<?php echo base_url() ?>cashbook/filelist",
|
trHTML += '<tr>' +
|
||||||
success:function(data)
|
'<td align="right">' + i + '</td>' +
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
'<td>' + item.BillNo + '</td>' +
|
||||||
$.each($.parseJSON(data),function (i, item) {
|
'<td>' + item.PONO + '</td>' +
|
||||||
i=i+1;
|
|
||||||
trHTML += '<tr>' +
|
|
||||||
'<td align="right">' + i + '</td>' +
|
|
||||||
|
|
||||||
'<td>' + item.BillNo+ '</td>' +
|
'<td><a target="_blank" href = <?php echo base_url() ?>public/uploads/BillFiles/' + item.FilePath + '>' + item.FilePath + '</a></td>' +
|
||||||
'<td>' + item.PONO+ '</td>' +
|
|
||||||
|
|
||||||
'<td><a target="_blank" href = <?php echo base_url()?>public/uploads/BillFiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
|
// '<td>' +item.FilePath+"<?php echo base_url() . 'public/uploads/BillFiles/' ?>"> +'</td>'
|
||||||
|
|
||||||
// '<td>' +item.FilePath+"<?php echo base_url().'public/uploads/BillFiles/'?>"> +'</td>'
|
'</tr>';
|
||||||
|
|
||||||
'</tr>';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
table = $('#req').DataTable( {
|
table = $('#req').DataTable({
|
||||||
"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(),
|
||||||
title: 'cashbook Overall Report',
|
title: 'cashbook Overall Report',
|
||||||
exportOptions: {
|
exportOptions: {
|
||||||
columns: ':visible'
|
columns: ':visible'
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
'colvis'
|
'colvis'
|
||||||
]
|
]
|
||||||
} );
|
});
|
||||||
} );
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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: {
|
||||||
type:"POST",
|
igrno: igrno,
|
||||||
url:"<?php echo base_url() ?>cashbook/IGRFilelist",
|
pono: pono
|
||||||
success:function(data)
|
},
|
||||||
{
|
type: "POST",
|
||||||
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
|
success: function(data) {
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
var FilePath ='';
|
var FilePath = '';
|
||||||
var Filename = '';
|
var Filename = '';
|
||||||
var PONO ='';
|
var PONO = '';
|
||||||
var BillNO ='';
|
var BillNO = '';
|
||||||
|
|
||||||
$.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;
|
Filename = item.FilePath;
|
||||||
Filename =item.FilePath;
|
FilePath = "<?php echo base_url() ?>public/uploads/Igrfiles/" + item.FilePath;
|
||||||
FilePath = "<?php echo base_url()?>public/uploads/Igrfiles/"+item.FilePath;
|
} else {
|
||||||
}else{
|
Filename = "BillDetails";
|
||||||
Filename ="BillDetails";
|
PONO = item.PONO;
|
||||||
PONO =item.PONO;
|
BillNO = item.BillNo;
|
||||||
BillNO =item.BillNo;
|
FilePath = item.FilePath;
|
||||||
FilePath = item.FilePath;
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Filename = item.file;
|
||||||
|
PONO = item.pono;
|
||||||
|
BillNO = '-';
|
||||||
|
FilePath = "<?php echo base_url() ?>" + item.file;
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
|
||||||
Filename = item.file;
|
|
||||||
PONO =item.pono;
|
|
||||||
BillNO = '-';
|
|
||||||
FilePath ="<?php echo base_url()?>"+item.file;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (Filename != null) {
|
||||||
|
i = i + 1;
|
||||||
|
i = i - 1;
|
||||||
|
trHTML += '<tr id=' + i + '>' +
|
||||||
|
'<td align="right">' + i + '</td>' +
|
||||||
|
'<td id="billno' + i + '">' + BillNO + '</td>' +
|
||||||
|
'<td>' + PONO + '</td>' +
|
||||||
|
|
||||||
if(Filename != null)
|
'<td id="file' + i + '"><a target="_blank" href = ' + FilePath + '>' + Filename + '</a></td>' +
|
||||||
{
|
|
||||||
i=i+1;
|
|
||||||
i=i-1;
|
|
||||||
trHTML += '<tr id='+i+'>' +
|
|
||||||
'<td align="right">' + i + '</td>' +
|
|
||||||
'<td id="billno'+i+'">' + BillNO+ '</td>' +
|
|
||||||
'<td>' + PONO+ '</td>' +
|
|
||||||
|
|
||||||
'<td id="file'+i+'"><a target="_blank" href = '+FilePath+'>'+ Filename +'</a></td>' +
|
// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
|
||||||
|
'</tr>';
|
||||||
|
|
||||||
// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
|
}
|
||||||
'</tr>';
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
$( function() {
|
$(function() {
|
||||||
//var dateFormat = "mm/dd/yy",
|
//var dateFormat = "mm/dd/yy",
|
||||||
from = $( "#min-date" )
|
from = $("#min-date")
|
||||||
.datepicker({
|
.datepicker({
|
||||||
dateFormat: "dd-mm-yy",
|
|
||||||
defaultDate: "+0d",
|
|
||||||
changeMonth: true,
|
|
||||||
//numberOfMonths: 1
|
|
||||||
|
|
||||||
})
|
|
||||||
.on( "change", function() {
|
|
||||||
to.datepicker("option", "minDate", getDate( this ) );
|
|
||||||
}),
|
|
||||||
to = $( "#max-date" ).datepicker({
|
|
||||||
dateFormat: "dd-mm-yy",
|
dateFormat: "dd-mm-yy",
|
||||||
defaultDate: "+0d",
|
defaultDate: "+0d",
|
||||||
changeMonth: true,
|
changeMonth: true,
|
||||||
//numberOfMonths: 1
|
//numberOfMonths: 1
|
||||||
|
|
||||||
})
|
})
|
||||||
.on( "change", function() {
|
.on("change", function() {
|
||||||
from.datepicker( "option", "maxDate", getDate( this ) );
|
to.datepicker("option", "minDate", getDate(this));
|
||||||
|
}),
|
||||||
|
to = $("#max-date").datepicker({
|
||||||
|
dateFormat: "dd-mm-yy",
|
||||||
|
defaultDate: "+0d",
|
||||||
|
changeMonth: true,
|
||||||
|
//numberOfMonths: 1
|
||||||
|
|
||||||
|
})
|
||||||
|
.on("change", function() {
|
||||||
|
from.datepicker("option", "maxDate", getDate(this));
|
||||||
});
|
});
|
||||||
|
|
||||||
function getDate( element ) {
|
function getDate(element) {
|
||||||
var date;
|
var date;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
date = $.datepicker.parseDate( dateFormat, element.value );
|
date = $.datepicker.parseDate(dateFormat, element.value);
|
||||||
|
|
||||||
} catch( error ) {
|
} catch (error) {
|
||||||
date = null;
|
date = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
} );
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -1,49 +1,44 @@
|
|||||||
|
|
||||||
|
|
||||||
<?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 {
|
|
||||||
width: 50%;
|
|
||||||
float: right;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
div.dt-buttons {
|
|
||||||
position: relative;
|
|
||||||
float: right;
|
|
||||||
|
|
||||||
}
|
.dataTables_paginate {
|
||||||
|
width: 50%;
|
||||||
|
float: right;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.dt-buttons {
|
||||||
|
position: relative;
|
||||||
|
float: right;
|
||||||
|
|
||||||
</style>
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!--<div class="row">
|
<!--<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div id="container"></div>
|
<div id="container"></div>
|
||||||
|
|
||||||
@ -52,225 +47,227 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- Left col -->
|
<!-- Left col -->
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<!-- TABLE: LATEST ORDERS -->
|
<!-- TABLE: LATEST ORDERS -->
|
||||||
<div class="box box-info">
|
<div class="box box-info">
|
||||||
<!--<div class="box-header with-border">-->
|
<!--<div class="box-header with-border">-->
|
||||||
<!--<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>-->
|
||||||
<!--</div>-->
|
<!--</div>-->
|
||||||
<!-- /.box-header -->
|
<!-- /.box-header -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
|
|
||||||
|
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
|
|
||||||
|
|
||||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||||
<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>
|
||||||
echo $fa;
|
<h3 class="box-title">
|
||||||
}
|
<p style="color: #00d976;; font-size: 18px;">Cashbook Reports <?php if (!empty($fa)) {
|
||||||
|
echo $fa;
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($fa)){
|
<?php if (!empty($fa)) {
|
||||||
echo '-';
|
echo '-';
|
||||||
echo $aa;
|
echo $aa;
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
<?php if(!empty($m))
|
<?php if (!empty($m)) {
|
||||||
{
|
echo '/';
|
||||||
echo '/';
|
echo $m;
|
||||||
echo $m;
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php if (!empty($fdate)) {
|
||||||
<?php if(!empty($fdate))
|
echo '/';
|
||||||
{
|
echo $fdate;
|
||||||
echo '/';
|
}
|
||||||
echo $fdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
?><?php if(!empty($tdate)){
|
?><?php if (!empty($tdate)) {
|
||||||
echo '/';
|
echo '/';
|
||||||
echo $tdate;
|
echo $tdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
?></p></h3></center>
|
?></p>
|
||||||
<center><h4 style="color: #00d976;"><span><?php echo $accountname;?></span></h4></center>
|
</h3>
|
||||||
<div class="box-body">
|
</center>
|
||||||
<div class="row">
|
<center>
|
||||||
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
<h4 style="color: #00d976;"><span><?php echo $accountname; ?></span></h4>
|
||||||
<div class="row">
|
</center>
|
||||||
<div class="col-md-6 col-xs-6">
|
<div class="box-body">
|
||||||
|
<div class="row">
|
||||||
|
<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">-->
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 col-xs-6">
|
||||||
|
|
||||||
<input type="hidden" class="form-control required" id="accountcode" name="accountcode" value="<?php echo $accountcode;?>" ></textarea>
|
<input type="hidden" class="form-control required" id="accountcode" name="accountcode" value="<?php echo $accountcode; ?>"></textarea>
|
||||||
<input type="hidden" class="form-control required" id="accountname" name="accountname" value="<?php echo $accountname;?>" ></textarea>
|
<input type="hidden" class="form-control required" id="accountname" name="accountname" value="<?php echo $accountname; ?>"></textarea>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
<!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
|
||||||
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID: </p> -->
|
||||||
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount: </p>-->
|
||||||
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
<!-- <p style="margin-left:25px;">Payment Mode: Bank</p>
|
||||||
<p style="margin-left:25px;" id="bamount" </p>
|
<p style="margin-left:25px;" id="bamount" </p>
|
||||||
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date: </p> -->
|
||||||
|
|
||||||
|
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Year'; ?>
|
<?php echo 'Year'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="financialyear" name="financialyear">
|
<select class="form-control" id="financialyear" name="financialyear">
|
||||||
<option value="">Select Year</option>
|
<option value="">Select Year</option>
|
||||||
<?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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'Month'; ?>
|
<?php echo 'Month'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="month" name="month">
|
<select class="form-control" id="month" name="month">
|
||||||
<option value="">Select Month</option>
|
<option value="">Select Month</option>
|
||||||
<option value="January">January</option>
|
<option value="January">January</option>
|
||||||
<option value="February">February</option>
|
<option value="February">February</option>
|
||||||
<option value="March">March</option>
|
<option value="March">March</option>
|
||||||
<option value="April">April</option>
|
<option value="April">April</option>
|
||||||
<option value="May">May</option>
|
<option value="May">May</option>
|
||||||
<option value="June">June</option>
|
<option value="June">June</option>
|
||||||
<option value="July">July</option>
|
<option value="July">July</option>
|
||||||
<option value="August">August</option>
|
<option value="August">August</option>
|
||||||
<option value="September">September</option>
|
<option value="September">September</option>
|
||||||
<option value="October">October</option>
|
<option value="October">October</option>
|
||||||
<option value="November">November</option>
|
<option value="November">November</option>
|
||||||
<option value="December">December</option>
|
<option value="December">December</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="from_date">
|
<label for="from_date">
|
||||||
<?php echo 'From Date'; ?>
|
<?php echo 'From Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="from_date" id="max-date" class="form-control datepicker">
|
<input name="from_date" id="max-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<label for="to_date">
|
<label for="to_date">
|
||||||
<?php echo 'To Date'; ?>
|
<?php echo 'To Date'; ?>
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input name="to_date" id="min-date" class="form-control datepicker">
|
<input name="to_date" id="min-date" class="form-control datepicker">
|
||||||
<span class="input-group-addon">
|
<span class="input-group-addon">
|
||||||
<i class="fa fa-calendar fa-fw"></i>
|
<i class="fa fa-calendar fa-fw"></i>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-3" style="margin-top:20px;">
|
<div class="col-md-3" style="margin-top:20px;">
|
||||||
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
|
||||||
<input type="submit" class="btn btn-success" name="btn_submit" value="View Cashbook">
|
<input type="submit" class="btn btn-success" name="btn_submit" value="View Cashbook">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
<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>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th>Account Name</th>
|
<th>Account Name</th>
|
||||||
<th>Supplier Name</th>
|
<th>Supplier Name</th>
|
||||||
<!-- <th>Bankid</th>-->
|
<!-- <th>Bankid</th>-->
|
||||||
<!--<th>Amount Type</th>-->
|
<!--<th>Amount Type</th>-->
|
||||||
<th>Total Amount (₹)</th>
|
<th>Total Amount (₹)</th>
|
||||||
<!--<th>Advance PO Amount (₹)</th>-->
|
<!--<th>Advance PO Amount (₹)</th>-->
|
||||||
<!--<th>Option (₹)</th>-->
|
<!--<th>Option (₹)</th>-->
|
||||||
<!--<th>Action</th>-->
|
<!--<th>Action</th>-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php
|
<?php
|
||||||
$tot_amount=0;
|
$tot_amount = 0;
|
||||||
$i=1;
|
$i = 1;
|
||||||
$ti=0.00;
|
$ti = 0.00;
|
||||||
$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;
|
?>
|
||||||
?>
|
<tr>
|
||||||
<tr>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->date?></span></td>
|
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->date ?></span></td>
|
||||||
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->name?></span></td>
|
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->name ?></span></td>
|
||||||
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->SupplierName?></span></td>
|
<td align="left" id="date<?php echo $i ?>"><span><?php echo $mc->SupplierName ?></span></td>
|
||||||
<!--<td align="left" id="sn<?php echo $i ?>"><span><?php echo $mc->bankid?></span></td>-->
|
<!--<td align="left" id="sn<?php echo $i ?>"><span><?php echo $mc->bankid ?></span></td>-->
|
||||||
<!--<td align="left" id="tov<?php echo $i ?>"><span><?php echo $mc->amounttype?></span></td>-->
|
<!--<td align="left" id="tov<?php echo $i ?>"><span><?php echo $mc->amounttype ?></span></td>-->
|
||||||
<td align="left" id="aa<?php echo $i ?>"><span><?php $tot_amount=$tot_amount+round($rate);?> <?php echo round($rate,2)?></span></td>
|
<td align="left" id="aa<?php echo $i ?>"><span><?php $tot_amount = $tot_amount + round($rate); ?> <?php echo round($rate, 2) ?></span></td>
|
||||||
<!--<td align="left" id="aa<?php echo $i ?>"><span><?php echo $mc->cashtype?></span></td>-->
|
<!--<td align="left" id="aa<?php echo $i ?>"><span><?php echo $mc->cashtype ?></span></td>-->
|
||||||
<!--<td>
|
<!--<td>
|
||||||
<a data-toggle="tooltip" href="<?php echo base_url().'cashbook/Deletemappingcashbook?bankid='.$mc->bankid; ?>&amount=<?php echo $mc->total?>&id=<?php echo $id?>&balancetoclear=<?php echo $balancetoclear?>&bankamount=<?php echo $bankamount?>&accountname=<?php echo $mc->name?>&amounttype=<?php echo $mc->amounttype?>"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details"></i> </a>
|
<a data-toggle="tooltip" href="<?php echo base_url() . 'cashbook/Deletemappingcashbook?bankid=' . $mc->bankid; ?>&amount=<?php echo $mc->total ?>&id=<?php echo $id ?>&balancetoclear=<?php echo $balancetoclear ?>&bankamount=<?php echo $bankamount ?>&accountname=<?php echo $mc->name ?>&amounttype=<?php echo $mc->amounttype ?>"><i class="fa fa-trash" data-toggle="tooltip" title="<?php echo $record->AdjustmentId; ?> - Click here to Delete details"></i> </a>
|
||||||
</td> -->
|
</td> -->
|
||||||
|
|
||||||
|
|
||||||
@ -280,41 +277,41 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
<tfoot width="100%">
|
<tfoot width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:left;"><strong>Total</strong></td>
|
<td style="text-align:left;"><strong>Total</strong></td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
|
|
||||||
<td class="amount"><strong>
|
<td class="amount"><strong>
|
||||||
<?php echo $tot_amount; ?>
|
<?php echo $tot_amount; ?>
|
||||||
</strong></td>
|
</strong></td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!-- /.box -->
|
<!-- /.box -->
|
||||||
</div>
|
</div>
|
||||||
<!-- /.col -->
|
<!-- /.col -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -322,190 +319,193 @@ if(!empty($mapping))
|
|||||||
|
|
||||||
|
|
||||||
<!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
|
<!-- <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> -->
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
||||||
<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) {
|
||||||
|
var igrno = $('#igrno' + i).text();
|
||||||
|
var pono = $('#pono' + i).text();
|
||||||
|
// alert(igrno);
|
||||||
|
// alert(pono);
|
||||||
|
// return false;
|
||||||
|
$("#Fileshow").modal('show');
|
||||||
|
$('#loader').show();
|
||||||
|
$.ajax(
|
||||||
|
|
||||||
function pono(i)
|
{
|
||||||
{
|
data: {
|
||||||
var igrno=$('#igrno'+i).text();
|
igrno: igrno,
|
||||||
var pono =$('#pono'+i).text();
|
pono: pono
|
||||||
// alert(igrno);
|
},
|
||||||
// alert(pono);
|
type: "POST",
|
||||||
// return false;
|
url: "<?php echo base_url() ?>cashbook/filelist",
|
||||||
$("#Fileshow").modal('show');
|
success: function(data) {
|
||||||
$.ajax(
|
|
||||||
|
|
||||||
{
|
var trHTML = '';
|
||||||
data:{igrno:igrno,pono:pono},
|
$.each($.parseJSON(data), function(i, item) {
|
||||||
type:"POST",
|
i = i + 1;
|
||||||
url:"<?php echo base_url() ?>cashbook/filelist",
|
trHTML += '<tr>' +
|
||||||
success:function(data)
|
'<td align="right">' + i + '</td>' +
|
||||||
{
|
|
||||||
|
|
||||||
var trHTML = '';
|
'<td>' + item.BillNo + '</td>' +
|
||||||
$.each($.parseJSON(data),function (i, item) {
|
'<td>' + item.PONO + '</td>' +
|
||||||
i=i+1;
|
|
||||||
trHTML += '<tr>' +
|
|
||||||
'<td align="right">' + i + '</td>' +
|
|
||||||
|
|
||||||
'<td>' + item.BillNo+ '</td>' +
|
'<td><a target="_blank" href = <?php echo base_url() ?>public/uploads/BillFiles/' + item.FilePath + '>' + item.FilePath + '</a></td>' +
|
||||||
'<td>' + item.PONO+ '</td>' +
|
|
||||||
|
|
||||||
'<td><a target="_blank" href = <?php echo base_url()?>public/uploads/BillFiles/'+item.FilePath+'>'+ item.FilePath +'</a></td>' +
|
// '<td>' +item.FilePath+"<?php echo base_url() . 'public/uploads/BillFiles/' ?>"> +'</td>'
|
||||||
|
|
||||||
// '<td>' +item.FilePath+"<?php echo base_url().'public/uploads/BillFiles/'?>"> +'</td>'
|
'</tr>';
|
||||||
|
|
||||||
'</tr>';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
table = $('#req').DataTable( {
|
table = $('#req').DataTable({
|
||||||
"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(),
|
||||||
title: 'cashbook Overall Report',
|
title: 'cashbook Overall Report',
|
||||||
exportOptions: {
|
exportOptions: {
|
||||||
columns: ':visible'
|
columns: ':visible'
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
'colvis'
|
'colvis'
|
||||||
]
|
]
|
||||||
} );
|
});
|
||||||
} );
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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: {
|
||||||
type:"POST",
|
igrno: igrno,
|
||||||
url:"<?php echo base_url() ?>cashbook/IGRFilelist",
|
pono: pono
|
||||||
success:function(data)
|
},
|
||||||
{
|
type: "POST",
|
||||||
|
url: "<?php echo base_url() ?>cashbook/IGRFilelist",
|
||||||
|
success: function(data) {
|
||||||
|
|
||||||
|
|
||||||
var trHTML = '';
|
var trHTML = '';
|
||||||
var FilePath ='';
|
var FilePath = '';
|
||||||
var Filename = '';
|
var Filename = '';
|
||||||
var PONO ='';
|
var PONO = '';
|
||||||
var BillNO ='';
|
var BillNO = '';
|
||||||
|
|
||||||
$.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;
|
Filename = item.FilePath;
|
||||||
Filename =item.FilePath;
|
FilePath = "<?php echo base_url() ?>public/uploads/Igrfiles/" + item.FilePath;
|
||||||
FilePath = "<?php echo base_url()?>public/uploads/Igrfiles/"+item.FilePath;
|
} else {
|
||||||
}else{
|
Filename = "BillDetails";
|
||||||
Filename ="BillDetails";
|
PONO = item.PONO;
|
||||||
PONO =item.PONO;
|
BillNO = item.BillNo;
|
||||||
BillNO =item.BillNo;
|
FilePath = item.FilePath;
|
||||||
FilePath = item.FilePath;
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Filename = item.file;
|
||||||
|
PONO = item.pono;
|
||||||
|
BillNO = '-';
|
||||||
|
FilePath = "<?php echo base_url() ?>" + item.file;
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
|
||||||
Filename = item.file;
|
|
||||||
PONO =item.pono;
|
|
||||||
BillNO = '-';
|
|
||||||
FilePath ="<?php echo base_url()?>"+item.file;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (Filename != null) {
|
||||||
|
i = i + 1;
|
||||||
|
i = i - 1;
|
||||||
|
trHTML += '<tr id=' + i + '>' +
|
||||||
|
'<td align="right">' + i + '</td>' +
|
||||||
|
'<td id="billno' + i + '">' + BillNO + '</td>' +
|
||||||
|
'<td>' + PONO + '</td>' +
|
||||||
|
|
||||||
if(Filename != null)
|
'<td id="file' + i + '"><a target="_blank" href = ' + FilePath + '>' + Filename + '</a></td>' +
|
||||||
{
|
|
||||||
i=i+1;
|
|
||||||
i=i-1;
|
|
||||||
trHTML += '<tr id='+i+'>' +
|
|
||||||
'<td align="right">' + i + '</td>' +
|
|
||||||
'<td id="billno'+i+'">' + BillNO+ '</td>' +
|
|
||||||
'<td>' + PONO+ '</td>' +
|
|
||||||
|
|
||||||
'<td id="file'+i+'"><a target="_blank" href = '+FilePath+'>'+ Filename +'</a></td>' +
|
// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
|
||||||
|
'</tr>';
|
||||||
|
|
||||||
// '<td name="filepathname" id="filepathname" onclick="openbillmodel('+i+');"><i class="fa fa-pencil"></i></td>' +
|
}
|
||||||
'</tr>';
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
$("#tbleAppend1").empty();
|
$("#tbleAppend1").empty();
|
||||||
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
$('#Inwardgateregistertable1 > tbody').append(trHTML);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
$( function() {
|
$(function() {
|
||||||
//var dateFormat = "mm/dd/yy",
|
//var dateFormat = "mm/dd/yy",
|
||||||
from = $( "#min-date" )
|
from = $("#min-date")
|
||||||
.datepicker({
|
.datepicker({
|
||||||
dateFormat: "dd-mm-yy",
|
|
||||||
defaultDate: "+0d",
|
|
||||||
changeMonth: true,
|
|
||||||
//numberOfMonths: 1
|
|
||||||
|
|
||||||
})
|
|
||||||
.on( "change", function() {
|
|
||||||
to.datepicker("option", "minDate", getDate( this ) );
|
|
||||||
}),
|
|
||||||
to = $( "#max-date" ).datepicker({
|
|
||||||
dateFormat: "dd-mm-yy",
|
dateFormat: "dd-mm-yy",
|
||||||
defaultDate: "+0d",
|
defaultDate: "+0d",
|
||||||
changeMonth: true,
|
changeMonth: true,
|
||||||
//numberOfMonths: 1
|
//numberOfMonths: 1
|
||||||
|
|
||||||
})
|
})
|
||||||
.on( "change", function() {
|
.on("change", function() {
|
||||||
from.datepicker( "option", "maxDate", getDate( this ) );
|
to.datepicker("option", "minDate", getDate(this));
|
||||||
|
}),
|
||||||
|
to = $("#max-date").datepicker({
|
||||||
|
dateFormat: "dd-mm-yy",
|
||||||
|
defaultDate: "+0d",
|
||||||
|
changeMonth: true,
|
||||||
|
//numberOfMonths: 1
|
||||||
|
|
||||||
|
})
|
||||||
|
.on("change", function() {
|
||||||
|
from.datepicker("option", "maxDate", getDate(this));
|
||||||
});
|
});
|
||||||
|
|
||||||
function getDate( element ) {
|
function getDate(element) {
|
||||||
var date;
|
var date;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
date = $.datepicker.parseDate( dateFormat, element.value );
|
date = $.datepicker.parseDate(dateFormat, element.value);
|
||||||
|
|
||||||
} catch( error ) {
|
} catch (error) {
|
||||||
date = null;
|
date = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
} );
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -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,8 +211,8 @@ $('#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,8 +988,8 @@ if (!empty($filenames)) {
|
|||||||
|
|
||||||
//if(bankname != '' || ifsccode != '' || bankaddress != '' )
|
//if(bankname != '' || ifsccode != '' || bankaddress != '' )
|
||||||
//{
|
//{
|
||||||
// $('#content').loader('show');
|
$('#loader').show();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
|
|
||||||
data: {
|
data: {
|
||||||
id: value
|
id: value
|
||||||
@ -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');
|
||||||
|
|||||||
@ -365,7 +365,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
|
||||||
@ -374,7 +374,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();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -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,8 +3386,8 @@ 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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -3379,8 +3395,8 @@ 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;
|
||||||
var reduceqty = 0;
|
var reduceqty = 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,8 +3585,8 @@ 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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -3576,8 +3594,8 @@ 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;
|
||||||
var reduceqty = 0;
|
var reduceqty = 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,8 +3776,8 @@ 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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -3765,8 +3785,8 @@ 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;
|
||||||
var reduceqty = 0;
|
var reduceqty = 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,8 +3959,8 @@ 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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -3946,8 +3968,8 @@ 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;
|
||||||
var reduceqty = 0;
|
var reduceqty = 0;
|
||||||
@ -4030,8 +4052,8 @@ 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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -4039,8 +4061,8 @@ 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;
|
||||||
var reduceqty = 0;
|
var reduceqty = 0;
|
||||||
@ -4123,8 +4145,8 @@ 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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -4132,8 +4154,8 @@ 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;
|
||||||
var reduceqty = 0;
|
var reduceqty = 0;
|
||||||
@ -4192,8 +4214,8 @@ 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,
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -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,8 +691,8 @@ 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}
|
||||||
type:"POST",
|
type:"POST",
|
||||||
@ -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);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -4587,6 +4591,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,
|
||||||
@ -4595,6 +4600,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);
|
||||||
@ -4682,7 +4688,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
|
||||||
@ -4690,6 +4696,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);
|
||||||
|
|
||||||
@ -5002,6 +5009,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",
|
||||||
@ -5010,6 +5018,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('');
|
||||||
@ -5239,7 +5248,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",
|
||||||
@ -5249,7 +5258,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]);
|
||||||
@ -5283,7 +5292,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",
|
||||||
@ -5293,7 +5302,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]);
|
||||||
@ -5317,7 +5326,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",
|
||||||
@ -5327,7 +5336,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,7 +2213,8 @@ foreach ($PaymentTerms as $TER) {
|
|||||||
} else {
|
} else {
|
||||||
// $('#content').loader('show');
|
// $('#content').loader('show');
|
||||||
var formData = new FormData($('.ServicePO')[0]);
|
var formData = new FormData($('.ServicePO')[0]);
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
// data: $('.ServicePO').serialize(),
|
// data: $('.ServicePO').serialize(),
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: "<?php echo base_url() ?>amendmentpurchaseorder/UpdateAmendServicePurchaseOrder",
|
url: "<?php echo base_url() ?>amendmentpurchaseorder/UpdateAmendServicePurchaseOrder",
|
||||||
@ -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,8 +524,8 @@ 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' ?>",
|
||||||
data: {
|
data: {
|
||||||
@ -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);
|
||||||
|
|||||||
@ -11,52 +11,48 @@ $DateOfPurchase = '';
|
|||||||
$DateOfCommison = '';
|
$DateOfCommison = '';
|
||||||
$AssetValue = '';
|
$AssetValue = '';
|
||||||
$AssetStatus = '';
|
$AssetStatus = '';
|
||||||
$IsActive ='';
|
$IsActive = '';
|
||||||
$Remarks = '';
|
$Remarks = '';
|
||||||
$DepartmentName ='';
|
$DepartmentName = '';
|
||||||
$Department ='';
|
$Department = '';
|
||||||
$SupplierCode = '';
|
$SupplierCode = '';
|
||||||
$MaterialCode = '';
|
$MaterialCode = '';
|
||||||
$PONO = '';
|
$PONO = '';
|
||||||
$POLineItem='';
|
$POLineItem = '';
|
||||||
$Quantity='';
|
$Quantity = '';
|
||||||
$UOM = '';
|
$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;
|
||||||
$Description = $Asset->Description;
|
$Description = $Asset->Description;
|
||||||
$Department = $Asset->DEPCode;
|
$Department = $Asset->DEPCode;
|
||||||
$DepartmentName = $Asset->DepartmentName;
|
$DepartmentName = $Asset->DepartmentName;
|
||||||
$Location = $Asset->Location;
|
$Location = $Asset->Location;
|
||||||
$User = $Asset->UserName;
|
$User = $Asset->UserName;
|
||||||
$SupplierName = $Asset->SupplierName;
|
$SupplierName = $Asset->SupplierName;
|
||||||
$SupplierCode = $Asset->SupplierCode;
|
$SupplierCode = $Asset->SupplierCode;
|
||||||
$DateOfPurchase = $Asset->DateOfPurchase;//print_r($Asset->DateOfPurchase);
|
$DateOfPurchase = $Asset->DateOfPurchase; //print_r($Asset->DateOfPurchase);
|
||||||
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 {
|
||||||
|
$DateOfCommison = '';
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
$DateOfCommison = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$AssetValue = $Asset->AssetValue;
|
$AssetValue = $Asset->AssetValue;
|
||||||
$AssetStatus = $Asset->AssetStatus;
|
$AssetStatus = $Asset->AssetStatus;
|
||||||
$MaterialCode = $Asset->MaterialCode;
|
$MaterialCode = $Asset->MaterialCode;
|
||||||
$PONO = $Asset->PONO;
|
$PONO = $Asset->PONO;
|
||||||
@ -65,37 +61,32 @@ if(!empty($assetList))
|
|||||||
$MaterialName = $Asset->MaterialName;
|
$MaterialName = $Asset->MaterialName;
|
||||||
$UOM = $Asset->UOM;
|
$UOM = $Asset->UOM;
|
||||||
$DDt = $Asset->DeliveryDate;
|
$DDt = $Asset->DeliveryDate;
|
||||||
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 {
|
||||||
}
|
$IsActive = '';
|
||||||
else
|
}
|
||||||
{
|
|
||||||
$IsActive = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// if($DateOfPurchase != '')
|
// if($DateOfPurchase != '')
|
||||||
// {
|
// {
|
||||||
// $dtpurchase = new DateTime($DateOfPurchase);
|
// $dtpurchase = new DateTime($DateOfPurchase);
|
||||||
// $DOPurchase = $dtpurchase ->format('d/m/Y');
|
// $DOPurchase = $dtpurchase ->format('d/m/Y');
|
||||||
// }
|
// }
|
||||||
// if($DateOfCommission != '')
|
// if($DateOfCommission != '')
|
||||||
// {
|
// {
|
||||||
// $dtCommission = new DateTime($DateOfCommission);
|
// $dtCommission = new DateTime($DateOfCommission);
|
||||||
// $DOCommission = $dtCommission ->format('Y-m-d');
|
// $DOCommission = $dtCommission ->format('Y-m-d');
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,8 +117,8 @@ if(!empty($assetList))
|
|||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="AssetName">Asset Name<span class="badge">*</span></label>
|
<label class="col-form-label" for="AssetName">Asset Name<span class="badge">*</span></label>
|
||||||
<input type="text" class="form-control" id="AssetName" name="AssetName" value="<?php echo $AssetName;?>" style="text-transform:uppercase;">
|
<input type="text" class="form-control" id="AssetName" name="AssetName" value="<?php echo $AssetName; ?>" style="text-transform:uppercase;">
|
||||||
<input type="hidden" name="AssetCode" id="AssetCode" class="form-control" readonly value="<?php echo $AssetCode;?>">
|
<input type="hidden" name="AssetCode" id="AssetCode" class="form-control" readonly value="<?php echo $AssetCode; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Description">Asset Description<span class="badge">*</span></label>
|
<label class="col-form-label" for="Description">Asset Description<span class="badge">*</span></label>
|
||||||
@ -135,44 +126,40 @@ if(!empty($assetList))
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="User">Asset User<span class="badge">*</span></label>
|
<label class="col-form-label" for="User">Asset User<span class="badge">*</span></label>
|
||||||
<input type="text" class="form-control" id="User" name="User" value="<?php echo $User;?>">
|
<input type="text" class="form-control" id="User" name="User" value="<?php echo $User; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Location">Asset Location<span class="badge">*</span></label>
|
<label class="col-form-label" for="Location">Asset Location<span class="badge">*</span></label>
|
||||||
<input type="text" class="form-control" id="Location" name="Location" value="<?php echo $Location;?>">
|
<input type="text" class="form-control" id="Location" name="Location" value="<?php echo $Location; ?>">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" style="margin-top:20px">
|
<div class="form-row" style="margin-top:20px">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<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 }
|
||||||
}?>
|
} ?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<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 }
|
||||||
}?>
|
} ?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="AssetType">Asset Type<span class="badge">*</span></label>
|
<label class="col-form-label" for="AssetType">Asset Type<span class="badge">*</span></label>
|
||||||
<select class="form-control select2" id="AssetType" name="AssetType">
|
<select class="form-control select2" id="AssetType" name="AssetType">
|
||||||
<option value="<?php echo $AssetType;?>"><?php echo $AssetType;?></option>
|
<option value="<?php echo $AssetType; ?>"><?php echo $AssetType; ?></option>
|
||||||
<option value="Fixed">Fixed</option>
|
<option value="Fixed">Fixed</option>
|
||||||
<option value="Consumable">Consumable</option>
|
<option value="Consumable">Consumable</option>
|
||||||
</select>
|
</select>
|
||||||
@ -180,7 +167,7 @@ if(!empty($assetList))
|
|||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="AssetSubType">Asset Sub-Type<span class="badge">*</span></label>
|
<label class="col-form-label" for="AssetSubType">Asset Sub-Type<span class="badge">*</span></label>
|
||||||
<select class="form-control select2" id="AssetSubType" name="AssetSubType">
|
<select class="form-control select2" id="AssetSubType" name="AssetSubType">
|
||||||
<option value="<?php echo $AssetSubType;?>"><?php echo $AssetSubType;?></option>
|
<option value="<?php echo $AssetSubType; ?>"><?php echo $AssetSubType; ?></option>
|
||||||
<option value="Individual">Individual</option>
|
<option value="Individual">Individual</option>
|
||||||
<option value="Common">Common</option>
|
<option value="Common">Common</option>
|
||||||
</select>
|
</select>
|
||||||
@ -189,71 +176,67 @@ if(!empty($assetList))
|
|||||||
<div class="form-row" style="margin-top:20px">
|
<div class="form-row" style="margin-top:20px">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="PDate">Purchase Date<span class="badge">*</span></label>
|
<label class="col-form-label" for="PDate">Purchase Date<span class="badge">*</span></label>
|
||||||
<input type="text" class="form-control" id="PDate" name="PDate" value="<?php echo $PDate;?>">
|
<input type="text" class="form-control" id="PDate" name="PDate" value="<?php echo $PDate; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<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 }
|
||||||
}?>
|
} ?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Rate">Rate<span class="badge">*</span></label>
|
<label class="col-form-label" for="Rate">Rate<span class="badge">*</span></label>
|
||||||
<input type="text" class="form-control" id="Rate" name="Rate" value="<?php echo $Rate;?>">
|
<input type="text" class="form-control" id="Rate" name="Rate" value="<?php echo $Rate; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Life">Life<span class="badge">*</span></label>
|
<label class="col-form-label" for="Life">Life<span class="badge">*</span></label>
|
||||||
<input type="text" class="form-control" id="Life" name="Life" value="<?php echo $Life;?>">
|
<input type="text" class="form-control" id="Life" name="Life" value="<?php echo $Life; ?>">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" style="margin-top:20px">
|
<div class="form-row" style="margin-top:20px">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="AssetDept">Asset Department</label>
|
<label class="col-form-label" for="AssetDept">Asset Department</label>
|
||||||
<input type="text" class="form-control" value="<?php echo $DepartmentName;?>" id="AssetDept" readonly>
|
<input type="text" class="form-control" value="<?php echo $DepartmentName; ?>" id="AssetDept" readonly>
|
||||||
<input type="hidden" name="AssetDept" id="depcode" value="<?php echo $Department?>">
|
<input type="hidden" name="AssetDept" id="depcode" value="<?php echo $Department ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<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 }
|
||||||
}?>
|
} ?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="VendorWarranty">Vendor Warranty</label>
|
<label class="col-form-label" for="VendorWarranty">Vendor Warranty</label>
|
||||||
<input type="text" class="form-control" id="VendorWarranty" name="VendorWarranty" value="<?php echo $VendorWarranty;?>">
|
<input type="text" class="form-control" id="VendorWarranty" name="VendorWarranty" value="<?php echo $VendorWarranty; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="AMC">AMC Details</label>
|
<label class="col-form-label" for="AMC">AMC Details</label>
|
||||||
<input type="text" class="form-control" id="AMC" name="AMC" value="<?php echo $AMC;?>">
|
<input type="text" class="form-control" id="AMC" name="AMC" value="<?php echo $AMC; ?>">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" style="margin-top:20px">
|
<div class="form-row" style="margin-top:20px">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="AssetLocation">Current Asset Location</label>
|
<label class="col-form-label" for="AssetLocation">Current Asset Location</label>
|
||||||
<input type="text" class="form-control" id="AssetLocation" name="AssetLocation" value="<?php echo $AssetLocation;?>">
|
<input type="text" class="form-control" id="AssetLocation" name="AssetLocation" value="<?php echo $AssetLocation; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Custodian">Custodian Name</label>
|
<label class="col-form-label" for="Custodian">Custodian Name</label>
|
||||||
<input type="text" class="form-control" id="Custodian" name="Custodian" value="<?php echo $Custodian;?>">
|
<input type="text" class="form-control" id="Custodian" name="Custodian" value="<?php echo $Custodian; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Condition">Condition</label>
|
<label class="col-form-label" for="Condition">Condition</label>
|
||||||
<select class="form-control select2" id="Condition" name="Condition">
|
<select class="form-control select2" id="Condition" name="Condition">
|
||||||
<option value="<?php echo $Condition;?>"><?php echo $Condition;?></option>
|
<option value="<?php echo $Condition; ?>"><?php echo $Condition; ?></option>
|
||||||
<option value="Good">Good</option>
|
<option value="Good">Good</option>
|
||||||
<option value="Average">Average</option>
|
<option value="Average">Average</option>
|
||||||
<option value="Poor">Poor</option>
|
<option value="Poor">Poor</option>
|
||||||
@ -261,12 +244,12 @@ if(!empty($assetList))
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<label class="col-form-label" for="Remarks">Remarks</label>
|
<label class="col-form-label" for="Remarks">Remarks</label>
|
||||||
<textarea class="form-control" id="Remarks" name="Remarks"><?php echo $Remarks;?></textarea>
|
<textarea class="form-control" id="Remarks" name="Remarks"><?php echo $Remarks; ?></textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row" style="margin-top:20px">
|
<div class="form-row" style="margin-top:20px">
|
||||||
<div class="col-md-12 text-right">
|
<div class="col-md-12 text-right">
|
||||||
<a href="<?php echo base_url()?>assetListing" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
|
<a href="<?php echo base_url() ?>assetListing" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
|
||||||
<input type="submit" class="btn btn-success" value="Submit" />
|
<input type="submit" class="btn btn-success" value="Submit" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -283,85 +266,86 @@ 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() {
|
||||||
|
$("#PONO").select2();
|
||||||
|
$("#SelectMaterialCode").select2();
|
||||||
|
$("#AssetStatus").select2();
|
||||||
|
|
||||||
$(function() {
|
var d = new Date();
|
||||||
$("#PONO").select2();
|
|
||||||
$("#SelectMaterialCode").select2();
|
|
||||||
$("#AssetStatus").select2();
|
|
||||||
|
|
||||||
var d = new Date();
|
var month = d.getMonth();
|
||||||
|
var day = d.getDate();
|
||||||
var month = d.getMonth();
|
var year = d.getFullYear();
|
||||||
var day = d.getDate();
|
var SIAStartYear = year - 2015;
|
||||||
var year = d.getFullYear() ;
|
var mindt = year - 70;
|
||||||
var SIAStartYear = year - 2015;
|
var maxdt = year - 15;
|
||||||
var mindt = year-70;
|
|
||||||
var maxdt = year-15;
|
|
||||||
|
|
||||||
|
|
||||||
$("#DateOfCommission").datepicker({
|
$("#DateOfCommission").datepicker({
|
||||||
minDate : new Date(year-SIAStartYear,1,1),
|
minDate: new Date(year - SIAStartYear, 1, 1),
|
||||||
maxDate :'now',
|
maxDate: 'now',
|
||||||
dateFormat: 'dd-mm-yy',
|
dateFormat: 'dd-mm-yy',
|
||||||
changeMonth: true,
|
changeMonth: true,
|
||||||
changeYear: true
|
changeYear: true
|
||||||
});
|
});
|
||||||
$("#DateOfPurchase").datepicker({
|
$("#DateOfPurchase").datepicker({
|
||||||
minDate : new Date(year-SIAStartYear,1,1),
|
minDate: new Date(year - SIAStartYear, 1, 1),
|
||||||
maxDate :'now',
|
maxDate: 'now',
|
||||||
dateFormat: 'dd-mm-yy',
|
dateFormat: 'dd-mm-yy',
|
||||||
changeMonth: true,
|
changeMonth: true,
|
||||||
changeYear: true
|
changeYear: true
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$('#PONO').on('change',function(){
|
$('#PONO').on('change', function() {
|
||||||
|
|
||||||
var PONO = $(this).val();
|
var PONO = $(this).val();
|
||||||
$('#SupplierName').val('');
|
$('#SupplierName').val('');
|
||||||
$('#SupID').val('');
|
$('#SupID').val('');
|
||||||
$('#MaterialCode').val('');
|
$('#MaterialCode').val('');
|
||||||
$('#UOM').val('');
|
$('#UOM').val('');
|
||||||
$('#Quantity').val('');
|
$('#Quantity').val('');
|
||||||
$('#depcode').val('');
|
$('#depcode').val('');
|
||||||
$('#AssetDept').val('');
|
$('#AssetDept').val('');
|
||||||
$('#DateOfPurchase').val('');
|
$('#DateOfPurchase').val('');
|
||||||
$('#DeliveryDate').val('');
|
$('#DeliveryDate').val('');
|
||||||
$('#PODescription').val('');
|
$('#PODescription').val('');
|
||||||
$('#Assetvalue').val('');
|
$('#Assetvalue').val('');
|
||||||
// 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",
|
||||||
data:'PONO='+PONO,
|
data: 'PONO=' + PONO,
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success:function(data){
|
success: function(data) {
|
||||||
//alert(data);
|
//alert(data);
|
||||||
|
$('#loader').hide();
|
||||||
|
|
||||||
var line ='';
|
var line = '';
|
||||||
$('#SelectMaterialCode').empty();
|
$('#SelectMaterialCode').empty();
|
||||||
//alert('before');
|
//alert('before');
|
||||||
$.each(data, function (i, item) {
|
$.each(data, function(i, item) {
|
||||||
//alert(item);
|
//alert(item);
|
||||||
|
|
||||||
//line ='<option>select Material Code</option>';
|
//line ='<option>select Material Code</option>';
|
||||||
//line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
|
//line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
|
||||||
//$('#DeliveryDate').val(item.DeliveryDate);
|
//$('#DeliveryDate').val(item.DeliveryDate);
|
||||||
line+=item;
|
line += item;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -369,94 +353,90 @@ $(function() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('#SelectMaterialCode').append(line);
|
$('#SelectMaterialCode').append(line);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$('#SelectMaterialCode').on('change',function(){
|
$('#SelectMaterialCode').on('change', 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",
|
||||||
data:'line='+line,
|
data: 'line=' + line,
|
||||||
success:function(data){
|
success: function(data) {
|
||||||
//alert(data);
|
//alert(data);
|
||||||
|
|
||||||
var id = $('#SelectMaterialCode').val();
|
var id = $('#SelectMaterialCode').val();
|
||||||
$.each(JSON.parse(data), function (i, item) {
|
$.each(JSON.parse(data), function(i, item) {
|
||||||
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 {
|
||||||
}
|
//alert(item.DeliveryDate+ ',' + date1);
|
||||||
else
|
$("#DeliveryDate").val(date1);
|
||||||
{
|
}
|
||||||
//alert(item.DeliveryDate+ ',' + date1);
|
|
||||||
$("#DeliveryDate").val(date1);
|
|
||||||
}
|
|
||||||
|
|
||||||
//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('');
|
|
||||||
|
|
||||||
}
|
}
|
||||||
$('#SupplierName').val(item.SupplierName);
|
$('#SupplierName').val(item.SupplierName);
|
||||||
$('#SupID').val(item.SupplierID);
|
$('#SupID').val(item.SupplierID);
|
||||||
|
|
||||||
$('#MaterialCode').val(item.MaterialCode);
|
$('#MaterialCode').val(item.MaterialCode);
|
||||||
$('#UOM').val(item.UOM);
|
$('#UOM').val(item.UOM);
|
||||||
$('#Quantity').val(item.Quantity);
|
$('#Quantity').val(item.Quantity);
|
||||||
$('#depcode').val(item.Departmentcode);
|
$('#depcode').val(item.Departmentcode);
|
||||||
$('#AssetDept').val(item.DepartmentName);
|
$('#AssetDept').val(item.DepartmentName);
|
||||||
$('#PODescription').val(item.MaterialName);
|
$('#PODescription').val(item.MaterialName);
|
||||||
|
|
||||||
$('#Assetvalue').val(item.TotalValue);
|
$('#Assetvalue').val(item.TotalValue);
|
||||||
|
|
||||||
//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());
|
||||||
|
|
||||||
var date = new Date(item.PODate);
|
var date = new Date(item.PODate);
|
||||||
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>';
|
||||||
|
|
||||||
// $('#POLineItem').append(line);
|
// $('#POLineItem').append(line);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
</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)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -5223,6 +5223,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
DelRows = "0" + ":" + rowid;
|
DelRows = "0" + ":" + rowid;
|
||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
$('#loader').show();
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
data: {
|
data: {
|
||||||
@ -5231,6 +5232,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);
|
||||||
@ -5404,6 +5407,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,
|
||||||
@ -5413,6 +5418,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,8 +1074,8 @@ $('.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,16 +340,16 @@ $('.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},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
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 = '';
|
||||||
$.each(JSON.parse(data),function(i,obj)
|
$.each(JSON.parse(data),function(i,obj)
|
||||||
|
|||||||
@ -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,14 +864,15 @@ function Deleterow(rowid)
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
data:{id:id},
|
data:{id:id},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>storerequisitionlist/DeleteRequistionForm",
|
url:"<?php echo base_url() ?>storerequisitionlist/DeleteRequistionForm",
|
||||||
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,14 +954,15 @@ function Deleterow(rowid)
|
|||||||
}
|
}
|
||||||
$('#txtDeletedRow').val(DelRows);
|
$('#txtDeletedRow').val(DelRows);
|
||||||
|
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
data:{id:id},
|
data:{id:id},
|
||||||
type:"POST",
|
type:"POST",
|
||||||
url:"<?php echo base_url() ?>storerequisitionlist/DeleteRequistionForm",
|
url:"<?php echo base_url() ?>storerequisitionlist/DeleteRequistionForm",
|
||||||
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,8 +1053,8 @@ 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",
|
||||||
url:"<?php echo base_url() ?>storerequisitionlist/UpdateStoreRequistion",
|
url:"<?php echo base_url() ?>storerequisitionlist/UpdateStoreRequistion",
|
||||||
@ -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,7 +327,8 @@
|
|||||||
});
|
});
|
||||||
formActionUrl = '<?php echo base_url() . 'editExpense' ?>'; // Set action URL for adding
|
formActionUrl = '<?php echo base_url() . 'editExpense' ?>'; // Set action URL for adding
|
||||||
|
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
url: '<?php echo base_url() . 'getExpenseDetails'; ?>',
|
url: '<?php echo base_url() . 'getExpenseDetails'; ?>',
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
data: {
|
data: {
|
||||||
@ -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,7 +412,8 @@
|
|||||||
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);
|
||||||
|
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
url: formActionUrl,
|
url: formActionUrl,
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
data: formData,
|
data: formData,
|
||||||
@ -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,7 +529,8 @@
|
|||||||
var fileName = $(this).data('file');
|
var fileName = $(this).data('file');
|
||||||
var expenseId = $(this).data('value');
|
var expenseId = $(this).data('value');
|
||||||
|
|
||||||
$.ajax({
|
$('#loader').show();
|
||||||
|
$.ajax({
|
||||||
url: '<?php echo base_url('deleteFile'); ?>',
|
url: '<?php echo base_url('deleteFile'); ?>',
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
data: {
|
data: {
|
||||||
@ -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();
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user