Skip to content

Commit

Permalink
Merge pull request #729 from ArwenQin/22845-Confirm-Page-Delievery-Email
Browse files Browse the repository at this point in the history
22845 -  Update Confirm Page Delivery Email
  • Loading branch information
ArwenQin authored Sep 4, 2024
2 parents a1eaad3 + 827c06d commit 0388fcd
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
24 changes: 23 additions & 1 deletion src/views/Amalgamation/ReviewConfirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,15 @@
>
<DocumentDelivery
class="py-8 px-6"
:class="{ 'invalid-section': isDocumentDeliveryInvalid }"
:editableCompletingParty="isRoleStaff"
:invalidSection="isDocumentDeliveryInvalid"
:contactValue="getBusinessContact.email"
:completingPartyEmail="getUserEmail"
:documentOptionalEmail="documentOptionalEmail"
contactLabel="Registered Office"
@update:optionalEmail="setDocumentOptionalEmail($event)"
@valid="setDocumentOptionalEmailValidity($event)"
/>
</v-card>
</section>
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -369,6 +378,19 @@ 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 Delivery email when a staff files.
* Default: staff email; editable.
*/
get documentOptionalEmail (): string {
return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
}
}
</script>

Expand Down
25 changes: 24 additions & 1 deletion src/views/ContinuationIn/ContinuationInReviewConfirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,15 @@
>
<DocumentDelivery
class="py-8 px-6"
:class="{ 'invalid-section': isDocumentDeliveryInvalid }"
:editableCompletingParty="isRoleStaff"
:invalidSection="isDocumentDeliveryInvalid"
:contactValue="getBusinessContact.email"
:completingPartyEmail="getUserEmail"
:documentOptionalEmail="documentOptionalEmail"
contactLabel="Registered Office"
@update:optionalEmail="setDocumentOptionalEmail($event)"
@valid="setDocumentOptionalEmailValidity($event)"
/>
</v-card>
</section>
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -302,6 +312,19 @@ 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 Delivery email when a staff files.
* Default: staff email; editable.
*/
get documentOptionalEmail (): string {
return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
}
}
</script>

Expand Down
10 changes: 9 additions & 1 deletion src/views/Dissolution/DissolutionReviewConfirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -497,6 +497,14 @@ export default class DissolutionReviewConfirm extends Mixins(DateMixin) {
get isCertifyInvalid (): boolean {
return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid)
}
/**
* Get the Document Delivery email when a staff files.
* Default: staff email; editable.
*/
get documentOptionalEmail (): string {
return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
}
}
</script>

Expand Down
10 changes: 9 additions & 1 deletion src/views/DissolutionFirm/DissolutionFirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
:contactValue="getBusinessContact.email"
:custodianEmail="getDissolutionCustodianEmail"
:completingPartyEmail="getUserEmail"
:documentOptionalEmail="getDocumentDelivery.documentOptionalEmail"
:documentOptionalEmail="documentOptionalEmail"
:additionalLabel="additionalLabel"
:additionalValue="additionalValue"
contactLabel="Business Contact"
Expand Down Expand Up @@ -501,6 +501,14 @@ export default class DissolutionFirm extends Mixins(DateMixin) {
]
}
/**
* Get the Document Delivery 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)
Expand Down
24 changes: 23 additions & 1 deletion src/views/Incorporation/IncorporationReviewConfirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,15 @@
>
<DocumentDelivery
class="py-8 px-6"
:class="{ 'invalid-section': isDocumentDeliveryInvalid }"
:editableCompletingParty="isRoleStaff"
:invalidSection="isDocumentDeliveryInvalid"
:contactValue="getBusinessContact.email"
:completingPartyEmail="getUserEmail"
:documentOptionalEmail="documentOptionalEmail"
contactLabel="Registered Office"
@update:optionalEmail="setDocumentOptionalEmail($event)"
@valid="setDocumentOptionalEmailValidity($event)"
/>
</v-card>
</section>
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -313,6 +322,19 @@ 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 Delivery email when a staff files.
* Default: staff email; editable.
*/
get documentOptionalEmail (): string {
return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
}
}
</script>

Expand Down
9 changes: 9 additions & 0 deletions src/views/Registration/RegistrationReviewConfirm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
:contactValue="getBusinessContact.email"
:editableCompletingParty="isRoleStaff || isSbcStaff"
:completingPartyEmail="getUserEmail"
:documentOptionalEmail="documentOptionalEmail"
:additionalLabel="documentDeliveryAdditionalLabel"
:additionalValue="documentDeliveryAdditionalValue"
:invalidSection="isDocumentDeliveryInvalid"
Expand Down Expand Up @@ -249,6 +250,14 @@ export default class RegistrationReviewConfirm extends Vue {
get isCertifyInvalid (): boolean {
return this.getValidateSteps && !(this.getCertifyState.certifiedBy && this.getCertifyState.valid)
}
/**
* Get the Document Delivery email when a staff files.
* Default: staff email; editable.
*/
get documentOptionalEmail (): string {
return this.getDocumentDelivery.documentOptionalEmail || this.getUserEmail
}
}
</script>

Expand Down

0 comments on commit 0388fcd

Please sign in to comment.