8000 DFPL-2670 Remove additional application payment choices by chak-shing-lo-justice · Pull Request #5937 · hmcts/fpl-ccd-configuration · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

DFPL-2670 Remove additional application payment choices #5937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

DFPL-2670 Remove additional application payment choices #5937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f2d8880
additional application pba payment
chak-shing-lo-justice Apr 9, 2025
36a0cc8
Merge branch 'master' into DFPL-2670
chak-shing-lo-justice Apr 10, 2025
3b2bbf4
Merge branch 'master' into DFPL-2670
Braimah101 Apr 16, 2025
21d9b14
DFPL-2670
Braimah101 Apr 22, 2025
c65e98f
Merge branch 'master' into DFPL-2670
Braimah101 Apr 23, 2025
dec69a6
Merge branch 'master' into DFPL-2670
Braimah101 Apr 23, 2025
987d319
Merge branch 'master' into DFPL-2670
chak-shing-lo-justice Apr 23, 2025
985c831
update question wordings
chak-shing-lo-justice Apr 23, 2025
3784372
fix permission
chak-shing-lo-justice Apr 23, 2025
4be6a11
Merge branch 'master' into DFPL-2670
Braimah101 Apr 29, 2025
2a0946e
Merge branch 'DFPL-2670' of https://github.com/hmcts/fpl-ccd-configur…
chak-shing-lo-justice Apr 29, 2025
e2d2588
Merge branch 'master' into DFPL-2670
chak-shing-lo-justice Apr 30, 2025
2d27bdf
Update PBAPayment.json
chak-shing-lo-justice Apr 30, 2025
0e0dc07
Merge branch 'master' into DFPL-2670
Braimah101 May 6, 2025
63bd5ff
DFPL-2670
Braimah101 May 6, 2025
bd5768a
DFPL-2670
Braimah101 May 7, 2025
4220cd2
Merge branch 'master' into DFPL-2670
Braimah101 May 7, 2025
ce2b189
Merge branch 'master' into DFPL-2670
Braimah101 May 7, 2025
9bd261d
Merge branch 'master' into DFPL-2670
Braimah101 May 8, 2025
c53900f
DFPL-5937
Braimah101 May 8, 2025
24a5ba5
Merge branch 'master' into DFPL-2670
Braimah101 May 12, 2025
cb52bc5
Merge branch 'master' into DFPL-2670
chak-shing-lo-justice May 14, 2025
b9f775d
Merge branch 'master' into DFPL-2670
chak-shing-lo-justice May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Split Diff View
Split
Diff view
214 changes: 214 additions & 0 deletions ccd-definition/AuthorisationComplexType/caseDocuments/AdditionalApplicationPayment.json
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "temporaryPbaPayment",
"ListElementCode": "usePbaPayment",
"AccessControl": [
{
"UserRoles": [
"c 10000 aseworker-publiclaw-courtadmin"
],
"CRUD": "CRUD"
},
{
"UserRoles": [
"[SOLICITOR]",
"[SOLICITORA]",
"[SOLICITORB]",
"[SOLICITORC]",
"[SOLICITORD]",
"[SOLICITORE]",
"[SOLICITORF]",
"[SOLICITORG]",
"[SOLICITORH]",
"[SOLICITORI]",
"[SOLICITORJ]",
"[CHILDSOLICITORA]",
"[CHILDSOLICITORB]",
"[CHILDSOLICITORC]",
"[CHILDSOLICITORD]",
"[CHILDSOLICITORE]",
"[CHILDSOLICITORF]",
"[CHILDSOLICITORG]",
"[CHILDSOLICITORH]",
"[CHILDSOLICITORI]",
"[CHILDSOLICITORJ]",
"[CHILDSOLICITORK]",
"[CHILDSOLICITORL]",
"[CHILDSOLICITORM]",
"[CHILDSOLICITORN]",
"[CHILDSOLICITORO]",
"[CAFCASSSOLICITOR]",
"[LASOLICITOR]",
"[LASHARED]",
"[LAMANAGING]",
"[LABARRISTER]",
"[EPSMANAGING]",
"[BARRISTER]",
"caseworker-publiclaw-cafcass"
],
"CRUD": "C"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "temporaryPbaPayment",
"ListElementCode": "pbaNumber",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin"
],
"CRUD": "CRUD"
},
{
"UserRoles": [
"[SOLICITOR]",
"[SOLICITORA]",
"[SOLICITORB]",
"[SOLICITORC]",
"[SOLICITORD]",
"[SOLICITORE]",
"[SOLICITORF]",
"[SOLICITORG]",
"[SOLICITORH]",
"[SOLICITORI]",
"[SOLICITORJ]",
"[CHILDSOLICITORA]",
"[CHILDSOLICITORB]",
"[CHILDSOLICITORC]",
"[CHILDSOLICITORD]",
"[CHILDSOLICITORE]",
"[CHILDSOLICITORF]",
"[CHILDSOLICITORG]",
"[CHILDSOLICITORH]",
"[CHILDSOLICITORI]",
"[CHILDSOLICITORJ]",
"[CHILDSOLICITORK]",
"[CHILDSOLICITORL]",
"[CHILDSOLICITORM]",
"[CHILDSOLICITORN]",
"[CHILDSOLICITORO]",
"[CAFCASSSOLICITOR]",
"[LASOLICITOR]",
"[LASHARED]",
"[LAMANAGING]",
"[LABARRISTER]",
"[EPSMANAGING]",
"[BARRISTER]",
"caseworker-publiclaw-cafcass"
],
"CRUD": "CRU"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "temporaryPbaPayment",
"ListElementCode": "clientCode",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin"
],
"CRUD": "CRUD"
},
{
"UserRoles": [
"[SOLICITOR]",
"[SOLICITORA]",
"[SOLICITORB]",
"[SOLICITORC]",
"[SOLICITORD]",
"[SOLICITORE]",
"[SOLICITORF]",
"[SOLICITORG]",
"[SOLICITORH]",
"[SOLICITORI]",
"[SOLICITORJ]",
"[CHILDSOLICITORA]",
"[CHILDSOLICITORB]",
"[CHILDSOLICITORC]",
"[CHILDSOLICITORD]",
"[CHILDSOLICITORE]",
"[CHILDSOLICITORF]",
"[CHILDSOLICITORG]",
"[CHILDSOLICITORH]",
"[CHILDSOLICITORI]",
"[CHILDSOLICITORJ]",
"[CHILDSOLICITORK]",
"[CHILDSOLICITORL]",
"[CHILDSOLICITORM]",
"[CHILDSOLICITORN]",
"[CHILDSOLICITORO]",
"[CAFCASSSOLICITOR]",
"[LASOLICITOR]",
"[LASHARED]",
"[LAMANAGING]",
"[LABARRISTER]",
"[EPSMANAGING]",
"[BARRISTER]",
"caseworker-publiclaw-cafcass"
],
"CRUD": "CRU"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "temporaryPbaPayment",
"ListElementCode": "fileReference",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin"
],
"CRUD": "CRUD"
},
{
"UserRoles": [
"[SOLICITOR]",
"[SOLICITORA]",
"[SOLICITORB]",
"[SOLICITORC]",
"[SOLICITORD]",
"[SOLICITORE]",
"[SOLICITORF]",
"[SOLICITORG]",
"[SOLICITORH]",
"[SOLICITORI]",
"[SOLICITORJ]",
"[CHILDSOLICITORA]",
"[CHILDSOLICITORB]",
"[CHILDSOLICITORC]",
"[CHILDSOLICITORD]",
"[CHILDSOLICITORE]",
"[CHILDSOLICITORF]",
"[CHILDSOLICITORG]",
"[CHILDSOLICITORH]",
"[CHILDSOLICITORI]",
"[CHILDSOLICITORJ]",
"[CHILDSOLICITORK]",
"[CHILDSOLICITORL]",
"[CHILDSOLICITORM]",
"[CHILDSOLICITORN]",
"[CHILDSOLICITORO]",
"[CAFCASSSOLICITOR]",
"[LASOLICITOR]",
"[LASHARED]",
"[LAMANAGING]",
"[LABARRISTER]",
"[EPSMANAGING]",
"[BARRISTER]",
"caseworker-publiclaw-cafcass"
],
"CRUD": "CRU"
}
]
}
]
9 changes: 5 additions & 4 deletions ccd-definition/CaseEventToComplexTypes/upload-c2/PBAPayment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"DisplayContext": "MANDATORY",
"ListElementCode": "usePbaPayment",
"FieldDisplayOrder": "1",
"FieldShowCondition": "displayAmountToPay=\"Yes\""
"FieldShowCondition": "displayAmountToPay=\"Yes\"",
"DefaultValue": "Yes"
},
{
"LiveFrom": "01/01/2017",
Expand All @@ -17,7 +18,7 @@
"DisplayContext": "MANDATORY",
"ListElementCode": "pbaNumber",
"FieldDisplayOrder": "2",
"FieldShowCondition": "temporaryPbaPayment.usePbaPayment=\"Yes\""
"FieldShowCondition": "displayAmountToPay=\"Yes\" AND temporaryPbaPayment.usePbaPayment!=\"No\""
},
{
"LiveFrom": "01/01/2017",
Expand All @@ -27,7 +28,7 @@
"DisplayContext": "OPTIONAL",
"ListElementCode": "clientCode",
"FieldDisplayOrder": "3",
"FieldShowCondition": "temporaryPbaPayment.usePbaPayment=\"Yes\""
"FieldShowCondition": "displayAmountToPay=\"Yes\" AND temporaryPbaPayment.usePbaPayment!=\"No\""
},
{
"LiveFrom": "01/01/2017",
Expand All @@ -37,6 +38,6 @@
"DisplayContext": "MANDATORY",
"ListElementCode": "fileReference",
"FieldDisplayOrder": "4",
"FieldShowCondition": "temporaryPbaPayment.usePbaPayment=\"Yes\""
"FieldShowCondition": "displayAmountToPay=\"Yes\" AND temporaryPbaPayment.usePbaPayment!=\"No\""
}
]
2 changes: 1 addition & 1 deletion ccd-definition/ComplexTypes/CareSupervision/1_PBAPayment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ID": "PBAPayment",
"ListElementCode": "usePbaPayment",
"FieldType": "YesOrNo",
"ElementLabel": "Paid with PBA",
"ElementLabel": "Do you want to enter PBA details?",
"SecurityClassification": "Public"
},
{
Expand Down
2 changes: 1 addition & 1 deletion ccd-definition/ComplexTypes/CareSupervision/4_C2DocumentBundle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"ID": "C2DocumentBundle",
"ListElementCode": "usePbaPayment",
"FieldType": "YesOrNo",
"ElementLabel": "Paid with PBA",
"ElementLabel": "Do you want to enter PBA details?",
"SecurityClassification": "Public"
},
{
Expand Down
2 changes: 1 addition & 1 deletion ccd-definition/ComplexTypes/CareSupervision/4_C2DocumentBundleConfidential.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"ID": "C2DocumentBundleConfidential",
"ListElementCode": "usePbaPayment",
"FieldType": "YesOrNo",
"ElementLabel": "Paid with PBA",
"ElementLabel": "Do you want to enter PBA details?",
"SecurityClassification": "Public"
},
{
Expand Down
28 changes: 18 additions & 10 deletions playwright-e2e/pages/additional-applications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@ export class AdditionalApplications extends BasePage {
readonly acknowledgeC2ApplicationForm: Locator;
readonly sameDay: Locator;
readonly within2Days: Locator;
readonly selectApplicant: Locator;
readonly selectApplication: Locator;
readonly checkbox: Locator;
readonly paymentPbaNumber: Locator;
readonly typeOfC2Application: Locator;

public constructor(page: Page) {
super(page);
this.otherSpecificOrder = page.getByText('Other specific order - including C1 and C100 orders, and supplements');
this.c2Order = page.getByText('C2 - to add or remove someone on a case, or for a specific request to the judge');
this.confidentialC2Order = page.locator('[for="isC2Confidential_Yes"]');
this.confidentialC2Order = page.getByLabel('Yes')
this.nonConfidentialC2Order = page.locator('[for="isC2Confidential_No"]');
this.applicant = page.getByLabel('Select applicant');
this.c1ApplicationType = page.getByLabel('Select application');
Expand All @@ -31,19 +36,24 @@ export class AdditionalApplications extends BasePage {
this.acknowledgeC2ApplicationForm = page.locator('[name="temporaryC2Document_documentAcknowledge"]');
this.sameDay = page.getByText('On the same day');
this.within2Days = page.getByText('Within 2 days');
this.selectApplicant = page.getByLabel('Select applicant');
this.selectApplication = page.getByLabel('What type of C2 application?');
this.checkbox = page.getByLabel('Yes');
this.paymentPbaNumber = page.getByLabel('Payment by account (PBA) number');
this.typeOfC2Application = page.getByLabel('Application with notice.');
}

public async chooseOtherApplicationType() {
await this.otherSpecificOrder.click();
await this.applicant.selectOption('Swansea City Council, Applicant');
await this.selectApplicant.selectOption('1: applicant');
await this.clickContinue();
}

public async chooseC2ApplicationType() {
await this.c2Order.click();
await this.applicant.selectOption('Swansea City Council, Applicant');
await this.page.getByText('Application by consent. Parties will be notified of this application.').click();
await this.nonConfidentialC2Order.click();
await this.typeOfC2Application.click();
await this.confidentialC2Order.click();
await this.selectApplicant.selectOption('3: 5c578fcc-7e41-45b0-82f7-46c38a769cb3');
await this.clickContinue();
}

Expand All @@ -59,7 +69,7 @@ export class AdditionalApplications extends BasePage {
await this.c2Order.click();
await this.otherSpecificOrder.click();
await this.applicant.selectOption('Swansea City Council, Applicant');
await this.page.getByText('Application by consent. Parties will be notified of this application.').click();
await this.typeOfC2Application.click();
await this.nonConfidentialC2Order.click();
await this.clickContinue();
}
Expand Down Expand Up @@ -103,7 +113,7 @@ export class AdditionalApplications extends BasePage {

// add new draft order if required
if (uploadDraftOrder) {
await this.uploadDraftOrder();
await this.uploadDraftOrder();
}

await this.clickContinue();
Expand All @@ -114,7 +124,6 @@ export class AdditionalApplications extends BasePage {
await this.page.locator('#temporaryC2Document_draftOrdersBundle_0_title').fill('Draft order title');
await this.page.locator('#temporaryC2Document_draftOrdersBundle_0_document').setInputFiles(config.testWordFile);
await this.expectAllUploadsCompleted();
// added hard wait due to EXUI-1194
await this.page.waitForTimeout(6000);
await this.page.locator('#temporaryC2Document_draftOrdersBundle_0_documentAcknowledge-ACK_RELATED_TO_CASE').check();

Expand All @@ -139,8 +148,7 @@ export class AdditionalApplications extends BasePage {
}

public async payForApplication() {
await this.page.locator('[for="temporaryPbaPayment_usePbaPayment_Yes"]').check();
await this.page.getByLabel('Payment by account (PBA) number').fill('PBA1234567');
await this.paymentPbaNumber.fill('PBA1234567');
await this.page.getByLabel('Customer reference').fill('Customer reference');
await this.clickContinue();
}
Expand Down
2 changes: 1 addition & 1 deletion playwright-e2e/pages/other-people-in-the-case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class OtherPeopleInCase extends BasePage {
await this.placeOfBirth.fill("London");
await this.currentAddress.getByLabel('No').check();
await this.reasonUnknownAddress.selectOption('1: No fixed abode');
await this.telephoneNumber.fill("0123456789")
await this.telephoneNumber.fill("0123456789");
await this.relationshipToChild.fill("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam fermentum augue velit, eget bibendum est viverra vel. Sed id urna mollis")
await this.contactDetailsHidden.getByLabel('No').check();
await this.page.getByLabel('Don\'t know').check();
Expand Down
Loading
0