From da95597ec1e7d5188f7d342d14906945aa351f96 Mon Sep 17 00:00:00 2001 From: Qin Date: Tue, 3 Sep 2024 13:31:44 -0700 Subject: [PATCH 1/4] editable delivery email for amalg and contIn Signed-off-by: Qin --- src/views/Amalgamation/ReviewConfirm.vue | 23 +++++++++++++++++- .../ContinuationInReviewConfirm.vue | 24 ++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/views/Amalgamation/ReviewConfirm.vue b/src/views/Amalgamation/ReviewConfirm.vue index 89407b58e..46aadac41 100644 --- a/src/views/Amalgamation/ReviewConfirm.vue +++ b/src/views/Amalgamation/ReviewConfirm.vue @@ -117,9 +117,15 @@ > @@ -263,7 +269,7 @@ import { Component, Vue } from 'vue-property-decorator' import { Action, Getter } from 'pinia-class' import { useStore } from '@/store/store' import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF, - CourtOrderStepIF } from '@/interfaces' + CourtOrderStepIF, DocumentDeliveryIF } from '@/interfaces' import CardHeader from '@/components/common/CardHeader.vue' import Certify from '@/components/common/Certify.vue' import { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa' @@ -301,6 +307,7 @@ export default class AmalgamationReviewConfirm extends Vue { @Getter(useStore) getCertifyState!: CertifyIF @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF + @Getter(useStore) getDocumentDelivery!: DocumentDeliveryIF @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF @Getter(useStore) getEntityType!: CorpTypeCd @Getter(useStore) getFolioNumber!: string @@ -316,6 +323,8 @@ export default class AmalgamationReviewConfirm extends Vue { @Action(useStore) setCertifyState!: (x: CertifyIF) => void @Action(useStore) setCourtOrderFileNumber!: (x: string) => void @Action(useStore) setCourtOrderValidity!: (x: boolean) => void + @Action(useStore) setDocumentOptionalEmail!: (x: string) => void + @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void @Action(useStore) setEffectiveDate!: (x: Date) => void @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void @Action(useStore) setFolioNumber!: (x: string) => void @@ -369,6 +378,18 @@ export default class AmalgamationReviewConfirm extends Vue { get isAmalgamationStatementInvalid (): boolean { return (this.getValidateSteps && !this.getAmalgamationCourtApprovalValid) } + + /** Is true when the Document Delivery conditions are not met. */ + get isDocumentDeliveryInvalid (): boolean { + return (this.getValidateSteps && !this.getDocumentDelivery.valid) + } + + /** Get the Document Delievery email when a staff files. + * Default: staff email; editable. + */ + get documentOptionalEmail (): string { + return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail + } } diff --git a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue index 1d0eaa744..d36b0195f 100644 --- a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue +++ b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue @@ -130,9 +130,15 @@ > @@ -222,7 +228,8 @@ import { Component, Vue } from 'vue-property-decorator' import { Action, Getter } from 'pinia-class' import { useStore } from '@/store/store' import { FilingStatus } from '@/enums' -import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF, CourtOrderStepIF } from '@/interfaces' +import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, ShareStructureIF, + CourtOrderStepIF, DocumentDeliveryIF } from '@/interfaces' import CardHeader from '@/components/common/CardHeader.vue' import Certify from '@/components/common/Certify.vue' import { DocumentDelivery } from '@bcrs-shared-components/document-delivery' @@ -257,6 +264,7 @@ export default class ContinuationInReviewConfirm extends Vue { @Getter(useStore) getCertifyState!: CertifyIF @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF + @Getter(useStore) getDocumentDelivery!: DocumentDeliveryIF @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF @Getter(useStore) getEntityType!: CorpTypeCd @Getter(useStore) getFilingStatus!: FilingStatus @@ -267,6 +275,8 @@ export default class ContinuationInReviewConfirm extends Vue { @Action(useStore) setCertifyState!: (x: CertifyIF) => void @Action(useStore) setCourtOrderFileNumber!: (x: string) => void @Action(useStore) setCourtOrderValidity!: (x: boolean) => void + @Action(useStore) setDocumentOptionalEmail!: (x: string) => void + @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void @Action(useStore) setEffectiveDate!: (x: Date) => void @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void @@ -302,6 +312,18 @@ export default class ContinuationInReviewConfirm extends Vue { get isCourtOrderInvalid (): boolean { return (this.getValidateSteps && !this.getCourtOrderStep.valid) } + + /** Is true when the Document Delivery conditions are not met. */ + get isDocumentDeliveryInvalid (): boolean { + return (this.getValidateSteps && !this.getDocumentDelivery.valid) + } + + /** Get the Document Delievery email when a staff files. + * Default: staff email; editable. + */ + get documentOptionalEmail (): string { + return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail + } } From b7b594460f11e681ff1ad25133a87a186a867bc6 Mon Sep 17 00:00:00 2001 From: Qin Date: Tue, 3 Sep 2024 13:55:28 -0700 Subject: [PATCH 2/4] editable delivery email for dissol, incorp and regist Signed-off-by: Qin --- .../Dissolution/DissolutionReviewConfirm.vue | 9 +++++++- src/views/DissolutionFirm/DissolutionFirm.vue | 9 +++++++- .../IncorporationReviewConfirm.vue | 23 ++++++++++++++++++- .../RegistrationReviewConfirm.vue | 8 +++++++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/views/Dissolution/DissolutionReviewConfirm.vue b/src/views/Dissolution/DissolutionReviewConfirm.vue index 42a16f3fb..af2fcabf4 100644 --- a/src/views/Dissolution/DissolutionReviewConfirm.vue +++ b/src/views/Dissolution/DissolutionReviewConfirm.vue @@ -251,7 +251,7 @@ :contactValue="getBusinessContact.email" :custodianEmail="getDissolutionCustodianEmail" :completingPartyEmail="getUserEmail" - :documentOptionalEmail="getDocumentDelivery.documentOptionalEmail" + :documentOptionalEmail="documentOptionalEmail" contactLabel="Registered Office" @update:optionalEmail="setDocumentOptionalEmail($event)" @valid="setDocumentOptionalEmailValidity($event)" @@ -497,6 +497,13 @@ export default class DissolutionReviewConfirm extends Mixins(DateMixin) { get isCertifyInvalid (): boolean { return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid) } + + /** Get the Document Delievery email when a staff files. + * Default: staff email; editable. + */ + get documentOptionalEmail (): string { + return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail + } } diff --git a/src/views/DissolutionFirm/DissolutionFirm.vue b/src/views/DissolutionFirm/DissolutionFirm.vue index c0657408a..2899929ab 100644 --- a/src/views/DissolutionFirm/DissolutionFirm.vue +++ b/src/views/DissolutionFirm/DissolutionFirm.vue @@ -125,7 +125,7 @@ :contactValue="getBusinessContact.email" :custodianEmail="getDissolutionCustodianEmail" :completingPartyEmail="getUserEmail" - :documentOptionalEmail="getDocumentDelivery.documentOptionalEmail" + :documentOptionalEmail="documentOptionalEmail" :additionalLabel="additionalLabel" :additionalValue="additionalValue" contactLabel="Business Contact" @@ -501,6 +501,13 @@ export default class DissolutionFirm extends Mixins(DateMixin) { ] } + /** Get the Document Delievery email when a staff files. + * Default: staff email; editable. + */ + get documentOptionalEmail (): string { + return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail + } + /** The entity description. */ corpTypeDescription (): string { return GetCorpFullDescription(this.getEntityType as any) diff --git a/src/views/Incorporation/IncorporationReviewConfirm.vue b/src/views/Incorporation/IncorporationReviewConfirm.vue index 64caf7221..be2ec5762 100644 --- a/src/views/Incorporation/IncorporationReviewConfirm.vue +++ b/src/views/Incorporation/IncorporationReviewConfirm.vue @@ -148,9 +148,15 @@ > @@ -240,7 +246,7 @@ import { Component, Vue } from 'vue-property-decorator' import { Action, Getter } from 'pinia-class' import { useStore } from '@/store/store' import { ContactPointIF, CertifyIF, EffectiveDateTimeIF, IncorporationAgreementIF, - ShareStructureIF, CourtOrderStepIF } from '@/interfaces' + ShareStructureIF, CourtOrderStepIF, DocumentDeliveryIF } from '@/interfaces' import AgreementType from '@/components/common/AgreementType.vue' import CardHeader from '@/components/common/CardHeader.vue' import Certify from '@/components/common/Certify.vue' @@ -277,6 +283,7 @@ export default class IncorporationReviewConfirm extends Vue { @Getter(useStore) getCompanyDisplayName!: string @Getter(useStore) getCourtOrderStep!: CourtOrderStepIF @Getter(useStore) getCreateShareStructureStep!: ShareStructureIF + @Getter(useStore) getDocumentDelivery!: DocumentDeliveryIF @Getter(useStore) getEffectiveDateTime!: EffectiveDateTimeIF @Getter(useStore) getEntityType!: CorpTypeCd @Getter(useStore) getIncorporationAgreementStep!: IncorporationAgreementIF @@ -289,6 +296,8 @@ export default class IncorporationReviewConfirm extends Vue { @Action(useStore) setCertifyState!: (x: CertifyIF) => void @Action(useStore) setCourtOrderFileNumber!: (x: string) => void @Action(useStore) setCourtOrderValidity!: (x: boolean) => void + @Action(useStore) setDocumentOptionalEmail!: (x: string) => void + @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void @Action(useStore) setEffectiveDate!: (x: Date) => void @Action(useStore) setEffectiveDateTimeValid!: (x: boolean) => void @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void @@ -313,6 +322,18 @@ export default class IncorporationReviewConfirm extends Vue { get isCourtOrderInvalid (): boolean { return (this.getValidateSteps && !this.getCourtOrderStep.valid) } + + /** Is true when the Document Delivery conditions are not met. */ + get isDocumentDeliveryInvalid (): boolean { + return (this.getValidateSteps && !this.getDocumentDelivery.valid) + } + + /** Get the Document Delievery email when a staff files. + * Default: staff email; editable. + */ + get documentOptionalEmail (): string { + return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail + } } diff --git a/src/views/Registration/RegistrationReviewConfirm.vue b/src/views/Registration/RegistrationReviewConfirm.vue index cb2ca07c9..37d13fdbd 100644 --- a/src/views/Registration/RegistrationReviewConfirm.vue +++ b/src/views/Registration/RegistrationReviewConfirm.vue @@ -63,6 +63,7 @@ :contactValue="getBusinessContact.email" :editableCompletingParty="isRoleStaff || isSbcStaff" :completingPartyEmail="getUserEmail" + :documentOptionalEmail="documentOptionalEmail" :additionalLabel="documentDeliveryAdditionalLabel" :additionalValue="documentDeliveryAdditionalValue" :invalidSection="isDocumentDeliveryInvalid" @@ -249,6 +250,13 @@ export default class RegistrationReviewConfirm extends Vue { get isCertifyInvalid (): boolean { return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid) } + + /** Get the Document Delievery email when a staff files. + * Default: staff email; editable. + */ + get documentOptionalEmail (): string { + return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail + } } From af20980c1f4d0d119720241f35c67e7b0e5252ba Mon Sep 17 00:00:00 2001 From: Qin Date: Tue, 3 Sep 2024 13:57:18 -0700 Subject: [PATCH 3/4] updated version number Signed-off-by: Qin --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0845ee997..9bded353f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "business-create-ui", - "version": "5.11.15", + "version": "5.11.16", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "business-create-ui", - "version": "5.11.15", + "version": "5.11.16", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/approval-type": "1.0.19", diff --git a/package.json b/package.json index 2ab88e63e..bb76f57f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "business-create-ui", - "version": "5.11.15", + "version": "5.11.16", "private": true, "appName": "Create UI", "sbcName": "SBC Common Components", From 827c06ddf18cc47ec99ea549e9e285c0b83845c8 Mon Sep 17 00:00:00 2001 From: Qin Date: Wed, 4 Sep 2024 10:02:23 -0700 Subject: [PATCH 4/4] adjusted comments Signed-off-by: Qin --- src/views/Amalgamation/ReviewConfirm.vue | 3 ++- src/views/ContinuationIn/ContinuationInReviewConfirm.vue | 3 ++- src/views/Dissolution/DissolutionReviewConfirm.vue | 3 ++- src/views/DissolutionFirm/DissolutionFirm.vue | 3 ++- src/views/Incorporation/IncorporationReviewConfirm.vue | 3 ++- src/views/Registration/RegistrationReviewConfirm.vue | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/Amalgamation/ReviewConfirm.vue b/src/views/Amalgamation/ReviewConfirm.vue index 46aadac41..a6772330a 100644 --- a/src/views/Amalgamation/ReviewConfirm.vue +++ b/src/views/Amalgamation/ReviewConfirm.vue @@ -384,7 +384,8 @@ export default class AmalgamationReviewConfirm extends Vue { return (this.getValidateSteps && !this.getDocumentDelivery.valid) } - /** Get the Document Delievery email when a staff files. + /** + * Get the Document Delivery email when a staff files. * Default: staff email; editable. */ get documentOptionalEmail (): string { diff --git a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue index d36b0195f..e5a8d2999 100644 --- a/src/views/ContinuationIn/ContinuationInReviewConfirm.vue +++ b/src/views/ContinuationIn/ContinuationInReviewConfirm.vue @@ -318,7 +318,8 @@ export default class ContinuationInReviewConfirm extends Vue { return (this.getValidateSteps && !this.getDocumentDelivery.valid) } - /** Get the Document Delievery email when a staff files. + /** + * Get the Document Delivery email when a staff files. * Default: staff email; editable. */ get documentOptionalEmail (): string { diff --git a/src/views/Dissolution/DissolutionReviewConfirm.vue b/src/views/Dissolution/DissolutionReviewConfirm.vue index af2fcabf4..826fdf510 100644 --- a/src/views/Dissolution/DissolutionReviewConfirm.vue +++ b/src/views/Dissolution/DissolutionReviewConfirm.vue @@ -498,7 +498,8 @@ export default class DissolutionReviewConfirm extends Mixins(DateMixin) { return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid) } - /** Get the Document Delievery email when a staff files. + /** + * Get the Document Delivery email when a staff files. * Default: staff email; editable. */ get documentOptionalEmail (): string { diff --git a/src/views/DissolutionFirm/DissolutionFirm.vue b/src/views/DissolutionFirm/DissolutionFirm.vue index 2899929ab..e7abcc291 100644 --- a/src/views/DissolutionFirm/DissolutionFirm.vue +++ b/src/views/DissolutionFirm/DissolutionFirm.vue @@ -501,7 +501,8 @@ export default class DissolutionFirm extends Mixins(DateMixin) { ] } - /** Get the Document Delievery email when a staff files. + /** + * Get the Document Delivery email when a staff files. * Default: staff email; editable. */ get documentOptionalEmail (): string { diff --git a/src/views/Incorporation/IncorporationReviewConfirm.vue b/src/views/Incorporation/IncorporationReviewConfirm.vue index be2ec5762..cfefa41fe 100644 --- a/src/views/Incorporation/IncorporationReviewConfirm.vue +++ b/src/views/Incorporation/IncorporationReviewConfirm.vue @@ -328,7 +328,8 @@ export default class IncorporationReviewConfirm extends Vue { return (this.getValidateSteps && !this.getDocumentDelivery.valid) } - /** Get the Document Delievery email when a staff files. + /** + * Get the Document Delivery email when a staff files. * Default: staff email; editable. */ get documentOptionalEmail (): string { diff --git a/src/views/Registration/RegistrationReviewConfirm.vue b/src/views/Registration/RegistrationReviewConfirm.vue index 37d13fdbd..8354f1db4 100644 --- a/src/views/Registration/RegistrationReviewConfirm.vue +++ b/src/views/Registration/RegistrationReviewConfirm.vue @@ -251,7 +251,8 @@ export default class RegistrationReviewConfirm extends Vue { return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid) } - /** Get the Document Delievery email when a staff files. + /** + * Get the Document Delivery email when a staff files. * Default: staff email; editable. */ get documentOptionalEmail (): string {