From 264e953a4f0c89ef03bd90cd74077b3ff78a5d32 Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Thu, 10 Aug 2017 14:51:27 +0530 Subject: [PATCH] MRIR Rejected Status Implemetation --- application/controllers/MRIRcontroller.php | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php index e6b3c21d..7681ec03 100755 --- a/application/controllers/MRIRcontroller.php +++ b/application/controllers/MRIRcontroller.php @@ -224,16 +224,16 @@ public function viewmMaterialDistributionList() $UPdateon = $date->format('Y-m-d H:i:s'); $PONO = $this->input->post('PONO'); //this array to store the updated value in master table.. - $updatemastervalues = array('MRIRStatus'=>$Status,'UpdateBY'=>$UPdateby,'UpdatedOn'=>$UPdateon); - - $updatemaster = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no); + + $strStatus = ''; + $strStatus = ''; //echo "outside for loop"; $CheckEmpty=0; $TotalRow=0; for($m=1;$m<=$RowCount ; $m++){ - $TotalRow=$TotalRow+$m; - } + $TotalRow=$TotalRow+$m; + } for ($i = 1; $i <= $RowCount; $i++) { $ActualQty=trim($this->input->post('ActualQuantityReceived'.$i)); @@ -241,12 +241,11 @@ public function viewmMaterialDistributionList() $rejectquantity=trim($this->input->post('QuantityRejected'.$i)); $MaterialCode = trim($this->input->post('MaterialCode'.$i)); $Lineitm = trim($this->input->post('Lineitm'.$i)); - + - //echo $acceptquantity; - if($rejectquantity==0) + if($acceptquantity != 0 ) { - $CheckEmpty=$CheckEmpty+$i; + $CheckEmpty=$CheckEmpty+$i; $strStatus = MRIR_APPROVED; $avlQty = 0; $getAvailableqty = $this->mrir_model->getItemQuantityFromStock(trim($MaterialCode)); @@ -259,23 +258,24 @@ public function viewmMaterialDistributionList() //echo 'Stock added for'.$mrir_no; $updatStock = array('Quantity'=>($acceptquantity+$avlQty),'Status'=>'0','UpdatedOn'=>$UPdateon,'UpdatedBy'=>$UPdateby,'Remarks'=>'Stock added for '. $this->input->post('MRIRNO')); + $this->mrir_model->UpdateStock($updatStock,trim($MaterialCode)); } - elseif($rejectquantity!=0) + elseif($rejectquantity !=0 && $acceptquantity == 0) { $strStatus = MRIR_REJECTED; } - + $remark=$this->input->post('Remark'.$i); $updateby=$this->session->userdata('userId'); $date = new DateTime('now',new DateTimeZone('Asia/Kolkata')); $updateon = $date->format('Y-m-d H:i:s'); //echo strlen($acceptquantity); - if(strlen($acceptquantity)<=0) + if(strlen($acceptquantity)<=0 && $acceptquantity == 0) { $rejectquantity = $ActualQty; //echo 'Reject qty'.$rejectquantity; @@ -283,7 +283,7 @@ public function viewmMaterialDistributionList() //this array to store the update value in child table.. $updatedetailvalues = array('UpdateBy'=>$updateby,'UpdatedOn'=>$updateon,'QuantityAccepted'=>$acceptquantity,'QuantityRejected'=>$rejectquantity,'Remarks'=>$remark,'MRIRStatus'=>$strStatus); - //print_r($updatedetailvalues); + // print_r($updatedetailvalues); //die(); $updatedetails = $this->mrir_model->update_mrirdetail($updatedetailvalues,$Lineitm); @@ -301,10 +301,10 @@ public function viewmMaterialDistributionList() else{ $PoMrirStatus = MRIR_REJECTED; } - - $this->mrir_model->UpdatePOMaster($PONO,$PoMrirStatus,$updateby); - - echo "successfully updated :".$mrir_no; + $updatemastervalues = array('MRIRStatus'=>$PoMrirStatus,'UpdateBY'=>$UPdateby,'UpdatedOn'=>$UPdateon); + $this->mrir_model->UpdatePOMaster($PONO,$PoMrirStatus,$updateby); + $updatemaster = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no); + echo "successfully updated :".$mrir_no; }