Skip to content

@W-20542850 Remove promotion from Shipping Method summary view #3563

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 2 commits into from
Jan 7, 2026
Merged

@W-20542850 Remove promotion from Shipping Method summary view #3563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb48c0
W-20542850 Remove promotion from Shipping Method summary view
syadupathi-sf Jan 7, 2026
8568925
add translations
syadupathi-sf Jan 7, 2026
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
84 changes: 22 additions & 62 deletions ...ate-retail-react-app/app/pages/checkout-one-click/partials/one-click-shipping-options.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,22 +248,18 @@ export default function ShippingOptions() {
id: 'checkout_confirmation.label.free'
})

let shippingPriceLabel = selectedMethodDisplayPrice
if (selectedMethodDisplayPrice !== shippingItem.price) {
const currentPrice =
selectedMethodDisplayPrice === 0 ? freeLabel : selectedMethodDisplayPrice

shippingPriceLabel = formatMessage(
{
defaultMessage: 'Originally {originalPrice}, now {newPrice}',
id: 'checkout_confirmation.label.shipping.strikethrough.price'
},
{
originalPrice: shippingItem.price,
newPrice: currentPrice
}
)
}
const shippingPriceLabel =
selectedMethodDisplayPrice === 0
? freeLabel
: formatMessage(
{
defaultMessage: '{price}',
id: 'checkout_confirmation.label.shipping.price'
},
{
price: selectedMethodDisplayPrice
}
)

