Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
gandhimathi
commit
48b6e02ca7
@ -924,46 +924,42 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
|
||||
|
||||
//echo $det['university'];die() ;
|
||||
|
||||
$this->db->select('T_Student_CourseDetails.UniversityID,UniversityName,
|
||||
SUM(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash,
|
||||
SUM(IF(ModeOfPayment ="CHEQUE",BillAmount, 0)) AS Cheque,
|
||||
SUM(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal,
|
||||
SUM(IF(ModeOfPayment ="ONLINE TRANSACTION",BillAmount, 0)) AS Onlinec,
|
||||
SUM(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER,
|
||||
SUM(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card,
|
||||
SUM(T_Students_Fees_PaidDetails.BillAmount) AS Total');
|
||||
$this->db->from('T_Students_Fees_PaidDetails');
|
||||
$this->db->join('T_Student_CourseDetails','T_Student_CourseDetails.StudentID=T_Students_Fees_PaidDetails.StudentID');
|
||||
$this->db->join('T_UniversityMaster','T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID');
|
||||
$this->db->select('d.UniversityID,UniversityName,
|
||||
sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash,
|
||||
sum(IF(ModeOfPayment ="CHEQUE", BillAmount, 0)) AS Cheque,
|
||||
sum(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal,
|
||||
sum(IF(ModeOfPayment ="ONLINE TRANSACTION", BillAmount, 0)) AS Onlinec,
|
||||
sum(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER,
|
||||
sum(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card,
|
||||
sum(a.BillAmount) AS Total,a.CreatedOn');
|
||||
$this->db->from('T_Students_Fees_PaidDetails a');
|
||||
$this->db->join('T_Students_Fees_Status b','b.FeesId = a.FeesID','left');
|
||||
$this->db->join('T_CourseMaster c','c.CourseID = b.CourseID','left');
|
||||
$this->db->join('T_UniversityMaster d','d.UniversityID=c.UniversityID','left');
|
||||
|
||||
// $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"');
|
||||
|
||||
|
||||
$this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
|
||||
$this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
|
||||
|
||||
|
||||
|
||||
$this->db->where("date_format(T_Students_Fees_PaidDetails.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(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)');
|
||||
|
||||
|
||||
|
||||
|
||||
$this->db->where('T_Students_Fees_PaidDetails.IsActive','1');
|
||||
$this->db->where('a.IsActive','1');
|
||||
|
||||
if($det['university']!='')
|
||||
{
|
||||
$this->db->where('T_Student_CourseDetails.UniversityID',$det['university']);
|
||||
$this->db->where('d.UniversityID',$det['university']);
|
||||
}
|
||||
|
||||
$this->db->group_by('UniversityID');
|
||||
|
||||
$feeDetails = $this->db->get()->result();
|
||||
|
||||
// print_r( $this->db->last_query());
|
||||
// die();
|
||||
|
||||
// print_r($feeDetails);
|
||||
|
||||
if($feeDetails)
|
||||
{
|
||||
|
||||
|
||||
@ -123,52 +123,52 @@
|
||||
<table class="table table-bordered" export-table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('Date')">Date
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th ng-click="sort('Date')" style="width: 20%">Date
|
||||
|
||||
</th>
|
||||
<th ng-click="sort('ListName')">Income/Expense
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
|
||||
|
||||
</th>
|
||||
<th>Voucher Number / Bill Number
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 5%">Voucher No / Bill No
|
||||
|
||||
</th>
|
||||
<th>Paid To / Received From
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7.5%">Paid To / Received From
|
||||
|
||||
</th>
|
||||
<th>Sem
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<!-- <th>Sem
|
||||
|
||||
</th>
|
||||
<th>Course
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
|
||||
</th> -->
|
||||
<th style="width: 7.5%"> University,</br>Course,</br>Sem
|
||||
|
||||
</th>
|
||||
<th>University
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th ng-click="sort('TypeName')" style="width: 7.5%">Type
|
||||
|
||||
</th>
|
||||
<th ng-click="sort('TypeName')">Type
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th>
|
||||
<th style="width: 7%">
|
||||
Receipt No
|
||||
</th>
|
||||
<th>
|
||||
<th style="width: 7%">
|
||||
Comments
|
||||
</th>
|
||||
<th>Mode of Payment
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Mode of Payment
|
||||
|
||||
</th>
|
||||
<th>Amount
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 5%">Amount
|
||||
|
||||
</th>
|
||||
<th>Balance
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Balance
|
||||
|
||||
</th>
|
||||
<th>Reason
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Reason
|
||||
|
||||
</th>
|
||||
<th class="center" ng-click="sort('Status')">Status
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
|
||||
|
||||
</th>
|
||||
<th class="center">Activity
|
||||
<th class="center" style="width: 7.5%">Activity
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -178,9 +178,7 @@
|
||||
<td>{{p.ListName}}</td>
|
||||
<td>{{p.VoucherNumber}}</td>
|
||||
<td>{{p.PaidTo}}</td>
|
||||
<td> {{p.FeePaymentDetails}}</td>
|
||||
<td>{{p.CourseName}}</td>
|
||||
<td> {{p.UniversityName}}</td>
|
||||
<td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
|
||||
<td>
|
||||
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
|
||||
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
|
||||
|
||||
@ -123,52 +123,52 @@
|
||||
<table class="table table-bordered export-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('Date')">Date
|
||||
<th ng-click="sort('Date')" style="width: 20%">Date
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th ng-click="sort('ListName')">Income/Expense
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
|
||||
|
||||
</th>
|
||||
<th>Voucher Number / Bill Number
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 5%">Voucher No / Bill No
|
||||
|
||||
</th>
|
||||
<th>Paid To / Received From
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7.5%">Paid To / Received From
|
||||
|
||||
</th>
|
||||
<th>Sem
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<!-- <th>Sem
|
||||
|
||||
</th>
|
||||
<th>Course
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
|
||||
</th> -->
|
||||
<th style="width: 7.5%">University,</br>Course,</br>Sem
|
||||
|
||||
</th>
|
||||
<th>University
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th ng-click="sort('TypeName')" style="width: 7.5%">Type
|
||||
|
||||
</th>
|
||||
<th ng-click="sort('TypeName')">Type
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th>
|
||||
<th style="width: 7%">
|
||||
Receipt No
|
||||
</th>
|
||||
<th>
|
||||
<th style="width: 7%">
|
||||
Comments
|
||||
</th>
|
||||
<th>Mode of Payment
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Mode of Payment
|
||||
|
||||
</th>
|
||||
<th>Amount
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 5%">Amount
|
||||
|
||||
</th>
|
||||
<th>Balance
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Balance
|
||||
|
||||
</th>
|
||||
<th>Reason
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Reason
|
||||
|
||||
</th>
|
||||
<th class="center" ng-click="sort('Status')">Status
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
|
||||
|
||||
</th>
|
||||
<th class="center">Activity
|
||||
<th class="center" style="width: 7.5%">Activity
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -179,9 +179,9 @@
|
||||
<td>{{p.ListName}}</td>
|
||||
<td>{{p.VoucherNumber}}</td>
|
||||
<td>{{p.PaidTo}}</td>
|
||||
<td> {{p.FeePaymentDetails}}</td>
|
||||
<td>{{p.CourseName}}</td>
|
||||
<td>{{p.UniversityName}}</td>
|
||||
<!-- <td> {{p.FeePaymentDetails}}</td>
|
||||
<td>{{p.CourseName}}</td> -->
|
||||
<td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
|
||||
<td>
|
||||
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
|
||||
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
|
||||
|
||||
@ -109,50 +109,50 @@
|
||||
<table class="table table-bordered export-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th ng-click="sort('Date')">Date
|
||||
<th ng-click="sort('Date')" style="width: 20%">Date
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th class="th" ng-click="sort('ListName')">Income/Expense
|
||||
<th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th>Voucher Number / Bill Number
|
||||
<th style="width: 5%">Voucher No / Bill No
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th>Paid To / Received From
|
||||
<th style="width: 7.5%">Paid To / Received From
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th>Sem
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<!-- <th>Sem
|
||||
|
||||
</th>
|
||||
<th>
|
||||
Course
|
||||
</th> -->
|
||||
<th style="width: 7.5%">
|
||||
University,</br>Course,</br>Sem
|
||||
</th>
|
||||
<th>
|
||||
University
|
||||
<th ng-click="sort('TypeName')" style="width: 7.5%">Type
|
||||
|
||||
</th>
|
||||
<th ng-click="sort('TypeName')">Type
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
</th>
|
||||
<th>
|
||||
<th style="width: 7.5%">
|
||||
Receipt No
|
||||
</th>
|
||||
<th>
|
||||
<th style="width: 7.5%">
|
||||
Comments
|
||||
</th>
|
||||
<th>Mode of Payment
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7.5%">Mode of Payment
|
||||
|
||||
</th>
|
||||
<th>Amount
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 5%">Amount
|
||||
|
||||
</th>
|
||||
<th>Balance
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Balance
|
||||
|
||||
</th>
|
||||
<th>Reason</th>
|
||||
<th class="center" ng-click="sort('Status')">Status
|
||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||
<th style="width: 7%">Reason</th>
|
||||
<th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
|
||||
|
||||
</th>
|
||||
<th class="center">Action
|
||||
<th class="center" style="width: 7.5%">Action
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -163,9 +163,8 @@
|
||||
<td>{{p.ListName}}</td>
|
||||
<td>{{p.VoucherNumber}}</td>
|
||||
<td>{{p.PaidTo}}</td>
|
||||
<td> {{p.FeePaymentDetails}}</td>
|
||||
<td>{{p.CourseName}} </td>
|
||||
<td>{{p.UniversityName}}</td>
|
||||
|
||||
<td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
|
||||
<td>
|
||||
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
|
||||
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
|
||||
|
||||
@ -112,7 +112,7 @@
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
|
||||
ng-click="getEmployeeList()">
|
||||
|
||||
<option value="" disabled selected>Select University</option>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
|
||||
|
||||
|
||||
|
||||
@ -355,7 +355,7 @@
|
||||
<i class="ti-write"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<span class="title" translate="sidebar.nav.master.HALLTICKET"> GENERATE HALLTICKET </span>
|
||||
<span class="title" translate="sidebar.nav.master.HALLTICKET"> GENERATE HALLTICKET </span><i class="icon-arrow"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
@ -391,7 +391,7 @@
|
||||
<i class="ti-rocket"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
|
||||
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
@ -856,7 +856,7 @@
|
||||
<i class="ti-rocket"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
|
||||
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
@ -1228,7 +1228,7 @@
|
||||
<i class="ti-rocket"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
|
||||
<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user