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

fee collected

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-15 12:32:52 +05:30
parent 4286f6d6e6
commit 1ca4ee5b4a
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/controllers/Report.php
View File

@ -501,6 +501,9 @@ class Report extends REST_Controller {
$det['from'] = $this->post('from'); $det['from'] = $this->post('from');
$det['to'] = $this->post('to'); $det['to'] = $this->post('to');
$det['university'] = $this->post('university'); $det['university'] = $this->post('university');
$det['branchId'] = $this->post('branchId');
$feelist = $this->report_model->GetFeePaidDetails($det); $feelist = $this->report_model->GetFeePaidDetails($det);

8
Apollo/api/application/models/Reports_model.php
View File

@ -1167,7 +1167,7 @@ $query = $this->db->query($subQuery,array());
$fromd= date("Y-m-d",strtotime($start_date)); $fromd= date("Y-m-d",strtotime($start_date));
$tod=date("Y-m-d",strtotime($end_date)); $tod=date("Y-m-d",strtotime($end_date));
//echo $det['university'];die() ; //echo $det['branchId'];die() ;
$this->db->select('d.UniversityID,UniversityName, $this->db->select('d.UniversityID,UniversityName,
sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash, sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash,
@ -1191,6 +1191,8 @@ $query = $this->db->query($subQuery,array());
$this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date))); $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date)));
$this->db->where('d.BranchCode',$det['branchId']);
$this->db->where('a.IsActive','1'); $this->db->where('a.IsActive','1');
@ -1219,8 +1221,8 @@ if($feeDetails)
} }
//print_r( $this->db->last_query()); // print_r( $this->db->last_query());
//die(); // die();
return $result_array; return $result_array;

5
Apollo/assets/js/controllers/FeeCollected_reportCtrl.js
View File

@ -91,6 +91,8 @@ $scope.universityId='';
$scope.getDetails = function (form,myModel) $scope.getDetails = function (form,myModel)
{ {
// console.log(JSON.parse(localStorage.getItem('localObj')).localBranchID);
// return false;
var firstError = null; var firstError = null;
if (form.$invalid) { if (form.$invalid) {
@ -161,7 +163,8 @@ $scope.tod = to_dt;
data: { data: {
university: $scope.universityId, university: $scope.universityId,
from : $scope.filters.from_date , from : $scope.filters.from_date ,
to : $scope.filters.to_date to : $scope.filters.to_date,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
} }
} }