Skip to content

use full tax and discount data for confirm checkout #1268

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

Open
pbennett1-godaddy wants to merge 2 commits into
base: main
Choose a base branch
from
Open

use full tax and discount data for confirm checkout #1268

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
d5f4d54
use full tax and discount data for confirm checkout
pbennett1-godaddy Jan 30, 2026
971c3ab
fix tax and discount input types
pbennett1-godaddy Feb 2, 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
10 changes: 6 additions & 4 deletions packages/react/src/components/checkout/discount/utils/use-get-price-adjustments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { useMutation } from '@tanstack/react-query';
import { useCheckoutContext } from '@/components/checkout/checkout';
import { useGoDaddyContext } from '@/godaddy-provider';
import { getDraftOrderPriceAdjustments } from '@/lib/godaddy/godaddy';
import type { DraftOrderPriceAdjustmentsQueryInput } from '@/types';
import type {
CalculatedAdjustments,
DraftOrderPriceAdjustmentsQueryInput,
} from '@/types';

type Vars = {
discountCodes: DraftOrderPriceAdjustmentsQueryInput['discountCodes'];
Expand All @@ -14,7 +17,7 @@ export function useGetPriceAdjustments() {
const { session, jwt } = useCheckoutContext();
const { apiHost } = useGoDaddyContext();

return useMutation<number | null | undefined, Error, Vars>({
return useMutation<CalculatedAdjustments | null | undefined, Error, Vars>({
mutationKey: [
'get-price-adjustments-by-discount-code',
session?.id ?? 'no-session',
Expand All @@ -34,8 +37,7 @@ export function useGetPriceAdjustments() {
apiHost
);

return data.checkoutSession?.draftOrder?.calculatedAdjustments
?.totalDiscountAmount?.value;
return data.checkoutSession?.draftOrder?.calculatedAdjustments;
},
});
}
99 changes: 53 additions & 46 deletions packages/react/src/components/checkout/payment/checkout-buttons/express/godaddy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import {
TrackingEventType,
track,
} from '@/tracking/track';
import type { CalculatedAdjustments, CalculatedTaxes } from '@/types';

export function ExpressCheckoutButton() {
const formatCurrency = useFormatCurrency();
Expand All @@ -60,7 +61,10 @@ export function ExpressCheckoutButton() {
undefined
);
const [error, setError] = useState('');
const [priceAdjustment, setPriceAdjustment] = useState<number | null>(null);
const [calculatedAdjustments, setCalculatedAdjustments] =
useState<CalculatedAdjustments | null>(null);
const [calculatedTaxes, setCalculatedTaxes] =
useState<CalculatedTaxes | null>(null);
const [appliedCouponCode, setAppliedCouponCode] = useState<string | null>(
null
);
Expand Down Expand Up @@ -177,7 +181,7 @@ export function ExpressCheckoutButton() {
let expressRequest = { ...poyntExpressRequest };

// If there's an applied coupon code and price adjustment, add it to the request
if (appliedCouponCode && priceAdjustment !== null) {
if (appliedCouponCode && calculatedAdjustments?.totalDiscountAmount) {
// console.log("[poynt collect] Adding discount to express request", {
// appliedCouponCode,
// priceAdjustment,
Expand All @@ -189,7 +193,7 @@ export function ExpressCheckoutButton() {
updatedLineItems.push({
label: t.totals.discount,
amount: formatCurrency({
amount: -priceAdjustment,
amount: -(calculatedAdjustments?.totalDiscountAmount?.value || 0),
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand All @@ -199,7 +203,8 @@ export function ExpressCheckoutButton() {

// Calculate the correct total in minor units
const totalInMinorUnits =
(totals?.subTotal?.value || 0) - priceAdjustment;
(totals?.subTotal?.value || 0) -
(calculatedAdjustments?.totalDiscountAmount?.value || 0);

const totalAmount = formatCurrency({
amount: totalInMinorUnits,
Expand All @@ -220,7 +225,7 @@ export function ExpressCheckoutButton() {
code: appliedCouponCode,
label: t.totals.discount,
amount: formatCurrency({
amount: -priceAdjustment,
amount: -(calculatedAdjustments?.totalDiscountAmount?.value || 0),
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -270,7 +275,7 @@ export function ExpressCheckoutButton() {
[
poyntExpressRequest,
appliedCouponCode,
priceAdjustment,
calculatedAdjustments,
t,
setCheckoutErrors,
]
Expand Down Expand Up @@ -322,7 +327,7 @@ export function ExpressCheckoutButton() {

if (result) {
setAppliedCouponCode(discountCodes?.[0]);
setPriceAdjustment(result);
setCalculatedAdjustments(result);
}
}
// Mark the fetch as complete regardless of whether there were discounts
Expand Down Expand Up @@ -355,12 +360,12 @@ export function ExpressCheckoutButton() {
let couponConfig:
| { code: string; label: string; amount: string }
| undefined;
if (priceAdjustment && appliedCouponCode) {
if (calculatedAdjustments?.totalDiscountAmount && appliedCouponCode) {
couponConfig = {
code: appliedCouponCode,
label: t.totals.discount,
amount: formatCurrency({
amount: priceAdjustment,
amount: calculatedAdjustments?.totalDiscountAmount?.value || 0,
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -392,7 +397,7 @@ export function ExpressCheckoutButton() {
session,
isPoyntLoaded,
isCollectLoading,
priceAdjustment,
calculatedAdjustments,
appliedCouponCode,
draftOrder,
couponFetchStatus,
Expand Down Expand Up @@ -550,7 +555,7 @@ export function ExpressCheckoutButton() {
if (!couponCode) {
// User removed the coupon code
setAppliedCouponCode(null);
setPriceAdjustment(null);
setCalculatedAdjustments(null);

// Add shipping and taxes if they exist
const finalLineItems = [...baseLineItems];
Expand Down Expand Up @@ -621,14 +626,16 @@ export function ExpressCheckoutButton() {
}

// Call the price adjustments mutation with the new coupon code
const adjustment = await getPriceAdjustments.mutateAsync({
const adjustments = await getPriceAdjustments.mutateAsync({
discountCodes: [couponCode],
shippingLines,
});

if (adjustment) {
if (adjustments?.totalDiscountAmount?.value) {
setAppliedCouponCode(couponCode);
setPriceAdjustment(adjustment);
setCalculatedAdjustments(adjustments);

const adjustmentValue = adjustments.totalDiscountAmount.value;

// Build line items with shipping, taxes, and the new discount
const finalLineItems = [...baseLineItems];
Expand Down Expand Up @@ -661,7 +668,7 @@ export function ExpressCheckoutButton() {
finalLineItems.push({
label: t.totals.discount,
amount: formatCurrency({
amount: -adjustment,
amount: -adjustmentValue,
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand All @@ -673,7 +680,7 @@ export function ExpressCheckoutButton() {
(totals?.subTotal?.value || 0) +
godaddyTotals.shipping.value +
godaddyTotals.taxes.value -
adjustment;
adjustmentValue;

const totalAmount = formatCurrency({
amount: totalInMinorUnits,
Expand All @@ -692,7 +699,7 @@ export function ExpressCheckoutButton() {
code: couponCode,
label: t.totals.discount,
amount: formatCurrency({
amount: -adjustment,
amount: -adjustmentValue,
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -766,14 +773,8 @@ export function ExpressCheckoutButton() {
shippingTotal: godaddyTotals.shipping,
}
: {}),
...(godaddyTotals.taxes
? {
taxTotal: {
value: godaddyTotals.taxes.value,
currencyCode: godaddyTotals.taxes.currencyCode,
},
}
: {}),
...(calculatedTaxes ? { calculatedTaxes } : {}),
...(calculatedAdjustments ? { calculatedAdjustments } : {}),
...(event?.billingAddress
? {
billing: {
Expand Down Expand Up @@ -958,10 +959,10 @@ export function ExpressCheckoutButton() {
shippingLines,
});

if (newAdjustments) {
setPriceAdjustment(newAdjustments);
if (newAdjustments?.totalDiscountAmount) {
setCalculatedAdjustments(newAdjustments);
} else {
setPriceAdjustment(null);
setCalculatedAdjustments(null);
setAppliedCouponCode('');
}
} catch (err) {
Expand All @@ -988,11 +989,14 @@ export function ExpressCheckoutButton() {
shippingAmount || '0'
);

if (taxesResult?.value) {
if (taxesResult?.totalTaxAmount?.value) {
// Store the full tax calculation response
setCalculatedTaxes(taxesResult);

poyntLineItems.push({
label: t.totals.estimatedTaxes,
amount: formatCurrency({
amount: taxesResult.value,
amount: taxesResult?.totalTaxAmount?.value,
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand All @@ -1003,7 +1007,7 @@ export function ExpressCheckoutButton() {
...value,
taxes: {
currencyCode: currencyCode,
value: taxesResult.value || 0,
value: taxesResult?.totalTaxAmount?.value || 0,
},
}));
}
Expand All @@ -1024,11 +1028,11 @@ export function ExpressCheckoutButton() {
}

// Add discount line if a coupon is applied
if (priceAdjustment && appliedCouponCode) {
if (calculatedAdjustments?.totalDiscountAmount && appliedCouponCode) {
poyntLineItems.push({
label: t.totals.discount,
amount: formatCurrency({
amount: -priceAdjustment,
amount: -(calculatedAdjustments?.totalDiscountAmount?.value || 0),
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -1057,12 +1061,12 @@ export function ExpressCheckoutButton() {
};

// Add coupon code to the request if one is applied
if (appliedCouponCode && priceAdjustment !== null) {
if (appliedCouponCode && calculatedAdjustments?.totalDiscountAmount) {
updatedOrder.couponCode = {
code: appliedCouponCode,
label: t.totals.discount,
amount: formatCurrency({
amount: -priceAdjustment,
amount: -(calculatedAdjustments?.totalDiscountAmount?.value || 0),
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -1126,10 +1130,10 @@ export function ExpressCheckoutButton() {
shippingLines,
});

if (newAdjustments) {
setPriceAdjustment(newAdjustments);
if (newAdjustments?.totalDiscountAmount) {
setCalculatedAdjustments(newAdjustments);
} else {
setPriceAdjustment(null);
setCalculatedAdjustments(null);
setAppliedCouponCode('');
}
} catch (err) {
Expand Down Expand Up @@ -1174,11 +1178,14 @@ export function ExpressCheckoutButton() {

// console.log("[poynt collect] Taxes result", { taxesResult });

if (taxesResult?.value) {
if (taxesResult?.totalTaxAmount?.value) {
// Store the full tax calculation response
setCalculatedTaxes(taxesResult);

poyntLineItems.push({
label: t.totals.estimatedTaxes,
amount: formatCurrency({
amount: taxesResult.value,
amount: taxesResult.totalTaxAmount.value,
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand All @@ -1189,7 +1196,7 @@ export function ExpressCheckoutButton() {
...value,
taxes: {
currencyCode: currencyCode,
value: taxesResult.value || 0,
value: taxesResult?.totalTaxAmount?.value || 0,
},
}));
}
Expand All @@ -1213,11 +1220,11 @@ export function ExpressCheckoutButton() {
}

// Add discount line if a coupon is applied
if (priceAdjustment && appliedCouponCode) {
if (calculatedAdjustments?.totalDiscountAmount && appliedCouponCode) {
poyntLineItems.push({
label: t.totals.discount,
amount: formatCurrency({
amount: -priceAdjustment,
amount: -(calculatedAdjustments?.totalDiscountAmount?.value || 0),
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -1247,12 +1254,12 @@ export function ExpressCheckoutButton() {
};

// Add coupon code to the request if one is applied
if (appliedCouponCode && priceAdjustment !== null) {
if (appliedCouponCode && calculatedAdjustments?.totalDiscountAmount) {
updatedOrder.couponCode = {
code: appliedCouponCode,
label: appliedCouponCode || 'Discount',
amount: formatCurrency({
amount: -priceAdjustment,
amount: -(calculatedAdjustments?.totalDiscountAmount?.value || 0),
currencyCode,
inputInMinorUnits: true,
returnRaw: true,
Expand Down Expand Up @@ -1296,7 +1303,7 @@ export function ExpressCheckoutButton() {
getSortedShippingMethods,
convertAddressToShippingLines,
getPriceAdjustments.mutateAsync,
priceAdjustment,
calculatedAdjustments,
appliedCouponCode,
t,
form,
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/checkout/taxes/utils/use-get-taxes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function useGetTaxes() {
)
: await getDraftOrderTaxes(session, { destination, lines }, apiHost);

return data.checkoutSession?.draftOrder?.calculatedTaxes?.totalTaxAmount;
return data.checkoutSession?.draftOrder?.calculatedTaxes;
},
});
}
Loading
Loading