Merge branch 'master' into feat/CIV-15612

# Conflicts: # ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json # ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json # ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json
hmcts · Dec 16, 2024 · 5e6c2ba · 5e6c2ba
2 parents eb35686 + 37d74f6
commit 5e6c2ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json
@@ -201,6 +201,19 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "isFinalOrder",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "cui-admin-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "courtStaffNextSteps",

diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json
@@ -21,6 +21,17 @@
     "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/validate-obligation-date",
     "PageShowCondition": "obligationDatePresent = \"Yes\""
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "CONFIRM_ORDER_REVIEW",
+    "CaseFieldID": "isFinalOrder",
+    "PageDisplayOrder": 2,
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY",
+    "PageID": "IsFinalOrder",
+    "ShowSummaryChangeOption": "Y",
+    "PageShowCondition": "obligationDatePresent = \"No\""
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "CONFIRM_ORDER_REVIEW",

diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json
@@ -122,6 +122,14 @@
     "SecurityClassification": "Public",
     "Searchable": "N"
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "isFinalOrder",
+    "Label": "Is this a final order?",
+    "FieldType": "YesOrNo",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "ID": "courtStaffNextSteps",