diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index a1adab1d..c34fadb4 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -576,6 +576,9 @@ class DayBook_model extends CI_Model // add non operational public function add_NonOperational($Arr) { + +//echo $Arr['Isdaybook']; + $voucherNo = $Arr['VoucherNumber']; $sqlCheck = "SELECT * FROM ".NONOPERATIONAL." WHERE VoucherNumber = '$voucherNo'"; // print_r($this->db->query($sqlCheck));exit(); @@ -599,6 +602,9 @@ class DayBook_model extends CI_Model }else{ } + + if($Arr['Isdaybook']==1) + { if($Arr['Name'] == 'I002') { //Income $Arr['Balance'] = $prevBalance + $Arr['Amount']; @@ -609,6 +615,8 @@ class DayBook_model extends CI_Model $Arr['Balance'] = 0; } + } + $this->db->insert(NONOPERATIONAL, $Arr); if ($this->db->affected_rows() == '1') { $result['addDayBookStatus'] = true; diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 6174849a..c7069a05 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -551,28 +551,12 @@ $scope.loadStaring = true; return val.TypeID === 'I001' ? 1 : 0; }); - $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) { - return val.TypeID === 'I003' ? 1 : 0; - }); - - $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) { - return val.TypeID === 'I004' ? 1 : 0; - }); - - $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) { - return val.TypeID === 'I005' ? 1 : 0; - }); - - $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) { - return val.TypeID === 'I006' ? 1 : 0; - }); - - - - + $scope.myModelAdd.type = ''; $scope.getTypes = type === 'I002' ? $scope.getIncomeTypes : $scope.getExpenseTypes; + // console.log($scope.getTypes) + }; $scope.editId = -1;