From 1e0bf0cdbf50d9e21e78c89e276f1b8e0eca0191 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 10 May 2018 13:19:42 +0530 Subject: [PATCH] bankstatement --- application/views/bankdebit.php | 75 +++++--- application/views/bankinvoice.php | 70 +++++--- application/views/bankinvoicesettlement.php | 73 ++++++-- application/views/bankstatement.php | 179 ++++++++++++++++---- application/views/editincomeexpenses.php | 61 +++---- 5 files changed, 328 insertions(+), 130 deletions(-) diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php index 820b17a8..4b8795c6 100644 --- a/application/views/bankdebit.php +++ b/application/views/bankdebit.php @@ -263,10 +263,10 @@ - - + +
@@ -353,6 +353,9 @@ ] } ); } ); + +//alert(pono+'array'); +var temppo=[]; var tot=0; var tot1=0; var intex=1; @@ -370,19 +373,21 @@ function GetPayment(i) var x = document.getElementById('checkboxcheckbox'+i).checked; - var amount= parseFloat( $('#invoicepaymet'+i).val() == '' ? '0.00' : $('#invoicepaymet'+i).val()) + var amount= parseFloat( $('#invoicepaymet'+i).val() == '' ? '0.00' : $('#invoicepaymet'+i).val()) + //alert(amount); var negative=0; if(amount<0) { negative=1; - alert("Invalid Amount") - $('#invoicepaymet'+i).val(''); + alert('Invalid Amount'); + // $('#invoicepaymet'+i).val(''); } temp=intex; //alert(temp+'temp');success if(x==true) { + //alert(x); var bankdebitamount=$('#debitamount').val(); var totalvalue=$('#addvalue').val(); var balanceamount=bankdebitamount-totalvalue; @@ -404,6 +409,24 @@ function GetPayment(i) $('#Rowid').val(row); var date= document.getElementById ( "date"+i ).innerText; var pono =document.getElementById ( "pono"+i ).innerText; + var poamount =document.getElementById ( "qw"+i ).innerText; + //alert(invoicepayment+'amny'); + //alert(invoicepayment+'amny1'); + var ponovalue = pono+'-'+poamount; + temppo.push(ponovalue); + //var res1 = temppo.split('-'); + var total=0; + $.each(temppo, function( index, value ) + { + var res2 = value.split('-'); + + var pono=res2[0]; + var bam=res2[1]; + total=parseFloat(bam)+parseFloat(total); + $('#addvalue').val(parseFloat(total).toFixed(2)); + }); + + //console.log(temppo); var supname =document.getElementById ("sn"+i ).innerText; var totalordervalue =document.getElementById ("tov"+i ).innerText; var invoicepayment =document.getElementById ( "qw"+i ).innerText; @@ -448,19 +471,23 @@ function GetPayment(i) intex = parseInt(intex)+1; - j=parseInt(j)+1; + j=parseInt(j)+1; + //alert(j+'j'); var to=0; - for(t=1;t').attr({ type:'hidden', @@ -429,14 +448,14 @@ if(x==true) j=parseInt(j)+1; var to=0; - for(t=1;t
-
+
@@ -115,17 +115,61 @@ if(!empty($debitmapping))

-
-
-
-

Payment ID:  bankid?>

-

Payment Mode:  Bank

-

Payment Amount:  

-
-
-
-
- +
+
+
+

Payment ID:  bankid?>

+

Payment Mode:  Bank

+

Payment Amount:  

