Skip to content

Commit

Permalink
Dissolutions staff support and payment flow (#321)
Browse files Browse the repository at this point in the history
* Dissolutions staff support and payment flow

* updated dialog btn and test

* refactored enum/const
  • Loading branch information
cameron-eyds authored Jan 20, 2022
1 parent 54eb041 commit acf963c
Show file tree
Hide file tree
Showing 17 changed files with 219 additions and 190 deletions.
214 changes: 108 additions & 106 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-create-ui",
"version": "3.1.4",
"version": "3.1.5",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand All @@ -22,7 +22,7 @@
"@bcrs-shared-components/effective-date-time": "1.0.2",
"@bcrs-shared-components/enums": "1.0.14",
"@bcrs-shared-components/interfaces": "1.0.28",
"@bcrs-shared-components/staff-payment": "1.0.30",
"@bcrs-shared-components/staff-payment": "1.0.35",
"@mdi/font": "^5.5.55",
"@sentry/browser": "^5.21.1",
"@sentry/integrations": "^5.21.1",
Expand Down
11 changes: 8 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
:errors="saveErrors"
:warnings="saveWarnings"
@exit="goToDashboard(true)"
@okay="paymentErrorDialog = false"
/>

<SaveErrorDialog
Expand Down Expand Up @@ -205,6 +206,7 @@ import {
FilingStatus,
FilingTypes,
NameRequestStates,
RoleTypes,
RouteNames,
StaffPaymentOptions
} from '@/enums'
Expand Down Expand Up @@ -292,6 +294,9 @@ export default class App extends Mixins(
private saveWarnings: Array<object> = []
private fileAndPayInvalidNameRequestDialog: boolean = false
// Local const
private readonly STAFF_ROLE = 'STAFF'
// Enum for template
readonly RouteNames = RouteNames
Expand Down Expand Up @@ -838,7 +843,7 @@ export default class App extends Mixins(
} else if (userInfo.email) {
// this is an IDIR user
this.setUserEmail(userInfo.email)
} else {
} else if (userInfo.type !== this.STAFF_ROLE) {
throw new Error('Invalid user email')
}
Expand All @@ -848,8 +853,8 @@ export default class App extends Mixins(
} else if (userInfo.phone) {
// this is an IDIR user
this.setUserPhone(userInfo.phone)
} else {
console.info('Invalid user phone') // eslint-disable-line no-console
} else if (userInfo.type !== this.STAFF_ROLE) {
console.info('Invalid user phone')
}
if (!userInfo.firstname) throw new Error('Invalid user first name')
Expand Down
10 changes: 9 additions & 1 deletion src/assets/styles/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,12 @@ $app-green: #1a9031; // same as the Vuetify theme success
$app-dk-green: #2e8540; // used for success checkmarks, same as theme success-checkmark
$app-red: #d3272c; // same as the Vuetify theme error
$app-dk-blue: #38598a; // same as the Vuetify theme appDkBlue
$app-lt-gray: rgba(0, 0, 0, 0.54) // used for overriding Vuetify red validation color for checkboxes
$app-lt-gray: rgba(0, 0, 0, 0.54); // used for overriding Vuetify red validation color for checkboxes

// Sizes for Fonts
$px-11: 0.6875rem;
$px-12: 0.7500rem;
$px-13: 0.8125rem;
$px-14: 0.8750rem;
$px-15: 0.9375rem;
$px-16: 1.0000rem;
6 changes: 3 additions & 3 deletions src/components/CreateResolution/CompleteResolution.vue
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ export default class CompleteResolution extends Mixins(CommonMixin, DateMixin, E
}
private get isConfirmResolutionValid (): boolean {
return this.$refs.confirmResolutionChkRef.valid
return this.$refs.confirmResolutionChkRef?.valid
}
private isResolutionValid (): boolean {
Expand All @@ -525,9 +525,9 @@ export default class CompleteResolution extends Mixins(CommonMixin, DateMixin, E
this.$refs.resolutionDatePickerRef.isDateValid() &&
this.isSigningPersonValid &&
this.$refs.signatureDatePickerRef.isDateValid() &&
this.$refs.confirmResolutionChkRef.valid
this.$refs.confirmResolutionChkRef?.valid
}
return this.$refs.confirmResolutionChkRef.valid
return this.$refs.confirmResolutionChkRef?.valid
}
private updateResolutionStepValidationDetail () {
Expand Down
Loading

0 comments on commit acf963c

Please sign in to comment.