Hdpi 3764 income expenditure frontend

src/main/assets/locales/cy/respondToClaim/incomeAndExpenditure.json

@@ -0,0 +1,15 @@
+{
+  "caption": "cyResponding to the possession claim",
+  "pageTitle": "cyIncome and expenses",
+  "infoParagraph1": "cyDetails about your income and expenses can be used by a judge to reach a decision on your case, and also to decide how much you could afford to repay if you have rent arrears.",
+  "infoParagraph2": "cyOn the day of the hearing, there may be a duty adviser at the court who can give you advice and represent you for free. They can also use this information to see if there's any additional benefits or support you might be entitled to.",
+  "infoParagraph3": "cyThe claimant will be able to see your answers.",
+  "question": "cyDo you want to provide details of your income and expenses?",
+  "options": {
+    "yes": "cyYes",
+    "no": "cyNo"
+  },
+  "errors": {
+    "provideFinanceDetails": "cySelect if you want to provide details of your income and expenses"
+  }
+}

src/main/assets/locales/cy/respondToClaim/regularIncome.json

@@ -0,0 +1,60 @@
+{
+  "caption": "cyRespond to a property possession claim",
+  "pageTitle": "cyWhat regular income do you receive? (Optional)",
+  "hintText": "cySelect all that apply. Enter total amount in pounds and pence, for example £148.00 or £148.50. The information you provide must be truthful and accurate.",
+  "options": {
+    "incomeFromJobs": "cyIncome from all jobs you do",
+    "pension": "cyPension – state and private",
+    "universalCredit": "cyUniversal Credit",
+    "otherBenefits": "cyOther benefits and credits",
+    "moneyFromElsewhere": "cyMoney from somewhere else (for example, child maintenance payments or someone in your household gives you money)"
+  },
+  "subFields": {
+    "amount": "cyTotal amount received",
+    "frequency": "cyReceived every:",
+    "moneyFromElsewhereDetailsLabel": "cyGive details",
+    "moneyFromElsewhereDetailsHint": "cyGive details about the other sources of income and how much you usually receive"
+  },
+  "frequency": {
+    "week": "cyWeek",
+    "month": "cyMonth"
+  },
+  "errors": {
+    "incomeFromJobsAmount": {
+      "required": "cyEnter the total amount you receive from all jobs you do",
+      "largeAmount": "cyThe total amount you receive from all jobs you do each week or month must be less than £1 billion"
+    },
+    "incomeFromJobsFrequency": {
+      "required": "cySelect how frequently you receive income from all jobs you do"
+    },
+    "pensionAmount": {
+      "required": "cyEnter the total amount you receive from a state or private pension",
+      "largeAmount": "cyThe total amount you receive from pension (state and private) each week or month must be less than £1 billion"
+    },
+    "pensionFrequency": {
+      "required": "cySelect how frequently you receive income from a state or private pension"
+    },
+    "universalCreditAmount": {
+      "required": "cyEnter the total amount you receive from Universal Credit",
+      "largeAmount": "cyThe total amount you receive from Universal Credit each week or month must be less than £1 billion"
+    },
+    "universalCreditFrequency": {
+      "required": "cySelect how frequently you receive Universal Credit"
+    },
+    "otherBenefitsAmount": {
+      "required": "cyEnter the total amount you receive from other benefits and credits",
+      "largeAmount": "cyThe total amount you receive from other benefits and credit each week or month must be less than £1 billion"
+    },
+    "otherBenefitsFrequency": {
+      "required": "cySelect how frequently you receive income from other benefits and credits"
+    },
+    "moneyFromElsewhereDetails": {
+      "required": "cyGive details about the other sources of income and how much you usually receive"
+    },
+    "amount": {
+      "negative": "cyAmount cannot be negative",
+      "tooLarge": "cyAmount is too large",
+      "invalidFormat": "cyEnter amount in pounds and pence, for example 148.00 or 148.50"
+    }
+  }
+}

src/main/assets/locales/en/respondToClaim/incomeAndExpenditure.json

