Merge branch 'master' into feat/civ-16297

hmcts · Jan 22, 2025 · 629349a · 629349a
2 parents e6cbeda + 651e660
commit 629349a
Show file tree

Hide file tree

Showing 36 changed files with 397 additions and 95 deletions.
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec-DTSCCI-927-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec-DTSCCI-927-nonprod.json
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEventDJspec.json
@@ -9,6 +9,13 @@
           "judge-profile"
         ],
         "CRUD": "R"
+      },
+      {
+        "UserRoles": [
+          "APP-SOL-SPEC-PROFILE",
+          "[CREATOR]"
+        ],
+        "CRUD": "CRU"
       }
     ]
   }

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts-nonprod.json
@@ -68,29 +68,6 @@
       }
     ]
   },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseFieldID": "showOldDJFixedCostsScreen",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "APP-SOL-SPEC-PROFILE",
-          "caseworker-civil-solicitor"
-        ],
-        "CRUD": "CRU"
-      },
-      {
-        "UserRoles": [
-          "caseworker-civil",
-          "caseworker-civil-admin",
-          "RES-SOL-ONE-SPEC-PROFILE",
-          "RES-SOL-TWO-SPEC-PROFILE",
-          "caseworker-civil-systemupdate"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "claimFixedCostsOnEntryDJ",

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-FixedCosts.json
@@ -0,0 +1,25 @@
+[
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "showOldDJFixedCostsScreen",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "APP-SOL-SPEC-PROFILE",
+          "caseworker-civil-solicitor"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil",
+          "caseworker-civil-admin",
+          "RES-SOL-ONE-SPEC-PROFILE",
+          "RES-SOL-TWO-SPEC-PROFILE",
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  }
+]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json
@@ -428,5 +428,19 @@
       "caseworker-civil-systemupdate"
     ],
     "CRUD": "CRU"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "respondForImmediateOption",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-staff",
+          "caseworker-civil-solicitor"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
   }
 ]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldDJspec.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldDJspec.json
@@ -125,6 +125,24 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "partialPaymentInsetHelpText",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-solicitor"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "partialPaymentAmount",

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-CUI.json
@@ -478,6 +478,28 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText",
+    "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${CCD_DEF_VERSION}",
     "CaseFieldID": "ccjPaymentPaidSomeAmount",

diff --git a/ccd-definition/AuthorisationCaseField/systemUpdateLRspec-CUI.json b/ccd-definition/AuthorisationCaseField/systemUpdateLRspec-CUI.json
@@ -95,6 +95,12 @@
     "UserRole": "caseworker-civil-systemupdate",
     "CRUD": "CRU"
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText",
+    "UserRole": "caseworker-civil-systemupdate",
+    "CRUD": "R"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "ccjPaymentPaidSomeAmount",

diff --git a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json
@@ -113,5 +113,26 @@
     "RetriesTimeoutAboutToStartEvent": 0,
     "RetriesTimeoutURLAboutToSubmitEvent": 0,
     "RetriesTimeoutURLSubmittedEvent": 0
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "REQUEST_JUDGEMENT_ADMISSION_SPEC",
+    "Name": "Request Judgement by Admission",
+    "Description": "Request Judgement by Admission (Specified)",
+    "DisplayOrder": 10,
+    "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;All_FINAL_ORDERS_ISSUED",
+    "PostConditionState": "*",
+    "EventEnablingCondition": "defenceAdmitPartPaymentTimeRouteRequired=\"IMMEDIATELY\" AND respondForImmediateOption =  \"Yes\"",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted",
+    "ShowSummary": "Y",
+    "ShowEventNotes": "N",
+    "EndButtonLabel": "Submit your response",
+    "RetriesTimeoutAboutToStartEvent": 0,
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "RetriesTimeoutURLSubmittedEvent": 0,
+    "Publish": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI-prod.json b/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI-prod.json
@@ -0,0 +1,23 @@
+[
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "REQUEST_JUDGEMENT_ADMISSION_SPEC",
+    "Name": "Request Judgement by Admission",
+    "Description": "Request Judgement by Admission (Specified)",
+    "DisplayOrder": 10,
+    "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;All_FINAL_ORDERS_ISSUED",
+    "PostConditionState": "*",
+    "EventEnablingCondition": "defenceAdmitPartPaymentTimeRouteRequired=\"IMMEDIATELY\"",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted",
+    "ShowSummary": "Y",
+    "ShowEventNotes": "N",
+    "EndButtonLabel": "Submit your response",
+    "RetriesTimeoutAboutToStartEvent": 0,
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "RetriesTimeoutURLSubmittedEvent": 0,
+    "Publish": "Y"
+  }
+]
diff --git a/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI.json b/ccd-definition/CaseEvent/User/UserEventsLRspec-CUI.json
@@ -39,27 +39,6 @@
     "Publish": "Y",
     "EventEnablingCondition": "CaseAccessCategory=\"SPEC_CLAIM\""
   },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "ID": "REQUEST_JUDGEMENT_ADMISSION_SPEC",
