Skip to content
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.

Sign up for GitHub

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

25066 - Fix BEN Conversion for Unauthorized Users #791

Merged
merged 20 commits into from
Jan 3, 2025
+3 −26
Merged

25066 - Fix BEN Conversion for Unauthorized Users #791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6bea31f
25066-Update-allowable-BEN-conversions
meawong Dec 31, 2024
19c3ec3
25066-Lint fixes
meawong Jan 2, 2025
10bca27
25066-Use-namexservice-to-fetch-business
meawong Jan 3, 2025
aa2f1f1
Add logic for displaying name change button
meawong Nov 29, 2024
8c9fceb
update patch version
meawong Nov 29, 2024
a8beee9
Add feature flag check
meawong Nov 29, 2024
496d0dd
lint fix
meawong Nov 29, 2024
9fec1a3
24205 - updates for name change and alteration (#784)
ketaki-deodhar Dec 12, 2024
5156bbf
24605 additional address field error when editing nr (#785)
EPortman Dec 18, 2024
76a2a77
23332 - Enable request restoration NR for a limited restored company …
AimeeGao Dec 19, 2024
9cf1004
23332 - Fix request restoration nr for limited restored company (#787)
AimeeGao Dec 23, 2024
59c30cd
24841 display error when create payment fails (#788)
EPortman Dec 23, 2024
7163d75
25066-Update-allowable-BEN-conversions
meawong Dec 31, 2024
f1c7e8c
25066-Lint fixes
meawong Jan 2, 2025
f54cb2d
25066-Use-namexservice-to-fetch-business
meawong Jan 3, 2025
3edf707
25066-Remove-unecessary-import
meawong Jan 3, 2025
c79e155
Merge branch '25066-Fix-LEAR-BEN-conversion-for-numbered-companies' o…
meawong Jan 3, 2025
b15efb5
Merge branch 'main' of https://github.com/bcgov/namerequest into 2506…
meawong Jan 3, 2025
3093a86
25066-Remove fetch business service that is unused
meawong Jan 3, 2025
ce3e24f
25066-Update patch version
meawong Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "name-request",
"version": "5.5.17",
"version": "5.5.18",
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand Down
51 changes: 25 additions & 26 deletions app/src/components/existing-request/nr-approved-gray-box.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,31 @@
class="my-1"
>
<div
v-if="isAllowAlterOnline"
v-if="!isAllowAlterOnline && !getIsLearBusiness"
class="contact-registries mt-30"
>
<p>To complete this alteration, please contact us at:</p>
<p>
<v-icon small>
mdi-phone
</v-icon>&nbsp;Canada and U.S. Toll Free:
<a href="tel:+1877-526-1526">1-877-526-1526</a>
</p>
<p>
<v-icon small>
mdi-phone
</v-icon>&nbsp;Victoria Office:
<a href="tel:250-387-7848">250-387-7848</a>
</p>
<p>
<v-icon small>
mdi-email
</v-icon>&nbsp;Email:
<a href="mailto:[email protected]">[email protected]</a>
</p>
</div>
<div
v-else
class="d-flex justify-center"
>
<v-btn
Expand All @@ -137,31 +161,6 @@
<strong>Alter Now</strong>
</v-btn>
</div>

<div
v-else
class="contact-registries mt-30"
>
<p>To complete this alteration, please contact us at:</p>
<p>
<v-icon small>
mdi-phone
</v-icon>&nbsp;Canada and U.S. Toll Free:
<a href="tel:+1877-526-1526">1-877-526-1526</a>
</p>
<p>
<v-icon small>
mdi-phone
</v-icon>&nbsp;Victoria Office:
<a href="tel:250-387-7848">250-387-7848</a>
</p>
<p>
<v-icon small>
mdi-email
</v-icon>&nbsp;Email:
<a href="mailto:[email protected]">[email protected]</a>
</p>
</div>
</div>

<div
Expand Down
3 changes: 1 addition & 2 deletions app/src/components/new-request/search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
/>
</template>

<NumberedCompanyBullets v-if="isNumberedCompany" />
<NumberedCompanyBullets v-if="isNumberedCompany && !isAlterOnline(getConversionType) && !getIsLearBusiness" />
</template>

<!-- Restoration / Reinstatement flow -->
Expand Down Expand Up @@ -530,7 +530,6 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
if (
this.isConversion &&
this.isNumberedCompany &&
this.isAlterOnline(this.getConversionType) &&
this.getIsLearBusiness
) return true

Expand Down
3 changes: 2 additions & 1 deletion app/src/mixins/common-mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
import { GetFeatureFlag } from '@/plugins'
import { Action, Getter } from 'vuex-class'
import BusinessServices from '@/services/business-services'

Check warning on line 6 in app/src/mixins/common-mixin.ts

View workflow job for this annotation

GitHub Actions / namerequest-ci / linting-pnpm (21, 9) 

'BusinessServices' is defined but never used

Check warning on line 6 in app/src/mixins/common-mixin.ts

View workflow job for this annotation

GitHub Actions / namerequest-ci / verify-build (21, 9) 

'BusinessServices' is defined but never used
import { BusinessSearchIF } from '@/interfaces'
import { ActionBindingIF } from '@/interfaces/store-interfaces'
import NamexServices from '@/services/namex-services'

@Component({})
export class CommonMixin extends Vue {
Expand Down Expand Up @@ -239,7 +240,7 @@
/** Set store value of isLearBusiness flag by fetching business from Lear. */
async checkBusinessInLear (identifier: string): Promise<void> {
if (identifier) {
const fetchedBusiness = await BusinessServices.fetchBusiness(identifier)
const fetchedBusiness = await NamexServices.searchEntities(identifier)
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
if (fetchedBusiness) {
this.setIsLearBusiness(true)
} else {
Expand Down
Loading