Skip to content

@W-19273013 feat: Set shipping method prices correctly in edit and summary mode #3075

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

Jump to bottom
Draft
wants to merge 88 commits into
base: develop
Choose a base branch
from
Draft

@W-19273013 feat: Set shipping method prices correctly in edit and summary mode #3075

wants to merge 88 commits into from

Conversation

sf-henry-semaganda
Copy link
Contributor

@sf-henry-semaganda sf-henry-semaganda commented Aug 12, 2025 •
edited
Loading

Description

Shipping options showed base prices instead of after promotional pricing when applicable or otherwise, creating mismatch with promotional messages.
Solution was to use updated shipping options from basket data instead of getShippingMethodsForShipment API base prices.

shipping_pricing.mov

Types of Changes

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Documentation update
  • Breaking change (could cause existing functionality to not work as expected)
  • Other changes (non-breaking changes that does not fit any of the above)

Breaking changes include:

  • Removing a public function or component or prop
  • Adding a required argument to a function
  • Changing the data type of a function parameter or return value
  • Adding a new peer dependency to package.json

Changes

  • (change1)

How to Test-Drive This PR

Testing Steps

  • Navigate to checkout with items that trigger shipping promotions
  • Go to shipping options step - verify promotional pricing display messages (e.g., £0.00 for free shipping)
  • Switch between edit/summary modes - ensure pricing remains consistent
  • Check cart summary shipping totals - verify shipping costs match between shipping options and cart summary
  • Test multiple shipments as well and - confirm individual and total shipping costs show promotional pricing correctly

Checklists

General

  • Changes are covered by test cases
  • CHANGELOG.md updated with a short description of changes (not required for documentation updates)

Accessibility Compliance

You must check off all items in one of the follow two lists:

  • There are no changes to UI

or...

Localization

  • Changes include a UI text update in the Retail React App (which requires translation)

