Skip to content

@W-21000344: [BOPIS] Pickup address component enhancement #3607

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
syadupathi-sf merged 1 commit into from
Jan 25, 2026
Merged

@W-21000344: [BOPIS] Pickup address component enhancement #3607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 31 additions & 10 deletions ...plate-retail-react-app/app/pages/checkout-one-click/partials/one-click-pickup-address.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
ToggleCard,
ToggleCardSummary
} from '@salesforce/retail-react-app/app/components/toggle-card'
import AddressDisplay from '@salesforce/retail-react-app/app/components/address-display'
import StoreDisplay from '@salesforce/retail-react-app/app/components/store-display'

// Hooks
import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context'
Expand All @@ -38,8 +38,6 @@ const PickupAddress = () => {
)
const pickupShipment = shipmentsWithItems.find((s) => isPickupShipment(s))

const selectedShippingAddress = pickupShipment?.shippingAddress

// Check if basket is a pickup order
const isPickupOrder = !!pickupShipment
const storeId = pickupShipment?.c_fromStoreId
Expand All @@ -54,6 +52,7 @@ const PickupAddress = () => {
}
)
const store = storeData?.data?.[0]
// Build address object for shipping API update (required for order processing)
const pickupAddress = {
address1: store?.address1,
city: store?.city,
Expand All @@ -64,8 +63,6 @@ const PickupAddress = () => {
lastName: 'Pickup',
phone: store?.phone
}
// Prefer store-derived address; only fall back to shipment shippingAddress if store unavailable
const displayAddress = pickupAddress || selectedShippingAddress

const submitAndContinue = async (address) => {
setIsLoading(true)
Expand Down Expand Up @@ -111,8 +108,21 @@ const PickupAddress = () => {
id="pickup_address.title.store_information"
/>
</Text>
{displayAddress ? (
<AddressDisplay address={displayAddress} />
{store ? (
<Box mb={4}>
<StoreDisplay
store={store}
showDistance={true}
showStoreHours={true}
showPhone={true}
showEmail={true}
nameStyle={{
fontSize: 'sm',
fontWeight: 'normal'
}}
textSize="sm"
/>
</Box>
) : isStoreLoading ? (
<Text>
<FormattedMessage
Expand All @@ -133,16 +143,27 @@ const PickupAddress = () => {
</Box>
</>
)}
{isPickupOrder && (displayAddress || isStoreLoading) && (
{isPickupOrder && (store || isStoreLoading) && (
<ToggleCardSummary>
<Text fontWeight="bold" fontSize="md" mb={2}>
<FormattedMessage
defaultMessage="Store Information"
id="pickup_address.title.store_information"
/>
</Text>
{displayAddress ? (
<AddressDisplay address={displayAddress} />
{store ? (
<StoreDisplay
store={store}
showDistance={true}
showStoreHours={true}
showPhone={true}
showEmail={true}
nameStyle={{
fontSize: 'sm',
fontWeight: 'normal'
}}
textSize="sm"
/>
) : (
<Text>
<FormattedMessage
Expand Down
52 changes: 48 additions & 4 deletions ...e-retail-react-app/app/pages/checkout-one-click/partials/one-click-pickup-address.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
postalCode: '94105',
countryCode: 'US',
phone: '555-123-4567',
storeHours: 'Mon-Fri: 9AM-6PM',
c_customerServiceEmail: 'store@example.com',
storeHours: '<p>Mon-Fri: 9AM-6PM</p>',
storeType: 'retail'
}
]
Expand Down Expand Up @@ -74,10 +75,11 @@ jest.mock('@salesforce/retail-react-app/app/hooks/use-current-basket', () => ({
shipmentId: 'me',
shipmentTotal: 25.17,
shippingStatus: 'not_shipped',
shippingTotal: 5.99
shippingTotal: 5.99,
c_fromStoreId: 'store-123',
c_deliveryType: 'pickup'
}
],
c_fromStoreId: 'store-123'
]
},
derivedData: {
hasBasket: true,
Expand Down Expand Up @@ -125,8 +127,18 @@ describe('PickupAddress', () => {
expect(screen.getByText('Store Information')).toBeInTheDocument()
expect(screen.getByText('Continue to Payment')).toBeInTheDocument()

// Verify store name is displayed
expect(screen.getByText('Test Store')).toBeInTheDocument()

// Verify store address is displayed
expect(screen.getByText('123 Main Street')).toBeInTheDocument()
expect(screen.getByText('San Francisco, CA 94105')).toBeInTheDocument()

// Verify Store Hours accordion is present
expect(screen.getByText('Store Hours')).toBeInTheDocument()

// Verify Store Contact Info accordion is present
expect(screen.getByText('Store Contact Info')).toBeInTheDocument()
})

test('submits pickup address and continues to payment', async () => {
Expand Down Expand Up @@ -158,4 +170,36 @@ describe('PickupAddress', () => {
})
})
})

test('displays store hours when accordion is expanded', async () => {
const {user} = renderWithProviders(<PickupAddress />)

await waitFor(() => {
expect(screen.getByText('Store Hours')).toBeInTheDocument()
})

// Click to expand the Store Hours accordion
await user.click(screen.getByText('Store Hours'))

await waitFor(() => {
expect(screen.getByText('Mon-Fri: 9AM-6PM')).toBeInTheDocument()
})
})

test('displays store contact info when accordion is expanded', async () => {
const {user} = renderWithProviders(<PickupAddress />)

await waitFor(() => {
expect(screen.getByText('Store Contact Info')).toBeInTheDocument()
})

// Click to expand the Store Contact Info accordion
await user.click(screen.getByText('Store Contact Info'))

await waitFor(() => {
// Email and phone are in the same element separated by <br />, use substring matcher
expect(screen.getByText(/Email: store@example\.com/)).toBeInTheDocument()
expect(screen.getByText(/Phone: 555-123-4567/)).toBeInTheDocument()
})
})
})
Loading