@@ -0,0 +1,15 @@
+{
+  "caption": "Responding to the possession claim",
+  "pageTitle": "Income and expenses",
+  "infoParagraph1": "Details about your income and expenses can be used by a judge to reach a decision on your case, and also to decide how much you could afford to repay if you have rent arrears.",
+  "infoParagraph2": "On the day of the hearing, there may be a duty adviser at the court who can give you advice and represent you for free. They can also use this information to see if there's any additional benefits or support you might be entitled to.",
+  "infoParagraph3": "The claimant will be able to see your answers.",
+  "question": "Do you want to provide details of your income and expenses?",
+  "options": {
+    "yes": "Yes",
+    "no": "No"
+  },
+  "errors": {
+    "provideFinanceDetails": "Select if you want to provide details of your income and expenses"
+  }
+}

src/main/assets/locales/en/respondToClaim/regularIncome.json

@@ -0,0 +1,60 @@
+{
+  "caption": "Respond to a property possession claim",
+  "pageTitle": "What regular income do you receive? (Optional)",
+  "hintText": "Select all that apply. Enter total amount in pounds and pence, for example £148.00 or £148.50. The information you provide must be truthful and accurate.",
+  "options": {
+    "incomeFromJobs": "Income from all jobs you do",
+    "pension": "Pension – state and private",
+    "universalCredit": "Universal Credit",
+    "otherBenefits": "Other benefits and credits",
+    "moneyFromElsewhere": "Money from somewhere else (for example, child maintenance payments or someone in your household gives you money)"
+  },
+  "subFields": {
+    "amount": "Total amount received",
+    "frequency": "Received every:",
+    "moneyFromElsewhereDetailsLabel": "Give details",
+    "moneyFromElsewhereDetailsHint": "Give details about the other sources of income and how much you usually receive"
+  },
+  "frequency": {
+    "week": "Week",
+    "month": "Month"
+  },
+  "errors": {
+    "incomeFromJobsAmount": {
+      "required": "Enter the total amount you receive from all jobs you do",
+      "largeAmount": "The total amount you receive from all jobs you do each week or month must be less than £1 billion"
+    },
+    "incomeFromJobsFrequency": {
+      "required": "Select how frequently you receive income from all jobs you do"
+    },
+    "pensionAmount": {
+      "required": "Enter the total amount you receive from a state or private pension",
+      "largeAmount": "The total amount you receive from pension (state and private) each week or month must be less than £1 billion"
+    },
+    "pensionFrequency": {
+      "required": "Select how frequently you receive income from a state or private pension"
+    },
+    "universalCreditAmount": {
+      "required": "Enter the total amount you receive from Universal Credit",
+      "largeAmount": "The total amount you receive from Universal Credit each week or month must be less than £1 billion"
+    },
+    "universalCreditFrequency": {
+      "required": "Select how frequently you receive Universal Credit"
+    },
+    "otherBenefitsAmount": {
+      "required": "Enter the total amount you receive from other benefits and credits",
+      "largeAmount": "The total amount you receive from other benefits and credit each week or month must be less than £1 billion"
+    },
+    "otherBenefitsFrequency": {
+      "required": "Select how frequently you receive income from other benefits and credits"
+    },
+    "moneyFromElsewhereDetails": {
+      "required": "Give details about the other sources of income and how much you usually receive"
+    },
+    "amount": {
+      "negative": "Amount cannot be negative",
+      "tooLarge": "Amount is too large",
+      "invalidFormat": "Enter amount in pounds and pence, for example 148.00 or 148.50"
+    }
+  }
+}

src/main/constants/validation.ts

@@ -0,0 +1,10 @@
+/**
+ * Validation constants for income and expenditure forms.
+ * Shared across all income/expense related steps.
+ */
+
+/** Maximum income/expense amount: £1 billion in pence */
+export const MAX_INCOME_AMOUNT = 1_000_000_000;
+
+/** Amount format: up to 10 digits, exactly 2 decimal places */
+export const AMOUNT_FORMAT_REGEX = /^\d{1,10}\.\d{2}$/;

src/main/interfaces/ccdCase.interface.ts

@@ -3,12 +3,15 @@ export enum CaseState {
   SUBMITTED = 'Submitted',
 }
 
