Merge pull request #1105 from hmrc/BST-112383

BST-112383 - Amended task list for 6048 about your lease or tenure
hmrc · Nov 29, 2024 · fc38ea0 · fc38ea0
2 parents d103171 + 616ef12
commit fc38ea0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/views/taskList.scala.html b/app/views/taskList.scala.html
@@ -601,7 +601,7 @@ <h2 id="leaseOrAgreement" class="app-task-list__section">
     </h2>
     <ul class="app-task-list__items">
      @if(forType == FOR6020) {
-      @includes.taskListItem("type-of-tenure", "checkYourAnswersAboutYourLeaseOrTenure.tenure.heading",
+      @includes.taskListItem("type-of-tenure", "checkYourAnswersAboutYourLeaseOrTenure.tenure.heading ",
        controllers.aboutYourLeaseOrTenure.routes.TypeOfTenureController.show(),
        section5Completed,
        session.aboutLeaseOrAgreementPartOne.flatMap(_.aboutTheLandlord),
@@ -643,7 +643,7 @@ <h2 id="leaseOrAgreement" class="app-task-list__section">
       )
      }
 
-     @if(forType == FOR6010 || forType == FOR6015 || forType == FOR6016 || forType == FOR6030 || forType == FOR6045 || forType == FOR6046 || forType == FOR6076) {
+     @if(forType == FOR6010 || forType == FOR6015 || forType == FOR6016 || forType == FOR6030 || forType == FOR6045 || forType == FOR6046 || forType == FOR6048  || forType == FOR6076) {
       @includes.taskListItem(
        "leaseback-arrangement", if(forType == FOR6076){"checkYourAnswersAboutYourLeaseOrTenure.yourLease.heading"} else {"checkYourAnswersAboutYourLeaseOrTenure.leaseDetails.heading"},
        controllers.aboutYourLeaseOrTenure.routes.PropertyUseLeasebackArrangementController.show(),
@@ -672,7 +672,7 @@ <h2 id="leaseOrAgreement" class="app-task-list__section">
       )
      }
 
-     @if(forType == FOR6010 || forType == FOR6015 || forType == FOR6016 || forType == FOR6020 || forType == FOR6030 || forType == FOR6045 || forType == FOR6045) {
+     @if(forType == FOR6010 || forType == FOR6015 || forType == FOR6016 || forType == FOR6020 || forType == FOR6030 || forType == FOR6045 || forType == FOR6046 || forType == FOR6048) {
       @includes.taskListItem("included-in-your-rent", "checkYourAnswersAboutYourLeaseOrTenure.whatRentIncludes.heading",
        controllers.aboutYourLeaseOrTenure.routes.IncludedInYourRentController.show(),
        section5Completed,
@@ -681,9 +681,9 @@ <h2 id="leaseOrAgreement" class="app-task-list__section">
       )
 
       @includes.taskListItem("rent-open-market-value", "checkYourAnswersAboutYourLeaseOrTenure.howRentWasCalculated.heading",
-       controllers.aboutYourLeaseOrTenure.routes.RentOpenMarketValueController.show(),
+       if(forType == FOR6048){controllers.aboutYourLeaseOrTenure.routes.HowIsCurrentRentFixedController.show()} else {controllers.aboutYourLeaseOrTenure.routes.RentOpenMarketValueController.show()},
        section5Completed,
-       session.aboutLeaseOrAgreementPartOne.flatMap(_.rentOpenMarketValueDetails),
+       if(forType == FOR6048){session.aboutLeaseOrAgreementPartTwo.flatMap(_.howIsCurrentRentFixed)} else {session.aboutLeaseOrAgreementPartOne.flatMap(_.rentOpenMarketValueDetails)},
        session.aboutLeaseOrAgreementPartOne.flatMap(_.includedInYourRentDetails).isEmpty
       )