From 2e6c1a02c4f812dae9557f966b4c5b4f49c58197 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Tue, 13 Nov 2018 13:13:24 +0530 Subject: [PATCH] latest changes --- application/controllers/cashbook.php | 22 ++++++------ application/models/cashbook_model.php | 48 +++++++++++++-------------- application/views/bankdebit.php | 3 +- application/views/banksettlement.php | 3 ++ application/views/bankstatement.php | 2 +- 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index 6e4c3201..d52e780e 100644 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -1082,10 +1082,7 @@ class cashbook extends BaseController $data['invoiceramount'] = $this->cashbook_model->invoiceamonut($bankid); $data['mappingcashbook']=$this->cashbook_model->mappingcashcreditbankid($bankid); $data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid); - - - - $data['supplier'] = $this->cashbook_model->getsupplier(); + $data['supplier'] = $this->cashbook_model->getsupplier(); //redirect('Bankingstatement','refresh'); $this->loadViews("bankinvoicesettlement", $this->global,$data,NULL); @@ -1213,13 +1210,14 @@ class cashbook extends BaseController $podata1 = array('Podate'=>$date,'PONO'=>$pono,'IGRNO'=>$igrno,'Suppliername'=>$sname,'SupplierID'=>$sid,'Totalpoamount'=>$tot,'Amountpaid'=>$ip,'Balancetopay'=>$balancetopay,'mid'=>$bankid,'IGRLineItemNo'=>$igrlineitem,'IsActive'=>$IsActive); + $resultn = $this->cashbook_model->mappingpo($podata1); //print_r($podata1); $podata = array('Podate'=>$date,'PONO'=>$pono,'IGRNO'=>$igrno,'Suppliername'=>$sname,'SupplierID'=>$sid,'Totalpoamount'=>$tot,'Amountpaid'=>$amtpaid,'Balancetopay'=>$balancetopay,'mid'=>$bankid,'IGRLineItemNo'=>$igrlineitem,'IsActive'=>$IsActive); //die(); $result3 = $this->cashbook_model->getpono($igrlineitem); - $resultn = $this->cashbook_model->mappingpo($podata1); + if(count($result3)<=0) { @@ -1361,7 +1359,7 @@ class cashbook extends BaseController $IsActive=1; $invoicedata1 = array('indate'=>$date,'invoiceno'=>$invid,'customername'=>$cname,'customerid'=>$cid,'totinvoiceamount'=>$invamount,'balancetoreceived'=>$balancetoreceived1,'amountreceived'=>$amtpaid,'bankid'=>$bankid,'IsActive'=>$IsActive); - $invoicedata = array('indate'=>$date,'invoiceno'=>$invid,'customername'=>$cname,'customerid'=>$cid,'totinvoiceamount'=>$invamount,'balancetoreceived'=>$updatenew,'amountreceived'=>$ip,'bankid'=>$bankid,'IsActive'=>$IsActive); + $invoicedata = array('indate'=>$date,'invoiceno'=>$invid,'customername'=>$cname,'customerid'=>$cid,'totinvoiceamount'=>$invamount,'balancetoreceived'=>$balancetoreceived1,'amountreceived'=>$ip,'bankid'=>$bankid,'IsActive'=>$IsActive); // //print_r ($invoicedata); // //die(); @@ -1411,17 +1409,17 @@ class cashbook extends BaseController $fdate = $this->input->post('from_date'); $tdate = $this->input->post('to_date'); $supplierID= $this->input->post('supplier'); - $data['supplierid']= $supplierID; + $data['supplierid']=$supplierID; $suppliername= $this->input->post('suppliername'); $data['suppliername']=$suppliername; $data['fa']=$fa; - $data['aa']=$aa; - $data['m']=$m; - $data['fdate']=$fdate; - $data['tdate']=$tdate; + $data['aa']=$aa; + $data['m']=$m; + $data['fdate']=$fdate; + $data['tdate']=$tdate; $data['suppliername']= $suppliername; $data['bankdebit'] = $this->cashbook_model->debitpolistfilter($supplierID,$fa,$aa,$m,$fdate,$tdate); - + //print_r($data['bankdebit']); } else { diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 05faa0d5..c95fdfb4 100644 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -1020,19 +1020,17 @@ function receiptdata() function debitpolistfilter($supplierID,$fa,$aa,$m,$fdate,$tdate) { - // echo $suppliername+'sn'; - $this->db->select('bm.id,bm.mid,bm.Podate,bm.PONO,bm.Suppliername,bm.Totalpoamount, - bm.Balancetopay,bm.Amountpaid,bm.IGRNO,igrm.file,bm.IGRLineItemNo,br.Clearbalance,br.Balancetocleared,bu.FilePath,bu.BillNo,inward.FilePath as Fpath'); - $this->db->from ('T_Bankporeport bm'); - $this->db->join ('T_IGR_Master igrm','igrm.PONO = bm.PONO or igrm.IGRNO = bm.IGRNO ','left'); - //$this->db->join ('T_IGR_Details igrde','igrde.IGRNO=igrm.IGRNO'); - $this->db->join ('T_SupplierDetailsN sd','sd.SupplierName = bm.Suppliername'); - $this->db->join ('T_bankreport br','br.ID=bm.mid'); - $this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =igrm.IGRNO','left'); - $this->db->join ('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left'); + $this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.Totalpoamount,bm.Podate, + bm.Balancetopay,bm.Amountpaid,bm.IGRNO,bm.IGRLineItemNo,br.Balancetocleared,br.Clearbalance, + inward.FilePath as igrfile,bu.FilePath pofile'); + $this->db->from ('T_Bankmappingpo bm'); + $this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =bm.IGRNO','left'); + $this->db->join('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left'); + $this->db->join('T_bankreport br','br.ID=bm.mid','left'); + $this->db->where('bm.SupplierID',$supplierID); $this->db->where('bm.IsActive',1); - $this->db->where('bm.SupplierID',$supplierID); - if ($fa and $aa != ''){ + //$this->db->group_by('bm.mid'); + if ($fa and $aa != ''){ //$sql.=" and (im.CreatedDate >= '".$fa."-04-01' and im.CreatedDate <= '".$aa."-03-31')"; $year="(bm.Podate >= '".$fa."-04-01' and bm.Podate <= '".$aa."-03-31')"; @@ -1051,12 +1049,11 @@ function receiptdata() $date = "date(bm.Podate) >= '".$fromdate."' and date(bm.Podate) <= '".$todate."'"; $this->db->where($date); - } - - + } + $this->db->group_by('bm.IGRLineItemNo'); $query = $this->db->get(); return $query->result(); - + } @@ -1159,7 +1156,7 @@ function receiptdata() $this->db->select('bm.ID,bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid, bm.balancetoreceived,bm.amountreceived,br.cclearbalance,br.cbalancetocleared'); - $this->db->from ('T_Bankinvoicereport bm'); + $this->db->from ('T_Bankmappingiv bm'); $this->db->join ('ip_clients ic','ic.client_name = bm.customername','left'); $this->db->join('T_bankreport br','br.ID = bm.bankid'); @@ -1525,9 +1522,10 @@ function receiptdata() // $r = $this->db->affected_rows(); // return $r; // } - function mappingpo($podata) + function mappingpo($podata1) { - $this->db->insert('T_Bankmappingpo',$podata); + print_r($podata1); + $this->db->insert('T_Bankmappingpo',$podata1); // $this->db->where('PONO',$pono); $r = $this->db->affected_rows(); return $r; @@ -1678,7 +1676,7 @@ function receiptdata() $this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.Totalpoamount,bm.Podate, bm.Balancetopay,bm.Amountpaid,bm.IGRNO,bm.IGRLineItemNo,br.Balancetocleared,br.Clearbalance, inward.FilePath as igrfile,bu.FilePath pofile'); - $this->db->from ('T_Bankporeport bm'); + $this->db->from ('T_Bankmappingpo bm'); $this->db->join('T_Inwardgateregister_fileupload inward','inward.IGRNO =bm.IGRNO','left'); $this->db->join('T_PurchaseOrder_BillUpload bu','bm.PONO=bu.PONO','left'); $this->db->join('T_bankreport br','br.ID=bm.mid','left'); @@ -1714,7 +1712,7 @@ function receiptdata() { $this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.SupplierID,bm.Totalpoamount,bm.Podate, bm.Balancetopay,sum(bm.Amountpaid) as Amountpaid,bm.IGRNO,bm.IGRLineItemNo'); - $this->db->from ('T_Bankporeport bm'); + $this->db->from ('T_Bankmappingpo bm'); $this->db->where('bm.IsActive',1); $this->db->group_by('bm.SupplierID'); $query = $this->db->get(); @@ -1821,7 +1819,7 @@ function receiptdata() { $this->db->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.SupplierID,sum(bm.Totalpoamount)as Totalpoamount, bm.Balancetopay,sum(bm.Amountpaid) as Amountpaid,bm.Podate,bm.IGRLineItemNo'); - $this->db->from ('T_Bankporeport bm'); + $this->db->from ('T_Bankmappingpo bm'); $this->db->where('bm.IsActive',1); @@ -1870,7 +1868,7 @@ function receiptdata() { $this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,bm.customerid, bm.balancetoreceived,bm.amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared'); - $this->db->from ('T_Bankinvoicereport bm'); + $this->db->from ('T_Bankmappingiv bm'); $this->db->join('T_bankreport br','br.ID=bm.bankid'); $this->db->where('bm.IsActive',1); $this->db->where('bm.customerid',$clientid); @@ -1901,7 +1899,7 @@ function receiptdata() { $this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,ic.client_id,bm.customerid as customerid, bm.balancetoreceived,sum(bm.amountreceived)as amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared'); - $this->db->from ('T_Bankinvoicereport bm'); + $this->db->from ('T_Bankmappingiv bm'); $this->db->join('T_bankreport br','br.ID=bm.bankid'); $this->db->join('ip_clients ic','ic.client_name=bm.customername','left'); $this->db->where('bm.IsActive',1); @@ -1913,7 +1911,7 @@ function receiptdata() { $this->db->select('bm.indate,bm.invoiceno,bm.customername,bm.customerid as customerid,bm.totinvoiceamount,bm.bankid,ic.client_id, bm.balancetoreceived,sum(bm.amountreceived)as amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared'); - $this->db->from ('T_Bankinvoicereport bm'); + $this->db->from ('T_Bankmappingiv bm'); $this->db->join('T_bankreport br','br.ID=bm.bankid'); $this->db->join('ip_clients ic','ic.client_name=bm.customername','left'); $this->db->where('bm.IsActive',1); diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php index 1e3b5a88..c2c76fe1 100644 --- a/application/views/bankdebit.php +++ b/application/views/bankdebit.php @@ -318,7 +318,6 @@ var row = 0; function GetPayment(i) { - var bankdebitamount=$('#debitamount').val(); var totalvalue=$('#addvalue').val(); var balanceamount=bankdebitamount-totalvalue; @@ -348,7 +347,7 @@ function GetPayment(i) var igrno=igrno1.trim(); var igrlineitem1=document.getElementById ("igrlineitem"+i).innerText; var igrlineitem=igrlineitem1.trim(); - //alert(igrlineitem.trim()); + alert(igrlineitem); var supname =document.getElementById ("sn"+i).innerText;//value taken from table col name : suppliername var supid =document.getElementById ("sid"+i ).innerText; var totalordervalue =document.getElementById ("tov"+i ).innerText;//value taken from table col name : total po amount diff --git a/application/views/banksettlement.php b/application/views/banksettlement.php index fe56e642..a53f7875 100644 --- a/application/views/banksettlement.php +++ b/application/views/banksettlement.php @@ -60,6 +60,9 @@ if(!empty($mapping))
+
+ Back +
diff --git a/application/views/bankstatement.php b/application/views/bankstatement.php index 99cd94eb..79b25dfe 100644 --- a/application/views/bankstatement.php +++ b/application/views/bankstatement.php @@ -300,7 +300,7 @@ $Bankname = $t->Bankname; $clearbalance=$t->Clearbalance; ?> - +