From db40153592cee2fd7bc563eb240dbee0ec5ed85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ylfa=20Hafsteinsd=C3=B3ttir?= Date: Thu, 30 Jan 2025 12:27:36 +0000 Subject: [PATCH] feat(income-plan): Temporarily don't show withholding tax (#17726) * temporarily not show withholding tax info * tweak * chore: nx format:write update dirty files --------- Co-authored-by: andes-it --- .../income-plan/src/lib/IncomePlanTemplate.ts | 126 +++++++++--------- .../src/forms/OldAgePensionForm.ts | 2 +- 2 files changed, 65 insertions(+), 63 deletions(-) diff --git a/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts b/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts index 8f50beac6010..1c2f55a9f9c7 100644 --- a/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts +++ b/libs/application/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts @@ -317,69 +317,71 @@ const IncomePlanTemplate: ApplicationTemplate< income.incomeCategoryName, ) }) - } else { - withholdingTax && - withholdingTax.incomeTypes?.forEach((income, i) => { - set( - answers, - `incomePlanTable[${i}].incomeType`, - income.incomeTypeName, - ) - set( - answers, - `incomePlanTable[${i}].incomePerYear`, - String(income.total), - ) - set(answers, `incomePlanTable[${i}].currency`, ISK) - set(answers, `incomePlanTable[${i}].income`, RatioType.YEARLY) - set( - answers, - `incomePlanTable[${i}].incomeCategory`, - income.categoryName, - ) - - set( - answers, - `incomePlanTable[${i}].january`, - String(income.january), - ) - set( - answers, - `incomePlanTable[${i}].february`, - String(income.february), - ) - set(answers, `incomePlanTable[${i}].march`, String(income.march)) - set(answers, `incomePlanTable[${i}].april`, String(income.april)) - set(answers, `incomePlanTable[${i}].may`, String(income.may)) - set(answers, `incomePlanTable[${i}].june`, String(income.june)) - set(answers, `incomePlanTable[${i}].july`, String(income.july)) - set( - answers, - `incomePlanTable[${i}].august`, - String(income.august), - ) - set( - answers, - `incomePlanTable[${i}].september`, - String(income.september), - ) - set( - answers, - `incomePlanTable[${i}].october`, - String(income.october), - ) - set( - answers, - `incomePlanTable[${i}].november`, - String(income.november), - ) - set( - answers, - `incomePlanTable[${i}].december`, - String(income.december), - ) - }) } + //Temporarily removing this until withholdingTax endpoint provides more accurate info + // } else { + // withholdingTax && + // withholdingTax.incomeTypes?.forEach((income, i) => { + // set( + // answers, + // `incomePlanTable[${i}].incomeType`, + // income.incomeTypeName, + // ) + // set( + // answers, + // `incomePlanTable[${i}].incomePerYear`, + // String(income.total), + // ) + // set(answers, `incomePlanTable[${i}].currency`, ISK) + // set(answers, `incomePlanTable[${i}].income`, RatioType.YEARLY) + // set( + // answers, + // `incomePlanTable[${i}].incomeCategory`, + // income.categoryName, + // ) + + // set( + // answers, + // `incomePlanTable[${i}].january`, + // String(income.january), + // ) + // set( + // answers, + // `incomePlanTable[${i}].february`, + // String(income.february), + // ) + // set(answers, `incomePlanTable[${i}].march`, String(income.march)) + // set(answers, `incomePlanTable[${i}].april`, String(income.april)) + // set(answers, `incomePlanTable[${i}].may`, String(income.may)) + // set(answers, `incomePlanTable[${i}].june`, String(income.june)) + // set(answers, `incomePlanTable[${i}].july`, String(income.july)) + // set( + // answers, + // `incomePlanTable[${i}].august`, + // String(income.august), + // ) + // set( + // answers, + // `incomePlanTable[${i}].september`, + // String(income.september), + // ) + // set( + // answers, + // `incomePlanTable[${i}].october`, + // String(income.october), + // ) + // set( + // answers, + // `incomePlanTable[${i}].november`, + // String(income.november), + // ) + // set( + // answers, + // `incomePlanTable[${i}].december`, + // String(income.december), + // ) + // }) + // } return context }), diff --git a/libs/application/templates/social-insurance-administration/old-age-pension/src/forms/OldAgePensionForm.ts b/libs/application/templates/social-insurance-administration/old-age-pension/src/forms/OldAgePensionForm.ts index 7183d7c62700..a9017330615b 100644 --- a/libs/application/templates/social-insurance-administration/old-age-pension/src/forms/OldAgePensionForm.ts +++ b/libs/application/templates/social-insurance-administration/old-age-pension/src/forms/OldAgePensionForm.ts @@ -533,7 +533,7 @@ export const OldAgePensionForm: Form = buildForm({ return currentEmployer?.ratioType === RatioType.YEARLY }, - placeholder: '1%', + placeholder: '1-50%', variant: 'number', width: 'full', }),