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

raj student view

Browse Source
This commit is contained in:
sriramv 2019-01-19 12:11:23 +05:30
commit c4b8a3bc29
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,10 +618,15 @@ class DayBook_model extends CI_Model
public function add_dayBook($Arr) public function add_dayBook($Arr)
{ {
$voucherNo = $Arr['VoucherNumber']; $voucherNo = $Arr['VoucherNumber'];
$branchCode = $Arr['BranchCode'];
// echo 'daybook';die();
// $Arr['Isdaybook'] = '1'; // $Arr['Isdaybook'] = '1';
$sqlCheck = "SELECT * FROM ".DAYBOOKMASTER." WHERE VoucherNumber = '$voucherNo'"; $sqlCheck = "SELECT * FROM ".DAYBOOKMASTER." WHERE VoucherNumber = '$voucherNo' and BranchCode = '$branchCode' ";
// print_r($this->db->query($sqlCheck));exit(); //print_r($this->db->query($sqlCheck));exit();
//print_r($this->db->last_query());die();
$checkAdd = $this->db->query($sqlCheck); $checkAdd = $this->db->query($sqlCheck);
$checkAddDetails = $checkAdd->result(); $checkAddDetails = $checkAdd->result();
if(count( $checkAddDetails ) > 0){ if(count( $checkAddDetails ) > 0){
@ -671,14 +676,19 @@ class DayBook_model extends CI_Model
// add non operational // add non operational
public function add_NonOperational($Arr) public function add_NonOperational($Arr)
{ {
// echo 'nonope';die();
//echo $Arr['Isdaybook']; //echo $Arr['Isdaybook'];
$branchCode = $Arr['BranchCode'];
//echo $branchCode;die();
$voucherNo = $Arr['VoucherNumber']; $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(); // print_r($this->db->query($sqlCheck));exit();
$checkAdd = $this->db->query($sqlCheck); $checkAdd = $this->db->query($sqlCheck);
$checkAddDetails = $checkAdd->result(); $checkAddDetails = $checkAdd->result();
// print_r($this->db->last_query());die();
if(count( $checkAddDetails ) > 0){ if(count( $checkAddDetails ) > 0){
$result['addDayBookStatus'] = false; $result['addDayBookStatus'] = false;
$result['message'] = "This Voucher Number Already Exist."; $result['message'] = "This Voucher Number Already Exist.";

2
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -320,7 +320,7 @@ console.log($scope.paymentOptions);
if(setfeedetails.Sem_Year == details.Sem_Year) if(setfeedetails.Sem_Year == details.Sem_Year)
{ {
if(role=='R002' || role == 'R005') if(role == 'R005')
{ {
console.log('if') console.log('if')