From a3e5085fc329fd6be42029505228c8297a4d6fdb Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 11 Jan 2019 16:57:48 +0530
Subject: [PATCH 1/2] daybook branch wise receipt no

---
 .../api/application/models/DayBook_model.php   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index c8512761..9e85b572 100644
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -618,10 +618,15 @@ class DayBook_model extends CI_Model
     public function add_dayBook($Arr)
     {
         $voucherNo = $Arr['VoucherNumber'];
+        $branchCode = $Arr['BranchCode'];
+
+       // echo 'daybook';die();
 
        // $Arr['Isdaybook'] = '1';
-        $sqlCheck = "SELECT * FROM ".DAYBOOKMASTER." WHERE VoucherNumber = '$voucherNo'";
-    //    print_r($this->db->query($sqlCheck));exit();
+        $sqlCheck = "SELECT * FROM ".DAYBOOKMASTER." WHERE VoucherNumber = '$voucherNo' and BranchCode = '$branchCode' ";
+       //print_r($this->db->query($sqlCheck));exit();
+
+        //print_r($this->db->last_query());die();
          $checkAdd = $this->db->query($sqlCheck);
             $checkAddDetails = $checkAdd->result();
         if(count( $checkAddDetails ) > 0){
@@ -671,14 +676,19 @@ class DayBook_model extends CI_Model
      // add non operational 
     public function add_NonOperational($Arr)
     {
-
+         // echo 'nonope';die();
 //echo $Arr['Isdaybook'];
+           $branchCode = $Arr['BranchCode']; 
+         //echo $branchCode;die();
 
         $voucherNo = $Arr['VoucherNumber'];
-        $sqlCheck = "SELECT * FROM ".NONOPERATIONAL." WHERE VoucherNumber = '$voucherNo'";
+        $sqlCheck = "SELECT * FROM ".NONOPERATIONAL." WHERE VoucherNumber = '$voucherNo' and BranchCode = '$branchCode' ";
     //    print_r($this->db->query($sqlCheck));exit();
+
          $checkAdd = $this->db->query($sqlCheck);
             $checkAddDetails = $checkAdd->result();
+
+             // print_r($this->db->last_query());die();
         if(count( $checkAddDetails ) > 0){
                     $result['addDayBookStatus'] = false;
                     $result['message']      = "This Voucher Number Already Exist.";

From 4086c6d3628ce02b5c7a2099d7b06ed0645cf243 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 14 Jan 2019 12:20:10 +0530
Subject: [PATCH 2/2] session edit for staff also

---
 Apollo/assets/js/controllers/feesStatusCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 799b3168..71e3ea8b 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -320,7 +320,7 @@ console.log($scope.paymentOptions);
               if(setfeedetails.Sem_Year == details.Sem_Year)
               {
         
-                if(role=='R002' || role == 'R005')
+                if(role == 'R005')
                 {
 
                     console.log('if')