tanshu
/
brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix: Employee Functions

This commit is contained in:
tanshu 2017-02-09 19:22:19 +05:30
parent c09515fbfe
commit 2ac10f16c3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brewman/static/app/overlord.app.js
View File

@ -212,7 +212,7 @@ var overlord = angular.module('overlord', ['overlord.directive', 'overlord.filte
resolve: PurchasesController.resolve resolve: PurchasesController.resolve
}). }).
when('/EmployeeFunctions', { when('/EmployeeFunctions', {
templateUrl: '/app/employee-functions/employee-functions.html', templateUrl: '/app/employee/employee-functions.html',
controller: EmployeeFunctionsController controller: EmployeeFunctionsController
}). }).

2
brewman/static/app/reconcile/reconcile.controller.js
View File

@ -19,7 +19,7 @@ var ReconcileController = ['$scope', '$routeParams', '$location', 'asDateFilter'
}; };
$scope.info = reconcile; $scope.info = reconcile;
$scope.show = function () { $scope.show = function () {
var id = $scope.info.Account.LedgerID var id = $scope.info.Account.LedgerID;
if (id === $routeParams.id && $scope.info.StartDate === $routeParams.StartDate && $scope.info.FinishDate === $routeParams.FinishDate) { if (id === $routeParams.id && $scope.info.StartDate === $routeParams.StartDate && $scope.info.FinishDate === $routeParams.FinishDate) {
Reconcile.get({id: id, StartDate: $scope.info.StartDate, FinishDate: $scope.info.FinishDate}, function (data) { Reconcile.get({id: id, StartDate: $scope.info.StartDate, FinishDate: $scope.info.FinishDate}, function (data) {
$scope.info = data; $scope.info = data;

2
brewman/static/app/service-charge/service-charge.controller.js
View File

@ -44,7 +44,7 @@ var ServiceChargeController = ['$scope', '$location', '$routeParams', 'numberFil
$scope.employeeAmount = function (employee) { $scope.employeeAmount = function (employee) {
return Number(employee.Points) * employee.DaysWorked * $scope.PointValue(); return Number(employee.Points) * employee.DaysWorked * $scope.PointValue();
} };
$scope.preventAlteration = function (voucher) { $scope.preventAlteration = function (voucher) {
if (angular.isUndefined($scope.perms)) { if (angular.isUndefined($scope.perms)) {
return false; return false;