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

18202 show both named and numbered option for LTD company #735

Merged
merged 13 commits into from
Oct 26, 2023
Merged

18202 show both named and numbered option for LTD company #735

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b9ed41b
show both named and numbered option for LTD company
tshyun24 Oct 23, 2023
b6293d8
Go to COLIN
tshyun24 Oct 23, 2023
71e797f
update version after rebasing
tshyun24 Oct 23, 2023
cfb6103
create getter for COLIN text
tshyun24 Oct 23, 2023
f495ad9
fix the error on Xpro company
tshyun24 Oct 25, 2023
e08c17d
fix the error when no supported FF
tshyun24 Oct 25, 2023
7c82e55
Merge branch 'main' into 18202-missing-numbered-option
tshyun24 Oct 25, 2023
82a694f
Merge branch '18202-missing-numbered-option' of https://github.com/ts…
tshyun24 Oct 25, 2023
be8cbbf
update version
tshyun24 Oct 25, 2023
b12103e
create a local getter
tshyun24 Oct 25, 2023
ba74fa8
add comments with showRestoreNameInput
tshyun24 Oct 26, 2023
167c524
fix some small errors
tshyun24 Oct 26, 2023
5d8e3dc
trailing space
tshyun24 Oct 26, 2023
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion 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.3.0",
"version": "5.3.1",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand Down
9 changes: 4 additions & 5 deletions src/components/new-request/search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
<!-- Restoration / Reinstatement flow -->
<template v-else-if="isRestoration">
<BusinessLookupFetch />
<CompanyType v-if="getSearchBusiness && isBcRestorable && isSupportedRestoration(getEntityTypeCd)" />
<CompanyType v-if="getSearchBusiness && isBcRestorable" />
<Jurisdiction
v-if="isSelectedXproAndRestorable"
cols="12"
Expand All @@ -250,7 +250,7 @@
<!-- federal sub-flow -->
<XproFederalBullets v-if="isFederal && getSearchBusiness" />

<template v-if="(isRestorable && !isFederal) && (isNamedCompany || !isSupportedRestoration(getEntityTypeCd))">
<template v-if="isRestorable && !isFederal && isNamedCompany">
<v-col
cols="12"
:md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
Expand Down Expand Up @@ -291,7 +291,7 @@
:href="colinLink"
target="_blank"
>
Go to Corporate Online to {{ isConversion ? 'Alter' : 'Register' }}
Go to Corporate Online to {{ isConversion ? 'Alter' : isRestoration ? 'Restore' : 'Register'}}
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
<v-icon
right
small
Expand Down Expand Up @@ -622,8 +622,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
if (this.isRestoration) {
if (this.getEntityTypeCd && this.isNamedCompany && !this.isFederal) return true
if (this.getEntityTypeCd && this.isSelectedXproAndRestorable && !this.isFederal) return true
if (this.getSearchBusiness && this.isBcRestorable &&
!this.isSupportedRestoration(this.getEntityTypeCd)) return true
if (this.getSearchBusiness && this.isBcRestorable && this.isNamedCompany) return true
}

// Conditional for Continuation In Flow.
Expand Down
Loading