Merge branch 'master' into 786-upozornenie-ze-danovnik-sa-moze-stat-p…

…latcom-preddavkov-na-dan
slovensko-digital · Oct 7, 2023 · a16696b · a16696b
2 parents 3ca8a76 + 44b56d5
commit a16696b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/lib/calculation.ts b/src/lib/calculation.ts
@@ -158,7 +158,10 @@ export function calculate(input: TaxFormUserInput): TaxForm {
     },
 
     get r034a() {
-      return input.r034a
+      if (input.hasChildren && !input.prijmyPredJul22) {
+          return `${input.zaciatokPrijmovDen}.${input.zaciatokPrijmovMesiac}.${input.zaciatokPrijmovRok}`
+      }
+      return ''
     },
 
     /** SECTION Mortgage NAMES ARE WRONG TODO*/

diff --git a/src/pages/deti.tsx b/src/pages/deti.tsx
@@ -85,12 +85,6 @@ const Deti: Page<ChildrenUserInput> = ({
               ...childrenUserInputInitialValues,
               hasChildren: false,
             }
-          userInput = values.prijmyPredJul22
-            ? userInput
-            : {
-              ...userInput,
-              r034a: `${values.zaciatokPrijmovDen}.${values.zaciatokPrijmovMesiac}.${values.zaciatokPrijmovRok}`,
-            }
           setTaxFormUserInput(userInput)
           router.push(nextRoute)
         }}

diff --git a/src/types/PageUserInputs.ts b/src/types/PageUserInputs.ts
@@ -24,7 +24,6 @@ export type ChildrenUserInput = Pick<
   | 'hasChildren'
   | 'children'
   | 'prijmyPredJul22'
-  | 'r034a'
   | 'zaciatokPrijmovDen'
   | 'zaciatokPrijmovMesiac'
   | 'zaciatokPrijmovRok'