+
+
+
+ @@ -222,7 +266,7 @@ if(!empty($debitmapping)) - + @@ -251,7 +295,7 @@ if(!empty($debitmapping)) - + @@ -282,7 +326,6 @@ if(!empty($debitmapping)) - diff --git a/application/views/bankstatement.php b/application/views/bankstatement.php index e56409ca..824f5182 100644 --- a/application/views/bankstatement.php +++ b/application/views/bankstatement.php @@ -55,7 +55,6 @@ -->
-
@@ -162,7 +161,7 @@
- +
@@ -220,12 +219,9 @@ - + - @@ -283,7 +279,14 @@ - + + + + + + + + -
DateAccount CodeAccount Name Bankid Amount Type Total Amountdate?>account_code?>name?>
ID?> date?> valuedate?> Bankname?>cstatus;?>
+ +
- - - - - @@ -349,6 +381,8 @@ var tcpaid=''; function checkamount(type,ide) { + //$('#addvalue').val('0.00'); + //alert(); var value=ide; //alert('row id'+value); i1=value; @@ -369,7 +403,7 @@ function checkamount(type,ide) if (x==true) { - + //alert('check'); if(overalltype == type || overalltype == undefined) { if(type==1){ // 1 means Debit, 0 means Credit @@ -378,19 +412,33 @@ if (x==true) row= parseInt(row)+1; $('#Rowid').val(row); var id=document.getElementById ("bankid"+value).innerText; - + //alert(id+'id'); var debit=document.getElementById ("btc"+value ).innerText; - // alert(debit+'hd'); + //alert(debit+'hd'); debit1=debit; //alert('bal to pay'+ debit); //alert('You have selected bankid=' +id+ '\n and your amount is=' +debit+ '\n Please select Poscreen'); var idvalue = id+'-'+debit; + //alert(idvalue); tempidvalue.push(idvalue); - tot11=parseFloat(tot11) + var total=0; + $.each(tempidvalue, function( index, value ) + { + var debited = value.split('-'); + + var bankid=debited[0]; + var debit=debited[1]; + total=parseFloat(debit)+parseFloat(total); + $('#addvalue').val(parseFloat(total).toFixed(2)); + }); + //tot11=0; + //tot11=parseFloat(tot11); + //alert('tot11'+tot11); - tot11=parseFloat(tot11)+parseFloat(debit) + //tot11=parseFloat(tot11)+parseFloat(debit) //alert('afetr add tot11'+tot11); - $('#addvalue').val(parseFloat(tot11).toFixed(2)); + //alert(tot11+'checkvalue'); + //$('#addvalue').val(parseFloat(tot11)); if(debit==0) { alert('status is closed'); @@ -409,38 +457,99 @@ if (x==true) // alert(tempid+'creditlatest'); //alert('Tempid ='+tempid) var credit=parseFloat(document.getElementById(tempid).innerText); + //alert(credit+'credit'); credit1=credit; //alert('You have selected bankid=' +id+ '\n and your amount is=' +credit+ '\n Please select Invoice screen'); var idvalue1 = id+'-'+credit; tempcredit.push(idvalue1); - tot11=parseFloat(tot11); - //alert('tot11-'+tot11); - tot11=parseFloat(tot11)+parseFloat(credit) - //alert('afetr add tot11-'+tot11); - $('#addvalue').val(parseFloat(tot11).toFixed(2)); + console.log(tempcredit); + var totalcredit=0; + $.each(tempcredit, function( index, value) + { + var credited = value.split('-'); + + var bankidc=credited[0]; + var creditc=credited[1]; + // alert(creditc+'if'); + totalcredit=parseFloat(creditc)+parseFloat(totalcredit); + // alert(totalc+'add'); + $('#addvalue').val(parseFloat(totalcredit).toFixed(2)); + }); + + // tot11=parseFloat(tot11); + // tot11=0; + // //alert('tot11-'+tot11); + // tot11=parseFloat(tot11)+parseFloat(credit) + // //alert('afetr add tot11-'+tot11); + // $('#addvalue').val(tot11); } } - else{ - - alert("Miss Match you have select sequentially amount"); - window.location.reload(); - document.getElementById('checkboxcheckbox'+value).checked = false; - } + else{ + + alert("Miss Match you have select sequentially amount"); + window.location.reload(); + document.getElementById('checkboxcheckbox'+value).checked = false; + } } else { - - - //$('#addvalue').val('0.00'); - delamount= document.getElementById ( "debit"+i ).innerText; + + //alert('uncheck'); + var id=document.getElementById ("bankid"+value).innerText; + delamount= document.getElementById ( "debit"+value ).innerText; + var tempcid = "credited"+value; + delcredit= document.getElementById (tempcid).innerText; + //alert(delcredit+'dc'); var tote= $('#addvalue').val(); var afterdeltot= parseFloat(tote)- parseFloat(delamount); - $('#addvalue').val(parseFloat(afterdeltot).toFixed(2)); + var updatetotal=0; + var updatecredit=0; + var debitvalue = id+'-'+delamount; + var creditvalue= id+'-'+delcredit; + var a = tempidvalue.indexOf(debitvalue); + if(a!=-1) + { + tempidvalue.splice(a,1); + $.each(tempidvalue, function( index, value ) + { + var debited = value.split('-'); + + var bankid=debited[0]; + var debit=debited[1]; + total=parseFloat(debit)+parseFloat(updatetotal); + $('#addvalue').val(parseFloat(total).toFixed(2)); + }); + + } + var a = tempcredit.indexOf(creditvalue); + if(a!=-1) + { + //alert('credit'); + tempcredit.splice(a,1); + console.log(tempcredit); + $.each(tempcredit, function( index, value ) + { + var credited = value.split('-'); + + var bankid=credited[0]; + var credit=credited[1]; + //alert(credit+'credit'); + total1=parseFloat(credit)+parseFloat(updatecredit); + //alert(total1+'addvalue'); + $('#addvalue').val(parseFloat(total1).toFixed(2)); + }); + + } + + //$('#addvalue').val(''); + //$('#addvalue').val('0.00'); + + // $('#addvalue').val(parseFloat(afterdeltot).toFixed(2)); } diff --git a/application/views/editincomeexpenses.php b/application/views/editincomeexpenses.php index 1b4a7d5f..f1f1456a 100755 --- a/application/views/editincomeexpenses.php +++ b/application/views/editincomeexpenses.php @@ -523,7 +523,7 @@ function loadAccountType(id)
- +
@@ -565,53 +565,32 @@ function loadAccountType(id)