From 378758da5996f540328964aed1fa436bc2a53f7a Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 22 Aug 2018 21:05:36 +0530
Subject: [PATCH] dash board changes

---
 Apollo/api/application/models/Dashboard_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apollo/api/application/models/Dashboard_model.php b/Apollo/api/application/models/Dashboard_model.php
index 9393025c..45a43106 100755
--- a/Apollo/api/application/models/Dashboard_model.php
+++ b/Apollo/api/application/models/Dashboard_model.php
@@ -118,7 +118,7 @@ class Dashboard_model extends CI_Model
        $feesDetails=array();
         $feesDetails['UniversityID']=$universityID;
         $feesDetails['UniversityName']=$universityName;
-        $this->db->select("SUM(SFS.CourseFees) as PayableFees");
+        $this->db->select("SUM(SFS.CourseFees+SFS.STFOrWR+Others) as PayableFees");
         $this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
         $this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
         $this->db->where('CU.UniversityID',$universityID);
@@ -170,7 +170,7 @@ class Dashboard_model extends CI_Model
             foreach ($getBatchDetails->result() as $bRows){
                 $batchFeesDetails['BatchCode']=$bRows->BatchCode;
                 $batchFeesDetails['BatchName']=$bRows->BatchName;
-                $this->db->select("SUM(SFS.CourseFees) as PayableFees");
+                $this->db->select("SUM(SFS.CourseFees+SFS.STFOrWR+Others) as PayableFees");
                 $this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
                 $this->db->where('SFS.BatchCode',$bRows->BatchCode);
                 $this->db->where('SFS.BranchCode',$branchCode);