From 608997ad58a22a3d5a19a0ce0485559102c015d2 Mon Sep 17 00:00:00 2001
From: ketaki-deodhar <116035339+ketaki-deodhar@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:48:38 -0800
Subject: [PATCH] 18848 - add court order / POA component on review page (#604)

* 18848-add Court order on review page

* 18848-update package version
---
 package-lock.json                             |  4 +-
 package.json                                  |  2 +-
 .../AmalgamationRegular/ReviewConfirm.vue     | 53 ++++++++++---------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 460a4c90e..02a1673ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.17",
+  "version": "5.6.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.6.17",
+      "version": "5.6.18",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index c385e9590..a57fb1d74 100644
--- 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/views/AmalgamationRegular/ReviewConfirm.vue b/src/views/AmalgamationRegular/ReviewConfirm.vue
index 496fd47a7..5b4280496 100644
--- a/src/views/AmalgamationRegular/ReviewConfirm.vue
+++ b/src/views/AmalgamationRegular/ReviewConfirm.vue
@@ -179,15 +179,18 @@
       </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>
 
@@ -195,27 +198,29 @@
         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>
 
@@ -223,19 +228,15 @@
         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