From e75ca5500cc152440f8ae341399f366b29a09e81 Mon Sep 17 00:00:00 2001 From: resicovenba Date: Wed, 14 Mar 2018 11:32:59 +0530 Subject: [PATCH] Daybook status updation update: kdk --- .../controllers/DayBook_Controller.php | 2 +- .../api/application/models/DayBook_model.php | 142 +++++++++++++++--- Apollo/assets/js/controllers/daybookCtrl.js | 5 +- Apollo/assets/views/daybook/daybook.html | 2 +- 4 files changed, 123 insertions(+), 28 deletions(-) diff --git a/Apollo/api/application/controllers/DayBook_Controller.php b/Apollo/api/application/controllers/DayBook_Controller.php index cab439f2..04f5e6c8 100755 --- a/Apollo/api/application/controllers/DayBook_Controller.php +++ b/Apollo/api/application/controllers/DayBook_Controller.php @@ -153,7 +153,7 @@ class DayBook_Controller extends REST_Controller { $req['PaidDescription'] = $reqData['description_paid']; $req['VoucherNumber'] = $reqData['voucherNumber']; $req['BranchCode'] = $reqData['branch']; - $req['Name'] = $reqData['name']; + $req['Name'] = $reqData['name']; $date = date('Y-m-d H:i:s'); $req['UpdatedOn'] = $date; $updatedayBookDetails = $this->daybook_model->update_dayBookDetails($req , $updateFor);// Check if the employee exist diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 03f919d7..e692c2df 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -67,7 +67,7 @@ class DayBook_model extends CI_Model $querys = "SELECT t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' - AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY CreatedOn DESC"; + AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ID DESC"; // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate); // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $toDate); @@ -86,7 +86,7 @@ class DayBook_model extends CI_Model $reqpayType = $reqDataBy['localBranchID']; $querys = "SELECT t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID - WHERE t1.BranchCode = '$reqpayType' ORDER BY CreatedOn DESC"; + WHERE t1.BranchCode = '$reqpayType' ORDER BY ID DESC"; } // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT'); @@ -239,7 +239,6 @@ class DayBook_model extends CI_Model $latestUpdateDetails1 = $latestUpdate1->result(); $currBalance = $latestUpdateDetails1[0]->Balance; - $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$upFor') ORDER BY ID ASC"; $latestUpdate2 = $this->db->query($sql2); @@ -259,9 +258,9 @@ class DayBook_model extends CI_Model } $result['updateDetailsStatus'] = true; $result['message'] = "Successfully Details Updated"; - } else { - $result['updateDetailsStatus'] = false; - $result['message'] = "Something went wrong.please try again"; + } else { + $result['updateDetailsStatus'] = false; + $result['message'] = "Something went wrong.please try again"; } return $result; } @@ -305,26 +304,119 @@ class DayBook_model extends CI_Model $UpdatedBy = $arr[0]['UpdatedBy']; $UpdatedOn = $arr[0]['UpdatedOn']; $status = $arr[0]['Status']; - $number = array(); - foreach($arr as $ar){ - array_push($number, $ar['ID']); - } - $updateFor = implode(',', $number); + // $number = array(); + // foreach($arr as $ar){ + // array_push($number, $ar['ID']); + // } + // $updateFor = implode(',', $number); + $updateFor = $arr[0]['ID']; + if( $status == "Pending" || $status == "Approved" || $status == "approved" || $status == "pending"){ - $sql = "UPDATE ".DAYBOOKMASTER." - SET Status = '$status', Approval_By = '$Approval_By' , - Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' - WHERE id IN ($updateFor)"; - $mBranchDetails = $this->db->query($sql); - // echo $mBranchDetails; - // echo $this->db->affected_rows(); exit(); - if ($this->db->affected_rows() >= 1) { - $result['addStatus'] = true; - $result['message'] = "Successfully Details Updated"; - } else { - $result['addStatus'] = false; - $result['message'] = "Something went wrong.please try again"; - } + $mysql = "SELECT * FROM ".DAYBOOKMASTER." WHERE ID = '$updateFor'"; + $updateDetails = $this->db->query($mysql); + $updateDataDetails = $updateDetails->result(); + $branch = $updateDataDetails[0]->BranchCode; + $Amount = 0; + $Amount = $updateDataDetails[0]->Amount; + + $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$updateFor') + ORDER BY ID DESC + LIMIT 1 "; + + $currBalance = 0; + $latestUpdate = $this->db->query($sql); + $latestUpdateDetails = $latestUpdate->result(); + if($updateDataDetails[0]->Name == 'I002') { + //Income + $currBalance = $latestUpdateDetails[0]->Balance + $Amount; + }else if ($updateDataDetails[0]->Name == 'I001') { + //Expense + $currBalance = $latestUpdateDetails[0]->Balance - $Amount; + } else { + } + // $currBalance = $latestUpdateDetails[0]->Balance + $Amount; + + $sql = "UPDATE ".DAYBOOKMASTER." + SET Status = '$status', Approval_By = '$Approval_By' , + Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' , Balance = '$currBalance' + WHERE id = '$updateFor' "; + $mBranchDetails = $this->db->query($sql); + // echo $mBranchDetails; + // echo $this->db->affected_rows(); exit(); + if ($this->db->affected_rows() >= 1) { + $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$updateFor') + ORDER BY ID ASC"; + $latestUpdate2 = $this->db->query($sql2); + $latestUpdateDetails2 = $latestUpdate2->result(); + foreach( $latestUpdateDetails2 as $clip){ + if($clip->Name == 'I002') { + //Income + $currBalance = $currBalance + $clip->Amount; + }else if ($clip->Name == 'I001') { + //Expense + $currBalance = $currBalance - $clip->Amount; + } else { + } + $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'"; + $this->db->query($updateSql); + } + $result['addStatus'] = true; + $result['message'] = "Successfully Details Updated"; + } else { + $result['addStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + } else if( $status == "Rejected" || $status == "rejected" ) { + + + $mysql = "SELECT * FROM ".DAYBOOKMASTER." WHERE ID = '$updateFor'"; + $updateDetails = $this->db->query($mysql); + $updateDataDetails = $updateDetails->result(); + $branch = $updateDataDetails[0]->BranchCode; + $Amount = 0; + $Amount = $updateDataDetails[0]->Amount; + + $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$updateFor') + ORDER BY ID DESC + LIMIT 1 "; + + $currBalance = 0; + $latestUpdate = $this->db->query($sql); + $latestUpdateDetails = $latestUpdate->result(); + $currBalance = $latestUpdateDetails[0]->Balance; + + $sql = "UPDATE ".DAYBOOKMASTER." + SET Status = '$status', Approval_By = '$Approval_By' , + Approval_Comments = '$Approval_Comments', UpdatedBy = '$UpdatedBy' , UpdatedOn = '$UpdatedOn' , Balance = '$currBalance' + WHERE id = '$updateFor' "; + $mBranchDetails = $this->db->query($sql); + // echo $mBranchDetails; + // echo $this->db->affected_rows(); exit(); + if ($this->db->affected_rows() >= 1) { + $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$updateFor') + ORDER BY ID ASC"; + $latestUpdate2 = $this->db->query($sql2); + $latestUpdateDetails2 = $latestUpdate2->result(); + foreach( $latestUpdateDetails2 as $clip){ + if($clip->Name == 'I002') { + //Income + $currBalance = $currBalance + $clip->Amount; + }else if ($clip->Name == 'I001') { + //Expense + $currBalance = $currBalance - $clip->Amount; + } else { + } + $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'"; + $this->db->query($updateSql); + } + $result['addStatus'] = true; + $result['message'] = "Successfully Details Updated"; + } else { + $result['addStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + + } return $result; } diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index ebd45ebe..c5873eda 100755 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -19,8 +19,11 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng const LOCALTYPE = localDetail.localType; if(LOCALTYPE === 'R002') { $scope.currentDate = new Date(); + var d = new Date(); + $scope.oneMonthBefore = d.setMonth(d.getMonth()-1); + // alert($scope.oneMonthBefore); var formate = "dd-MM-yyyy"; - $scope.searchData.date = $filter('date')(new Date($scope.currentDate), formate); + $scope.searchData.date = $filter('date')(new Date($scope.oneMonthBefore), formate); $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate); $scope.getDayBookList(); $scope.getIncomeExpenseType_Status(); diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index aa9cb253..cf5319b5 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -107,7 +107,7 @@ Income/Expense - Voucher Number + Voucher Number / Bill Number Paid To / Received From