shauryemahajanSF and others added 30 commits July 10, 2025 13:28
@shauryemahajanSF
new multiship branch with feature toggle
f18bf33
@gurpreetsainisalesforce
@W-18780652 - Multi Ship
410e39f
@gurpreetsainisalesforce
Revert "@W-18780652 - Multi Ship"
58b9f0d 
This reverts commit 410e39f.
@gurpreetsainisalesforce
@W-18780652 - Multi Ship Feature
eee491d
@gurpreetsainisalesforce
refactor: lint and test
2136e4d
@gurpreetsainisalesforce
chore: add multi ship condition
843249f
@patricksullivansf
@W-18669182 multiship cart support (#2784)
432aa7c
@gurpreetsainisalesforce
add isMultiShipEnabled
f923e77
@gurpreetsainisalesforce
revert changes
5afb4dd
@gurpreetsainisalesforce
pr review
2f032e2
@shauryemahajanSF
add to cart for multiship
927e402
@yunakim714 @shauryemahajanSF
@W-18954259 - [Multiship] Update Order Summary for multiship orders (#…
4f74527 
…2788)

Update Order Confirmation page to support multiple shipments with both Pickup and Delivery details

---------

Signed-off-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com>
Co-authored-by: Shaurye Mahajan <s.mahajan@salesforce.com>
@shauryemahajanSF
lint fix/commenting
4e4a7e2
@gurpreetsainisalesforce
fix pr comments
f875730
@gurpreetsainisalesforce
pr review: update naming
570372d
@gurpreetsainisalesforce
remove accidental files
41ed37a
@gurpreetsainisalesforce
cleanup
6738c72
@shauryemahajanSF
fix current unit tests
627eee7
@gurpreetsainisalesforce
reusing css
f8c9ea4
@gurpreetsainisalesforce
address for ltr languages
7bbfd31
@gurpreetsainisalesforce
revert
963b7f1
@gurpreetsainisalesforce
pr review
c46280d
@gurpreetsainisalesforce
more fixes
19eaa9f
@gurpreetsainisalesforce
accessibility
57faa3d
@gurpreetsainisalesforce
accessibility
ca5be50
@shauryemahajanSF
PR comments/Unit tests
70894b0
@shauryemahajanSF
minor styling fixes
7e90c3b
@shauryemahajanSF
styling
47fb781
@shauryemahajanSF
linting fix
5911e30
@gurpreetsainisalesforce
lint fixes
d006220
aditek-sf and others added 22 commits July 31, 2025 09:15
@aditek-sf
Fixed Shipping Method button functionality for multiship
de6b540
@shauryemahajanSF
@W-19175835 - Show Only Delivery Items in Multiship View (#2959)
3eebdde 
Show only delivery items in multiship view
@aditek-sf
Added tests and some minor impl changes
cc81a48
@aditek-sf
Merge branch 'feature/multiship' into t/commerce/spark/W-19159882/fix…
0f0c0c4 
…ShippingMethodButtonfunctionality

Signed-off-by: Aditya Tekur <126732792+aditek-sf@users.noreply.github.com>
@aditek-sf
Lint fixes
76f7824
@aditek-sf
Added comments
afd5807
@aditek-sf
Merge pull request #2963 from SalesforceCommerceCloud/t/commerce/spar…
89f6bbb 
…k/W-19159882/fixShippingMethodButtonfunctionality

@W-19159882 - fix shipping method button functionality
@patricksullivansf
@18669235 multiship cart inventory fixes (#2967)
ba903f6
@shauryemahajanSF
@W-18796904 - Set Shipments on Continue to Shipping Methods 2 (#2990)
f37f32c 
Fix Shipment Setting on Continue to Shipping Method
@gurpreetsainisalesforce
@W-19119093 - Multiship Shipping Options (#2976)
96e3b10 
* Shipping Options for MultiShip
@gurpreetsainisalesforce
@W-19119093 - Multiship PR review fixes (#3000)
565f433 
* PR review Fixes
@sf-henry-semaganda
@W-19159765 feat: guest multi ship address support (#3002)
1191704 
* show multi ship address product UI and add local component state addresses

* rebase with feature main

* harmonize variable namings for guest vs registered

* enaable/disable continue button when form open or no addresses for bth guest and authed user

* update selected address for both guest and registered

* display address product from loaded basket data

* revert unnesssary top state from shipping

* nit: remove extra line

* fix if block

* update selected addresses to correspond to both guest and registered user

* update tests

* update build files

* update multi ship to only look at delivery items

---------

Signed-off-by: sf-henry-semaganda <henry.semaganda@salesforce.com>
@gurpreetsainisalesforce
fix (#3016)
dff8132
@sf-henry-semaganda
@W-19168677 feat: set correct pickup addresses for each individual sh…
388c8ab 
…ipment (#3015)

* should should set all addresses of each pickup shipment

* update component tests
@shauryemahajanSF
@W-19183611 - Handle Shipments for Ship to Single Address (#3011)
bb590a2 
Handle Ship to Single Address Shipments
@shauryemahajanSF
Filter shipping methods for pick up if BOPIS enabled (#3020)
445ea85
@shauryemahajanSF
Add DEFAULT_SHIPMENT_ID to constants (#3024)
cbcdb2f
@patricksullivansf
@W-18822011 BOPIS Product Set Inventory (#3034)
40f2075
@gurpreetsainisalesforce
ChangeLog for MultiShip (#3064)
77bfadc
@gurpreetsainisalesforce
@W-18891305 - Multiship merge PR lint fixes (#3065)
e126c10 
* Lint Fixes
@gurpreetsainisalesforce
Merge branch 'develop' into feature/multiship
b996452
@sf-henry-semaganda
get shipping costs from parent basket shipping items
08fffcf
@sf-henry-semaganda sf-henry-semaganda requested a review from a team as a code owner August 12, 2025 22:30
@cc-prodsec
Copy link
Collaborator

cc-prodsec commented Aug 12, 2025 •
edited
Loading

🎉 Snyk checks have passed. No issues have been found so far.

✅ security/snyk check is complete. No issues have been found. (View Details)

✅ license/snyk check is complete. No issues have been found. (View Details)

@sf-henry-semaganda sf-henry-semaganda marked this pull request as draft August 12, 2025 22:38
@sf-henry-semaganda sf-henry-semaganda added the skip changelog Skip the "Changelog Check" GitHub Actions step even if the Changelog.md files are not updated label Aug 13, 2025
Base automatically changed from feature/multiship to develop August 27, 2025 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
skip changelog Skip the "Changelog Check" GitHub Actions step even if the Changelog.md files are not updated
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@sf-henry-semaganda @cc-prodsec @shauryemahajanSF @gurpreetsainisalesforce @patricksullivansf @yunakim714 @aditek-sf