From 60aa1a5bb8d291f3b3d5eeaf48fc3789f8181f58 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Wed, 18 Apr 2018 10:03:40 +0530
Subject: [PATCH] daybook changes : kdk

---
 Apollo/api/application/models/DayBook_model.php | 11 +++++++++++
 Apollo/assets/views/daybook/daybook.html        |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php
index d80ea3d7..ed511354 100755
--- a/Apollo/api/application/models/DayBook_model.php
+++ b/Apollo/api/application/models/DayBook_model.php
@@ -309,6 +309,15 @@ class DayBook_model extends CI_Model
      // add dayBook 
     public function add_dayBook($Arr)
     {
+        $voucherNo = $Arr['VoucherNumber'];
+        $sqlCheck = "SELECT * FROM ".DAYBOOKMASTER." WHERE VoucherNumber = '$voucherNo'";
+    //    print_r($this->db->query($sqlCheck));exit();
+         $checkAdd = $this->db->query($sqlCheck);
+            $checkAddDetails = $checkAdd->result();
+        if(count( $checkAddDetails ) > 0){
+                    $result['addDayBookStatus'] = false;
+                    $result['message']      = "This Voucher Number Already Exist.";
+        }else{
          $branch = $Arr['BranchCode'];
         $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE BranchCode = '$branch'
             ORDER BY  ID DESC
@@ -341,6 +350,8 @@ class DayBook_model extends CI_Model
             $result['addDayBookStatus'] = false;
             $result['message']      = "Something went wrong.please try again";
         }
+}
+       
         return $result;
     }
 
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index a9eeab7a..be7b351a 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -152,7 +152,7 @@
                                             <td class="center" ng-if="p.ListName == 'Income' ">
                                                 <span ng-if=" p.PaymentStatus == 1 "> <i  tooltip="EDIT" class="glyphicon glyphicon-pencil"  ng-click="setEditId(p.ID)"></i> </span>
                                                 <span ng-if=" p.PaymentStatus == 0 "> 
-                                                    <i  tooltip="DELETE" class="glyphicon glyphicon-remove"  ng-click="deleteFeePayableEntry(p.ID)"></i> 
+                                                    <!--<i  tooltip="DELETE" class="glyphicon glyphicon-remove"  ng-click="deleteFeePayableEntry(p.ID)"></i> -->
                                                     </span>
                                             </td>
                                             <td class="center" ng-if="p.Status == 'Pending'">