-export type YesNoValue = 'YES' | 'NO' | null;
+export type YesNoValue = 'Yes' | 'No' | null;
 export type TenancyTypeCorrectValue = YesNoValue | 'NOT_SURE';
 export type ContactPreference = 'EMAIL' | 'POST' | null;
 
 export type YesNoNotSureValue = 'YES' | 'NO' | 'NOT_SURE';
 
+export type FrequencyValue = 'WEEKLY' | 'MONTHLY';
+export type PenceAmount = string;
+
 export interface CcdUserCase {
   id: string;
   state: CaseState;
@@ -37,6 +40,25 @@ export interface Address {
   Country?: string;
 }
 
+export interface HouseholdCircumstances {
+  shareIncomeExpenseDetails?: YesNoValue;
+  incomeFromJobs?: YesNoValue;
+  incomeFromJobsAmount?: PenceAmount;
+  incomeFromJobsFrequency?: FrequencyValue;
+  pension?: YesNoValue;
+  pensionAmount?: PenceAmount;
+  pensionFrequency?: FrequencyValue;
+  universalCredit?: YesNoValue;
+  universalCreditAmount?: PenceAmount;
+  universalCreditFrequency?: FrequencyValue;
+  ucApplicationDate?: string;
+  otherBenefits?: YesNoValue;
+  otherBenefitsAmount?: PenceAmount;
+  otherBenefitsFrequency?: FrequencyValue;
+  moneyFromElsewhere?: YesNoValue;
+  moneyFromElsewhereDetails?: string;
+}
+
 export interface PossessionClaimResponse {
   defendantContactDetails?: {
     party?: {
@@ -61,6 +83,7 @@ export interface PossessionClaimResponse {
     dateOfBirth?: string;
     landlordRegistered?: YesNoNotSureValue;
     landlordLicensed?: YesNoNotSureValue;
+    householdCircumstances?: HouseholdCircumstances;
   };
 }
 

src/main/interfaces/formFieldConfig.interface.ts

@@ -42,6 +42,8 @@ export interface FormFieldConfig {
   classes?: string;
   attributes?: Record<string, unknown>;
   legendClasses?: string;
+  prefix?: { text: string };
+  suffix?: { text: string };
   // Pre-built component config for Nunjucks template rendering
   component?: Record<string, unknown>;
   componentType?: ComponentType;

src/main/modules/steps/formBuilder/componentBuilders.ts

@@ -55,6 +55,12 @@ export function buildComponentConfig(
   switch (field.type) {
     case 'text': {
       component.value = (fieldValue as string) || '';
+      if (field.prefix) {
+        component.prefix = field.prefix;
+      }
+      if (field.suffix) {
+        component.suffix = field.suffix;
+      }
       componentType = 'input';
       break;
     }

src/main/steps/respond-to-claim/contact-preferences-telephone/index.ts

@@ -1,6 +1,7 @@
 import type { PossessionClaimResponse } from '../../../interfaces/ccdCase.interface';
 import type { StepDefinition } from '../../../interfaces/stepFormData.interface';
 import { createFormStep } from '../../../modules/steps';
+import { toYesNoEnum } from '../../utils';
 import { buildCcdCaseForPossessionClaimResponse as buildAndSubmitPossessionClaimResponse } from '../../utils/populateResponseToClaimPayloadmap';
 import { flowConfig } from '../flow.config';
 
@@ -94,7 +95,7 @@ export const step: StepDefinition = createFormStep({
         },
       },
       defendantResponses: {
-        contactByPhone: telephoneForm.contactByTelephone === 'yes' ? 'YES' : 'NO',
+        contactByPhone: toYesNoEnum(telephoneForm.contactByTelephone),
       },
     };
 

src/main/steps/respond-to-claim/contact-preferences-text-message/index.ts

@@ -1,6 +1,7 @@
 import type { PossessionClaimResponse } from '../../../interfaces/ccdCase.interface';
 import type { StepDefinition } from '../../../interfaces/stepFormData.interface';
 import { createFormStep } from '../../../modules/steps';
+import { toYesNoEnum } from '../../utils';
 import { buildCcdCaseForPossessionClaimResponse as buildAndSubmitPossessionClaimResponse } from '../../utils/populateResponseToClaimPayloadmap';
 import { flowConfig } from '../flow.config';
 
@@ -47,7 +48,7 @@ export const step: StepDefinition = createFormStep({
 
     const possessionClaimResponse: PossessionClaimResponse = {
       defendantResponses: {
-        contactByText: textForm.contactByTextMessage === 'yes' ? 'YES' : 'NO',
+        contactByText: toYesNoEnum(textForm.contactByTextMessage),
       },
     };
 

src/main/steps/respond-to-claim/flow.config.ts

@@ -3,11 +3,15 @@ import { type Request } from 'express';
 import type { JourneyFlowConfig } from '../../interfaces/stepFlow.interface';
 import {
   getPreviousPageForArrears,
+  hasSelectedUniversalCredit,
   isDefendantNameKnown,
+  isFinanceDetailsProvided,
+  isFromIncomeAndExpenditure,
   isNoticeDateProvided,
   isNoticeServed,
   isRentArrearsClaim,
   isTenancyStartDateKnown,
+  isUniversalCreditSelected,
   isWelshProperty,
 } from '../utils';
 
@@ -50,11 +54,12 @@ export const flowConfig: JourneyFlowConfig = {
     'your-circumstances',
     'exceptional-hardship',
     'income-and-expenditure',
-    'what-regular-income-do-you-receive',
+    'regular-income',
     'have-you-applied-for-universal-credit',
     'priority-debts',
     'priority-debt-details',
     'what-other-regular-expenses-do-you-have',
+    'upload-docs',
     'end-now',
   ],
   steps: {
@@ -356,26 +361,70 @@ export const flowConfig: JourneyFlowConfig = {
     },
     'income-and-expenditure': {
       previousStep: 'exceptional-hardship',
-      defaultNext: 'what-regular-income-do-you-receive',
+      routes: [
+        {
+          condition: async (req: Request): Promise<boolean> => {
+            return !(await isFinanceDetailsProvided(req));
+          },
+          nextStep: 'upload-docs',
+        },
+        {
+          condition: async (req: Request): Promise<boolean> => {
+            return isFinanceDetailsProvided(req);
+          },
+          nextStep: 'regular-income',
+        },
+      ],
+      defaultNext: 'regular-income',
     },
-    'what-regular-income-do-you-receive': {
+    'regular-income': {
       previousStep: 'income-and-expenditure',
+      routes: [
+        {
+          condition: async (req: Request): Promise<boolean> => {
+            return isUniversalCreditSelected(req);
+          },
+          nextStep: 'priority-debts',
+        },
+        {
+          condition: async (req: Request): Promise<boolean> => {
+            return !(await isUniversalCreditSelected(req));
+          },
+          nextStep: 'have-you-applied-for-universal-credit',
+        },
+      ],
       defaultNext: 'have-you-applied-for-universal-credit',
     },
     'have-you-applied-for-universal-credit': {
-      previousStep: 'what-regular-income-do-you-receive',
+      previousStep: 'regular-income',
       defaultNext: 'priority-debts',
     },
     'priority-debts': {
-      previousStep: 'have-you-applied-for-universal-credit',
+      previousStep: async (req: Request): Promise<string> => {
+        const selectedUniversalCredit = await hasSelectedUniversalCredit(req);
+        return selectedUniversalCredit ? 'regular-income' : 'have-you-applied-for-universal-credit';
+      },
       defaultNext: 'priority-debt-details',
     },
     'priority-debt-details': {
-      previousStep: 'priority-debts',
       defaultNext: 'what-other-regular-expenses-do-you-have',
     },
     'what-other-regular-expenses-do-you-have': {
-      previousStep: 'priority-debt-details',
+      defaultNext: 'upload-docs',
+    },
+    'upload-docs': {
+      previousStep: async (req: Request): Promise<string> => {
+        const fromIncomeExpenditure = await isFromIncomeAndExpenditure(req);
+        return fromIncomeExpenditure ? 'income-and-expenditure' : 'what-other-regular-expenses-do-you-have';
+      },
+      routes: [
+        {
+          condition: async (req: Request): Promise<boolean> => {
+            return isFromIncomeAndExpenditure(req);
+          },
+          nextStep: 'income-and-expenditure',
+        },
+      ],
       defaultNext: 'end-now',
     },
   },