HDPI-3769 Regular expenses

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

@@ -0,0 +1,101 @@
+{
+  "pageTitle": "cyRegular expenses",
+  "heading": "cyWhat other regular expenses do you have? (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": {
+    "householdBills": "cyHousehold bills (for example, council tax, gas, electricity, water, internet)",
+    "loanPayments": "cyLoan payments",
+    "childSpousalMaintenance": "cyChild or spousal maintenance",
+    "mobilePhone": "cyMobile phone",
+    "groceryShopping": "cyGrocery shopping",
+    "fuelParkingTransport": "cyFuel, parking and transport",
+    "schoolCosts": "cySchool costs (for example, uniform and school dinners)",
+    "clothing": "cyClothing",
+    "otherExpenses": "cyOther"
+  },
+  "subFields": {
+    "amount": "cyAmount paid",
+    "frequency": "cyPaid every:"
+  },
+  "frequency": {
+    "week": "cyWeek",
+    "month": "cyMonth"
+  },
+  "errors": {
+    "householdBillsAmount": {
+      "required": "cyEnter the amount you pay for household bills",
+      "negative": "cyThe amount you pay for household bills each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for household bills each week or month must be less than £1 billion"
+    },
+    "householdBillsFrequency": {
+      "required": "cySelect how frequently you pay household bills"
+    },
+    "loanPaymentsAmount": {
+      "required": "cyEnter the amount you pay for loan payments",
+      "negative": "cyThe amount you pay for loan payments each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for loan payments each week or month must be less than £1 billion"
+    },
+    "loanPaymentsFrequency": {
+      "required": "cySelect how frequently you make loan payments"
+    },
+    "childSpousalMaintenanceAmount": {
+      "required": "cyEnter the amount you pay for child or spousal maintenance",
+      "negative": "cyThe amount you pay for child or spousal maintenance each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for child or spousal maintenance each week or month must be less than £1 billion"
+    },
+    "childSpousalMaintenanceFrequency": {
+      "required": "cySelect how frequently you pay child or spousal maintenance"
+    },
+    "mobilePhoneAmount": {
+      "required": "cyEnter the amount you pay for a mobile phone",
+      "negative": "cyThe amount you pay for a mobile phone each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for a mobile phone each week or month must be less than £1 billion"
+    },
+    "mobilePhoneFrequency": {
+      "required": "cySelect how frequently you pay for a mobile phone"
+    },
+    "groceryShoppingAmount": {
+      "required": "cyEnter the amount you pay for grocery shopping",
+      "negative": "cyThe amount you pay for grocery shopping each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for grocery shopping each week or month must be less than £1 billion"
+    },
+    "groceryShoppingFrequency": {
+      "required": "cySelect how frequently you pay for grocery shopping"
+    },
+    "fuelParkingTransportAmount": {
+      "required": "cyEnter the amount you pay for fuel, parking and transport",
+      "negative": "cyThe amount you pay for fuel, parking and transport each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for fuel, parking and transport each week or month must be less than £1 billion"
+    },
+    "fuelParkingTransportFrequency": {
+      "required": "cySelect how frequently you pay for fuel, parking and transport"
+    },
+    "schoolCostsAmount": {
+      "required": "cyEnter the amount you pay for school costs",
+      "negative": "cyThe amount you pay for school costs each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for school costs each week or month must be less than £1 billion"
+    },
+    "schoolCostsFrequency": {
+      "required": "cySelect how frequently you pay school costs"
+    },
+    "clothingAmount": {
+      "required": "cyEnter the amount you pay for clothing",
+      "negative": "cyThe amount you pay for clothing each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for clothing each week or month must be less than £1 billion"
+    },
+    "clothingFrequency": {
+      "required": "cySelect how frequently you pay for clothing"
+    },
+    "otherExpensesAmount": {
+      "required": "cyEnter the amount you pay for other regular expenses",
+      "negative": "cyThe amount you pay for other expenses each week or month must be £0.00 or above",
+      "largeAmount": "cyThe amount you pay for other expenses each week or month must be less than £1 billion"
+    },
+    "otherExpensesFrequency": {
+      "required": "cySelect how frequently you pay for other expenses"
+    },
+    "amount": {
+      "invalidFormat": "cyEnter an amount in the correct format, for example 148.00 or 148.50"
+    }
+  }
+}

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

