Skip to content

@W-18902257 - [BOPIS] Implement feature toggle #2694

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

Merged
yunakim714 merged 19 commits into from
Jun 30, 2025
Merged

@W-18902257 - [BOPIS] Implement feature toggle #2694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c590cf1
cursor initial feature toggle implementation
yunakim714 Jun 30, 2025
02a740a
revert cart changes
yunakim714 Jun 30, 2025
40fee66
fix product view component
yunakim714 Jun 30, 2025
4c223fe
lint
yunakim714 Jun 30, 2025
4398c84
revert toggle
yunakim714 Jun 30, 2025
e1e8571
update payment partial
yunakim714 Jun 30, 2025
ebc6ac9
minor updates
yunakim714 Jun 30, 2025
1b3f2c2
remove helmet
yunakim714 Jun 30, 2025
f234555
revert product view changes
yunakim714 Jun 30, 2025
ac8af5d
revert store locator provider changes
yunakim714 Jun 30, 2025
6b0b4cc
revert pickup shipment hook changes
yunakim714 Jun 30, 2025
5434a65
remove redundant code
yunakim714 Jun 30, 2025
d8dbe57
remove redundancy
yunakim714 Jun 30, 2025
3c54e7b
remove redundant feature flag
yunakim714 Jun 30, 2025
80d30b6
cleanup
yunakim714 Jun 30, 2025
c0c3b15
lint
yunakim714 Jun 30, 2025
79ca98c
DRY storeinventory component
yunakim714 Jun 30, 2025
541b29a
fix unit test
yunakim714 Jun 30, 2025
5f5e531
Merge branch 'feature/shop-in-store' into W-18902257-bopis-feature-to…
yunakim714 Jun 30, 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
13 changes: 8 additions & 5 deletions packages/template-retail-react-app/app/components/_app/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ import {
THEME_COLOR,
CAT_MENU_DEFAULT_NAV_SSR_DEPTH,
CAT_MENU_DEFAULT_ROOT_CATEGORY,
DEFAULT_LOCALE
DEFAULT_LOCALE,
STORE_LOCATOR_IS_ENABLED
} from '@salesforce/retail-react-app/app/constants'

