18848 - add court order / POA component on review page (bcgov#604)

* 18848-add Court order on review page * 18848-update package version
JazzarKarim · Dec 21, 2023 · a7bf48d · a7bf48d
1 parent d98100d
commit a7bf48d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.17",
+  "version": "5.6.18",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",

diff --git a/src/store/store.ts b/src/store/store.ts
@@ -581,12 +581,15 @@ export const useStore = defineStore('store', {
     isAmalgamationRegularValid (): boolean {
       // *** TODO: add checks for review page components
       const isFolioNumberValid = !this.isPremiumAccount || this.getFolioNumberValid
+      const isCourtOrderValid = this.isRoleStaff ? this.getCourtOrderStep.valid : true
+
       return (
         this.getAmalgamatingBusinessesValid &&
         this.isDefineCompanyValid &&
         this.isAddPeopleAndRolesValid &&
         this.isCreateShareStructureValid &&
-        isFolioNumberValid
+        isFolioNumberValid &&
+        isCourtOrderValid
       )
     },
 

diff --git a/src/views/AmalgamationRegular/ReviewConfirm.vue b/src/views/AmalgamationRegular/ReviewConfirm.vue
@@ -179,63 +179,64 @@
       </v-card>
     </section>
 
-    <!-- Certify -->
+    <!-- Court Order and Plan of Arrangement -->
     <section
-      id="certify-section"
+      v-if="isRoleStaff"
+      id="court-order-poa-section"
       class="mt-10"
     >
       <header>
-        <h2>Certify</h2>
+        <h2>Court Order and Plan of Arrangement</h2>
         <p class="mt-4">
-          Confirm the legal name of the person authorized to complete and submit this application.
+          If this filing is pursuant to a court order, enter the court order number. If this
+          filing is pursuant to a plan of arrangement, enter the court order number and select
+          Plan of Arrangement.
         </p>
       </header>
 
       <v-card
         flat
         class="mt-6"
       >
-        <Certify
+        <CourtOrderPoa
           class="py-8 px-6"
-          :class="{ 'invalid-section': isCertifyInvalid }"
-          :disableEdit="!isRoleStaff"
-          :invalidSection="isCertifyInvalid"
-          :isStaff="isRoleStaff"
+          :class="{ 'invalid-section': isCourtOrderInvalid }"
+          :draftCourtOrderNumber="getCourtOrderStep.courtOrder.fileNumber"
+          :hasDraftPlanOfArrangement="getCourtOrderStep.courtOrder.hasPlanOfArrangement"
+          :courtOrderNumberRequired="false"
+          :invalidSection="isCourtOrderInvalid"
+          @emitCourtNumber="setCourtOrderFileNumber($event)"
+          @emitPoa="setHasPlanOfArrangement($event)"
+          @emitValid="setCourtOrderValidity($event)"
         />
       </v-card>
     </section>
 
-    <!-- Court Order and Plan of Arrangement -->
-    <!-- <section
-      id="court-order-poa-section"
+    <!-- Certify -->
+    <section
+      id="certify-section"
       class="mt-10"
     >
       <header>
-        <h2>Court Order and Plan of Arrangement</h2>
+        <h2>Certify</h2>
         <p class="mt-4">
-          If this filing is pursuant to a court order, enter the court order number. If this
-          filing is pursuant to a plan of arrangement, enter the court order number and select
-          Plan of Arrangement.
+          Confirm the legal name of the person authorized to complete and submit this application.
         </p>
       </header>
 
       <v-card
         flat
         class="mt-6"
       >
-        <CourtOrderPoa
+        <Certify
           class="py-8 px-6"
-          :class="{ 'invalid-section': isCourtOrderInvalid }"
-          :draftCourtOrderNumber="getCourtOrderStep.courtOrder.fileNumber"
-          :hasDraftPlanOfArrangement="getCourtOrderStep.courtOrder.hasPlanOfArrangement"
-          :courtOrderNumberRequired="false"
-          :invalidSection="isCourtOrderInvalid"
-          @emitCourtNumber="setCourtOrderFileNumber($event)"
-          @emitPoa="setHasPlanOfArrangement($event)"
-          @emitValid="setCourtOrderValidity($event)"
+          :class="{ 'invalid-section': isCertifyInvalid }"
+          :disableEdit="!isRoleStaff"
+          :invalidSection="isCertifyInvalid"
+          :isStaff="isRoleStaff"
         />
       </v-card>
-    </section> -->
+    </section>
 
     <!-- Staff Payment -->
     <section