Skip to content

Commit

Permalink
Merge branch 'main' into ofmcc-5446-time-picker-timezone-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
vietle-cgi committed Aug 6, 2024
2 parents 2b7226e + a4f712a commit d8218b7
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ import AppButton from '@/components/ui/AppButton.vue'
import AppDialog from '@/components/ui/AppDialog.vue'
import ApplicationService from '@/services/applicationService'
import alertMixin from '@/mixins/alertMixin'
import permissionsMixin from '@/mixins/permissionsMixin'
import DocumentService from '@/services/documentService'
import FundingAgreementService from '@/services/fundingAgreementService'
import IndigenousProgrammingSummary from '@/components/supp-allowances/IndigenousProgrammingSummary.vue'
Expand All @@ -98,7 +99,7 @@ import rules from '@/utils/rules'
export default {
components: { AppDialog, AppButton, IndigenousProgrammingSummary, SupportNeedsSummary, TransportationSummary },
mixins: [alertMixin],
mixins: [alertMixin, permissionsMixin],
props: {
back: {
type: Boolean,
Expand Down Expand Up @@ -176,7 +177,7 @@ export default {
return this.isIndigenousComplete && this.isSupportComplete && this.isTransportComplete
},
readonly() {
return !this.isApplicationComplete || this.processing || this.loading
return !this.isApplicationComplete || this.processing || this.loading || !this.hasPermission(this.PERMISSIONS.APPLY_FOR_FUNDING)
},
},
watch: {
Expand Down Expand Up @@ -309,7 +310,7 @@ export default {
}
},
setSubmit() {
this.$emit('setSubmit', this.supplementaryDeclaration && this.isApplicationComplete)
this.$emit('setSubmit', this.supplementaryDeclaration && this.isApplicationComplete && this.hasPermission(this.PERMISSIONS.APPLY_FOR_FUNDING))
},
async saveApplication(showAlert = false, isSubmit = false) {
try {
Expand Down

0 comments on commit d8218b7

Please sign in to comment.