diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php index fed89157..71ef65b1 100644 --- a/application/controllers/cashbook.php +++ b/application/controllers/cashbook.php @@ -2024,7 +2024,8 @@ class cashbook extends BaseController $result= $this->cashbook_model->IGRStatusUpdate($igrno,$PaymentStatus); - $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear); + $Status=OPEN; + $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear,$Status); //for update mapping amount in t_bankmappingpo table// $balancetopay=$this->input->post('balancetopay'); $totalbalancetopay=$Amount+$balancetopay; @@ -2081,7 +2082,8 @@ public function Deletemappingpo() $result= $this->cashbook_model->IGRStatusUpdate($igrno,$PaymentStatus); - $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear); + $Status=OPEN; + $result1= $this->cashbook_model->deletemapping($Bankid,$updateamount,$updatebalancetoclear,$Status); //for update mapping amount in t_bankreport table// $balancetopay=$_GET['balancetopay'];//balancetopay $totalbalancetopay=$Amount + $balancetopay; @@ -2104,6 +2106,7 @@ public function Deletemappingpo() { $IsAct=1; } + $result3= $this->cashbook_model->updateBankporeport($igrno,$balancetopayupdate,$amountpaidupdate,$IsAct); if(count($result3)>0) @@ -2142,15 +2145,15 @@ public function Deletemappingpo() //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); + // if($credit==$mapped) + // { + $CStatus=OPEN; + // } + // else + // { + // $active=1; + // } + $bankstatement=array('cbalancetocleared'=>$updatebalancetoclear,'cclearbalance'=>$updateclearbalance,'cstatus'=>$CStatus); $result1= $this->cashbook_model->updatebankreportiv($bankid,$bankstatement); @@ -2201,7 +2204,6 @@ public function Deletemappingpo() // } } - public function Deletemappingcashbook() { $bankamount=$_GET['bankamount']; diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index fe51ea82..ec1c045a 100644 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -1960,10 +1960,11 @@ function receiptdata() } } - function deletemapping($Bankid,$updateamount,$updatebalancetoclear) + function deletemapping($Bankid,$updateamount,$updatebalancetoclear,$Status) { $this->db->set('Clearbalance',$updateamount); - $this->db->set('Balancetocleared',$updatebalancetoclear); + $this->db->set('Balancetocleared',$updatebalancetoclear); + $this->db->set('Status',$Status); $this->db->where('ID',$Bankid); $this->db->update('T_bankreport'); $r = $this->db->affected_rows();