return (
<ToggleCard
Expand Down Expand Up @@ -398,7 +394,6 @@ export default function ShippingOptions() {
<SingleShipmentSummary
selectedShippingMethod={selectedShippingMethod}
selectedMethodDisplayPrice={selectedMethodDisplayPrice}
shippingItem={shippingItem}
shippingPriceLabel={shippingPriceLabel}
currency={currency}
freeLabel={freeLabel}
Expand Down Expand Up @@ -497,7 +492,6 @@ MultiShipmentSummary.propTypes = {
const SingleShipmentSummary = ({
selectedShippingMethod,
selectedMethodDisplayPrice,
shippingItem,
shippingPriceLabel,
currency,
freeLabel
Expand All @@ -506,46 +500,21 @@ const SingleShipmentSummary = ({
<ToggleCardSummary>
<Flex justify="space-between" w="full">
<Text>{selectedShippingMethod.name}</Text>
<Flex alignItems="center" aria-label={shippingPriceLabel} role="group">
<Text fontWeight="bold" aria-hidden="true" role="presentation">
{selectedMethodDisplayPrice === 0 ? (
freeLabel
) : (
<FormattedNumber
value={selectedMethodDisplayPrice}
style="currency"
currency={currency}
/>
)}
</Text>
{selectedMethodDisplayPrice !== shippingItem.price && (
<Text
fontWeight="normal"
textDecoration="line-through"
color="gray.600"
marginLeft={1}
aria-hidden="true"
role="presentation"
>
<FormattedNumber
style="currency"
currency={currency}
value={shippingItem.price}
/>
</Text>
<Text fontWeight="bold" aria-label={shippingPriceLabel}>
{selectedMethodDisplayPrice === 0 ? (
freeLabel
) : (
<FormattedNumber
value={selectedMethodDisplayPrice}
style="currency"
currency={currency}
/>
)}
</Flex>
</Text>
</Flex>
<Text fontSize="sm" color="gray.700">
{selectedShippingMethod.description}
</Text>
{shippingItem?.priceAdjustments?.map((adjustment) => {
return (
<Text key={adjustment.priceAdjustmentId} fontSize="sm" color="green.600">
{adjustment.itemText}
</Text>
)
})}
</ToggleCardSummary>
)
}
Expand All @@ -556,15 +525,6 @@ SingleShipmentSummary.propTypes = {
description: PropTypes.string
}).isRequired,
selectedMethodDisplayPrice: PropTypes.number.isRequired,
shippingItem: PropTypes.shape({
price: PropTypes.number,
priceAdjustments: PropTypes.arrayOf(
PropTypes.shape({
priceAdjustmentId: PropTypes.string,
itemText: PropTypes.string
})
)
}),
shippingPriceLabel: PropTypes.string.isRequired,
currency: PropTypes.string.isRequired,
freeLabel: PropTypes.string.isRequired
Expand Down
171 changes: 168 additions & 3 deletions ...retail-react-app/app/pages/checkout-one-click/partials/one-click-shipping-options.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ describe('ShippingOptions Component', () => {
})

describe('in summary view (PAYMENT step)', () => {
test('renders SingleShipmentSummary with price adjustments and strikethrough price', async () => {
test('renders SingleShipmentSummary without price adjustments and strikethrough price', async () => {
jest.resetModules()

jest.doMock(
Expand Down Expand Up @@ -500,7 +500,81 @@ describe('ShippingOptions Component', () => {

expect(screen.getAllByText('Standard Shipping').length).toBeGreaterThan(0)
expect(screen.getAllByText('5-7 business days').length).toBeGreaterThan(0)
expect(screen.getByText('50% off shipping!')).toBeInTheDocument()
// Verify promotion text is NOT shown in summary view
expect(screen.queryByText('50% off shipping!')).not.toBeInTheDocument()
// Verify only the final price is shown (no strikethrough)
// Price is formatted with currency code (US$4.99)
expect(screen.getByText(/4\.99/)).toBeInTheDocument()
// Verify original price with strikethrough is NOT shown
expect(screen.queryByText(/9\.99/)).not.toBeInTheDocument()
})

test('renders only final price in summary view when price differs from original', async () => {
jest.resetModules()

jest.doMock(
'@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context',
() => ({
useCheckout: jest.fn().mockReturnValue({
step: 4,
STEPS: {
CONTACT_INFO: 0,
PICKUP_ADDRESS: 1,
SHIPPING_ADDRESS: 2,
SHIPPING_OPTIONS: 3,
PAYMENT: 4
},
goToStep: mockGoToStep,
goToNextStep: mockGoToNextStep
})
})
)
jest.doMock('@salesforce/retail-react-app/app/hooks/use-current-customer', () => ({
useCurrentCustomer: () => ({
data: {customerId: 'test-customer-id', isRegistered: true}
})
}))
jest.doMock('@salesforce/retail-react-app/app/hooks/use-current-basket', () => ({
useCurrentBasket: () => ({
data: {
basketId: 'test-basket-id',
shipments: [
{
shipmentId: 'me',
shippingAddress: {address1: '123 Main St', city: 'Test City'},
shippingMethod: {
id: 'standard-shipping',
name: 'Standard Shipping',
description: '5-7 business days'
}
}
],
shippingItems: [
{
price: 9.99,
priceAfterItemDiscount: 0,
priceAdjustments: []
}
]
},
derivedData: {hasBasket: true, totalItems: 1, totalShippingCost: 0}
})
}))

const {renderWithProviders: localRenderWithProviders} = await import(
'@salesforce/retail-react-app/app/utils/test-utils'
)
const module = await import(
'@salesforce/retail-react-app/app/pages/checkout-one-click/partials/one-click-shipping-options'
)

localRenderWithProviders(<module.default />)

// Verify "Free" is shown (final price is 0)
// There may be multiple instances (edit view and summary view), so use getAllByText
expect(screen.getAllByText('Free').length).toBeGreaterThan(0)
// Verify original price is NOT shown
expect(screen.queryByText(/9\.99/)).not.toBeInTheDocument()
})

test('renders "Free" label when shipping cost is zero', async () => {
Expand Down Expand Up @@ -580,7 +654,8 @@ describe('ShippingOptions Component', () => {

localRenderWithProviders(<module.default />)

expect(screen.getByText('Free')).toBeInTheDocument()
// There may be multiple instances (edit view and summary view), so use getAllByText
expect(screen.getAllByText('Free').length).toBeGreaterThan(0)
})
})

Expand Down Expand Up @@ -1014,6 +1089,96 @@ describe('ShippingOptions Component', () => {
screen.getByText('Jane Doe, 456 Oak Avenue, Seattle, WA, 98101')
).toBeInTheDocument()
})

test('displays shipping promotions in edit view for multi-shipment', async () => {
jest.resetModules()

const methodsWithPromos = {
defaultShippingMethodId: 'std',
applicableShippingMethods: [
{
id: 'std',
name: 'Standard Shipping',
description: '4-5 days',
price: 5.99,
shippingPromotions: [
{
promotionId: 'promo1',
calloutMsg: 'Free Shipping Amount Above 50'
}
]
},
{
id: 'exp',
name: 'Express Shipping',
description: 'Overnight',
price: 10,
shippingPromotions: []
}
]
}

jest.doMock(
'@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context',
() => ({
useCheckout: jest.fn().mockReturnValue({
step: 3,
STEPS: {
CONTACT_INFO: 0,
PICKUP_ADDRESS: 1,
SHIPPING_ADDRESS: 2,
SHIPPING_OPTIONS: 3,
PAYMENT: 4
},
goToStep: mockGoToStep,
goToNextStep: mockGoToNextStep
})
})
)
jest.doMock('@salesforce/retail-react-app/app/hooks/use-current-customer', () => ({
useCurrentCustomer: () => ({
data: {customerId: null, isRegistered: false}
})
}))
jest.doMock('@salesforce/retail-react-app/app/hooks/use-current-basket', () => ({
useCurrentBasket: () => ({
data: {
basketId: 'test-basket-id',
shipments: [
{
shipmentId: 'ship1',
shippingAddress: {
firstName: 'John',
lastName: 'Smith',
address1: '789 Elm Street',
city: 'Portland',
stateCode: 'OR',
postalCode: '97201'
},
shippingMethod: null
}
],
shippingItems: [{shipmentId: 'ship1', price: 0}]
},
derivedData: {hasBasket: true, totalItems: 1}
})
}))

const sdk = await import('@salesforce/commerce-sdk-react')
sdk.useShippingMethodsForShipment.mockReturnValue({data: methodsWithPromos})

const {renderWithProviders: localRenderWithProviders} = await import(
'@salesforce/retail-react-app/app/utils/test-utils'
)
const module = await import(
'@salesforce/retail-react-app/app/pages/checkout-one-click/partials/one-click-shipping-options'
)

localRenderWithProviders(<module.default />)

// Verify promotion text is shown in edit view
expect(screen.getByText('Free Shipping Amount Above 50')).toBeInTheDocument()
})
})

describe('multi-shipment summary view', () => {
Expand Down
16 changes: 2 additions & 14 deletions packages/template-retail-react-app/app/static/translations/compiled/en-GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,22 +1147,10 @@
"value": "Shipping"
}
],
"checkout_confirmation.label.shipping.strikethrough.price": [
{
"type": 0,
"value": "Originally "
},
{
"type": 1,
"value": "originalPrice"
},
{
"type": 0,
"value": ", now "
},
"checkout_confirmation.label.shipping.price": [
{
"type": 1,
"value": "newPrice"
"value": "price"
}
],
"checkout_confirmation.label.subtotal": [
Expand Down
16 changes: 2 additions & 14 deletions packages/template-retail-react-app/app/static/translations/compiled/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,22 +1147,10 @@
"value": "Shipping"
}
],
"checkout_confirmation.label.shipping.strikethrough.price": [
{
"type": 0,
"value": "Originally "
},
{
"type": 1,
"value": "originalPrice"
},
{
"type": 0,
"value": ", now "
},
"checkout_confirmation.label.shipping.price": [
{
"type": 1,
"value": "newPrice"
"value": "price"
}
],
"checkout_confirmation.label.subtotal": [
Expand Down
Loading
Loading