diff --git a/CHANGELOG.md b/CHANGELOG.md index 277779569..08b8b3098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Ignore case for forgot-password email [#970] [https://github.com/open-apparel-registry/open-apparel-registry/pull/970] +- Update 'parent company' label to 'parent company / supplier group' [#971] (https://github.com/open-apparel-registry/open-apparel-registry/pull/971) + ### Security ## [2.22.0] - 2020-02-20 diff --git a/src/app/src/actions/claimFacility.js b/src/app/src/actions/claimFacility.js index f8d118de2..de7b0f57f 100644 --- a/src/app/src/actions/claimFacility.js +++ b/src/app/src/actions/claimFacility.js @@ -118,7 +118,7 @@ export function fetchParentCompanyOptions() { .then(data => dispatch(completeFetchParentCompanyOptions(data))) .catch(err => dispatch(logErrorAndDispatchFailure( err, - 'An error prevented fetching parent company options', + 'An error prevented fetching parent company / supplier group options', failFetchParentCompanyOptions, ))); }; diff --git a/src/app/src/components/ClaimFacilityIntroStep.jsx b/src/app/src/components/ClaimFacilityIntroStep.jsx index 97c8196c1..a938cef94 100644 --- a/src/app/src/components/ClaimFacilityIntroStep.jsx +++ b/src/app/src/components/ClaimFacilityIntroStep.jsx @@ -73,7 +73,8 @@ export default function ClaimFacilityIntroStep() { - Add information about your head office and parent company + Add information about your head office + and parent company / supplier group diff --git a/src/app/src/components/ClaimedFacilitiesDetails.jsx b/src/app/src/components/ClaimedFacilitiesDetails.jsx index 9b3b91e42..dbca3b473 100644 --- a/src/app/src/components/ClaimedFacilitiesDetails.jsx +++ b/src/app/src/components/ClaimedFacilitiesDetails.jsx @@ -415,7 +415,7 @@ function ClaimedFacilitiesDetails({ /> - Parent Company + Parent Company / Supplier Group {get(data, 'facility_parent_company.name', null)} diff --git a/src/app/src/components/DashboardClaimsDetails.jsx b/src/app/src/components/DashboardClaimsDetails.jsx index e74a0ca8d..12a4ea906 100644 --- a/src/app/src/components/DashboardClaimsDetails.jsx +++ b/src/app/src/components/DashboardClaimsDetails.jsx @@ -163,7 +163,7 @@ function DashboardClaimsDetails({ } /> { const parentCompanyName = get(data, 'facility_parent_company.name', null); diff --git a/src/app/src/components/FacilityDetailSidebarClaimedInfo.jsx b/src/app/src/components/FacilityDetailSidebarClaimedInfo.jsx index 69b1fe620..9c328e647 100644 --- a/src/app/src/components/FacilityDetailSidebarClaimedInfo.jsx +++ b/src/app/src/components/FacilityDetailSidebarClaimedInfo.jsx @@ -76,7 +76,7 @@ export default function FacilityDetailsSidebarClaimedInfo({ value={facility.address} />