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

payment option

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-01-08 15:29:31 +05:30
parent 61a58b233e
commit 00a779266d
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/Login_model.php
View File

@ -143,7 +143,7 @@ class Login_model extends CI_Model
// echo 'no _if';die();
// print_r($loginDetails);die();
$this->db->select('LO.MobileNumber, LO.ListCode, LO.ID, ST.IsActive,LO.StaffID,ST.BranchCode,SC.CallModuleAccess');
$this->db->select('LO.MobileNumber, LO.ListCode, LO.ID, ST.IsActive,LO.StaffID,ST.BranchCode,SC.CallModuleAccess,SC.FinanceModuleAccess');
$this->db->from('' . LOGIN . ' as LO');
$this->db->join('' . STAFF . ' as ST', 'LO.StaffID = ST.StaffID');
$this->db->join('' . STAFF_BRANCH . ' as SC', 'SC.StaffID = ST.StaffID');

9
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -20,6 +20,11 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* updateModel default value
* */
//console.log(JSON.parse(localStorage.getItem('localObj')).localType)
//console.log(JSON.parse(localStorage.getItem('localObj')).is_DayBookApproval_Access)
$scope.updateModel = {
"feesType": "",
"date": "",
@ -47,7 +52,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
/*
* get payment options
* */
if(JSON.parse(localStorage.getItem('localObj')).localType=='R002' && JSON.parse(localStorage.getItem('localObj')).is_DayBookApproval_Access==0){
$scope.paymentOptions = [
{
@ -116,7 +121,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
console.log($scope.paymentOptions);
$scope.isTrainee = false;
var localUserType = JSON.parse(localStorage.getItem('localObj')).localType;

6
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -299,12 +299,18 @@
<label>
Mode Of Payment <span class="symbol required"></span>
</label>
<div>
<select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
ng-model="updateModel.paymentOn"
ng-options="payment.paymentOn for payment in paymentOptions"
required>
<option value=""> Select Payment</option>
</select>
</div>
<span class="error text-small block"
ng-if="Form.paymentOn.$dirty && Form.paymentOn.$invalid">Payment type is required</span>
</div>