CIV-5462 Propose Payment Plan Check your Answers and Confirmation Scr…

…een (#2298) * CIV-7432: Set Up field to show * CIV-5462: Set Up Payment Date Field --------- Co-authored-by: KumarSam <[email protected]> Co-authored-by: Raja Mani <[email protected]>
hmcts · Mar 17, 2023 · e5116a9 · e5116a9
1 parent 5456249
commit e5116a9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 65 deletions.
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI-nonprod.json
@@ -315,28 +315,6 @@
       }
     ]
   },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseFieldID": "applicant1RequestedPaymentDateForDefendantSpecLabel",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "APP-SOL-UNSPEC-PROFILE",
-          "APP-SOL-SPEC-PROFILE"
-        ],
-        "CRUD": "CRU"
-      },
-      {
-        "UserRoles": [
-          "caseworker-civil-admin",
-          "RES-SOL-ONE-UNSPEC-PROFILE",
-          "RES-SOL-ONE-SPEC-PROFILE",
-          "RES-SOL-TWO-SPEC-PROFILE"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
   {
     "CaseTypeID": "CIVIL",
     "CaseFieldID": "applicant1RequestedPaymentDateForDefendantSpec",

diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI-nonprod.json b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI-nonprod.json
@@ -159,9 +159,20 @@
   {
     "CaseTypeID": "CIVIL",
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
-    "CaseFieldID": "respondent1GeneratedResponseDocument",
+    "CaseFieldID": "respondent1FullAdmitAmountLabel",
     "PageDisplayOrder": 1,
     "PageFieldDisplayOrder": 8,
+    "DisplayContext": "READONLY",
+    "PageID": "RespondentResponse",
+    "FieldShowCondition": "showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_PAY_BY_SET_DATE\" OR showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_PAY_INSTALMENT\"",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
+    "CaseFieldID": "respondent1GeneratedResponseDocument",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 9,
     "DisplayContext": "COMPLEX",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "showResponseOneVOneFlag!=\"ONE_V_ONE_FULL_ADMIT_HAS_PAID\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_FULL_ADMIT_PAY_INSTALMENT\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_FULL_ADMIT_PAY_BY_SET_DATE\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_FULL_ADMIT_PAY_BY_SET_DATE\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_PART_ADMIT_PAY_INSTALMENT\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_PART_ADMIT_PAY_BY_SET_DATE\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_PART_ADMIT_PAY_IMMEDIATELY\"  AND showResponseOneVOneFlag!=\"ONE_V_ONE_PART_ADMIT_HAS_PAID\"",
@@ -173,7 +184,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "respondent1ClaimResponseDocumentSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 8,
+    "PageFieldDisplayOrder": 9,
     "DisplayContext": "COMPLEX",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_HAS_PAID\" OR showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_PAY_INSTALMENT\" OR showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_PAY_BY_SET_DATE\" OR showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_PAY_INSTALMENT\" OR showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_PAY_BY_SET_DATE\" OR showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_PAY_IMMEDIATELY\" OR showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_HAS_PAID\"",
@@ -185,7 +196,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "respondent2GeneratedResponseDocument",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 9,
+    "PageFieldDisplayOrder": 10,
     "DisplayContext": "COMPLEX",
     "PageID": "RespondentResponse",
     "ShowSummaryChangeOption": "N",
@@ -197,7 +208,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1ProceedWithClaim",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 10,
+    "PageFieldDisplayOrder": 11,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "CaseEventFieldLabel": "Does the claimant want to proceed with the claim?",
@@ -209,7 +220,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1FullAdmitConfirmAmountPaidSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 10,
+    "PageFieldDisplayOrder": 11,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "claimantResponseScenarioFlag!=\"TWO_V_ONE\" AND showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_HAS_PAID\"",
@@ -220,7 +231,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1PartAdmitConfirmAmountPaidSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 10,
+    "PageFieldDisplayOrder": 11,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "claimantResponseScenarioFlag!=\"TWO_V_ONE\" AND showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_HAS_PAID\"",
@@ -231,7 +242,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1AcceptAdmitAmountPaidSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 10,
+    "PageFieldDisplayOrder": 11,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_PAY_INSTALMENT\" OR showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_PAY_BY_SET_DATE\" OR showResponseOneVOneFlag=\"ONE_V_ONE_PART_ADMIT_PAY_IMMEDIATELY\"",
@@ -242,7 +253,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1AcceptFullAdmitPaymentPlanSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 11,
+    "PageFieldDisplayOrder": 12,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_PAY_INSTALMENT\" OR showResponseOneVOneFlag=\"ONE_V_ONE_FULL_ADMIT_PAY_BY_SET_DATE\"",
@@ -253,7 +264,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1AcceptPartAdmitPaymentPlanSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 11,
+    "PageFieldDisplayOrder": 12,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "applicant1AcceptAdmitAmountPaidSpec=\"Yes\" AND showResponseOneVOneFlag!=\"ONE_V_ONE_PART_ADMIT_PAY_IMMEDIATELY\"",
@@ -264,7 +275,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicantDefenceResponseDocumentAndDQFlag",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 12,
+    "PageFieldDisplayOrder": 13,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "ShowSummaryChangeOption": "N",
@@ -276,7 +287,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1ProceedWithClaimSpec2v1",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 13,
+    "PageFieldDisplayOrder": 14,
     "DisplayContext": "MANDATORY",
     "PageID": "RespondentResponse",
     "ShowSummaryChangeOption": "Y",
@@ -290,7 +301,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "responseClaimTrack",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 14,
+    "PageFieldDisplayOrder": 15,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -301,7 +312,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "allocatedTrack",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 15,
+    "PageFieldDisplayOrder": 16,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -312,7 +323,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "claimType",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 16,
+    "PageFieldDisplayOrder": 17,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -323,7 +334,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "defenceRouteRequired",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 17,
+    "PageFieldDisplayOrder": 18,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -334,7 +345,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "respondentResponseIsSame",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 18,
+    "PageFieldDisplayOrder": 19,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -345,7 +356,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "defendantSingleResponseToBothClaimants",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 19,
+    "PageFieldDisplayOrder": 20,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -357,7 +368,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "respondent1ClaimResponseTypeForSpec",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 20,
+    "PageFieldDisplayOrder": 21,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "claimantResponseScenarioFlag=\"DO NOT SHOW IN UI\"",
@@ -368,7 +379,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "defenceAdmitPartPaymentTimeRouteRequired",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 21,
+    "PageFieldDisplayOrder": 22,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -379,7 +390,7 @@
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "showResponseOneVOneFlag",
     "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 22,
+    "PageFieldDisplayOrder": 23,
     "DisplayContext": "READONLY",
     "PageID": "RespondentResponse",
     "FieldShowCondition": "respondent1ClaimResponseTypeForSpec=\"DO NOT SHOW IN UI\"",
@@ -646,26 +657,16 @@
     "ShowSummaryChangeOption": "Y",
     "FieldShowCondition": "ccjPaymentPaidSomeOption =\"Yes\" "
   },
-  {
-    "CaseTypeID": "CIVIL",
-    "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
-    "CaseFieldID": "applicant1RequestedPaymentDateForDefendantSpecLabel",
-    "PageDisplayOrder": 4,
-    "PageFieldDisplayOrder": 1,
-    "DisplayContext": "READONLY",
-    "PageID": "PaymentDate",
-    "PageShowCondition": "applicant1RepaymentOptionForDefendantSpec=\"SET_DATE\"",
-    "ShowSummaryChangeOption": "Y"
-  },
   {
     "CaseTypeID": "CIVIL",
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
     "CaseFieldID": "applicant1RequestedPaymentDateForDefendantSpec",
     "PageDisplayOrder": 4,
-    "PageFieldDisplayOrder": 2,
+    "PageFieldDisplayOrder": 1,
     "PageID": "PaymentDate",
     "ShowSummaryChangeOption": "Y",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/version/V_1/mid/validate-respondent-payment-date",
+    "PageShowCondition": "applicant1RepaymentOptionForDefendantSpec=\"SET_DATE\"",
     "DisplayContext": "MANDATORY"
   },
   {

diff --git a/ccd-definition/CaseField/CaseFieldLRspec-CUI-nonprod.json b/ccd-definition/CaseField/CaseFieldLRspec-CUI-nonprod.json
@@ -149,19 +149,11 @@
     "FieldTypeParameter": "PaymentTypeList",
     "SecurityClassification": "Public"
   },
-  {
-    "CaseTypeID": "CIVIL",
-    "ID": "applicant1RequestedPaymentDateForDefendantSpecLabel",
-    "Label": "<h2 class=\"govuk-heading-l\">When do you want ${respondent1.partyName} to pay?</h2>",
-    "FieldType": "Label",
-    "SecurityClassification": "Public"
-  },
   {
     "CaseTypeID": "CIVIL",
     "ID": "applicant1RequestedPaymentDateForDefendantSpec",
-    "Label": " ",
-    "HintText": "For example, 12 11 2023",
-    "FieldType": "Date",
+    "Label": "When do you want ${respondent1.partyName} to pay?",
+    "FieldType": "PaymentBySetDate",
     "SecurityClassification": "Public"
   },
   {
@@ -376,5 +368,12 @@
     "Label": " ",
     "FieldType": "Text",
     "SecurityClassification": "Public"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "ID": "respondent1FullAdmitAmountLabel",
+    "Label": "Total Claim amount is £${totalClaimAmount}. This includes all court fees and interest.",
+    "FieldType": "Label",
+    "SecurityClassification": "Public"
   }
 ]
diff --git a/ccd-definition/ComplexTypes/PaymentBySetDate-CUI-nonprod.json b/ccd-definition/ComplexTypes/PaymentBySetDate-CUI-nonprod.json
@@ -0,0 +1,10 @@
+[
+  {
+    "ID": "PaymentBySetDate",
+    "ListElementCode": "paymentSetDate",
+    "FieldType": "Date",
+    "HintText": "For example, 12 11 2023",
+    "ElementLabel": " ",
+    "SecurityClassification": "Public"
+  }
+]
diff --git a/e2e/fixtures/events/claimantResponseSpecCui.js b/e2e/fixtures/events/claimantResponseSpecCui.js
@@ -123,7 +123,9 @@ module.exports = {
             applicant1RepaymentOptionForDefendantSpec: 'SET_DATE',
           },
           PaymentDate: {
-            applicant1RequestedPaymentDateForDefendantSpec : '2220-01-01'
+            applicant1RequestedPaymentDateForDefendantSpec : {
+              paymentSetDate: '2220-01-01'
+            }
           },
           SuggestInstalments: {
             applicant1SuggestInstalmentsFirstRepaymentDateForDefendantSpec : '2220-01-01',