@W-18902385 - [BOPIS][Bug] Fix prefilling shipping address bug #2673
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,6 +83,7 @@ const ProductDetail = () => { | |
| const {data: basket, isLoading: isBasketLoading} = useCurrentBasket() | ||
| const {addItemToNewOrExistingBasket} = useShopperBasketsMutationHelper() | ||
| const updateItemsInBasketMutation = useShopperBasketsMutation('updateItemsInBasket') | ||
| const updateShipmentForBasketMutation = useShopperBasketsMutation('updateShipmentForBasket') | ||
| const {res} = useServerContext() | ||
| if (res) { | ||
| res.set( | ||
|
|
@@ -344,6 +345,66 @@ const ProductDetail = () => { | |
|
|
||
| const addToCartModal = useAddToCartModalContext() | ||
|
|
||
| /** | ||
| * Helper function to configure shipping method based on pickup selection | ||
| * @param {Object} basketResponse - The basket response from adding items | ||
| * @param {Array} productItems - Array of product items that were added | ||
| * @param {boolean} hasAnyPickupSelected - Whether any items have pickup selected | ||
| * @returns {Promise<void>} | ||
| */ | ||
| const configureShippingMethodIfNeeded = async ( | ||
| basketResponse, | ||
| productItems, | ||
| hasAnyPickupSelected | ||
| ) => { | ||
| if (!basketResponse?.basketId || !basketResponse.shipments.length) { | ||
| return | ||
| } | ||
|
|
||
| const currentShippingMethod = basketResponse.shipments[0].shippingMethod | ||
| const isCurrentlyPickup = isCurrentShippingMethodPickup(currentShippingMethod) | ||
|
|
||
| // Only configure if there's a mismatch between pickup selection and current method | ||
| if ( | ||
| (hasAnyPickupSelected && !isCurrentlyPickup) || | ||
| (!hasAnyPickupSelected && isCurrentlyPickup) | ||
| ) { | ||
| // Clear shipping address when there's a mismatch by updating shipment without shippingAddress | ||
| await updateShipmentForBasketMutation.mutateAsync({ | ||
| parameters: { | ||
| basketId: basketResponse.basketId, | ||
| shipmentId: 'me' | ||
| }, | ||
| body: { | ||
| shippingAddress: {} | ||
| } | ||
|
||
| }) | ||
|
|
||
| // Fetch shipping methods to get available options | ||
| const {data: fetchedShippingMethods} = await refetchShippingMethods() | ||
|
|
||
| if (hasAnyPickupSelected && !isCurrentlyPickup) { | ||
| // Configure pickup shipment if pickup is selected but current method is not pickup | ||
| const pickupShippingMethodId = getPickupShippingMethodId(fetchedShippingMethods) | ||
| await configurePickupShipment( | ||
| basketResponse.basketId, | ||
| productItems, | ||
| selectedStore, | ||
| { | ||
| pickupShippingMethodId | ||
| } | ||
| ) | ||
| } else if (!hasAnyPickupSelected && isCurrentlyPickup) { | ||
| // Configure regular shipping if pickup is not selected but current method is pickup | ||
| const defaultShippingMethodId = getDefaultShippingMethodId(fetchedShippingMethods) | ||
| await configureRegularShippingMethod( | ||
| basketResponse.basketId, | ||
| defaultShippingMethodId | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| const handleAddToCart = async (productSelectionValues = []) => { | ||
| try { | ||
| let productItems = productSelectionValues.map((item) => { | ||
|
|
@@ -415,37 +476,11 @@ const ProductDetail = () => { | |
| const basketResponse = await addItemToNewOrExistingBasket(productItems) | ||
|
|
||
| // Configure shipping method based on pickup selection | ||
| await configureShippingMethodIfNeeded( | ||
| basketResponse, | ||
| productItems, | ||
| hasAnyPickupSelected | ||
| ) | ||
|
|
||
| const productItemsForEinstein = productSelectionValues.map( | ||
| ({product, variant, quantity}) => ({ | ||
|
|
@@ -626,26 +661,7 @@ const ProductDetail = () => { | |
| } | ||
|
|
||
| // Configure shipping method based on pickup selection | ||
| await configureShippingMethodIfNeeded(res, productItems, hasAnyPickupSelected) | ||
|
|
||
| einstein.sendAddToCart(productItems) | ||
| // Open modal with itemsAdded and selectedQuantity for bundles | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created a helper function to DRY code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
love it. is it possible to move this to use-pickup-shipment?