diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 5487cef7..9d031631 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -79,7 +79,7 @@ class Studentview_model extends CI_Model * */ public function getStudentCourse($studentId=null){ - $this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName'); + $this->db->select('SCU.EnrollmentID,CU.CourseID,CU.CourseName,US.UniversityID,US.UniversityName,US.UniversityShortName'); $this->db->from( STUDENTCOURSE . ' as SCU'); $this->db->join( COURSE . ' as CU', 'CU.CourseID = SCU.CourseID'); $this->db->join( UNIVERSITY . ' as US', 'US.UniversityID = SCU.UniversityID'); @@ -93,6 +93,7 @@ class Studentview_model extends CI_Model $fetchData['CourseName']=$row->CourseName; $fetchData['UniversityID']=$row->UniversityID; $fetchData['UniversityName']=$row->UniversityName; + $fetchData['UniveShortName'] = $row->UniversityShortName; // $fetchData['SessionName']=$row->SessionName; $fetchData['EnrollmentID']=$row->EnrollmentID; // get student fees details @@ -170,11 +171,16 @@ class Studentview_model extends CI_Model $storePaidDetails['BatchDate'] = $feeRow->BatchDate; // for get paid bill details - $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo'); - $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(); + // for get paid bill details + $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,STF.Firstname as ReceivedBy'); + $this->db->from(STUDENTS_FEES_PAID.' as SFP'); + $this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left'); + $this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy'); + $this->db->join(STAFF.' as STF','STF.StaffID = LO.StaffID'); + $this->db->where('SFP.FeesId',$feeRow->FeesID); + $this->db->order_by('SFP.ID',"ASC"); + $this->db->group_by('SFP.BillNO'); + $storePaidDetails['paidDetails']=$this->db->get()->result(); // for installment details $this->load->model('Fees_status_model'); @@ -252,11 +258,15 @@ class Studentview_model extends CI_Model $storePaidDetails['BatchDate'] = ""; // for get paid bill details - $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo'); - $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(); + $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,STF.Firstname as ReceivedBy'); + $this->db->from(STUDENTS_FEES_PAID.' as SFP'); + $this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left'); + $this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy'); + $this->db->join(STAFF.' as STF','STF.StaffID = LO.StaffID'); + $this->db->where('SFP.FeesId',$feeRow->FeesID); + $this->db->order_by('SFP.ID',"ASC"); + $this->db->group_by('SFP.BillNO'); + $storePaidDetails['paidDetails']=$this->db->get()->result(); $storePaidDetails['InstallmentDetails']=""; $mergeResult[]=$storePaidDetails;