From f2475406f92b20fcabd403bfeaef99e385bfa88f Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 28 Sep 2023 11:20:11 -0700
Subject: [PATCH 1/3] ccfri 2193 update wording for parent fee closure
 addNewFees

---
 frontend/src/components/ccfriApplication/group/AddNewFees.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index aedadf54..9b407b13 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -206,8 +206,7 @@
           <div class="px-md-12 px-7">
             <br>
             <div>
-              <p>Do you charge parent fees at this facility for any closures on business days? Indicate the facility closures on business days within the current fiscal year other than <a href="https://www2.gov.bc.ca/gov/content/employment-business/employment-standards-advice/employment-standards/statutory-holidays"> British Columbia Statutory Holidays. </a> Only indicate the date of closures where parent fees are charged.
-              </p>
+              <p> Do you charge parent fees at this facility for any closures on business days (other than designated holidays)? Only indicate the date of closures where parent fees are charged. </p>
             </div>
             <v-radio-group
               required

From ca80d1e5f94da7fd3fc5be2fdfcb61759963452b Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 28 Sep 2023 11:46:00 -0700
Subject: [PATCH 2/3] ccfri 2841 back button for cr new fac goes to correct
 spot now

---
 .../src/components/ccfriApplication/group/AddNewFees.vue     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ccfriApplication/group/AddNewFees.vue b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
index 9b407b13..f8c48b0a 100644
--- a/frontend/src/components/ccfriApplication/group/AddNewFees.vue
+++ b/frontend/src/components/ccfriApplication/group/AddNewFees.vue
@@ -404,7 +404,7 @@
   </v-form>
 </template>
 <script>
-import { PATHS, pcfUrlGuid, pcfUrl } from '@/utils/constants';
+import { PATHS, pcfUrlGuid, pcfUrl, changeUrl} from '@/utils/constants';
 import { mapGetters, mapState, mapActions, mapMutations} from 'vuex';
 import alertMixin from '@/mixins/alertMixin';
 import globalMixin from '@/mixins/globalMixin';
@@ -543,6 +543,9 @@ export default {
       if (this.isReadOnly){
         this.$router.push(pcfUrl(PATHS.CCFRI_HOME, this.programYearId));
       }
+      else if(this.isChangeRequest){
+        this.$router.push(changeUrl(PATHS.CCFRI_HOME, this.changeRequestId));
+      }
       else if (this.isRenewal){
         this.$router.push(pcfUrlGuid(PATHS.CCFRI_CURRENT_FEES, this.programYearId, this.$route.params.urlGuid));
       }

From eee97c53c2ffb38708fb948b9af8e7a0f1abdb4c Mon Sep 17 00:00:00 2001
From: Jen Beckett <115109120+jenbeckett@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:06:29 -0700
Subject: [PATCH 3/3] fixed ccfri 2847 where RFI document upload was not
 unlocking properly

---
 frontend/src/components/RFI/RFIDocumentUpload.vue | 2 +-
 frontend/src/components/RFI/RFILanding.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/RFI/RFIDocumentUpload.vue b/frontend/src/components/RFI/RFIDocumentUpload.vue
index 8f5cf1ed..4c91c517 100644
--- a/frontend/src/components/RFI/RFIDocumentUpload.vue
+++ b/frontend/src/components/RFI/RFIDocumentUpload.vue
@@ -124,7 +124,7 @@ export default {
     ...mapGetters('navBar',['isChangeRequest']),
     ...mapGetters('reportChanges',['changeRequestStatus']),
     isLocked() {
-      if (this.currentFacility.unlockRfi === 1) {
+      if (this.currentFacility.unlockRfi) {
         return false;
       } else if(this.isChangeRequest){
         if (!this.changeRequestStatus){
diff --git a/frontend/src/components/RFI/RFILanding.vue b/frontend/src/components/RFI/RFILanding.vue
index 4458de50..6a1124d3 100644
--- a/frontend/src/components/RFI/RFILanding.vue
+++ b/frontend/src/components/RFI/RFILanding.vue
@@ -1609,7 +1609,7 @@ export default {
     },
     isReadOnly() {
       //if submitted, lock er up. If unlock CCFRI - unlock
-      if (this.currentFacility?.unlockRfi === 1) {
+      if (this.currentFacility?.unlockRfi) {
         return false;
       }else if(this.isChangeRequest){
         if (!this.changeRequestStatus||this.currentFacility.unlockRfi){