Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nonoperational sl no

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-09 10:58:27 +05:30
parent 7af5778e54
commit 965144e000
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apollo/api/application/models/DayBook_model.php
View File

@ -589,13 +589,16 @@ class DayBook_model extends CI_Model
$result['message'] = "This Voucher Number Already Exist."; $result['message'] = "This Voucher Number Already Exist.";
}else{ }else{
$branch = $Arr['BranchCode']; $branch = $Arr['BranchCode'];
$sql = "SELECT * FROM ".NONOPERATIONAL." WHERE BranchCode = '$branch' $sql = "SELECT * FROM ".NONOPERATIONAL." WHERE BranchCode = '$branch' and Isdaybook='1'
ORDER BY ID DESC ORDER BY ID DESC
LIMIT 1"; LIMIT 1";
$prevBalance = 0; $prevBalance = 0;
$latestUpdate = $this->db->query($sql); $latestUpdate = $this->db->query($sql);
$latestUpdateDetails = $latestUpdate->result(); $latestUpdateDetails = $latestUpdate->result();
// print_r($latestUpdateDetails);die();
If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0) If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0)
{ {
$prevBalance = $latestUpdateDetails[0]->Balance; $prevBalance = $latestUpdateDetails[0]->Balance;

5
Apollo/assets/js/controllers/nonoperationalCtrl.js
View File

@ -221,6 +221,9 @@ app.controller('nonoperationalCtrl', ["$scope", "$rootScope","$modal", "toaster"
$scope.data = response.data.dayBookListDetails; $scope.data = response.data.dayBookListDetails;
$scope.datas = response.data.dayBookListDetails; $scope.datas = response.data.dayBookListDetails;
for(var i=0;i<$scope.datas.length;i++)
$scope.datas[i].SL_NO = i+1;
// alert(JSON.stringify($scope.data)); // alert(JSON.stringify($scope.data));
console.log($scope.data); console.log($scope.data);
console.log($scope.datas); console.log($scope.datas);
@ -316,7 +319,7 @@ $scope.loadStaring = true;
{ {
var Lastname = element.Lastname; var Lastname = element.Lastname;
} }
value['SNo'] = element.ORDER_ID; value['SNo'] = element.SL_NO;
value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
var ListName = element.ListName; var ListName = element.ListName;
value['ListName'] = element.ListName||'-'; value['ListName'] = element.ListName||'-';

2
Apollo/assets/views/daybook/nonoperational.html
View File

@ -141,7 +141,7 @@
<tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10"> <tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
<tr> <tr>
<td>{{p.ORDER_ID}}</td> <td>{{p.SL_NO}}</td>
<td>{{p.Date}}</td> <td>{{p.Date}}</td>
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td ng-click="billDetails(p.VoucherNumber)"> <td ng-click="billDetails(p.VoucherNumber)">