Commit 283c3671 authored by Hando Lukats's avatar Hando Lukats
Browse files

Merge branch 'hotfix/TEIS-2163' into 'master'

Release: merge 'hotfix-teis-2163' into 'master' created by Hando Lukats

See merge request teis/public-web-client!645
parents 616f2b2a d866c9a7
{
"name": "te-is",
"version": "1.26.0",
"version": "1.26.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "te-is",
"version": "1.26.0",
"version": "1.26.1",
"license": "MIT",
"scripts": {
"ng": "ng",
......
......@@ -280,10 +280,10 @@ export class ViolationActsService {
penaltyPaymentLegislations$ = of(null);
} else {
// a. Ettekirjutuse vormistamine
const violationActType = violationActs
.some(violationAct => violationAct.type.id === ViolationActTypeId.PRECEPT_WARNING_OF_PENALTY_PAYMENT || violationAct.type.id === ViolationActTypeId.WARNING_OF_PENALTY_PAYMENT);
const violationActStatus = violationActs.some(violationAct => violationAct.status.id === ViolationActStatusId.SENT);
if (!violationActs.length || !(violationActType && violationActStatus)) {
const violationActWarnings = violationActs
.filter(violationAct => violationAct.type.id === ViolationActTypeId.PRECEPT_WARNING_OF_PENALTY_PAYMENT || violationAct.type.id === ViolationActTypeId.WARNING_OF_PENALTY_PAYMENT);
const violationActStatus = violationActWarnings.some(violationAct => violationAct.status.id === ViolationActStatusId.SENT);
if (!violationActs.length || !violationActStatus) {
penaltyPaymentLegislations$ = of(null);
}
if (violationActs.length === 1 && violationActs[0].type.id === ViolationActTypeId.PRECEPT) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment