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

issue no : 1671

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-20 18:04:21 +05:30
parent b2e0e5af21
commit 4f32bbd391
4 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1216,47 +1216,41 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y'));
$end_date = $det['to'];
$fromd= date("Y-m-d",strtotime($start_date));
$fromd= date("Y-m-d",strtotime($start_date));
$tod=date("Y-m-d",strtotime($end_date));
//echo $det['branchId'];die() ; sum(a.BillAmount) AS Total,
$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,
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)).'"');
$sql="SELECT distinct d.UniversityName,c.UniversityID,
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, a.CreatedOn
FROM T_Students_Fees_PaidDetails a
JOIN T_Students_Fees_Status b ON b.FeesId = a.FeesID and b.StudentID=a.StudentID
LEFT JOIN T_CourseMaster c ON c.CourseID = b.CourseID
left join T_UniversityMaster d on d.UniversityID=c.UniversityID and d.BranchCode = '".$det['branchId']."'
$this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
WHERE date_format(a.CreatedOn,'%Y-%m-%d') >= '".date('Y-m-d', strtotime($start_date))."' AND date_format(a.CreatedOn,'%Y-%m-%d') <= '".date('Y-m-d', strtotime($end_date))."' AND b.BranchCode = '".$det['branchId']."' AND a.IsActive = '1' ";
$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');
if($det['university']!='')
if($det['university']!='')
{
$this->db->where('d.UniversityID',$det['university']);
$sql.=" and c.UniversityID='".$det['university']."'";
}
$this->db->group_by('UniversityID');
$sql.=" GROUP BY c.UniversityID";
$feeDetails = $this->db->get()->result();
$res = $this->db->query($sql,array());
$result = $res->result();
$feeDetails = $result;
// $feeDetails = $this->db->get()->result();
if($feeDetails)
@ -1273,8 +1267,8 @@ if($feeDetails)
}
// print_r( $this->db->last_query());
// die();
//print_r( $this->db->last_query());
//die();
return $result_array;

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

@ -213,7 +213,9 @@ $scope.tod = to_dt;
//console.log(newreglist)
$scope.Totalfee= parseFloat($scope.Totalfee)+ parseFloat(newreglist.Cash)+parseFloat(newreglist.Cheque)+parseFloat(newreglist.Onlinec)+parseFloat(newreglist.Card);
$scope.Totalfee= parseFloat($scope.Totalfee)+ parseFloat(newreglist.Cash)+
parseFloat(newreglist.Cheque)+parseFloat(newreglist.Onlinec)+
parseFloat(newreglist.Card)+parseFloat(newreglist.Referal)+parseFloat(newreglist.WAIVER);
//console.log( $scope.Totalfee);
});

16
Apollo/assets/views/feecollected.html
View File

@ -181,9 +181,11 @@
<th style="font-size: 12px;">Online Transaction</th>
<th style="font-size: 12px;">Credit/Debit Card</th>
<th style="font-size: 12px;">Waiver</th>
<th style="font-size: 12px">Referral</th>
<th style="font-size: 12px;">Total</th>
<th style="font-size: 12px;">Waiver</th>
<th style="font-size: 12px">Referral</th>
<!-- <th style="font-size: 12px;">Waiver</th>
<th style="font-size: 12px">Referral</th> -->
<!-- <th style="font-size: 12px;">Amount</th>
<th style="font-size: 12px;">Action</th> -->
</tr>
@ -198,9 +200,11 @@
<td>{{p.Onlinec}}</td>
<td>{{p.Card}}</td>
<td>{{p.Card -- p.Cash -- p.Cheque -- p.Onlinec }}</td>
<td>{{p.WAIVER}}</td>
<td>{{p.Referal}}</td>
<td>{{p.WAIVER}}</td>
<td>{{p.Referal}}</td>
<td>{{p.Card -- p.Cash -- p.Cheque -- p.Onlinec -- p.WAIVER -- p.Referal}}</td>
<!-- <td>{{p.WAIVER}}</td>
<td>{{p.Referal}}</td> -->
</tr>
</tbody>
@ -211,7 +215,7 @@
<td></td>style="font-size:35px;"
<td></td>
<td></td> -->
<td colspan="5" align="right"><span style="font-size:15px;font-weight:bold">Total</span></td>
<td colspan="7" align="right"><span style="font-size:15px;font-weight:bold">Total</span></td>
<!-- <td></td>
<td></td> -->
<td><span style="font-size:15px;font-weight:bold">{{Totalfee}}</span></td>

2
Apollo/assets/views/login_login.html
View File

@ -431,7 +431,7 @@
<div class="form-group" ng-class="{'has-error':Form.passwordemp.$dirty && Form.passwordemp.$invalid, 'has-success':Form.passwordemp.$valid}" ng-if="Empcheck">
<span class="input-icon">
<input type="text" id="inputPassword4" placeholder="OTP" class="form-control heighLight underline" name="passwordemp" ng-model="myModel.passwordemp"
<input type="password" id="inputPassword4" placeholder="OTP" class="form-control heighLight underline" name="passwordemp" ng-model="myModel.passwordemp"
ng-minlength="6" required/>
<i style="color: black;" class="fa fa-lock"></i>
<span class="error text-small block" ng-if="Form.passwordemp.$dirty && Form.passwordemp.$invalid"> Password Required</span></span>