Skip to content

Commit d6b5c0e

Browse files
its-me2000its-me2000
authored
Merge branch 'main' into AVIO-529
2 parents 6437d2e + de42255 commit d6b5c0e

File tree

3 files changed

+66
-238
lines changed

3 files changed

+66
-238
lines changed

‎force-app/nks-skattekort/classes/nksSkattekortWrappers/NKS_SkattekortWrapper.cls‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,69 @@
11
public with sharing class NKS_SkattekortWrapper {
22
@AuraEnabled
33
@TestVisible
4-
public Integer inntektsaar { get; private set; }
5-
4+
public String utstedtDato { get; private set; }
5+
66
@AuraEnabled
77
@TestVisible
8-
public String arbeidstakeridentifikator { get; private set; }
9-
8+
public Integer inntektsaar { get; private set; }
9+
1010
@AuraEnabled
1111
@TestVisible
12-
public String resultatPaaForespoersel { get; private set; }
13-
12+
public String resultatForSkattekort { get; private set; }
13+
1414
@AuraEnabled
1515
@TestVisible
16-
public Skattekort skattekort { get; private set; }
17-
16+
public List<Forskuddstrekk> forskuddstrekkList { get; private set; }
17+
1818
@AuraEnabled
1919
@TestVisible
20-
public List<String> tilleggsopplysning { get; private set; }
20+
public List<String> tilleggsopplysningList { get; private set; }
2121

22-
public class Skattekort {
22+
public class Frikort {
2323
@AuraEnabled
2424
@TestVisible
25-
public String utstedtDato { get; private set; }
26-
25+
public Integer frikortBeloep { get; private set; }
26+
}
27+
28+
public class Prosentkort {
2729
@AuraEnabled
2830
@TestVisible
29-
public Integer skattekortidentifikator { get; private set; }
30-
31+
public Double prosentSats { get; private set; }
32+
3133
@AuraEnabled
3234
@TestVisible
33-
public List<Forskuddstrekk> forskuddstrekk { get; private set; }
35+
public Double antallMndForTrekk { get; private set; }
3436
}
3537

36-
public class Forskuddstrekk {
38+
public class Trekktabell {
39+
@AuraEnabled
40+
@TestVisible
41+
public String tabell { get; private set; }
42+
3743
@AuraEnabled
3844
@TestVisible
39-
public String type { get; private set; }
40-
45+
public Double prosentSats { get; private set; }
46+
4147
@AuraEnabled
4248
@TestVisible
43-
public String trekkode { get; private set; }
44-
49+
public Double antallMndForTrekk { get; private set; }
50+
}
51+
52+
public class Forskuddstrekk {
4553
@AuraEnabled
4654
@TestVisible
47-
public Double prosentsats { get; private set; }
48-
55+
public String trekkode { get; private set; }
56+
4957
@AuraEnabled
5058
@TestVisible
51-
public Double frikortbeloep { get; private set; }
52-
59+
public Frikort frikort { get; private set; }
60+
5361
@AuraEnabled
5462
@TestVisible
55-
public String tabellnummer { get; private set; }
56-
63+
public Prosentkort prosentkort { get; private set; }
64+
5765
@AuraEnabled
5866
@TestVisible
59-
public Double antallMaanederForTrekk { get; private set; }
67+
public Trekktabell trekktabell { get; private set; }
6068
}
61-
}
69+
}

‎force-app/nks-skattekort/customMetadata/API_Service_Configuration.POST_SKATTEKORT_API.md-meta.xml‎

Lines changed: 29 additions & 209 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<CustomMetadata xmlns="http://soap.sforce.com/2006/04/metadata"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
2+
<CustomMetadata xmlns="http://soap.sforce.com/2006/04/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
53
<label>POST_SKATTEKORT_API</label>
64
<protected>false</protected>
75
<values>
@@ -22,211 +20,33 @@
2220
&quot;200&quot;: {
2321
&quot;headers&quot;: null,
2422
&quot;body&quot;:
25-
[{
26-
&quot;inntektsaar&quot;: 2025,
27-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
28-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
29-
&quot;skattekort&quot;: {
30-
&quot;forskuddstrekk&quot;: [
31-
{
32-
&quot;type&quot;: &quot;Trekkprosent&quot;,
33-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
34-
&quot;prosentsats&quot;: 22.20
35-
},
36-
{
37-
&quot;type&quot;: &quot;Trekkprosent&quot;,
38-
&quot;trekkode&quot;: &quot;pensjonFraNAV&quot;,
39-
&quot;prosentsats&quot;: 15.00
40-
}
41-
]
42-
},
43-
&quot;tilleggsopplysning&quot;: [
44-
&quot;kildeskattPaaPensjon&quot;
45-
]
46-
},
47-
{
48-
&quot;inntektsaar&quot;: 2025,
49-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
50-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
51-
&quot;skattekort&quot;: {
52-
&quot;utstedtDato&quot;: &quot;2025-12-04&quot;,
53-
&quot;skattekortidentifikator&quot;: 72883,
54-
&quot;forskuddstrekk&quot;: [
55-
{
56-
&quot;type&quot;: &quot;Trekkprosent&quot;,
57-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
58-
&quot;prosentsats&quot;: 22.20
59-
}
60-
]
61-
},
62-
&quot;tilleggsopplysning&quot;: [
63-
&quot;kildeskattPaaPensjon&quot;
64-
]
65-
},
66-
{
67-
&quot;inntektsaar&quot;: 2025,
68-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
69-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
70-
&quot;skattekort&quot;: {
71-
&quot;forskuddstrekk&quot;: [
72-
{
73-
&quot;type&quot;: &quot;Trekkprosent&quot;,
74-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
75-
&quot;prosentsats&quot;: 22.20
76-
},
77-
{
78-
&quot;type&quot;: &quot;Trekkprosent&quot;,
79-
&quot;trekkode&quot;: &quot;pensjonFraNAV&quot;,
80-
&quot;prosentsats&quot;: 15.00
81-
}
82-
]
83-
},
84-
&quot;tilleggsopplysning&quot;: [
85-
&quot;kildeskattPaaPensjon&quot;
86-
]
87-
},
88-
{
89-
&quot;inntektsaar&quot;: 2025,
90-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
91-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
92-
&quot;skattekort&quot;: {
93-
&quot;utstedtDato&quot;: &quot;2025-12-05&quot;,
94-
&quot;skattekortidentifikator&quot;: 73599,
95-
&quot;forskuddstrekk&quot;: [
96-
{
97-
&quot;type&quot;: &quot;Trekkprosent&quot;,
98-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
99-
&quot;prosentsats&quot;: 22.20
100-
}
101-
]
102-
},
103-
&quot;tilleggsopplysning&quot;: [
104-
&quot;kildeskattPaaPensjon&quot;
105-
]
106-
},
107-
{
108-
&quot;inntektsaar&quot;: 2025,
109-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
110-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
111-
&quot;skattekort&quot;: {
112-
&quot;forskuddstrekk&quot;: [
113-
{
114-
&quot;type&quot;: &quot;Trekkprosent&quot;,
115-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
116-
&quot;prosentsats&quot;: 22.20
117-
},
118-
{
119-
&quot;type&quot;: &quot;Trekkprosent&quot;,
120-
&quot;trekkode&quot;: &quot;pensjonFraNAV&quot;,
121-
&quot;prosentsats&quot;: 15.00
122-
}
123-
]
124-
},
125-
&quot;tilleggsopplysning&quot;: [
126-
&quot;kildeskattPaaPensjon&quot;
127-
]
128-
},
129-
{
130-
&quot;inntektsaar&quot;: 2025,
131-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
132-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
133-
&quot;skattekort&quot;: {
134-
&quot;utstedtDato&quot;: &quot;2025-12-06&quot;,
135-
&quot;skattekortidentifikator&quot;: 74315,
136-
&quot;forskuddstrekk&quot;: [
137-
{
138-
&quot;type&quot;: &quot;Trekkprosent&quot;,
139-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
140-
&quot;prosentsats&quot;: 22.20
141-
}
142-
]
143-
},
144-
&quot;tilleggsopplysning&quot;: [
145-
&quot;kildeskattPaaPensjon&quot;
146-
]
147-
},
148-
{
149-
&quot;inntektsaar&quot;: 2025,
150-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
151-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
152-
&quot;skattekort&quot;: {
153-
&quot;forskuddstrekk&quot;: [
154-
{
155-
&quot;type&quot;: &quot;Trekkprosent&quot;,
156-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
157-
&quot;prosentsats&quot;: 22.20
158-
},
159-
{
160-
&quot;type&quot;: &quot;Trekkprosent&quot;,
161-
&quot;trekkode&quot;: &quot;pensjonFraNAV&quot;,
162-
&quot;prosentsats&quot;: 15.00
163-
}
164-
]
165-
},
166-
&quot;tilleggsopplysning&quot;: [
167-
&quot;kildeskattPaaPensjon&quot;
168-
]
169-
},
170-
{
171-
&quot;inntektsaar&quot;: 2025,
172-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
173-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
174-
&quot;skattekort&quot;: {
175-
&quot;utstedtDato&quot;: &quot;2025-12-08&quot;,
176-
&quot;skattekortidentifikator&quot;: 75747,
177-
&quot;forskuddstrekk&quot;: [
178-
{
179-
&quot;type&quot;: &quot;Trekkprosent&quot;,
180-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
181-
&quot;prosentsats&quot;: 22.20
182-
}
183-
]
184-
},
185-
&quot;tilleggsopplysning&quot;: [
186-
&quot;kildeskattPaaPensjon&quot;
187-
]
188-
},
189-
{
190-
&quot;inntektsaar&quot;: 2025,
191-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
192-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
193-
&quot;skattekort&quot;: {
194-
&quot;forskuddstrekk&quot;: [
195-
{
196-
&quot;type&quot;: &quot;Trekkprosent&quot;,
197-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
198-
&quot;prosentsats&quot;: 22.20
199-
},
200-
{
201-
&quot;type&quot;: &quot;Trekkprosent&quot;,
202-
&quot;trekkode&quot;: &quot;pensjonFraNAV&quot;,
203-
&quot;prosentsats&quot;: 15.00
204-
}
205-
]
206-
},
207-
&quot;tilleggsopplysning&quot;: [
208-
&quot;kildeskattPaaPensjon&quot;
209-
]
210-
},
211-
{
212-
&quot;inntektsaar&quot;: 2025,
213-
&quot;arbeidstakeridentifikator&quot;: &quot;29860299923&quot;,
214-
&quot;resultatPaaForespoersel&quot;: &quot;skattekortopplysningerOK&quot;,
215-
&quot;skattekort&quot;: {
216-
&quot;utstedtDato&quot;: &quot;2025-12-09&quot;,
217-
&quot;skattekortidentifikator&quot;: 76463,
218-
&quot;forskuddstrekk&quot;: [
219-
{
220-
&quot;type&quot;: &quot;Trekkprosent&quot;,
221-
&quot;trekkode&quot;: &quot;ufoeretrygdFraNAV&quot;,
222-
&quot;prosentsats&quot;: 22.20
223-
}
224-
]
225-
},
226-
&quot;tilleggsopplysning&quot;: [
227-
&quot;kildeskattPaaPensjon&quot;
228-
]
229-
}]
23+
[
24+
{
25+
&quot;utstedtDato&quot;: &quot;2026-02-10&quot;,
26+
&quot;inntektsaar&quot;: 2026,
27+
&quot;resultatForSkattekort&quot;: &quot;skattekortopplysningerOK&quot;,
28+
&quot;forskuddstrekkList&quot;: [
29+
{
30+
&quot;trekkode&quot;: &quot;string&quot;,
31+
&quot;frikort&quot;: {
32+
&quot;frikortBeloep&quot;: 0
33+
},
34+
&quot;prosentkort&quot;: {
35+
&quot;prosentSats&quot;: 0,
36+
&quot;antallMndForTrekk&quot;: 0
37+
},
38+
&quot;trekktabell&quot;: {
39+
&quot;tabell&quot;: &quot;string&quot;,
40+
&quot;prosentSats&quot;: 0,
41+
&quot;antallMndForTrekk&quot;: 0
42+
}
43+
}
44+
],
45+
&quot;tilleggsopplysningList&quot;: [
46+
&quot;oppholdPaaSvalbard&quot;
47+
]
48+
}
49+
]
23050
},
23151
&quot;401&quot;: {
23252
&quot;headers&quot;: null,
@@ -264,4 +84,4 @@
26484
<field>Service_Path__c</field>
26585
<value xsi:type="xsd:string">/api/v1/hent-skattekort</value>
26686
</values>
267-
</CustomMetadata>
87+
</CustomMetadata>

‎sfdx-project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"path": "force-app",
99
"package": "crm-platform-integration",
10-
"versionNumber": "0.169.0.NEXT",
10+
"versionNumber": "0.170.0.NEXT",
1111
"definitionFile": "config/scratch-def.json",
1212
"dependencies": [
1313
{

0 commit comments

Comments
 (0)