Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions src/payment/google.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,25 @@ export async function onPaymentDataChanged(intermediatePaymentData) {
);
}

// Auto-apply shipping if only one service is available
if (cart.shipment_rating.services.length === 1) {
const [singleService] = cart.shipment_rating.services;
let shippingService;

if (intermediatePaymentData.shippingOptionData?.id) {
const defaultServiceId =
intermediatePaymentData.shippingOptionData?.id;

shippingService = cart.shipment_rating.services.find(
(service) => service.id === defaultServiceId,
);
}

if (shippingService === undefined) {
// Auto-apply first shipping service in the list
shippingService = cart.shipment_rating.services[0];
}

if (cart.shipping?.service !== shippingService.id) {
cart = await this.updateCart({
shipping: { service: singleService.id },
shipping: { service: shippingService.id },
});
}

Expand Down
Loading