diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 62c0b7a4..374be11e 100755 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -220,7 +220,8 @@ class cashbook extends BaseController //$this->global['pageTitle'] = 'Siddharth : Cash Book: Add New Income Expense '; $this->global['pageTitle'] = 'Siddharth : Bank Report - File Upload'; $data['bankbalance'] = $this->cashbook_model->getbalancedetails(); - $data['clearbalance'] = $this->cashbook_model->clearedbalance(); + $data['cleareddebitbalance'] = $this->cashbook_model->cleareddebitbalance(); + $data['clearedcreditbalance'] = $this->cashbook_model->clearedcreditbalance(); $this->loadViews("bankingfile", $this->global, $data , NULL); } function bankfileupload() @@ -316,8 +317,8 @@ class cashbook extends BaseController $credit=$sheet->getCell('G'.$x)->getValue(); $balance=$sheet->getCell('H'.$x)->getValue(); - - $filedataupload= array('reportdate'=>$Date1,'valuedate'=>$Date2,'chequeNo'=>$cod,'Narration'=>$narration,'Cod'=> $chqno,'Debit'=>$debit,'Credit'=>$credit,'Balance'=>$balance,'Bankname'=>$bank); + // $IsActive=0; + $filedataupload= array('reportdate'=>$Date1,'valuedate'=>$Date2,'chequeNo'=>$cod,'Narration'=>$narration,'Cod'=> $chqno,'Debit'=>$debit,'Credit'=>$credit,'Balance'=>$balance,'Bankname'=>$bank,'IsActive'=> $IsActive); @@ -476,17 +477,18 @@ class cashbook extends BaseController { $statu1='OPEN'; } + $isactive=1; //$clearbalance=$totalbankamount- if($amounttype=='CREDIT') { - $cashbookstatus1= array('cclearbalance'=>$ctotal,'cstatus'=>$statu); + $cashbookstatus1= array('cclearbalance'=>$ctotal,'cstatus'=>$statu,'IsActive'=>$isactive); //print_r($cashbookstatus1); //die(); $res1 = $this->cashbook_model->cashcreditupdate($cashbookstatus1,$bankid); } else { - $cashbookstatus = array('Clearbalance'=>$total,'Status'=>$statu1); + $cashbookstatus = array('Clearbalance'=>$total,'Status'=>$statu1,'IsActive'=>$isactive); $res23 = $this->cashbook_model->cashbankupdate($cashbookstatus,$bankid); } @@ -922,17 +924,18 @@ class cashbook extends BaseController if($amounttype=='CREDIT') { $updatecredit=$invam+$cashamnt; - //print_r($updateamount); - $cashbookstatus1= array('cclearbalance'=>$updatecredit,'cstatus'=>$status); + $isactive=0; + $cashbookstatus1= array('cclearbalance'=>$updatecredit,'cstatus'=>$status,'IsActive'=>$isactive); //print_r($cashbookstatus1); //die(); + $res1 = $this->cashbook_model->cashcreditupdate($cashbookstatus1,$bankid); } else { $updatedepit=$poamnt+$cashamnt; - $cashbookstatus = array('Clearbalance'=>$updatedepit,'Status'=>$status); + $cashbookstatus = array('Clearbalance'=>$updatedepit,'Status'=>$status,'IsActive'=>$isactive); // print_r($cashbookstatus); //die(); $res = $this->cashbook_model->cashbankupdate($cashbookstatus,$bankid); @@ -1011,9 +1014,6 @@ class cashbook extends BaseController public function mappingpo() { - - - $this->global['pageTitle'] = 'Siddharth : Bank Report - Debited Settlements'; $SupplierName = $this->input->post('SupplierName'); $fdate = $this->input->post('from_date'); @@ -1030,7 +1030,6 @@ class cashbook extends BaseController $data['balancetoclear'] =$_GET['balancetoclear']; $data['mappingcashbook']=$this->cashbook_model->mappingcash($SupplierName,$fdate,$tdate,$bankid); $data['mapping'] = $this->cashbook_model->debitpolist($bankid); - // $data['mappingimage'] = $this->cashbook_model->debitimage($bankid); $data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid); $data['paidpoamount'] = $this->cashbook_model->poamonut($bankid); $data['supplier'] = $this->cashbook_model->getsupplier(); @@ -1144,8 +1143,8 @@ class cashbook extends BaseController { $status='CLOSE'; } - - $bankdata = array('Clearbalance'=>$clearedblnce,'Balancetocleared'=>$balancetocleared,'Status'=>$status); + $active=1; + $bankdata = array('Clearbalance'=>$clearedblnce,'Balancetocleared'=>$balancetocleared,'Status'=>$status,'IsActive'=>$active); if($check == 1) { @@ -1266,8 +1265,8 @@ class cashbook extends BaseController } - - $bankdata = array('cclearbalance'=>$clearedblnce,'cbalancetocleared'=>$balancetoreceived,'cstatus'=>$status); + $active=1; + $bankdata = array('cclearbalance'=>$clearedblnce,'cbalancetocleared'=>$balancetoreceived,'cstatus'=>$status,'IsActive'=>$active); if($check == 1) { $res = $this->cashbook_model->bankcreditupdate($bankdata,$bankid); @@ -1330,26 +1329,23 @@ class cashbook extends BaseController echo ""; } - public function amountpaid() - { + public function amountpaid() + { - - - //$this->global['pageTitle'] = 'Siddharth : amountpaid'; + //$this->global['pageTitle'] = 'Siddharth : amountpaid'; $this->global['pageTitle'] = 'Siddharth : Bank Report - Amount Payment Details'; if ($this->input->post('btn_submit')) { $SupplierName = $this->input->post('SupplierName'); $fdate = $this->input->post('from_date'); $tdate = $this->input->post('to_date'); - - $data['bankdebit'] = $this->cashbook_model->debitpolistfilter($SupplierName,$fdate,$tdate); + $data['bankdebit'] = $this->cashbook_model->debitpolistfilter($SupplierName,$fdate,$tdate); } - $data['amountpaid'] = $this->cashbook_model->paided(); + $data['amountpaid'] = $this->cashbook_model->paided(); $data['supplier'] = $this->cashbook_model->getsupplier(); $this->loadViews("bankamountpaid", $this->global,$data, NULL); - } + } public function amountreceived() { @@ -1384,7 +1380,6 @@ class cashbook extends BaseController { $totalamount =$this->input->post('Totalpoamount'); - $Amount = $this->input->post('paidamount'); $id=$this->input->post('mappingid'); $igrno = $this->input->post('IGRItemNo'); @@ -1393,8 +1388,8 @@ class cashbook extends BaseController $clearedbalance=$this->input->post('clearbalance'); $updateamount=$clearedbalance-$Amount; $updatebalancetoclear=$Amount+$balancetoclear; - $data['$bankmappingamount'] = $this->cashbook_model->gettotalbankmappingpo($igrno); - $amountpaid=$data['$bankmappingamount'][0]->Amountpaid; + $data['$bankmappingamount'] = $this->cashbook_model->gettotalbankmappingpo($igrno); + $amountpaid=$data['$bankmappingamount'][0]->Amountpaid; //$data['$totallineitemamount']=$this->cashbook_model->gettotallineitem($igrno); if($amountpaid==$totalamount) @@ -1426,16 +1421,32 @@ class cashbook extends BaseController $Bankid = $_GET['bankid']; $Amount = $_GET['amount']; $igrno = $_GET['igrno']; - - $id=$_GET['id']; $balancetoclear=$_GET['balancetoclear']; + //for T_Bankreport IsActive// + $bankdebit=$_GET['debit']; + $mapped= $Amount+$balancetoclear; + if( $bankdebit==$mapped) + { + $active=0; + } + else + { + $active=1; + } + + ///////////////// + + $id=$_GET['id']; + $bankamount=$_GET['bankamount']; $updateamount=$bankamount-$Amount; $updatebalancetoclear=$Amount+$balancetoclear; - $data['$bankmappingamount'] = $this->cashbook_model->gettotalbankmappingpo($igrno); - $amountpaid=$data['$bankmappingamount'][0]->Amountpaid; + $data['$bankmappingamount'] = $this->cashbook_model->gettotalbankmappingpo($igrno); + $amountpaid=$data['$bankmappingamount'][0]->Amountpaid; + //if($Amount==) //$data['$totallineitemamount']=$this->cashbook_model->gettotallineitem($igrno); + if($amountpaid==$totalamount) { @@ -1447,7 +1458,7 @@ class cashbook extends BaseController } $result= $this->cashbook_model->IgrDetailsStatusUpdate($igrno,$BankStatus); - $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear); + $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear,$active); //for update mapping amount in t_bankmappingpo table// $balancetopay=$_GET['balancetopay']; $totalbalancetopay=$Amount + $balancetopay; @@ -1455,7 +1466,7 @@ class cashbook extends BaseController $updatebankpoamount=$totalamount-$totalbalancetopay; $result2= $this->cashbook_model->deleteBankmappingpo($id,$IsActive); //for update mapping amount inT_Bankporeport table// - $result3= $this->cashbook_model->updateBankporeportpo($igrno,$totalbalancetopay,$updatebankpoamount,$Bankid); + $result3= $this->cashbook_model->updateBankporeportpo($igrno,$totalbalancetopay,$updatebankpoamount,$Bankid,$active); if(count($result2)>0) { @@ -1467,6 +1478,7 @@ class cashbook extends BaseController { $this->global['pageTitle'] = 'Siddharth : Bank Report - Delete Mapping Invoice'; + $credit= $this->input->post('credit'); $invoiceno = $this->input->post('invoiceno'); $bankid = $this->input->post('bankid'); $mappingid=$this->input->post('mappingid'); @@ -1477,7 +1489,19 @@ class cashbook extends BaseController $balancetoreceived = $this->input->post('balancetoreceived'); $updatebalancetoclear=$amountreceived+$bankingbalclear; $updateclearbalance=$bankingclear-$amountreceived; - $bankstatement=array('cbalancetocleared'=>$updatebalancetoclear,'cclearbalance'=>$updateclearbalance); + + + //update Isactive field in T_Bankreport ////// + $mapped=$balancetoreceived+$amountreceived; + if($credit==$mapped) + { + $active=0; + } + else + { + $active=1; + } + $bankstatement=array('cbalancetocleared'=>$updatebalancetoclear,'cclearbalance'=>$updateclearbalance,'IsActive'=>$active); $result1= $this->cashbook_model->updatebankreportiv($bankid,$bankstatement); if($totinvoiceamount==$amountreceived) { diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index df2b1c04..df930005 100755 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -31,12 +31,12 @@ class cashbook_model extends CI_Model $r = $this->db->affected_rows(); return $r; } - function addcashbook($bankcash1) - { - $this->db->insert('T_Bankmappingcashbook',$bankcash1); - $r = $this->db->affected_rows(); - return $r; - } + // function addcashbook($bankcash1) + // { + // $this->db->insert('T_Bankmappingcashbook',$bankcash1); + // $r = $this->db->affected_rows(); + // return $r; + // } function getIncomeExpenseList($i="") { @@ -94,6 +94,7 @@ class cashbook_model extends CI_Model $this->db->join('T_Employee_Details','tbl_users.EmpID=T_Employee_Details.EmpID','left'); $this->db->where('t_income_expense.IsActive',1); $this->db->where('t_income_expense.account_code','ADV001'); + //$this->db->where('t_income_expense.account_code','0013'); $this->db->order_by("date","desc"); if(!empty($i)) { @@ -324,15 +325,25 @@ function bankstatement($fdate,$tdate,$fa,$aa){ } -function clearedbalance(){ +function cleareddebitbalance(){ - $sql = 'SELECT SUM(cclearbalance) as credit,SUM(Clearbalance) as debit FROM T_bankreport'; + $sql = "SELECT SUM(Balancetocleared) as debit FROM T_bankreport where Clearbalance >'0'"; $query = $this->db->query($sql); return $query->result(); } +function clearedcreditbalance(){ + + $sql = "SELECT SUM(cbalancetocleared) as credit FROM T_bankreport where cclearbalance >'0'"; + + $query = $this->db->query($sql); + return $query->result(); + + +} + function debitbankstatemet($Supplierid,$fdate,$tdate) { @@ -420,11 +431,12 @@ function receiptdata() function debitpolist($bankid) { - $this->db->select('bp.id,bp.mid,igrm.MaterialRcvdDate,bp.PONO,bp.Suppliername,bp.Totalpoamount, + $this->db->select('bp.id,bp.mid,igrm.MaterialRcvdDate,bp.PONO,bp.Suppliername,bp.Totalpoamount,br.Debit, bp.Balancetopay,bp.Amountpaid,bp.IGRNO,bp.IGRLineItemNo,igrm.file,bu.FilePath'); $this->db->from ('T_Bankmappingpo bp'); $this->db->join ('T_IGR_Master igrm','bp.IGRNO = igrm.IGRNO','left'); $this->db->join ('T_PurchaseOrder_BillUpload bu','bu.PONO = bp.PONO','left'); + $this->db->join ('T_bankreport br','br.ID=bp.mid'); $this->db->where('bp.IsActive',1); $this->db->where('bp.mid',$bankid); // $this->db->where('igrde.BankStatus !=','ST072'); @@ -469,7 +481,7 @@ function debitpolist($bankid) $this->db->where('sd.SupplierID',$SupplierName); } - $this->db->where('bm.IsActive',1);; + $this->db->where('bm.IsActive',1); $this->db->group_by('bm.id'); $query = $this->db->get(); return $query->result(); @@ -478,11 +490,12 @@ function debitpolist($bankid) function creditinvoicelist($bankid) { - $this->db->select('indate,invoiceno,customername,totinvoiceamount,bankid, - balancetoreceived,amountreceived,ID'); - $this->db->from ('T_Bankmappingiv'); - $this->db->where('bankid',$bankid); - $this->db->where('IsActive',1); + $this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid, + bm.balancetoreceived,bm.amountreceived,bm.ID,br.Credit'); + $this->db->from ('T_Bankmappingiv bm'); + $this->db->join('T_bankreport br','br.ID=bm.bankid'); + $this->db->where('bm.bankid',$bankid); + $this->db->where('bm.IsActive',1); //$this->db->group_by('invoiceno'); $query = $this->db->get(); return $query->result(); @@ -881,10 +894,11 @@ function debitpolist($bankid) } } - function deletemapping($Bankid,$updateamount,$updatebalancetoclear) + function deletemapping($Bankid,$updateamount,$updatebalancetoclear,$active) { $this->db->set('Clearbalance',$updateamount); - $this->db->set('Balancetocleared',$updatebalancetoclear); + $this->db->set('Balancetocleared',$updatebalancetoclear); + $this->db->set('IsActive',$active); $this->db->where('ID',$Bankid); $this->db->update('T_bankreport'); $r = $this->db->affected_rows(); diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php index 9dc29281..d43c7ea0 100644 --- a/application/views/bankdebit.php +++ b/application/views/bankdebit.php @@ -399,19 +399,8 @@ function GetPayment(i) //alert(poamount1+'amt'); var ponovalue = igrlineitem+','+poamount; temppo.push(ponovalue); - console.log(temppo); - var total=0; - $.each(temppo, function( index, value ) - { - var res2 = value.split(','); - - var pono=res2[0]; - //alert(pono+'pono'); - var bam=res2[1]; - //alert(bam+'bam'); - total=parseFloat(bam)+parseFloat(total); - $('#addvalue').val(parseFloat(total).toFixed(2)); - }); + console.log(temppo); + //console.log(temppo); var supname =document.getElementById ("sn"+i ).innerText; @@ -475,20 +464,22 @@ function GetPayment(i) j=parseInt(j)+1; //alert(j+'j'); var to=0; - // for(t=1;tcreditdebit; - $credit = $b->credit; + $debit = $b->debit; // + }} + if(!empty($clearedcreditbalance)){ + foreach($clearedcreditbalance as $a) + // print_r($t);die(); + + { + + $credit = $a->credit; + // + + }} ?> diff --git a/application/views/bankinvoice.php b/application/views/bankinvoice.php index 9fb0ece0..5ae32c8a 100644 --- a/application/views/bankinvoice.php +++ b/application/views/bankinvoice.php @@ -556,19 +556,22 @@ function calculategrandtotal(){ tempTotal[index]=parseFloat(res2[2]); + } - else{ - - - tempTotal[index]=parseFloat(res2[3]); + else + { + tempTotal[index]=parseFloat(res2[3]); } }); //console.log(tempTotal); var sum = 0; for (var i = 0; i < tempTotal.length; i++) { - sum += tempTotal[i] << 0; + + sum += tempTotal[i]; + } + $('#addvalue').val(parseFloat(sum).toFixed(2)); } diff --git a/application/views/bankinvoicesettlement.php b/application/views/bankinvoicesettlement.php index 0ab2576c..768cf2f0 100644 --- a/application/views/bankinvoicesettlement.php +++ b/application/views/bankinvoicesettlement.php @@ -169,6 +169,7 @@ foreach($financialyear as $item) + @@ -290,12 +291,12 @@ var bankid=$('#bankingid'+i).val(); var amountreceived=$('#amountreceived'+i).text(); var bankingclear=$('#bankingclear'+i).val(); var mappingid=$('#mappingid'+i).val(); - +var credit=$('#credit'+i).val(); var bankingbalclear=$('#bankingbalclear'+i).val(); $.ajax( { - data:{mappingid:mappingid,invoiceno:invoiceno,bankid:bankid,amountreceived:amountreceived,bankingclear:bankingclear,bankingbalclear:bankingbalclear,totinvoiceamount:totinvoiceamount,balancetoreceived:balancetoreceived}, + data:{credit:credit,mappingid:mappingid,invoiceno:invoiceno,bankid:bankid,amountreceived:amountreceived,bankingclear:bankingclear,bankingbalclear:bankingbalclear,totinvoiceamount:totinvoiceamount,balancetoreceived:balancetoreceived}, type:"POST", url:"DeleteInvoice", success:function(data) diff --git a/application/views/banksettlement.php b/application/views/banksettlement.php index 2b4ec7da..66336fc5 100644 --- a/application/views/banksettlement.php +++ b/application/views/banksettlement.php @@ -334,7 +334,7 @@ if(!empty($mapping)) ?> -     +