Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EY-4841: Fjerner skattetrekk fra pdfgen og common #373

Merged
merged 1 commit into from
Dec 17, 2024
Merged

EY-4841: Fjerner skattetrekk fra pdfgen og common #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions apps/etterlatte-notifikasjoner/src/test/resources/barnepensjon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,7 @@
"utenlandskBankNavn": null,
"utenlandskBankAdresse": null,
"iban": null,
"swift": null,
"skattetrekk": {
"svar": {
"verdi": "NEI",
"innhold": "Nei"
},
"spoersmaal": "Ønsker du at vi legger inn et skattetrekk for barnepensjonen?",
"opplysning": null
}
"swift": null
}
},
"soeker": {
Expand Down
21 changes: 0 additions & 21 deletions apps/ey-pdfgen/data/eypdfgen/barnepensjon_v2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,6 @@
"svar": {
"innhold": "1234.12.31234"
}
},
"skattetrekk": {
"svar": {
"svar": {
"verdi": "JA",
"innhold": "Ja"
},
"spoersmaal": "Ønsker du at vi legger inn et skattetrekk for barnepensjonen?"
},
"trekk": {
"spoersmaal": "Frivillig skattetrekk i prosent per måned",
"svar": {
"innhold": "30%"
}
},
"beskrivelse": {
"spoersmaal": "Vi trenger beskjed hvis det ikke skal være trekk i desember eller andre deler av året (valgfritt)",
"svar": {
"innhold": "Ikke i desember"
}
}
}
}
},
Expand Down
1 change: 0 additions & 1 deletion apps/ey-pdfgen/templates/brev/endring-nb.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
{{> brev/partials/beregning}}
{{> brev/partials/endringer}}
{{> brev/partials/kontonummer}}
{{> brev/partials/skattetrekk}}
{{> brev/partials/klage}}
{{> brev/partials/innsyn}}
{{> brev/partials/sporsmaal}}
Expand Down
17 changes: 0 additions & 17 deletions ...n/templates/eypdfgen/partials_v2/common/utbetalingsinformasjon/utbetalingsinformasjon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,4 @@
{{> eypdfgen/partials_v2/common/opplysning this.iban}}

{{> eypdfgen/partials_v2/common/opplysning this.swift}}

{{> eypdfgen/partials_v2/common/opplysning this.skattetrekk.svar}}

{{#eq this.skattetrekk.svar.svar.verdi "JA"}}
{{> eypdfgen/partials_v2/common/opplysning this.skattetrekk.trekk}}

{{#if this.skattetrekk.beskrivelse}}
{{> eypdfgen/partials_v2/common/opplysning this.skattetrekk.beskrivelse}}
{{/if}}
{{/eq}}

<!-- Kan fjernes 72 timer etter lansering av ny versjon -->
{{#eq this.skattetrekk.svar.verdi "JA"}}
{{#if this.skattetrekk.trekkprosent}}
{{> eypdfgen/partials_v2/common/opplysning this.skattetrekk.trekkprosent}}
{{/if}}
{{/eq}}
{{/with}}
7 changes: 0 additions & 7 deletions common/src/main/kotlin/no/nav/etterlatte/libs/common/innsendtsoeknad/common/Opplysninger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ data class UtbetalingsInformasjon(
val utenlandskBankAdresse: Opplysning<FritekstSvar>? = null,
val iban: Opplysning<FritekstSvar>? = null,
val swift: Opplysning<FritekstSvar>? = null,
val skattetrekk: Skattetrekk? = null,
)

data class Skattetrekk(
val svar: Opplysning<EnumSvar<JaNeiVetIkke>>? = null,
val trekk: Opplysning<FritekstSvar>? = null,
val beskrivelse: Opplysning<FritekstSvar>? = null,
)

@JsonIgnoreProperties(ignoreUnknown = true)
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/kotlin/innsendtsoeknad/common/InnsendtSoeknadTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 1 addition & 10 deletions common/src/test/resources/soeknad/barnepensjon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,7 @@
"utenlandskBankNavn": null,
"utenlandskBankAdresse": null,
"iban": null,
"swift": null,
"skattetrekk": {
"svar": {
"svar": {
"verdi": "NEI",
"innhold": "Nei"
},
"spoersmaal": "Ønsker du at vi legger inn et skattetrekk for barnepensjonen?"
}
}
"swift": null
}
},
"soeker": {
Expand Down
23 changes: 1 addition & 22 deletions common/src/test/resources/soeknad/barnepensjon_utland.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,7 @@
"utenlandskBankNavn": null,
"utenlandskBankAdresse": null,
"iban": null,
"swift": null,
"skattetrekk": {
"svar": {
"svar": {
"verdi": "NEI",
"innhold": "Nei"
},
"spoersmaal": "Ønsker du at vi legger inn et skattetrekk for barnepensjonen?"
},
"trekk": {
"svar": {
"innhold": "20%"
},
"spoersmaal": "Frivillig skattetrekk i prosent per måned"
},
"beskrivelse": {
"svar": {
"innhold": "Ikke i desember"
},
"spoersmaal": "Vi trenger beskjed hvis det ikke skal være trekk i desember eller andre deler av året (valgfritt)"
}
}
"swift": null
}
},
"soeker": {
Expand Down
Loading