diff --git a/Apollo/api/application/controllers/DayBook_Controller.php b/Apollo/api/application/controllers/DayBook_Controller.php index e3524ff1..b7f3fc13 100755 --- a/Apollo/api/application/controllers/DayBook_Controller.php +++ b/Apollo/api/application/controllers/DayBook_Controller.php @@ -121,8 +121,12 @@ class DayBook_Controller extends REST_Controller { public function deleteDayBookDetails_post() { $reqData = $this->post('data'); + $reason = $this->post('reason'); + // print_r($reqData); + // print_r($reason); + // exit(); $reqbyData = $this->post('localReqDetails'); - $deletedayBookDetails = $this->daybook_model->delete_dayBookDetails($reqData);// Check if the employee exist + $deletedayBookDetails = $this->daybook_model->delete_dayBookDetails($reqData,$reason);// Check if the employee exist if ($deletedayBookDetails) { $deletedayBookDetails['status'] = REST_Controller::HTTP_OK; @@ -141,10 +145,10 @@ class DayBook_Controller extends REST_Controller { public function deleteDayBookFeePayableDetails_post() { $reqData = $this->post('data'); + $reason = $this->post('reason'); $reqbyData = $this->post('requestDetails'); - // print_r($reqbyData);exit(); - $deletedayBookFeePayableDetails = $this->daybook_model->delete_dayBookFeePayableDetails($reqData);// Check if the employee exist + $deletedayBookFeePayableDetails = $this->daybook_model->delete_dayBookFeePayableDetails($reqData,$reason);// Check if the employee exist if ($deletedayBookFeePayableDetails) { $deletedayBookFeePayableDetails['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 66c0e5e8..26a2b1ec 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -151,7 +151,7 @@ class DayBook_model extends CI_Model } // delete the daybook details - public function delete_dayBookDetails($id) { + public function delete_dayBookDetails($id,$reason) { // echo $id;exit(); $mysql = "SELECT * FROM ".DAYBOOKMASTER." WHERE ID = '$id'"; @@ -170,7 +170,7 @@ class DayBook_model extends CI_Model $currID = $latestUpdateDetails[0]->ID; // $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE ID ='$id'"; - $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel' WHERE ID ='$id'"; + $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel',Reason='$reason' WHERE ID ='$id'"; // update branch to staff_branch table if ($this->db->query($sql1) == '1') { @@ -206,7 +206,7 @@ class DayBook_model extends CI_Model } // delete the daybook fees entry details - public function delete_dayBookFeePayableDetails($id) { + public function delete_dayBookFeePayableDetails($id,$reason) { $this->db->select('FeesPaymentID, BranchCode'); $this->db->from(DAYBOOKMASTER); $this->db->where('ID', $id); @@ -241,7 +241,7 @@ class DayBook_model extends CI_Model // $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE FeesPaymentID ='$getID'"; // $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE FeesPaymentID ='$getID'"; - $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel' WHERE FeesPaymentID ='$getID'"; + $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel',Reason='$reason' WHERE FeesPaymentID ='$getID'"; // update branch to staff_branch table if ($this->db->query($sql1) == '1') { @@ -271,7 +271,7 @@ class DayBook_model extends CI_Model $result['message'] = "Something went wrong.please try again"; } }else{ - $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel' , Balance ='$currBalance' WHERE FeesPaymentID ='$getID'"; + $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel' ,Reason='$reason', Balance ='$currBalance' WHERE FeesPaymentID ='$getID'"; // update branch to staff_branch table if ($this->db->query($sql1) == '1') { diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index fec96a89..ccbb00f0 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -149,7 +149,7 @@ $scope.dayBookApprovalAccess = ''; $scope.getDayBookList(); } } - + // change to date, update and call search functionality $scope.changeToDate = function () { if($scope.searchData.dateTo !== undefined) { @@ -291,10 +291,15 @@ $scope.dayBookApprovalAccess = ''; } // alert(JSON.stringify($scope.myModel)); } - - + + + $scope.deleted1 = function (id) { + var id=id; + var reason=prompt("Enter for the Delete Reason!",""); + $scope.deleteFeePayableEntry(reason,id); + } //delete the income entry From the fees payable - $scope.deleteFeePayableEntry = function (id) { + $scope.deleteFeePayableEntry = function (reason,id) { // alert(id); SweetAlert.swal({ title: "Warning!", @@ -307,14 +312,14 @@ $scope.dayBookApprovalAccess = ''; if (res === true) { // alert(id); // alert(stuId); - var deleteFeePayableDetails = { + var deleteFeePayableDetails ={ method: 'POST', url: apiPoint.url + 'deleteDayBookFeePayableDetails/', headers: { 'Content-Type': 'application/json' }, data: { - data: id, + reason:reason,data:id, requestDetails: localDetails } }; @@ -330,10 +335,25 @@ $scope.dayBookApprovalAccess = ''; }); } + + $scope.deleted = function (id) { + // swal({ + // title: "Enter Reason For Delete", + var id=id; + var a=prompt("Enter for the Delete Reason!",""); + $scope.deleEditEntry(a,id); + // html: true, + // text: "Reason:" +// }); + + + + } // delete the income/expense list row - $scope.deleEditEntry = function (id) { + $scope.deleEditEntry = function (a,id) { swal({ + title: "Are you sure?", text: "Your will not be able to recover this record!", type: "warning", @@ -343,9 +363,9 @@ $scope.dayBookApprovalAccess = ''; closeOnConfirm: false }, function () { - $scope.indexDelete2(id); + $scope.indexDelete2(a,id); }); - $scope.indexDelete2 = function (id) { + $scope.indexDelete2 = function (a,id) { var deleteDetails = { method: 'POST', url: apiPoint.url + 'deleteDayBookDetails/', @@ -353,7 +373,7 @@ $scope.dayBookApprovalAccess = ''; 'Content-Type': 'application/json' }, data: { - data: id, + reason:a,data: id, requestDetails: localDetails } }; diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 6bfd7660..97e9a170 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -138,7 +138,7 @@