-    "Name": "Request Judgement by Admission",
-    "Description": "Request Judgement by Admission (Specified)",
-    "DisplayOrder": 10,
-    "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;All_FINAL_ORDERS_ISSUED",
-    "PostConditionState": "*",
-    "EventEnablingCondition": "defenceAdmitPartPaymentTimeRouteRequired=\"IMMEDIATELY\"",
-    "SecurityClassification": "Public",
-    "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start",
-    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
-    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted",
-    "ShowSummary": "Y",
-    "ShowEventNotes": "N",
-    "EndButtonLabel": "Submit your response",
-    "RetriesTimeoutAboutToStartEvent": 0,
-    "RetriesTimeoutURLAboutToSubmitEvent": 0,
-    "RetriesTimeoutURLSubmittedEvent": 0,
-    "Publish": "Y"
-  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "ID": "ENTER_BREATHING_SPACE_SPEC",

diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json
@@ -457,9 +457,19 @@
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
-    "CaseFieldID": "ccjPaymentPaidSomeAmount",
+    "CaseFieldID": "ccjPaymentPaidSomeLabelInsetHelpText",
     "PageDisplayOrder": 2,
     "PageFieldDisplayOrder": 3,
+    "DisplayContext": "READONLY",
+    "PageID": "CcjPaymentPaidSome",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "CLAIMANT_RESPONSE_SPEC",
+    "CaseFieldID": "ccjPaymentPaidSomeAmount",
+    "PageDisplayOrder": 2,
+    "PageFieldDisplayOrder": 4,
     "DisplayContext": "MANDATORY",
     "PageID": "CcjPaymentPaidSome",
     "ShowSummaryChangeOption": "Y",

diff --git a/ccd-definition/CaseEventToFields/CreateClaimLRspec.json b/ccd-definition/CaseEventToFields/CreateClaimLRspec.json
@@ -817,7 +817,8 @@
     "PageDisplayOrder": 36,
     "PageColumnNumber": 1,
     "ShowSummaryChangeOption": "Y",
-    "PageShowCondition": "claimInterest = \"Yes\""
+    "PageShowCondition": "claimInterest = \"Yes\"",
+    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/interest-from"
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -828,7 +829,8 @@
     "PageID": "InterestClaimFrom",
     "PageDisplayOrder": 36,
     "PageColumnNumber": 1,
-    "ShowSummaryChangeOption": "Y"
+    "ShowSummaryChangeOption": "Y",
+    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/interest-from"
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -890,7 +892,7 @@
     "PageColumnNumber": 1,
     "ShowSummaryChangeOption": "Y",
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/interest-calc",
-    "PageShowCondition": "claimInterest = \"Yes\""
+    "PageShowCondition": "interestClaimFrom = \"FROM_A_SPECIFIC_DATE\" AND claimInterest = \"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",

diff --git a/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-nonprod.json b/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-nonprod.json
@@ -183,8 +183,19 @@
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "DEFAULT_JUDGEMENT_SPEC",
-    "CaseFieldID": "partialPaymentAmount",
+    "CaseFieldID": "partialPaymentInsetHelpText",
     "PageFieldDisplayOrder": 4,
+    "DisplayContext": "READONLY",
+    "PageID": "claimPartialPayment",
+    "PageDisplayOrder": 3,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "DEFAULT_JUDGEMENT_SPEC",
+    "CaseFieldID": "partialPaymentAmount",
+    "PageFieldDisplayOrder": 5,
     "DisplayContext": "MANDATORY",
     "PageID": "claimPartialPayment",
     "PageDisplayOrder": 3,

diff --git a/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-prod.json b/ccd-definition/CaseEventToFields/DefaultJudgmentDJspec-FixedCosts-prod.json
@@ -147,8 +147,19 @@
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "DEFAULT_JUDGEMENT_SPEC",
-    "CaseFieldID": "partialPaymentAmount",
+    "CaseFieldID": "partialPaymentInsetHelpText",
     "PageFieldDisplayOrder": 4,
+    "DisplayContext": "READONLY",
+    "PageID": "claimPartialPayment",
+    "PageDisplayOrder": 3,
+    "PageColumnNumber": 1,
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "DEFAULT_JUDGEMENT_SPEC",
+    "CaseFieldID": "partialPaymentAmount",
+    "PageFieldDisplayOrder": 5,
     "DisplayContext": "MANDATORY",
     "PageID": "claimPartialPayment",
     "PageDisplayOrder": 3,