From 005985e20daed6ef7f4418ccbb2f924b25d60ef2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 27 Dec 2017 15:57:47 +0530
Subject: [PATCH] course details changes done

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

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index e11c4337..cc9c7552 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -253,11 +253,13 @@ class Fees_status_model extends CI_Model
                 }
 
                 // for get paid bill details
-                $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment');
+                $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,BR.BranchName');
+                $this->db->from(STUDENTS_FEES_PAID.' as SFP');
+                $this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left');
                 $this->db->where('FeesId',$feeRow->FeesID);
                 $this->db->order_by('ID',"ASC");
                 $this->db->group_by('BillNO');
-                $storePaidDetails['paidDetails']=$this->db->get(STUDENTS_FEES_PAID)->result();
+                $storePaidDetails['paidDetails']=$this->db->get()->result();
                 $mergeResult[]=$storePaidDetails;
 
             }