From 3c6ba6daaa4a2639ae3003c9adc161be3e642605 Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Tue, 30 Jan 2024 10:56:49 -0800 Subject: [PATCH 1/6] Implemented continuation in start + misc. fixes --- package-lock.json | 27 ++-- package.json | 6 +- src/App.vue | 37 ++++-- .../dialogs/continuation-in-error.vue | 96 ++++++++++++++ src/components/dialogs/index.ts | 1 + .../existing-request/nr-approved-gray-box.vue | 38 ++++++ src/components/new-request/search.vue | 7 +- src/interfaces/business.ts | 6 + src/interfaces/new-request-interface.ts | 1 + src/mixins/nr-affiliation-mixin.ts | 123 ++++++++---------- src/store/actions.ts | 4 + src/store/getters.ts | 4 + src/store/mutations.ts | 4 + src/store/state.ts | 1 + 14 files changed, 250 insertions(+), 105 deletions(-) create mode 100644 src/components/dialogs/continuation-in-error.vue diff --git a/package-lock.json b/package-lock.json index 6daf3f03a..28e9ec8b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "name-request", - "version": "5.3.12", + "version": "5.3.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "name-request", - "version": "5.3.12", + "version": "5.3.13", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/breadcrumb": "2.1.24", - "@bcrs-shared-components/corp-type-module": "1.0.13", - "@bcrs-shared-components/enums": "1.1.4", + "@bcrs-shared-components/corp-type-module": "1.0.15", + "@bcrs-shared-components/enums": "1.1.7", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/interfaces": "1.0.67", "@bcrs-shared-components/staff-payment": "1.0.29", @@ -1913,23 +1913,18 @@ } }, "node_modules/@bcrs-shared-components/corp-type-module": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.13.tgz", - "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA==" + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.15.tgz", + "integrity": "sha512-g/TcNSR7zJsG2lBjn/NnM+/+k7dJzhAiy5PiPj0ObN56bUV1PrUWVVlg5lz4/JZUEAZetWhwnyAzPVGsn7kr1w==" }, "node_modules/@bcrs-shared-components/enums": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.4.tgz", - "integrity": "sha512-EwHjFTfIiOJLzU3yWSPJnxfplF+cgQSPGFE+6T1jo/7aVpLPMw/cSSGi3cJIr3h7SjyQd8wTxsFP4QDVgCrH7A==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.7.tgz", + "integrity": "sha512-WORgcK1YS/AssOI6sbuSQv4f13wZTQR6td7+gcghgAl34WNyO5HT0Mu2VfVGbD2zXfIYDm5jXTj2Dg6dkxpouA==", "dependencies": { - "@bcrs-shared-components/corp-type-module": "^1.0.14" + "@bcrs-shared-components/corp-type-module": "^1.0.15" } }, - "node_modules/@bcrs-shared-components/enums/node_modules/@bcrs-shared-components/corp-type-module": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.14.tgz", - "integrity": "sha512-SZhJw4hpqQT2BL3RuVB0Z1hmShhrv5byhH4gnaF1fVl9jsUGkjC/Ytic08UnEX4DIyR1/VWNyjTclNgxi9+0Bw==" - }, "node_modules/@bcrs-shared-components/folio-number-input": { "version": "1.1.28", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.28.tgz", diff --git a/package.json b/package.json index 09c1d7dab..c853a7e43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.3.12", + "version": "5.3.13", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", @@ -15,8 +15,8 @@ "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/breadcrumb": "2.1.24", - "@bcrs-shared-components/corp-type-module": "1.0.13", - "@bcrs-shared-components/enums": "1.1.4", + "@bcrs-shared-components/corp-type-module":"1.0.15", + "@bcrs-shared-components/enums": "1.1.7", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/interfaces": "1.0.67", "@bcrs-shared-components/staff-payment": "1.0.29", diff --git a/src/App.vue b/src/App.vue index 39f8bfffe..11d115510 100644 --- a/src/App.vue +++ b/src/App.vue @@ -86,6 +86,11 @@ :dialog="getAmalgamateNowErrorStatus" @close="closeAmalgamateNowErrorDialog()" /> + @@ -126,9 +131,9 @@ import { Breadcrumb } from '@/components/common' import GenesysWebMessage from '@bcrs-shared-components/genesys-web-message/GenesysWebMessage.vue' import { WebChat as ChatPopup } from '@bcrs-shared-components/web-chat' import { - AffiliationErrorDialog, AmalgamateNowErrorDialog, CancelDialog, ConditionsDialog, ErrorDialog, ExitDialog, - HelpMeChooseDialog, IncorporateNowErrorDialog, MrasSearchInfoDialog, NrNotRequiredDialog, ConfirmNrDialog, - PaymentCompleteDialog, PickEntityOrConversionDialog, RenewDialog, ReceiptsDialog, + AffiliationErrorDialog, AmalgamateNowErrorDialog, CancelDialog, ConditionsDialog, ContinuationInErrorDialog, + ErrorDialog, ExitDialog, HelpMeChooseDialog, IncorporateNowErrorDialog, MrasSearchInfoDialog, NrNotRequiredDialog, + ConfirmNrDialog, PaymentCompleteDialog, PickEntityOrConversionDialog, RenewDialog, ReceiptsDialog, RefundDialog, ResubmitDialog, RetryDialog, StaffPaymentErrorDialog, UpgradeDialog, ExitIncompletePaymentDialog } from '@/components/dialogs' import SbcHeader from 'sbc-common-components/src/components/SbcHeader.vue' @@ -149,6 +154,7 @@ import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module' ChatPopup, ConditionsDialog, ConfirmNrDialog, + ContinuationInErrorDialog, ErrorDialog, ExitDialog, ExitIncompletePaymentDialog, @@ -175,6 +181,7 @@ export default class App extends Mixins( ) { // Global getters @Getter getAmalgamateNowErrorStatus!: boolean + @Getter getContinuationInErrorStatus!: boolean @Getter getDisplayedComponent!: string @Getter getIncorporateNowErrorStatus!: boolean @Getter getNrId!: number @@ -189,6 +196,7 @@ export default class App extends Mixins( @Action setDisplayedComponent!: ActionBindingIF @Action toggleConfirmNrModal!: ActionBindingIF @Action setCurrentJsDate!: ActionBindingIF + @Action setRequestAction!: ActionBindingIF @Action setWindowWidth!: ActionBindingIF readonly axios = axios @@ -273,22 +281,25 @@ export default class App extends Mixins( sessionStorage.removeItem('NR_DATA') } - // if there is stored legal type for an IA then incorporate/register it now + // if there is stored legal type and request action cd, try to continue const legaltype = sessionStorage.getItem('LEGAL_TYPE') - if (legaltype && this.isAuthenticated) { + const requestActionCd = sessionStorage.getItem('REQUEST_ACTION_CD') + + if (legaltype && requestActionCd && this.isAuthenticated) { try { - if (this.isNewBusiness) { - await this.incorporateNow(legaltype as CorpTypeCd) - } else { - await this.amalgamateNow(legaltype as CorpTypeCd) + this.setRequestAction(requestActionCd) + if (this.isNewBusiness || this.isAmalgamation || this.isContinuationIn) { + await this.actionNumberedEntity(legaltype as CorpTypeCd) } // clear the legal type data sessionStorage.removeItem('LEGAL_TYPE') } catch (error) { if (this.isNewBusiness) { this.setIncorporateNowErrorStatus(true) - } else { + } else if (this.isAmalgamation) { this.setAmalgamateNowErrorStatus(true) + } else if (this.isContinuationIn) { + this.setContinuationInErrorStatus(true) } console.error(error) } @@ -370,6 +381,12 @@ export default class App extends Mixins( sessionStorage.removeItem('LEGAL_TYPE') this.setAmalgamateNowErrorStatus(false) } + + /** Close ContinuationInErrorDialog and clear session storage. */ + closeContinuationInErrorDialog (): void { + sessionStorage.removeItem('LEGAL_TYPE') + this.setContinuationInErrorStatus(false) + } } diff --git a/src/components/dialogs/continuation-in-error.vue b/src/components/dialogs/continuation-in-error.vue new file mode 100644 index 000000000..155b65a1f --- /dev/null +++ b/src/components/dialogs/continuation-in-error.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/components/dialogs/index.ts b/src/components/dialogs/index.ts index 4fc905b09..51ef67202 100644 --- a/src/components/dialogs/index.ts +++ b/src/components/dialogs/index.ts @@ -3,6 +3,7 @@ export { default as AmalgamateNowErrorDialog } from './amalgamate-now-error.vue' export { default as CancelDialog } from './cancel.vue' export { default as ConditionsDialog } from './conditions.vue' export { default as ConfirmNrDialog } from './confirm-name-request.vue' +export { default as ContinuationInErrorDialog } from './continuation-in-error.vue' export { default as ErrorDialog } from './error.vue' export { default as ExitDialog } from './exit.vue' export { default as ExitIncompletePaymentDialog } from './exit-incomplete-payment.vue' diff --git a/src/components/existing-request/nr-approved-gray-box.vue b/src/components/existing-request/nr-approved-gray-box.vue index d4e90555f..7a5562ed4 100644 --- a/src/components/existing-request/nr-approved-gray-box.vue +++ b/src/components/existing-request/nr-approved-gray-box.vue @@ -78,6 +78,34 @@ +
+ + Continue In Now +   + + mdi-open-in-new + + + + Continue In Now + +
+
{ - try { - // show spinner since this is a network call - this.$root.$emit('showSpinner', true) - const accountId = +JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id || 0 - const businessId = await this.createBusinessIA(accountId, legalType) - this.goToEntityDashboard(businessId) - return - } catch (error) { - this.$root.$emit('showSpinner', false) - this.setIncorporateNowErrorStatus(true) - throw new Error('Unable to Incorporate Now ' + error) - } - } - - /** - * Handle "Amalgamate Now" button. - * Submit an amalgamation draft depending on business type. - * Redirect to Dashboard. - * @param legalType The legal type of the amalgamated business + * @param legalType The legal type of the business */ - async amalgamateNow (legalType: CorpTypeCd): Promise { + async actionNumberedEntity (legalType: CorpTypeCd): Promise { + // show spinner since this is a network call + this.$root.$emit('showSpinner', true) + const accountId = +JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id || 0 try { - // show spinner since this is a network call - this.$root.$emit('showSpinner', true) - const accountId = +JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT'))?.id || 0 - const businessId = await this.createBusinessAA(accountId, legalType) + const businessId = await this.createNumberedBusiness(accountId, legalType) this.goToEntityDashboard(businessId) return } catch (error) { this.$root.$emit('showSpinner', false) - this.setAmalgamateNowErrorStatus(true) - throw new Error('Unable to Amalgamate Now ' + error) + if (this.isAmalgamation) { + this.setAmalgamateNowErrorStatus(true) + throw new Error('Unable to Amalgamate Now ' + error) + } else if (this.isContinuationIn) { + this.setContinuationInErrorStatus(true) + throw new Error('Unable to Continue In Now ' + error) + } else { + this.setIncorporateNowErrorStatus(true) + throw new Error('Unable to Incorporate Now ' + error) + } } } /** - * Create a draft amalgamation application based on selected business type. + * Create a draft numbered business based on selected business type (If applicable). * @param accountId Account ID of logged in user. - * @param legalType The legal type of the amalgamated business + * @param legalType The legal type of the business that's being created. */ - async createBusinessAA (accountId: number, legalType: CorpTypeCd): Promise { + async createNumberedBusiness (accountId: number, legalType: CorpTypeCd): Promise { const businessRequest = { filing: { header: { - name: FilingTypes.AMALGAMATION_APPLICATION, accountId: accountId }, business: { legalType: legalType - }, - amalgamationApplication: { - nameRequest: { - legalType: legalType - }, - type: AmalgamationTypes.REGULAR } } } as BusinessRequest - const createBusinessResponse = - await BusinessServices.createBusiness(businessRequest).catch(error => { - throw new Error('Unable to create new Amalgamation Draft ' + error) - }) - - return createBusinessResponse.data?.filing?.business?.identifier as string - } - - /** - * Create a draft business based on selected business type (If applicable). - * @param accountId Account ID of logged in user. - * @param legalType The legal type of the IA that's being incorporated. - */ - async createBusinessIA (accountId: number, legalType: CorpTypeCd): Promise { - const businessRequest = { - filing: { - header: { - name: 'incorporationApplication', - accountId: accountId - }, - business: { - legalType: legalType - }, - incorporationApplication: { - nameRequest: { - legalType: legalType - } - } + if (this.isAmalgamation) { + businessRequest.filing.header.name = FilingTypes.AMALGAMATION_APPLICATION + businessRequest.filing.amalgamationApplication = { + nameRequest: { legalType }, + type: AmalgamationTypes.REGULAR } - } as BusinessRequest + } else if (this.isContinuationIn) { + businessRequest.filing.header.name = FilingTypes.CONTINUATION_IN + businessRequest.filing.continuationIn = { nameRequest: { legalType } } + } else { + businessRequest.filing.header.name = FilingTypes.INCORPORATION_APPLICATION + businessRequest.filing.incorporationApplication = { nameRequest: { legalType } } + } const createBusinessResponse = await BusinessServices.createBusiness(businessRequest).catch(error => { diff --git a/src/store/actions.ts b/src/store/actions.ts index 8d9f0404d..bfd53ba2c 100644 --- a/src/store/actions.ts +++ b/src/store/actions.ts @@ -1257,6 +1257,10 @@ export const setAmalgamateNowErrorStatus = ({ commit }, amalgamateNowError: bool commit('mutateAmalgamateNowErrorStatus', amalgamateNowError) } +export const setContinuationInErrorStatus = ({ commit }, continuationInError: boolean): void => { + commit('mutateContinuationInErrorStatus', continuationInError) +} + export const setSearchBusiness = ({ commit }, val: BusinessSearchIF): void => { commit('mutateSearchBusiness', val) } diff --git a/src/store/getters.ts b/src/store/getters.ts index 5437e4213..296e9a754 100644 --- a/src/store/getters.ts +++ b/src/store/getters.ts @@ -1247,6 +1247,10 @@ export const getAmalgamateNowErrorStatus = (state: StateIF): boolean => { return state.stateModel.newRequestModel.amalgamateNowError } +export const getContinuationInErrorStatus = (state: StateIF): boolean => { + return state.stateModel.newRequestModel.continuationInError +} + /** True if current request action requires business lookup. */ export const isBusinessLookupRequestAction = (state: StateIF): boolean => { return BusinessLookupRequestActions.includes(getRequestActionCd(state)) diff --git a/src/store/mutations.ts b/src/store/mutations.ts index 420a34160..fea78c898 100644 --- a/src/store/mutations.ts +++ b/src/store/mutations.ts @@ -584,6 +584,10 @@ export const mutateAmalgamateNowErrorStatus = (state: StateIF, amalgamateNowErro state.stateModel.newRequestModel.amalgamateNowError = amalgamateNowError } +export const mutateContinuationInErrorStatus = (state: StateIF, continuationInError: boolean) => { + state.stateModel.newRequestModel.continuationInError = continuationInError +} + export const mutateSearchBusiness = (state: StateIF, val: BusinessSearchIF) => { state.stateModel.newRequestModel.search.business = val } diff --git a/src/store/state.ts b/src/store/state.ts index 877e7da9c..383a753cb 100644 --- a/src/store/state.ts +++ b/src/store/state.ts @@ -78,6 +78,7 @@ export const stateModel: StateModelIF = { affiliationErrorModalValue: NrAffiliationErrors.NONE, // initially hidden incorporateNowError: false, amalgamateNowError: false, + continuationInError: false, isPersonsName: false, issueIndex: 0, location: null, From 2a25c1e069afc03d884db476f68e9e6a67daef87 Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Tue, 30 Jan 2024 10:59:37 -0800 Subject: [PATCH 2/6] missing space --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c853a7e43..411278002 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/breadcrumb": "2.1.24", - "@bcrs-shared-components/corp-type-module":"1.0.15", + "@bcrs-shared-components/corp-type-module": "1.0.15", "@bcrs-shared-components/enums": "1.1.7", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/interfaces": "1.0.67", From 784ea438bd35628c6d1480d38d68da5d72331d8d Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Tue, 30 Jan 2024 11:04:03 -0800 Subject: [PATCH 3/6] clear the request action from session storage --- src/App.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 11d115510..a314d13ec 100644 --- a/src/App.vue +++ b/src/App.vue @@ -284,15 +284,15 @@ export default class App extends Mixins( // if there is stored legal type and request action cd, try to continue const legaltype = sessionStorage.getItem('LEGAL_TYPE') const requestActionCd = sessionStorage.getItem('REQUEST_ACTION_CD') - if (legaltype && requestActionCd && this.isAuthenticated) { try { this.setRequestAction(requestActionCd) if (this.isNewBusiness || this.isAmalgamation || this.isContinuationIn) { await this.actionNumberedEntity(legaltype as CorpTypeCd) } - // clear the legal type data + // clear the legal type and request action data sessionStorage.removeItem('LEGAL_TYPE') + sessionStorage.removeItem('REQUEST_ACTION_CD') } catch (error) { if (this.isNewBusiness) { this.setIncorporateNowErrorStatus(true) From 767794d82bcc8288be21476672a439a952b2dbf8 Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Tue, 30 Jan 2024 11:22:36 -0800 Subject: [PATCH 4/6] removed the request action cd on error dialog close --- src/App.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/App.vue b/src/App.vue index a314d13ec..573f6e2c4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -373,18 +373,21 @@ export default class App extends Mixins( /** Close IncorporateNowErrorDialog and clear session storage. */ closeIncorporateNowErrorDialog (): void { sessionStorage.removeItem('LEGAL_TYPE') + sessionStorage.removeItem('REQUEST_ACTION_CD') this.setIncorporateNowErrorStatus(false) } /** Close AmalgamateNowErrorDialog and clear session storage. */ closeAmalgamateNowErrorDialog (): void { sessionStorage.removeItem('LEGAL_TYPE') + sessionStorage.removeItem('REQUEST_ACTION_CD') this.setAmalgamateNowErrorStatus(false) } /** Close ContinuationInErrorDialog and clear session storage. */ closeContinuationInErrorDialog (): void { sessionStorage.removeItem('LEGAL_TYPE') + sessionStorage.removeItem('REQUEST_ACTION_CD') this.setContinuationInErrorStatus(false) } } From 3a466017ce462112b6078658434b0ca9b500aeb9 Mon Sep 17 00:00:00 2001 From: JazzarKarim Date: Wed, 31 Jan 2024 11:05:35 -0800 Subject: [PATCH 5/6] Fixed in response to Sev's comments --- package-lock.json | 4 +- package.json | 2 +- src/App.vue | 51 +++------- .../dialogs/continuation-in-error.vue | 96 ------------------- ...ow-error.vue => create-business-error.vue} | 36 +++++-- .../dialogs/incorporate-now-error.vue | 96 ------------------- src/components/dialogs/index.ts | 4 +- .../dialogs/societies-info-dialog.vue | 72 +++++++------- .../new-request/business-lookup.vue | 2 +- .../xpro-federal-bullets.vue | 10 +- src/components/new-request/search.vue | 2 +- src/interfaces/new-request-interface.ts | 6 +- src/mixins/nr-affiliation-mixin.ts | 10 +- src/store/actions.ts | 12 +-- src/store/getters.ts | 6 +- src/store/mutations.ts | 12 +-- src/store/state.ts | 6 +- 17 files changed, 125 insertions(+), 302 deletions(-) delete mode 100644 src/components/dialogs/continuation-in-error.vue rename src/components/dialogs/{amalgamate-now-error.vue => create-business-error.vue} (57%) delete mode 100644 src/components/dialogs/incorporate-now-error.vue diff --git a/package-lock.json b/package-lock.json index 28e9ec8b8..3dfbc3537 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "name-request", - "version": "5.3.13", + "version": "5.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "name-request", - "version": "5.3.13", + "version": "5.4.0", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/breadcrumb": "2.1.24", diff --git a/package.json b/package.json index 411278002..190cb5f8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.3.13", + "version": "5.4.0", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", diff --git a/src/App.vue b/src/App.vue index 573f6e2c4..c9fea3d0f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -76,20 +76,10 @@ - - - @@ -131,10 +121,10 @@ import { Breadcrumb } from '@/components/common' import GenesysWebMessage from '@bcrs-shared-components/genesys-web-message/GenesysWebMessage.vue' import { WebChat as ChatPopup } from '@bcrs-shared-components/web-chat' import { - AffiliationErrorDialog, AmalgamateNowErrorDialog, CancelDialog, ConditionsDialog, ContinuationInErrorDialog, - ErrorDialog, ExitDialog, HelpMeChooseDialog, IncorporateNowErrorDialog, MrasSearchInfoDialog, NrNotRequiredDialog, - ConfirmNrDialog, PaymentCompleteDialog, PickEntityOrConversionDialog, RenewDialog, ReceiptsDialog, - RefundDialog, ResubmitDialog, RetryDialog, StaffPaymentErrorDialog, UpgradeDialog, ExitIncompletePaymentDialog + AffiliationErrorDialog, CancelDialog, ConditionsDialog, ErrorDialog, ExitDialog, HelpMeChooseDialog, + MrasSearchInfoDialog, NrNotRequiredDialog, CreateBusinessErrorDialog, ConfirmNrDialog, + PaymentCompleteDialog, PickEntityOrConversionDialog, RenewDialog, ReceiptsDialog, RefundDialog, + ResubmitDialog, RetryDialog, StaffPaymentErrorDialog, UpgradeDialog, ExitIncompletePaymentDialog } from '@/components/dialogs' import SbcHeader from 'sbc-common-components/src/components/SbcHeader.vue' import SbcFooter from 'sbc-common-components/src/components/SbcFooter.vue' @@ -148,19 +138,17 @@ import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module' @Component({ components: { AffiliationErrorDialog, - AmalgamateNowErrorDialog, Breadcrumb, CancelDialog, ChatPopup, ConditionsDialog, ConfirmNrDialog, - ContinuationInErrorDialog, + CreateBusinessErrorDialog, ErrorDialog, ExitDialog, ExitIncompletePaymentDialog, GenesysWebMessage, HelpMeChooseDialog, - IncorporateNowErrorDialog, MrasSearchInfoDialog, NrNotRequiredDialog, PaymentCompleteDialog, @@ -294,6 +282,7 @@ export default class App extends Mixins( sessionStorage.removeItem('LEGAL_TYPE') sessionStorage.removeItem('REQUEST_ACTION_CD') } catch (error) { + sessionStorage.removeItem('REQUEST_ACTION_CD') if (this.isNewBusiness) { this.setIncorporateNowErrorStatus(true) } else if (this.isAmalgamation) { @@ -370,25 +359,13 @@ export default class App extends Mixins( return !!GetFeatureFlag('enable-genesys-web-message') } - /** Close IncorporateNowErrorDialog and clear session storage. */ - closeIncorporateNowErrorDialog (): void { - sessionStorage.removeItem('LEGAL_TYPE') - sessionStorage.removeItem('REQUEST_ACTION_CD') - this.setIncorporateNowErrorStatus(false) - } - - /** Close AmalgamateNowErrorDialog and clear session storage. */ - closeAmalgamateNowErrorDialog (): void { - sessionStorage.removeItem('LEGAL_TYPE') - sessionStorage.removeItem('REQUEST_ACTION_CD') - this.setAmalgamateNowErrorStatus(false) - } - - /** Close ContinuationInErrorDialog and clear session storage. */ - closeContinuationInErrorDialog (): void { + /** Closes the Business Error Dialog and clear session storage. */ + closeBusinessErrorDialog (): void { sessionStorage.removeItem('LEGAL_TYPE') sessionStorage.removeItem('REQUEST_ACTION_CD') - this.setContinuationInErrorStatus(false) + if (this.getAmalgamateNowErrorStatus) this.setAmalgamateNowErrorStatus(false) + if (this.getContinuationInErrorStatus) this.setContinuationInErrorStatus(false) + if (this.getIncorporateNowErrorStatus) this.setIncorporateNowErrorStatus(false) } } diff --git a/src/components/dialogs/continuation-in-error.vue b/src/components/dialogs/continuation-in-error.vue deleted file mode 100644 index 155b65a1f..000000000 --- a/src/components/dialogs/continuation-in-error.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - - - diff --git a/src/components/dialogs/amalgamate-now-error.vue b/src/components/dialogs/create-business-error.vue similarity index 57% rename from src/components/dialogs/amalgamate-now-error.vue rename to src/components/dialogs/create-business-error.vue index 48dcf71a9..a7968ecaf 100644 --- a/src/components/dialogs/amalgamate-now-error.vue +++ b/src/components/dialogs/create-business-error.vue @@ -7,13 +7,13 @@ > - Unable to Amalgamate Now + {{ title }}
-

Unable to amalgamate now. Please cancel or try again.

+

{{ dialogText }}

 @@ -44,20 +44,42 @@ - - diff --git a/src/components/dialogs/index.ts b/src/components/dialogs/index.ts index 51ef67202..1601a9e38 100644 --- a/src/components/dialogs/index.ts +++ b/src/components/dialogs/index.ts @@ -1,14 +1,12 @@ export { default as AffiliationErrorDialog } from './affiliation-error.vue' -export { default as AmalgamateNowErrorDialog } from './amalgamate-now-error.vue' export { default as CancelDialog } from './cancel.vue' export { default as ConditionsDialog } from './conditions.vue' export { default as ConfirmNrDialog } from './confirm-name-request.vue' -export { default as ContinuationInErrorDialog } from './continuation-in-error.vue' +export { default as CreateBusinessErrorDialog } from './create-business-error.vue' export { default as ErrorDialog } from './error.vue' export { default as ExitDialog } from './exit.vue' export { default as ExitIncompletePaymentDialog } from './exit-incomplete-payment.vue' export { default as HelpMeChooseDialog } from './help-me-choose.vue' -export { default as IncorporateNowErrorDialog } from './incorporate-now-error.vue' export { default as MrasSearchInfoDialog } from './mras-search-info.vue' export { default as NrNotRequiredDialog } from './nr-not-required.vue' export { default as PaymentCompleteDialog } from './payment-complete.vue' diff --git a/src/components/dialogs/societies-info-dialog.vue b/src/components/dialogs/societies-info-dialog.vue index 220f67698..75f5e5056 100644 --- a/src/components/dialogs/societies-info-dialog.vue +++ b/src/components/dialogs/societies-info-dialog.vue @@ -1,42 +1,50 @@ + + + + + + + To {{ type }} a Society + + + please use the Societies Online website + + + https://www.bcregistry.ca/societies/ + + + + + + + + + +