From 965144e0007697de6db0c4592db853d7211817d9 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 9 Oct 2018 10:58:27 +0530
Subject: [PATCH] nonoperational sl no

---
 Apollo/api/application/models/DayBook_model.php    | 5 ++++-
 Apollo/assets/js/controllers/nonoperationalCtrl.js | 5 ++++-
 Apollo/assets/views/daybook/nonoperational.html    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index c34fadb4..128d9a43 100644
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -589,13 +589,16 @@ class DayBook_model extends CI_Model
                     $result['message']      = "This Voucher Number Already Exist.";
         }else{
          $branch = $Arr['BranchCode'];
-        $sql = "SELECT * FROM ".NONOPERATIONAL." WHERE BranchCode = '$branch'
+        $sql = "SELECT * FROM ".NONOPERATIONAL." WHERE BranchCode = '$branch' and Isdaybook='1'
             ORDER BY  ID DESC
             LIMIT 1";
              $prevBalance = 0;
         $latestUpdate = $this->db->query($sql);
         $latestUpdateDetails = $latestUpdate->result();
 
+
+       // print_r($latestUpdateDetails);die();
+
           If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0)
         {
         $prevBalance = $latestUpdateDetails[0]->Balance;
diff --git a/Apollo/assets/js/controllers/nonoperationalCtrl.js b/Apollo/assets/js/controllers/nonoperationalCtrl.js
index e7a34602..ee6ec2f9 100644
--- a/Apollo/assets/js/controllers/nonoperationalCtrl.js
+++ b/Apollo/assets/js/controllers/nonoperationalCtrl.js
@@ -221,6 +221,9 @@ app.controller('nonoperationalCtrl', ["$scope", "$rootScope","$modal", "toaster"
 
                 $scope.data = 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));
                 console.log($scope.data);
                  console.log($scope.datas);
@@ -316,7 +319,7 @@ $scope.loadStaring = true;
             {
             var Lastname = element.Lastname;
             }
-            value['SNo'] = element.ORDER_ID;
+            value['SNo'] = element.SL_NO;
             value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
             var ListName = element.ListName;
             value['ListName'] = element.ListName||'-';
diff --git a/Apollo/assets/views/daybook/nonoperational.html b/Apollo/assets/views/daybook/nonoperational.html
index 1ff2353f..6edd1207 100644
--- a/Apollo/assets/views/daybook/nonoperational.html
+++ b/Apollo/assets/views/daybook/nonoperational.html
@@ -141,7 +141,7 @@
          
                     <tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
                     <tr>
-                        <td>{{p.ORDER_ID}}</td> 
+                        <td>{{p.SL_NO}}</td> 
                         <td>{{p.Date}}</td>
                         <td>{{p.ListName}}</td>
                         <td ng-click="billDetails(p.VoucherNumber)">