Restrict Supplemental Allowances (#532)

* feat: remove undesired call to action from confirmation page

* feat: add funding agreement status to validator

* chore: remove unused vars

Author: trev-dev

frontend/src/services/applicationService.js

@@ -3,7 +3,7 @@ import { isEmpty } from 'lodash'
 import ApiService from '@/common/apiService'
 import { useApplicationsStore } from '@/stores/applications'
 import { useAuthStore } from '@/stores/auth'
-import { APPLICATION_RENEWAL_TYPES, APPLICATION_STATUS_CODES, ApiRoutes, CRM_STATE_CODES } from '@/utils/constants'
+import { APPLICATION_RENEWAL_TYPES, APPLICATION_STATUS_CODES, FUNDING_AGREEMENT_STATUS_CODES, ApiRoutes, CRM_STATE_CODES } from '@/utils/constants'
 
 function sortApplications(applications) {
   applications?.sort((app1, app2) => {
@@ -297,7 +297,7 @@ export default {
 
   checkFundingAgreement(fundingAgreement) {
     const isUnexpired = new Date() < new Date(fundingAgreement?.endDate)
-    return fundingAgreement?.stateCode === CRM_STATE_CODES.ACTIVE && isUnexpired
+    return fundingAgreement?.stateCode === CRM_STATE_CODES.ACTIVE && isUnexpired && fundingAgreement?.statusCode === FUNDING_AGREEMENT_STATUS_CODES.ACTIVE
   },
 
   async hasApprovedApplication(facilities = []) {

frontend/src/views/applications/ApplicationConfirmationView.vue

@@ -17,37 +17,6 @@
         </v-col>
       </v-row>
 
-      <v-card v-if="hasNonUnionFacilityGroupOrg" elevation="2" class="supp-applications-card">
-        <v-card-text class="px-8" py-6>
-          <v-row no-gutters class="align-center">
-            <v-col cols="12" md="8">
-              <p>You may be eligible for additional Allowances. Would you like to apply?</p>
-              <p class="mt-4">Available allowances:</p>
-              <ul class="pl-6">
-                <li>Indigenous programming</li>
-                <li>Support needs programming</li>
-                <li>Transportation allowance</li>
-              </ul>
-              <p class="mt-4">
-                You may apply for one or more allowances. You can also apply through
-                <router-link :to="{ name: 'applications-history' }">Applications</router-link>
-                at any time.
-              </p>
-            </v-col>
-            <v-col cols="12" md="4" align="right" class="my-4">
-              <AppButton
-                id="apply-button"
-                :primary="false"
-                size="large"
-                width="100px"
-                :disabled="!hasGoodStanding"
-                :to="{ name: 'supp-allowances-form', params: { applicationGuid: $route.params.applicationGuid } }">
-                Apply
-              </AppButton>
-            </v-col>
-          </v-row>
-        </v-card-text>
-      </v-card>
       <v-row justify="space-around" no-gutters class="mt-10">
         <AppBackButton id="back-home-button" :primary="false" width="250px" :to="{ name: 'home' }" align="center">Home</AppBackButton>
         <AppButton id="view-applications-button" size="large" width="250px" :to="{ name: 'applications-history' }" align="center" class="mt-2">View Applications</AppButton>
@@ -61,7 +30,7 @@ import AppButton from '@/components/ui/AppButton.vue'
 import AppBackButton from '@/components/ui/AppBackButton.vue'
 import AppAlertBanner from '@/components/ui/AppAlertBanner.vue'
 import alertMixin from '@/mixins/alertMixin'
-import { APPLICATION_STATUS_CODES, GOOD_STANDING_STATUS_CODES, NOT_IN_GOOD_STANDING_WARNING_MESSAGE, PROVIDER_TYPE_CODES, UNION_TYPE_CODES } from '@/utils/constants'
+import { APPLICATION_STATUS_CODES, GOOD_STANDING_STATUS_CODES, NOT_IN_GOOD_STANDING_WARNING_MESSAGE } from '@/utils/constants'
 import { useOrgStore } from '@/stores/org'
 import { useAuthStore } from '@/stores/auth'
 import { useApplicationsStore } from '@/stores/applications'
@@ -87,12 +56,6 @@ export default {
     hasGoodStanding() {
       return this.currentOrg?.goodStandingStatusCode === this.GOOD_STANDING_STATUS_CODES.GOOD
     },
-    hasNonUnionFacilityGroupOrg() {
-      if (this.currentOrg?.providerType === PROVIDER_TYPE_CODES.FAMILY) {
-        return false
-      }
-      return this.currentApplication?.isUnionized === UNION_TYPE_CODES.NO
-    },
   },
   async created() {
     try {