import Seo from '@salesforce/retail-react-app/app/components/seo'
Expand Down Expand Up @@ -354,10 +355,12 @@ const App = (props) => {

<Box id="app" display="flex" flexDirection="column" flex={1}>
<SkipNavLink zIndex="skipLink">Skip to Content</SkipNavLink>
<StoreLocatorModal
isOpen={isOpenStoreLocator}
onClose={onCloseStoreLocator}
/>
{STORE_LOCATOR_IS_ENABLED && (
<StoreLocatorModal
isOpen={isOpenStoreLocator}
onClose={onCloseStoreLocator}
/>
)}
<Box {...styles.headerWrapper}>
{!isCheckout ? (
<>
Expand Down
192 changes: 100 additions & 92 deletions packages/template-retail-react-app/app/components/product-view/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
} from '@salesforce/retail-react-app/app/components/shared/ui'
import {useCurrency, useDerivedProduct} from '@salesforce/retail-react-app/app/hooks'
import {useAddToCartModalContext} from '@salesforce/retail-react-app/app/hooks/use-add-to-cart-modal'
import {STORE_LOCATOR_IS_ENABLED} from '@salesforce/retail-react-app/app/constants'

// project components
import ImageGallery from '@salesforce/retail-react-app/app/components/image-gallery'
Expand Down Expand Up @@ -672,13 +673,8 @@ const ProductView = forwardRef(
<Box>
{showDeliveryOptions && (
<>
<Box mb={1}>
<Text
as="label"
fontWeight="bold"
mb={1}
display="block"
>
<Box mb={4}>
<Text fontWeight={600} mb={3}>
<FormattedMessage
defaultMessage="Delivery:"
id="product_view.label.delivery"
Expand All @@ -696,95 +692,107 @@ const ProductView = forwardRef(
id="product_view.label.ship_to_address"
/>
</Radio>
<Radio
value="pickup"
isDisabled={
!pickupEnabled ||
(storeName &&
inventoryId &&
isSelectedStoreOutOfStock)
}
>
<FormattedMessage
defaultMessage="Pickup in Store"
id="product_view.label.pickup_in_store"
/>
</Radio>
{STORE_LOCATOR_IS_ENABLED && (
<Radio
value="pickup"
isDisabled={
!pickupEnabled ||
(storeName &&
inventoryId &&
isSelectedStoreOutOfStock)
}
>
<FormattedMessage
defaultMessage="Pickup in Store"
id="product_view.label.pickup_in_store"
/>
</Radio>
)}
</Stack>
</RadioGroup>
</Box>
{storeName && inventoryId && (
<Text
color="black"
fontWeight={600}
mb={2}
data-testid="store-stock-status-msg"
>
{!isSelectedStoreOutOfStock
? intl.formatMessage(
{
id: 'product_view.status.in_stock_at_store',
defaultMessage:
'In Stock at {storeName}'
},
{
storeName: (
<Link
as="button"
color="blue.600"
textDecoration="underline"
onClick={onOpenStoreLocator}
>
{storeName}
</Link>
)
}
)
: intl.formatMessage(
{
id: 'product_view.status.out_of_stock_at_store',
defaultMessage:
'Out of Stock at {storeName}'
},
{
storeName: (
<Link
as="button"
color="blue.600"
textDecoration="underline"
onClick={onOpenStoreLocator}
>
{storeName}
</Link>

{STORE_LOCATOR_IS_ENABLED && (
<>
{storeName && inventoryId && (
<Text
color="black"
fontWeight={600}
mb={2}
data-testid="store-stock-status-msg"
>
{!isSelectedStoreOutOfStock
? intl.formatMessage(
{
id: 'product_view.status.in_stock_at_store',
defaultMessage:
'In Stock at {storeName}'
},
{
storeName: (
<Link
as="button"
color="blue.600"
textDecoration="underline"
onClick={
onOpenStoreLocator
}
>
{storeName}
</Link>
)
}
)
}
)}
</Text>
)}
{/* Show label if pickup is disabled due to no store/inventoryId */}
{!pickupEnabled && !storeName && !inventoryId && (
<Text
color="black"
fontWeight={600}
mb={3}
data-testid="pickup-select-store-msg"
>
<FormattedMessage
defaultMessage="Pickup in "
id="product_view.label.pickup_in_select_store_prefix"
/>{' '}
<Link
as="button"
color="blue.600"
textDecoration="underline"
onClick={onOpenStoreLocator}
>
<FormattedMessage
defaultMessage="Select Store"
id="product_view.label.select_store_link"
/>
</Link>
</Text>
: intl.formatMessage(
{
id: 'product_view.status.out_of_stock_at_store',
defaultMessage:
'Out of Stock at {storeName}'
},
{
storeName: (
<Link
as="button"
color="blue.600"
textDecoration="underline"
onClick={
onOpenStoreLocator
}
>
{storeName}
</Link>
)
}
)}
</Text>
)}

{/* Show label if pickup is disabled due to no store/inventoryId */}
{!pickupEnabled && !storeName && !inventoryId && (
<Text
color="black"
fontWeight={600}
mb={3}
data-testid="pickup-select-store-msg"
>
<FormattedMessage
defaultMessage="Pickup in "
id="product_view.label.pickup_in_select_store_prefix"
/>{' '}
<Link
as="button"
color="blue.600"
textDecoration="underline"
onClick={onOpenStoreLocator}
>
<FormattedMessage
defaultMessage="Select Store"
id="product_view.label.select_store_link"
/>
</Link>
</Text>
)}
</>
)}
</>
)}
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/hooks/use-pickup-shipment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Salesforce, Inc.
* Copyright (c) 2025, Salesforce, Inc.
* All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
Expand Down
Loading
Loading