Merge pull request #87 from hmrc/SASS-7508

[SASS-7508] Convert Yes/No RadioButton pages to Boolean pages - Expenses tailoring
hmrc · Mar 6, 2024 · 2db98d3 · 2db98d3
2 parents ad6f7c1 + bc97af6
commit 2db98d3
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 360 deletions.
diff --git a/app/models/frontend/expenses/tailoring/ExpensesTailoringAnswers.scala b/app/models/frontend/expenses/tailoring/ExpensesTailoringAnswers.scala
@@ -53,21 +53,21 @@ object ExpensesTailoringAnswers {
       officeSupplies: OfficeSupplies,
       goodsToSellOrUse: GoodsToSellOrUse,
       repairsAndMaintenance: RepairsAndMaintenance,
-      workFromHome: WorkFromHome,
+      workFromHome: Boolean,
       workFromBusinessPremises: WorkFromBusinessPremises,
       travelForWork: TravelForWork,
       advertisingOrMarketing: AdvertisingOrMarketing,
-      entertainmentCosts: Option[EntertainmentCosts],
+      entertainmentCosts: Option[Boolean],
       professionalServiceExpenses: List[ProfessionalServiceExpenses],
       financialExpenses: List[FinancialExpenses],
-      depreciation: Depreciation,
+      depreciation: Boolean,
       otherExpenses: OtherExpenses,
-      disallowableInterest: Option[DisallowableInterest],
-      disallowableOtherFinancialCharges: Option[DisallowableOtherFinancialCharges],
-      disallowableIrrecoverableDebts: Option[DisallowableIrrecoverableDebts],
-      disallowableStaffCosts: Option[DisallowableStaffCosts],
-      disallowableSubcontractorCosts: Option[DisallowableSubcontractorCosts],
-      disallowableProfessionalFees: Option[DisallowableProfessionalFees]
+      disallowableInterest: Option[Boolean],
+      disallowableOtherFinancialCharges: Option[Boolean],
+      disallowableIrrecoverableDebts: Option[Boolean],
+      disallowableStaffCosts: Option[Boolean],
+      disallowableSubcontractorCosts: Option[Boolean],
+      disallowableProfessionalFees: Option[Boolean]
   ) extends ExpensesTailoringAnswers {
     val expensesCategories: ExpensesTailoring = ExpensesTailoring.IndividualCategories
   }

diff --git a/app/models/frontend/expenses/tailoring/individualCategories/Depreciation.scala b/app/models/frontend/expenses/tailoring/individualCategories/Depreciation.scala
diff --git a/app/models/frontend/expenses/tailoring/individualCategories/DisallowableInterest.scala b/app/models/frontend/expenses/tailoring/individualCategories/DisallowableInterest.scala
diff --git a/...els/frontend/expenses/tailoring/individualCategories/DisallowableIrrecoverableDebts.scala b/...els/frontend/expenses/tailoring/individualCategories/DisallowableIrrecoverableDebts.scala
diff --git a/.../frontend/expenses/tailoring/individualCategories/DisallowableOtherFinancialCharges.scala b/.../frontend/expenses/tailoring/individualCategories/DisallowableOtherFinancialCharges.scala
diff --git a/...odels/frontend/expenses/tailoring/individualCategories/DisallowableProfessionalFees.scala b/...odels/frontend/expenses/tailoring/individualCategories/DisallowableProfessionalFees.scala
diff --git a/app/models/frontend/expenses/tailoring/individualCategories/DisallowableStaffCosts.scala b/app/models/frontend/expenses/tailoring/individualCategories/DisallowableStaffCosts.scala
diff --git a/...els/frontend/expenses/tailoring/individualCategories/DisallowableSubcontractorCosts.scala b/...els/frontend/expenses/tailoring/individualCategories/DisallowableSubcontractorCosts.scala
diff --git a/app/models/frontend/expenses/tailoring/individualCategories/EntertainmentCosts.scala b/app/models/frontend/expenses/tailoring/individualCategories/EntertainmentCosts.scala
diff --git a/app/models/frontend/expenses/tailoring/individualCategories/WorkFromHome.scala b/app/models/frontend/expenses/tailoring/individualCategories/WorkFromHome.scala