diff --git a/app/package.json b/app/package.json
index 785ee978e..c3b4f799c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "name-request",
- "version": "5.5.10",
+ "version": "5.5.11",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
@@ -17,7 +17,7 @@
"@babel/compat-data": "^7.24.4",
"@bcrs-shared-components/breadcrumb": "2.1.24",
"@bcrs-shared-components/corp-type-module": "1.0.15",
- "@bcrs-shared-components/enums": "1.1.13",
+ "@bcrs-shared-components/enums": "1.1.15",
"@bcrs-shared-components/folio-number-input": "^1.1.44",
"@bcrs-shared-components/genesys-web-message": "1.0.0",
"@bcrs-shared-components/interfaces": "1.0.67",
diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml
index 6ac7ec07d..c670721d4 100644
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
specifier: 1.0.15
version: 1.0.15
'@bcrs-shared-components/enums':
- specifier: 1.1.13
- version: 1.1.13
+ specifier: 1.1.15
+ version: 1.1.15
'@bcrs-shared-components/folio-number-input':
specifier: ^1.1.44
version: 1.1.44
@@ -928,8 +928,8 @@ packages:
'@bcrs-shared-components/corp-type-module@1.0.16':
resolution: {integrity: sha512-3MumJZ/0Urfnp1AGJpnUifk5DMrLcjDD+8YiGXy1WXjvpVLwA0S4bNPuvFUf0w4My+0HyXWZ/XsZWiQydVGYHw==}
- '@bcrs-shared-components/enums@1.1.13':
- resolution: {integrity: sha512-3kAFt9BvdSs1O8b0MIp4ysqt/QK1BzvkYEyju+0aI/fKeywFYOst8MOfmM47M3z4LKExOrmayj6M/S+5F+KkGw==}
+ '@bcrs-shared-components/enums@1.1.15':
+ resolution: {integrity: sha512-K86ctY66OPPlil+fRTiCeHxNjhSk5PwSn+hNnfdLNsauhzYrWC4MNHuQHcbilOxje6l56JTZtm446TlbPzPK2w==}
'@bcrs-shared-components/folio-number-input@1.1.44':
resolution: {integrity: sha512-CWQmST9C5DplVu+ArHPeetRruZhAyHZ5wfR49XFZCi4y2AnQ+9LjTvTXmiK66OK6aRyn0bQ5DU8wSXV9W4dcaA==}
@@ -7543,7 +7543,7 @@ snapshots:
'@bcrs-shared-components/corp-type-module@1.0.16': {}
- '@bcrs-shared-components/enums@1.1.13':
+ '@bcrs-shared-components/enums@1.1.15':
dependencies:
'@bcrs-shared-components/corp-type-module': 1.0.16
@@ -7561,18 +7561,18 @@ snapshots:
'@bcrs-shared-components/interfaces@1.0.67':
dependencies:
- '@bcrs-shared-components/enums': 1.1.13
+ '@bcrs-shared-components/enums': 1.1.15
vue: 2.7.16
'@bcrs-shared-components/interfaces@1.1.10':
dependencies:
'@bcrs-shared-components/corp-type-module': 1.0.15
- '@bcrs-shared-components/enums': 1.1.13
+ '@bcrs-shared-components/enums': 1.1.15
vue: 2.7.16
'@bcrs-shared-components/staff-payment@1.0.29(vue@2.7.10)':
dependencies:
- '@bcrs-shared-components/enums': 1.1.13
+ '@bcrs-shared-components/enums': 1.1.15
'@bcrs-shared-components/folio-number-input': 1.1.44
'@bcrs-shared-components/interfaces': 1.0.67
vue-property-decorator: 8.5.1(vue@2.7.10)
diff --git a/app/src/components/new-request/search-components/business-lookup-fetch.vue b/app/src/components/new-request/search-components/business-lookup-fetch.vue
index dec7f946c..a135c04c0 100644
--- a/app/src/components/new-request/search-components/business-lookup-fetch.vue
+++ b/app/src/components/new-request/search-components/business-lookup-fetch.vue
@@ -41,7 +41,7 @@ import BusinessFetch from '@/components/new-request/business-fetch.vue'
import BusinessLookup from '@/components/new-request/business-lookup.vue'
import SocietiesInfo from '@/components/dialogs/societies-info-dialog.vue'
import { BusinessSearchIF, FormType } from '@/interfaces'
-import { CorpTypeCd, CompanyTypes, EntityStates, EntityTypes, Location, NrRequestTypeCodes } from '@/enums'
+import { CorpTypeCd, CompanyTypes, EntityStates, Location } from '@/enums'
import { CommonMixin, SearchMixin } from '@/mixins'
@Component({
@@ -118,12 +118,6 @@ export default class BusinessLookupFetch extends Mixins(CommonMixin, SearchMixin
if (this.getSearchBusiness) {
// set the from business for alteration (conversion)
this.setOriginEntityTypeCd(this.getSearchBusiness.legalType)
- // special case if the from business is BEN
- // set conversionType and entityTypeCd because there's only one alteration type for it
- if (this.isBenBusiness) {
- this.setConversionType(NrRequestTypeCodes.CONVERT_CORP)
- this.setEntityTypeCd(EntityTypes.CR)
- }
} else {
// clear all related fields when clearing business search/fetch for alter
this.setConversionType(null)
diff --git a/app/src/components/new-request/search-components/entity-type.vue b/app/src/components/new-request/search-components/entity-type.vue
index b1b9e2bfc..bf160d0af 100644
--- a/app/src/components/new-request/search-components/entity-type.vue
+++ b/app/src/components/new-request/search-components/entity-type.vue
@@ -4,16 +4,7 @@
:cols="cols"
:md="md"
>
-
-
conv.value === nrRequestType)?.entity_type_cd || null
+ const entityType = ConversionTypes.find(conv =>
+ conv.value === nrRequestType && conv.origin_entity_type_cd === this.origin_entity_type_cd
+ )?.entity_type_cd || null
+
this.setEntityTypeCd(entityType)
this.setConversionType(type)
return