Skip to content

Commit 10a03f8

Browse files
jenbeckettjenbeckett
committed
Merge branch 'release-2.1' of https://github.com/bcgov/EDUC-CCOF into ccfri-prod-save-parent-fees
update feature branch with release 2.1.8 code
2 parents 0b736e1 + a75db2d commit 10a03f8

7 files changed

+9
-9
lines changed

‎.github/workflows/deploy-to-openshift-backend-uat.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
# Process update-configmap
144144
curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/${{ env.BRANCH }}/tools/config/update-configmap.sh \
145145
| bash /dev/stdin \
146-
test \
146+
uat \
147147
${{ env.APP_NAME }} \
148148
${{ env.NAMESPACE }} \
149149
${{ env.SPLUNK_TOKEN }}

‎.github/workflows/deploy-to-openshift-frontend-uat.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
# Create tag for TEST env from DEV env image
123123
oc tag \
124124
${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ steps.get-latest-tag.outputs.tag }} \
125-
${{ env.NAMESPACE }}-uat/${{ env.REPO_NAME }}-${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ steps.get-latest-tag.outputs.tag }}
125+
${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ steps.get-latest-tag.outputs.tag }}
126126
127127
# Process and apply deployment template
128128
oc process \

‎frontend/src/components/LandingPage.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</div>
4343
<p class="pt-2" v-if="ccofStatus === CCOF_STATUS_NEW">
4444
For more information, visit the government website:
45-
<a class='text-decoration-underline' href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding">gov.bc.ca/childcareoperatingfunding</a>
45+
<a class='text-decoration-underline' href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/childcarebc-programs/child-care-operating-funding">gov.bc.ca/childcareoperatingfunding</a>
4646
</p>
4747
</template>
4848
<template #button>
@@ -119,7 +119,7 @@
119119
Current providers must renew their Funding Agreement every year. For more information, visit the government website:
120120
</p>
121121
<p>
122-
<a class='text-decoration-underline' style="pointer-events: all;" href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding">gov.bc.ca/childcareoperatingfunding</a>
122+
<a class='text-decoration-underline' style="pointer-events: all;" href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/childcarebc-programs/child-care-operating-funding">gov.bc.ca/childcareoperatingfunding</a>
123123
</p>
124124
<!-- <div class="text-h5 blueText" v-if="ccofRenewStatus === RENEW_STATUS_APPROVED">Status of the {{formattedProgramYear}} PCF: Approved</div> -->
125125
<div v-if="ccofRenewStatus === RENEW_STATUS_COMPLETE">

‎frontend/src/components/eceweApplication/EceweEligibility.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</v-icon>
2828
</span>
2929
<span>
30-
<strong>Note:</strong> Please read and understand the full eligibility requirements in the <u><a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding/wage-enhancement" target="_blank"> ECE-WE Funding Guidelines</a></u>. All CCFRI-eligible facilities must opt-in to CCFRI <u>to be eligible for ECE-WE.</u>
30+
<strong>Note:</strong> Please read and understand the full eligibility requirements in the <u><a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/childcarebc-programs/child-care-operating-funding/wage-enhancement" target="_blank"> ECE-WE Funding Guidelines</a></u>. All CCFRI-eligible facilities must opt-in to CCFRI <u>to be eligible for ECE-WE.</u>
3131
</span>
3232
</v-alert>
3333
</v-row>

‎frontend/src/components/requestChanges/ChangeInformation.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<br>
4040
<p class="px-10 text-h6">
4141
<br>
42-
<a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding/report-changes" target="_blank">
42+
<a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/childcarebc-programs/child-care-operating-funding/report-changes" target="_blank">
4343
Learn more about reporting changes</a> to your licence or service.
4444
<br>
4545
<b>Before you continue:</b>

‎frontend/src/components/requestChanges/ChangeNotificationDialogue.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<GroupChangeDialogueContent v-if="organizationProviderType === 'GROUP'"></GroupChangeDialogueContent>
1414
<FamilyChangeDialogueContent v-else></FamilyChangeDialogueContent>
1515
<v-row class="d-flex justify-center">
16-
<p>For more information about reporting changes, <a href='https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding/report-changes '>visit the Child Care Operating Funding Website</a>.</p>
16+
<p>For more information about reporting changes, <a href='https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/childcarebc-programs/child-care-operating-funding/report-changes '>visit the Child Care Operating Funding Website</a>.</p>
1717
</v-row>
1818
<NavButton :isProcessing="processing" :isNextDisplayed="true" class="mt-10" @previous="previous" @next="next">
1919
</NavButton>

‎frontend/src/components/requestChanges/ChangeNotificationForm.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<v-col class="col-lg-7 ">
1111
<v-row>
1212
<v-col class="col-lg-12">
13-
<a href="https://www2.gov.bc.ca/assets/gov/family-and-social-supports/child-care/cf1345_cc_operating_program_funding_agreement_change_notification.pdf" target="_blank">
13+
<a href="https://www2.gov.bc.ca/assets/download/E7A1C3009EA24111A7EFB93554D08428" target="_blank">
1414
<v-btn dark class="blueButton mb-10" x-large>
1515
<strong>Download a Change Notification Form</strong>
1616
</v-btn>
@@ -70,7 +70,7 @@
7070
</p>
7171
<p class="mt-10">
7272
For more information
73-
<a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/running-daycare-preschool/child-care-operating-funding" class="text-decoration-underline"> visit the Child Care Operating Funding website</a>
73+
<a href="https://www2.gov.bc.ca/gov/content/family-social-supports/caring-for-young-children/childcarebc-programs/child-care-operating-funding/report-changes" class="text-decoration-underline"> visit the Child Care Operating Funding website</a>
7474
</p>
7575
<p class="mt-10">
7676
Toll Free: <a href="tel:+18883386622" class="text-decoration-underline">1 888 338-6622 (Option 2)</a>

0 commit comments

Comments
 (0)