@@ -0,0 +1,101 @@
+{
+  "pageTitle": "Regular expenses",
+  "heading": "What other regular expenses do you have? (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": {
+    "householdBills": "Household bills (for example, council tax, gas, electricity, water, internet)",
+    "loanPayments": "Loan payments",
+    "childSpousalMaintenance": "Child or spousal maintenance",
+    "mobilePhone": "Mobile phone",
+    "groceryShopping": "Grocery shopping",
+    "fuelParkingTransport": "Fuel, parking and transport",
+    "schoolCosts": "School costs (for example, uniform and school dinners)",
+    "clothing": "Clothing",
+    "otherExpenses": "Other"
+  },
+  "subFields": {
+    "amount": "Amount paid",
+    "frequency": "Paid every:"
+  },
+  "frequency": {
+    "week": "Week",
+    "month": "Month"
+  },
+  "errors": {
+    "householdBillsAmount": {
+      "required": "Enter the amount you pay for household bills",
+      "negative": "The amount you pay for household bills each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for household bills each week or month must be less than £1 billion"
+    },
+    "householdBillsFrequency": {
+      "required": "Select how frequently you pay household bills"
+    },
+    "loanPaymentsAmount": {
+      "required": "Enter the amount you pay for loan payments",
+      "negative": "The amount you pay for loan payments each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for loan payments each week or month must be less than £1 billion"
+    },
+    "loanPaymentsFrequency": {
+      "required": "Select how frequently you make loan payments"
+    },
+    "childSpousalMaintenanceAmount": {
+      "required": "Enter the amount you pay for child or spousal maintenance",
+      "negative": "The amount you pay for child or spousal maintenance each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for child or spousal maintenance each week or month must be less than £1 billion"
+    },
+    "childSpousalMaintenanceFrequency": {
+      "required": "Select how frequently you pay child or spousal maintenance"
+    },
+    "mobilePhoneAmount": {
+      "required": "Enter the amount you pay for a mobile phone",
+      "negative": "The amount you pay for a mobile phone each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for a mobile phone each week or month must be less than £1 billion"
+    },
+    "mobilePhoneFrequency": {
+      "required": "Select how frequently you pay for a mobile phone"
+    },
+    "groceryShoppingAmount": {
+      "required": "Enter the amount you pay for grocery shopping",
+      "negative": "The amount you pay for grocery shopping each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for grocery shopping each week or month must be less than £1 billion"
+    },
+    "groceryShoppingFrequency": {
+      "required": "Select how frequently you pay for grocery shopping"
+    },
+    "fuelParkingTransportAmount": {
+      "required": "Enter the amount you pay for fuel, parking and transport",
+      "negative": "The amount you pay for fuel, parking and transport each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for fuel, parking and transport each week or month must be less than £1 billion"
+    },
+    "fuelParkingTransportFrequency": {
+      "required": "Select how frequently you pay for fuel, parking and transport"
+    },
+    "schoolCostsAmount": {
+      "required": "Enter the amount you pay for school costs",
+      "negative": "The amount you pay for school costs each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for school costs each week or month must be less than £1 billion"
+    },
+    "schoolCostsFrequency": {
+      "required": "Select how frequently you pay school costs"
+    },
+    "clothingAmount": {
+      "required": "Enter the amount you pay for clothing",
+      "negative": "The amount you pay for clothing each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for clothing each week or month must be less than £1 billion"
+    },
+    "clothingFrequency": {
+      "required": "Select how frequently you pay for clothing"
+    },
+    "otherExpensesAmount": {
+      "required": "Enter the amount you pay for other regular expenses",
+      "negative": "The amount you pay for other expenses each week or month must be £0.00 or above",
+      "largeAmount": "The amount you pay for other expenses each week or month must be less than £1 billion"
+    },
+    "otherExpensesFrequency": {
+      "required": "Select how frequently you pay for other expenses"
+    },
+    "amount": {
+      "invalidFormat": "Enter an amount in the correct format, for example 148.00 or 148.50"
+    }
+  }
+}

src/main/services/ccdCase.interface.ts

@@ -20,6 +20,12 @@ export type EqualityAndDiversityQuestionsChoice = 'CONTINUE' | 'SKIP' | null;
 export type FrequencyValue = 'WEEKLY' | 'MONTHLY';
 export type PenceAmount = string;
 
+export interface IncomeExpenseDetails {
+  applies: YesNoValue;
+  amount?: PenceAmount;
+  frequency?: FrequencyValue;
+}
+
 export interface HouseholdCircumstances {
   shareAdditionalCircumstances?: YesNoValue;
   additionalCircumstancesDetails?: string;
@@ -49,6 +55,15 @@ export interface HouseholdCircumstances {
   otherBenefitsFrequency?: FrequencyValue;
   moneyFromElsewhere?: YesNoValue;
   moneyFromElsewhereDetails?: string;
+  householdBills?: IncomeExpenseDetails;
+  loanPayments?: IncomeExpenseDetails;
+  childSpousalMaintenance?: IncomeExpenseDetails;
+  mobilePhone?: IncomeExpenseDetails;
+  groceryShopping?: IncomeExpenseDetails;
+  fuelParkingTransport?: IncomeExpenseDetails;
+  schoolCosts?: IncomeExpenseDetails;
+  clothing?: IncomeExpenseDetails;
+  otherExpenses?: IncomeExpenseDetails;
 }
 
 export type PaymentAgreement = {

src/main/steps/respond-to-claim/other-considerations/otherConsiderations.njk

@@ -6,10 +6,14 @@
   {% if errorSummary %}
     {{ govukErrorSummary(errorSummary) }}
   {% endif %}
+
   <h1 class="govuk-heading-l">Other considerations (placeholder)</h1>
   <p class="govuk-body">This is a placeholder for Other Considerations step.</p>
+
   <form method="post" action="{{ url }}">
     {{ stepButtons(continue, saveForLater) }}
     {{ csrfProtection(csrfToken) }}
   </form>
+
 {% endblock %}
+