Merge branch 'master' into test_CIV_14986

hmcts · Oct 25, 2024 · 62eacfc · 62eacfc
2 parents 9f022fc + 41afadf
commit 62eacfc
Show file tree

Hide file tree

Showing 49 changed files with 704 additions and 363 deletions.
diff --git a/charts/civil-citizen-ui/Chart.yaml b/charts/civil-citizen-ui/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.1"
 description: Helm chart for the HMCTS Civil Citizen Frontend service
 name: civil-citizen-ui
 home: https://github.com/hmcts/civil-citizen-ui
-version: 0.0.95
+version: 0.0.96
 maintainers:
   - name: HMCTS Civil Citizen Ui team
 
@@ -12,7 +12,7 @@ dependencies:
     version: 3.1.0
     repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
   - name: civil-service
-    version: 0.0.67
+    version: 0.0.72
     repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
     condition: civil-service.enabled
   - name: ccd

diff --git a/src/main/common/form/models/caseProgression/hearingFee/applyHelpFeesReferenceForm.ts b/src/main/common/form/models/caseProgression/hearingFee/applyHelpFeesReferenceForm.ts
@@ -18,7 +18,7 @@ export class ReferenceNumberValidator implements ValidatorConstraintInterface {
 
 export class ApplyHelpFeesReferenceForm {
 
-  @IsDefined({message: 'ERRORS.VALID_YES_NO_SELECTION_UPPER'})
+  @IsDefined({message: 'ERRORS.VALID_YES_NO_SELECTION_ALT'})
     option: string;
   @ValidateIf(o =>  o.isReferenceRequired())
   @IsDefined({message: 'ERRORS.VALID_ENTER_REFERENCE_NUMBER'})

diff --git a/src/main/common/models/dashboard/dashboardItem.ts b/src/main/common/models/dashboard/dashboardItem.ts
@@ -81,6 +81,14 @@ export class DashboardClaimantItem extends DashboardItem {
       CLAIMANT_REJECTED_PAYMENT_PLAN_REQ_JUDGE_DECISION: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.REJECTED_PAYMENT_PLAN_REQUEST_JUDGE_DECISION'},
       DEFENDANT_PART_ADMIT: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.NOT_ADMITTED_CLAIMANT'},
       DEFENDANT_PART_ADMIT_PAID: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.NOT_ADMITTED_CLAIMANT'},
+      HEARING_FORM_GENERATED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.PAY_HEARING_FEE'},
+      HEARING_FORM_GENERATED_RELISTING: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.TRIAL_OR_HEARING_SCHEDULED'},
+      TRIAL_ARRANGEMENTS_REQUIRED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.TRIAL_ARRANGEMENTS_REQUIRED'},
+      TRIAL_ARRANGEMENTS_SUBMITTED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.TRIAL_ARRANGEMENTS_SUBMITTED'},
+      BUNDLE_CREATED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.BUNDLE_CREATED'},
+      HEARING_SUBMIT_HWF: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HEARING_SUBMIT_HWF'},
+      AWAITING_JUDGMENT: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.AWAITING_JUDGMENT'},
+      ORDER_MADE: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.ORDER_MADE'},
       RESPONSE_BY_POST: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.RESPONSE_BY_POST'},
       WAITING_FOR_CLAIMANT_TO_RESPOND: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.NOT_ADMITTED_CLAIMANT'},
       WAITING_COURT_REVIEW: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.WAITING_COURT_REVIEW'},
@@ -104,11 +112,13 @@ export class DashboardClaimantItem extends DashboardItem {
       CLAIMANT_REJECT_PARTIAL_ADMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.WAITING_COURT_REVIEW'},
       CLAIMANT_HWF_NO_REMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_NO_REMISSION'},
       CLAIMANT_HWF_PARTIAL_REMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_PARTIAL_REMISSION'},
+      CLAIMANT_HWF_FULL_REMISSION : {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_FULL_REMISSION'},
       CLAIMANT_HWF_UPDATED_REF_NUMBER: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_UPDATED_REF_NUMBER'},
       CLAIMANT_HWF_INVALID_REF_NUMBER: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_INVALID_REF_NUMBER'},
       CLAIMANT_HWF_FEE_PAYMENT_OUTCOME: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.HWF_FEE_PAYMENT_OUTCOME'},
       SETTLED: {translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.CLAIM_SETTLED'},
-      SDO_ORDER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_STATUS' },
+      SDO_ORDER_CREATED_PRE_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_STATUS_PRE_CP' },
+      SDO_ORDER_CREATED_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_STATUS_CP' },
       SDO_ORDER_LEGAL_ADVISER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_LEGAL_ADVISER_STATUS' },
       SDO_ORDER_IN_REVIEW: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW' },
       SDO_ORDER_IN_REVIEW_OTHER_PARTY: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW_OTHER_PARTY_DEFENDANT' },
@@ -211,7 +221,12 @@ export class DashboardDefendantItem extends DashboardItem {
       },
       DEFENDANT_PART_ADMIT: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.PART_ADMIT_NOT_PAID'},
       HEARING_FORM_GENERATED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_OR_HEARING_SCHEDULED'},
-      MORE_DETAILS_REQUIRED: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.MORE_DETAILS_REQUIRED' },
+      HEARING_FORM_GENERATED_RELISTING: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_OR_HEARING_SCHEDULED'},
+      TRIAL_ARRANGEMENTS_REQUIRED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_ARRANGEMENTS_REQUIRED'},
+      TRIAL_ARRANGEMENTS_SUBMITTED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.TRIAL_ARRANGEMENTS_SUBMITTED'},
+      AWAITING_JUDGMENT: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.AWAITING_JUDGMENT'},
+      BUNDLE_CREATED: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.BUNDLE_CREATED'},
+      ORDER_MADE: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.ORDER_MADE'},
       MEDIATION_SUCCESSFUL: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.MEDIATION_SUCCESSFUL' },
       MEDIATION_UNSUCCESSFUL: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.MEDIATION_UNSUCCESSFUL' },
       IN_MEDIATION: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.IN_MEDIATION' },
@@ -224,7 +239,8 @@ export class DashboardDefendantItem extends DashboardItem {
         translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.CLAIMANT_REJECT_PARTIAL_ADMISSION',
         parameter: [paramClaimantName, paramAdmittedAmount],
       },
-      SDO_ORDER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.SDO_ORDER_STATUS' },
+      SDO_ORDER_CREATED_PRE_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.SDO_ORDER_STATUS_PRE_CP' },
+      SDO_ORDER_CREATED_CP: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.SDO_ORDER_STATUS_CP' },
       SDO_ORDER_LEGAL_ADVISER_CREATED: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_LEGAL_ADVISER_STATUS' },
       SDO_ORDER_IN_REVIEW: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW' },
       SDO_ORDER_IN_REVIEW_OTHER_PARTY: { translationKey: 'PAGES.DASHBOARD.STATUS_CLAIMANT.SDO_ORDER_IN_REVIEW_OTHER_PARTY_CLAIMANT' },

diff --git a/src/main/common/models/document/documentType.ts b/src/main/common/models/document/documentType.ts
@@ -44,6 +44,7 @@ export enum DocumentType {
   HEARING_ORDER = 'HEARING_ORDER',
   WRITTEN_REPRESENTATION_SEQUENTIAL = 'WRITTEN_REPRESENTATION_SEQUENTIAL',
   WRITTEN_REPRESENTATION_CONCURRENT = 'WRITTEN_REPRESENTATION_CONCURRENT',
+  CERTIFICATE_OF_DEBT_PAYMENT='CERTIFICATE_OF_DEBT_PAYMENT',
   GENERAL_APPLICATION_DRAFT = 'GENERAL_APPLICATION_DRAFT'
 }
 export enum DocumentUri {