-
Notifications
You must be signed in to change notification settings - Fork 48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
18449 - GP/SP registration modify #582
Changes from all commits
a87d37e
3486641
4f29a2a
a458164
58f4beb
f4e518f
81fb8f5
761fbd4
07761d4
e6d351e
d9e559f
8872339
3ac5019
be78b27
5a4439a
354e507
d64594a
0c5e936
081225c
79db398
0dfd9e7
4329b98
04d951f
3c6bb43
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
<template> | ||
<ul class="contact-info pl-0"> | ||
<li class="contact-container"> | ||
<v-icon | ||
class="contact-icon" | ||
size="18px" | ||
> | ||
mdi-phone | ||
</v-icon> | ||
<span class="px-2">Canada and U.S. Toll Free:</span> | ||
<a | ||
href="tel:+1-877-370-1033" | ||
class="contact-value" | ||
>1-877-370-1033</a> | ||
</li> | ||
<li class="contact-container"> | ||
<v-icon | ||
class="contact-icon" | ||
size="18px" | ||
> | ||
mdi-phone | ||
</v-icon> | ||
<span class="px-2">Victoria Office:</span> | ||
<a | ||
href="tel:+1-250-370-1033" | ||
class="contact-value" | ||
>250-370-1033</a> | ||
</li> | ||
</ul> | ||
</template> | ||
|
||
<script lang="ts"> | ||
import { Component, Vue } from 'vue-property-decorator' | ||
|
||
@Component({}) | ||
export default class FirmContactInfo extends Vue {} | ||
</script> | ||
|
||
<style lang="scss" scoped> | ||
@import '@/assets/styles/theme.scss'; | ||
|
||
.contact-container { | ||
font-size: $px-15; | ||
color: $gray7; | ||
display: flex; | ||
} | ||
|
||
.contact-icon { | ||
flex: 0 0 1.375rem; | ||
justify-content: flex-start; | ||
color: $app-dk-blue; | ||
} | ||
|
||
.contact-value { | ||
flex: 1 1; | ||
} | ||
</style> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,8 +21,30 @@ | |
class="add-org-header" | ||
:class="{'error-text': !addPersonOrgFormValid}" | ||
> | ||
<span v-if="isNaN(activeIndex)">Add Business or Corporation</span> | ||
<span v-else>Edit Business or Corporation</span> | ||
<div v-if="isRoleStaff"> | ||
<span v-if="isNaN(activeIndex)">Add Business or Corporation</span> | ||
<span v-else>Edit Business or Corporation</span> | ||
</div> | ||
|
||
<div v-else> | ||
<template v-if="isNaN(activeIndex)"> | ||
<template v-if="isTypePartnership"> | ||
Add a Business as a Partner | ||
</template> | ||
<template v-else> | ||
Add a Business as the Proprietor | ||
</template> | ||
</template> | ||
|
||
<template v-else> | ||
<template v-if="isTypePartnership"> | ||
Edit a Business as a Partner | ||
</template> | ||
<template v-else> | ||
Edit a Business as the Proprietor | ||
</template> | ||
</template> | ||
</div> | ||
</label> | ||
|
||
<!-- Title for person --> | ||
|
@@ -104,9 +126,9 @@ | |
|
||
<!-- Business or Corporation --> | ||
<template v-if="isOrg"> | ||
<!-- Business or Corporation Unregistered in B.C. --> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Check with Mihai if we are ever going to use this again. I think we might so I recommend disabling this code instead of deleting it, but confirm first. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, I see in the uxpin, "Don't make changes for Registries staff. Make the changes for SBC staff and clients." There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. LGTM |
||
<!-- Business or Corporation Unregistered in B.C. (Registries Staff Only) --> | ||
<article | ||
v-if="!orgPerson.isLookupBusiness" | ||
v-if="!orgPerson.isLookupBusiness && isRoleStaff" | ||
class="manual-add-article" | ||
> | ||
<label> | ||
|
@@ -136,7 +158,7 @@ | |
</template> | ||
</p> | ||
|
||
<HelpContactUs class="mt-6" /> | ||
<HelpContactUs class="help" /> | ||
|
||
<!-- Confirm checkbox (org only) --> | ||
<v-checkbox | ||
|
@@ -188,9 +210,9 @@ | |
<v-divider class="mt-8" /> | ||
</article> | ||
|
||
<!-- Business or Corporation Look up --> | ||
<!-- Business or Corporation Look up with Registries Staff--> | ||
<article | ||
v-else | ||
v-else-if="isRoleStaff" | ||
class="business-lookup-article" | ||
> | ||
<label>Business or Corporation Registered in B.C.</label> | ||
|
@@ -235,7 +257,7 @@ | |
a bank or a railway, use the manual entry form. All other types of business cannot | ||
be a partner. | ||
</p> | ||
<HelpContactUs class="mt-6" /> | ||
<HelpContactUs class="help" /> | ||
</div> | ||
<div v-else> | ||
<p class="mt-6 mb-0"> | ||
|
@@ -256,6 +278,48 @@ | |
@undoBusiness="resetBusinessDetails()" | ||
/> | ||
</article> | ||
|
||
<!-- Business or Corporation Look up with SBC Staff or Clients--> | ||
<article | ||
v-else | ||
class="business-lookup-article" | ||
> | ||
<div | ||
v-if="hasBusinessSelectedFromLookup" | ||
class="mt-6" | ||
> | ||
<v-card | ||
outlined | ||
class="message-box rounded-0" | ||
> | ||
<p> | ||
<strong>Important:</strong> If the addresses shown below are out of date, you | ||
may update them here. The updates are applicable only to this application. | ||
</p> | ||
</v-card> | ||
</div> | ||
<div v-if="isProprietor"> | ||
<p class="mb-0"> | ||
Enter an existing B.C. business as the proprietor. | ||
</p> | ||
</div> | ||
<div v-else> | ||
<p class="mb-0"> | ||
Enter an existing B.C. business as a partner. | ||
</p> | ||
</div> | ||
|
||
<HelpContactUs class="help" /> | ||
|
||
<BusinessLookup | ||
:showErrors="enableRules" | ||
:businessLookup="inProgressBusinessLookup" | ||
:BusinessLookupServices="BusinessLookupServices" | ||
label="Business Name or Incorporation/Registration Number" | ||
@setBusiness="updateBusinessDetails($event)" | ||
@undoBusiness="resetBusinessDetails()" | ||
/> | ||
</article> | ||
</template> | ||
|
||
<!-- Roles --> | ||
|
@@ -540,6 +604,11 @@ div.three-column { | |
color: $gray7; | ||
} | ||
|
||
.help { | ||
margin-top: 30px; | ||
margin-bottom: 40px; | ||
} | ||
|
||
// align checkbox with top of its label | ||
:deep(.v-input--checkbox .v-input__slot) { | ||
align-items: flex-start; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import Vuetify from 'vuetify' | ||
import { mount } from '@vue/test-utils' | ||
import FirmContactInfo from '@/components/common/FirmContactInfo.vue' | ||
|
||
const vuetify = new Vuetify({}) | ||
|
||
describe('FirmContactInfo', () => { | ||
it('Displays expected content', () => { | ||
const wrapper = mount(FirmContactInfo, { vuetify }) | ||
|
||
// verify content | ||
const listItems = wrapper.findAll('.contact-container') | ||
expect(listItems.length).toBe(2) | ||
expect(listItems.at(0).find('span').text()).toBe('Canada and U.S. Toll Free:') | ||
expect(listItems.at(0).find('.contact-value').text()).toBe('1-877-370-1033') | ||
expect(listItems.at(1).find('span').text()).toBe('Victoria Office:') | ||
expect(listItems.at(1).find('.contact-value').text()).toBe('250-370-1033') | ||
|
||
wrapper.destroy() | ||
}) | ||
}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can use computed properties here instead when checking isTypePartnership.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
James and I discussed this, and he's right, but I think leaving the code like this is also acceptable as it's clear what's going on.