Incentive Done!!
Employee Benefit Done!!
This commit is contained in:
@@ -6,7 +6,7 @@ import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {BehaviorSubject, Observable, of as observableOf} from 'rxjs';
|
||||
import {EmployeeBenefitsDataSource} from './employee-benefits-datasource';
|
||||
import {VoucherService} from '../core/voucher.service';
|
||||
import {EmployeeBenefit, Journal, Voucher} from '../core/voucher';
|
||||
import {EmployeeBenefit, Voucher} from '../core/voucher';
|
||||
import * as moment from 'moment';
|
||||
import {AuthService} from '../auth/auth.service';
|
||||
import {ConfirmDialogComponent} from '../shared/confirm-dialog/confirm-dialog.component';
|
||||
@@ -106,7 +106,7 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit {
|
||||
}
|
||||
|
||||
addRow() {
|
||||
const oldFiltered = this.voucher.employeeBenefits.filter((x) => x.journal.account.id === this.employee.id);
|
||||
const oldFiltered = this.voucher.employeeBenefits.filter((x) => x.employee.id === this.employee.id);
|
||||
if (oldFiltered.length) {
|
||||
this.toaster.show('Danger', 'Employee has already been added');
|
||||
return;
|
||||
@@ -121,7 +121,7 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit {
|
||||
const pf = this.getPf(grossSalary, daysWorked, daysInMonth);
|
||||
|
||||
this.voucher.employeeBenefits.push({
|
||||
journal: new Journal({account: new Account(this.employee)}),
|
||||
employee: this.employee,
|
||||
grossSalary: grossSalary,
|
||||
daysWorked: daysWorked,
|
||||
esiEmployee: esi.ee,
|
||||
|
||||
Reference in New Issue
Block a user