enh
This commit is contained in:
parent
3dca930fb3
commit
7ab2d71569
7 changed files with 738 additions and 116 deletions
|
|
@ -31,12 +31,13 @@ import { useGetCart, useUpdateCartItem, useRemoveFromCart } from '@/hooks/cart-q
|
||||||
import { useRegionalConsts } from '@/src/hooks/prominent-api-hooks';
|
import { useRegionalConsts } from '@/src/hooks/prominent-api-hooks';
|
||||||
import { useRegion } from '@/src/hooks/useRegion';
|
import { useRegion } from '@/src/hooks/useRegion';
|
||||||
import CheckoutAddressSelector from '@/components/CheckoutAddressSelector';
|
import CheckoutAddressSelector from '@/components/CheckoutAddressSelector';
|
||||||
|
import CouponBreakdownDialog from '@/src/components/CouponBreakdownDialog';
|
||||||
import LoginWall from '@/components/LoginWall';
|
import LoginWall from '@/components/LoginWall';
|
||||||
import CartAddressGate from '@/components/CartAddressGate';
|
import CartAddressGate from '@/components/CartAddressGate';
|
||||||
import { useAddressStore } from '@/src/store/addressStore';
|
import { useAddressStore } from '@/src/store/addressStore';
|
||||||
import { useCheckoutStore } from '@/src/store/checkoutStore';
|
import { useCheckoutStore } from '@/src/store/checkoutStore';
|
||||||
import type { FlashDeliveryProps } from '@packages/shared';
|
import type { FlashDeliveryProps } from '@packages/shared';
|
||||||
import { computeCouponStack, computeEligibleSubtotal, type CartLine } from '@packages/shared';
|
import { computeCouponStack, computeCouponLineBreakdowns, evaluateCouponEligibility, type CartLine, type CouponLineBreakdown } from '@packages/shared';
|
||||||
|
|
||||||
const formatDeliverySlot = (deliveryTime: string): string => {
|
const formatDeliverySlot = (deliveryTime: string): string => {
|
||||||
const time = dayjs(deliveryTime);
|
const time = dayjs(deliveryTime);
|
||||||
|
|
@ -353,19 +354,6 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
);
|
);
|
||||||
}, [products, productSlotsMap]);
|
}, [products, productSlotsMap]);
|
||||||
|
|
||||||
// Base total price without discounts for coupon eligibility check
|
|
||||||
const baseTotalPrice = useMemo(
|
|
||||||
() =>
|
|
||||||
cartItems
|
|
||||||
.filter((item) => !productSlotsMap[item.skuId]?.isOutOfStock)
|
|
||||||
.reduce((sum, item) => {
|
|
||||||
const product = productsById[item.skuId];
|
|
||||||
const price = product?.price || 0;
|
|
||||||
return sum + price * (quantities[item.id] || item.quantity);
|
|
||||||
}, 0),
|
|
||||||
[cartItems, quantities, productsById]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Cart lines (in-stock only) with their effective unit price, in the shared
|
// Cart lines (in-stock only) with their effective unit price, in the shared
|
||||||
// shape the coupon helpers expect. Declared before the coupon list so coupon
|
// shape the coupon helpers expect. Declared before the coupon list so coupon
|
||||||
// targeting can be evaluated against the cart.
|
// targeting can be evaluated against the cart.
|
||||||
|
|
@ -389,7 +377,10 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
|
|
||||||
// Every coupon we're allowed to surface (the API already drops expired,
|
// Every coupon we're allowed to surface (the API already drops expired,
|
||||||
// invalidated, usage-limit-exceeded and other users' personal coupons).
|
// invalidated, usage-limit-exceeded and other users' personal coupons).
|
||||||
// Ineligible ones are kept but flagged with the reason, and sorted to the end.
|
// Whether each one applies to THIS cart is decided locally — the shared
|
||||||
|
// resolver, the same rules the backend applies at placeOrder — so changing the
|
||||||
|
// cart never has to ask the server again. Ineligible ones are kept, flagged with
|
||||||
|
// the reason, and sorted to the end.
|
||||||
const eligibleCoupons = useMemo(() => {
|
const eligibleCoupons = useMemo(() => {
|
||||||
if (!couponsRaw?.data) return [];
|
if (!couponsRaw?.data) return [];
|
||||||
const isFirstOrder = couponsRaw.isFirstOrder ?? true;
|
const isFirstOrder = couponsRaw.isFirstOrder ?? true;
|
||||||
|
|
@ -398,20 +389,17 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
// Target SKUs live on the coupon row itself (empty => whole cart).
|
// Target SKUs live on the coupon row itself (empty => whole cart).
|
||||||
const applicableSkuIds = Array.isArray(coupon.skuIds) ? (coupon.skuIds as number[]) : [];
|
const applicableSkuIds = Array.isArray(coupon.skuIds) ? (coupon.skuIds as number[]) : [];
|
||||||
|
|
||||||
let reason: string | undefined;
|
const { isEligible, reason: ineligibilityReason } = evaluateCouponEligibility(
|
||||||
if (coupon.regionId != null && regionId != null && coupon.regionId !== regionId) {
|
{
|
||||||
reason = "Not valid in your region";
|
regionId: coupon.regionId,
|
||||||
} else if (coupon.isFirstOrderOnly && !isFirstOrder) {
|
isFirstOrderOnly: coupon.isFirstOrderOnly,
|
||||||
reason = "Valid on your first order only";
|
minOrder: coupon.minOrder,
|
||||||
} else if (coupon.minOrder && parseFloat(coupon.minOrder) > baseTotalPrice) {
|
maxLimitForUser: coupon.maxLimitForUser,
|
||||||
const shortfall = Math.ceil(parseFloat(coupon.minOrder) - baseTotalPrice);
|
usages: coupon.usages,
|
||||||
reason = `Add ₹${shortfall} more to use this coupon`;
|
applicableSkuIds,
|
||||||
} else if (
|
},
|
||||||
applicableSkuIds.length > 0 &&
|
{ cartLines, regionId, isFirstOrder }
|
||||||
computeEligibleSubtotal(cartLines, { applicableSkuIds }) <= 0
|
);
|
||||||
) {
|
|
||||||
reason = "No applicable items in your cart";
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: coupon.id,
|
id: coupon.id,
|
||||||
|
|
@ -428,14 +416,14 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
discountPercent: coupon.discountPercent,
|
discountPercent: coupon.discountPercent,
|
||||||
flatDiscount: coupon.flatDiscount,
|
flatDiscount: coupon.flatDiscount,
|
||||||
applicableSkuIds,
|
applicableSkuIds,
|
||||||
isEligible: !reason,
|
isEligible,
|
||||||
ineligibilityReason: reason,
|
ineligibilityReason,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// Applicable coupons first, disabled ones at the end (stable within groups).
|
// Applicable coupons first, disabled ones at the end (stable within groups).
|
||||||
return mapped.sort((a, b) => Number(b.isEligible) - Number(a.isEligible));
|
return mapped.sort((a, b) => Number(b.isEligible) - Number(a.isEligible));
|
||||||
}, [couponsRaw, baseTotalPrice, cartLines, regionId]);
|
}, [couponsRaw, cartLines, regionId]);
|
||||||
|
|
||||||
const updateCartItem = useUpdateCartItem({ showSuccessAlert: false, showErrorAlert: false, refetchCart: true }, cartType);
|
const updateCartItem = useUpdateCartItem({ showSuccessAlert: false, showErrorAlert: false, refetchCart: true }, cartType);
|
||||||
const removeFromCart = useRemoveFromCart({ showSuccessAlert: false, showErrorAlert: false, refetchCart: true }, cartType);
|
const removeFromCart = useRemoveFromCart({ showSuccessAlert: false, showErrorAlert: false, refetchCart: true }, cartType);
|
||||||
|
|
@ -451,6 +439,9 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
const [selectedSlots, setSelectedSlots] = useState<Record<number, number>>({});
|
const [selectedSlots, setSelectedSlots] = useState<Record<number, number>>({});
|
||||||
const [selectedCouponIds, setSelectedCouponIds] = useState<number[]>([]);
|
const [selectedCouponIds, setSelectedCouponIds] = useState<number[]>([]);
|
||||||
const [couponDialogOpen, setCouponDialogOpen] = useState(false);
|
const [couponDialogOpen, setCouponDialogOpen] = useState(false);
|
||||||
|
// Coupon whose per-product discount split is open (only product-specific ones
|
||||||
|
// have an "i" in the bill).
|
||||||
|
const [breakdownCouponId, setBreakdownCouponId] = useState<number | null>(null);
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
|
@ -609,6 +600,24 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
[couponDiscounts]
|
[couponDiscounts]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Where each applied coupon's discount landed, per cart line — the bill's "i"
|
||||||
|
// popup for product-specific coupons. Totals come from the same waterfall as the
|
||||||
|
// bill's own figures, so the popup's rows always add up to the coupon's line.
|
||||||
|
const couponBreakdowns = useMemo(() => {
|
||||||
|
const byId = new Map<number, CouponLineBreakdown>();
|
||||||
|
computeCouponLineBreakdowns(cartLines, selectedCoupons).forEach((entry) => {
|
||||||
|
byId.set(entry.couponId, entry);
|
||||||
|
});
|
||||||
|
return byId;
|
||||||
|
}, [cartLines, selectedCoupons]);
|
||||||
|
|
||||||
|
// Cart lines by SKU, for the popup's quantity × price line.
|
||||||
|
// The coupon whose per-product split is open, if it is still applied.
|
||||||
|
const breakdownCoupon =
|
||||||
|
breakdownCouponId != null ? couponById.get(breakdownCouponId) : undefined;
|
||||||
|
const breakdown =
|
||||||
|
breakdownCouponId != null ? couponBreakdowns.get(breakdownCouponId) : undefined;
|
||||||
|
|
||||||
const finalTotal = totalPrice - discountAmount;
|
const finalTotal = totalPrice - discountAmount;
|
||||||
|
|
||||||
const deliveryCharge = useMemo(
|
const deliveryCharge = useMemo(
|
||||||
|
|
@ -1465,16 +1474,31 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
key={coupon.id}
|
key={coupon.id}
|
||||||
style={tw`flex-row justify-between items-center mb-3`}
|
style={tw`flex-row justify-between items-center mb-3`}
|
||||||
>
|
>
|
||||||
<MyTouchableOpacity
|
<View style={tw`flex-row items-center flex-1 mr-2`}>
|
||||||
style={tw`flex-row items-center flex-1 mr-2`}
|
<MyTouchableOpacity
|
||||||
onPress={() => setCouponDialogOpen(true)}
|
style={tw`flex-row items-center`}
|
||||||
activeOpacity={0.7}
|
onPress={() => setCouponDialogOpen(true)}
|
||||||
>
|
activeOpacity={0.7}
|
||||||
<MaterialIcons name="local-offer" size={14} color="#EC4899" style={tw`mr-1.5`} />
|
>
|
||||||
<MyText style={tw`text-pink-600 font-medium`}>
|
<MaterialIcons name="local-offer" size={14} color="#EC4899" style={tw`mr-1.5`} />
|
||||||
{coupon.code}
|
<MyText style={tw`text-pink-600 font-medium`}>
|
||||||
</MyText>
|
{coupon.code}
|
||||||
</MyTouchableOpacity>
|
</MyText>
|
||||||
|
</MyTouchableOpacity>
|
||||||
|
{/* Product-specific coupon: how much came off each product. A
|
||||||
|
sibling of the row above, so it cannot open the applied-
|
||||||
|
coupons dialog by accident. */}
|
||||||
|
{coupon.applicableSkuIds.length > 0 && (
|
||||||
|
<MyTouchableOpacity
|
||||||
|
testID={`coupon-breakdown-${coupon.id}`}
|
||||||
|
onPress={() => setBreakdownCouponId(coupon.id)}
|
||||||
|
style={tw`p-1 ml-0.5`}
|
||||||
|
activeOpacity={0.7}
|
||||||
|
>
|
||||||
|
<MaterialIcons name="info-outline" size={14} color="#EC4899" />
|
||||||
|
</MyTouchableOpacity>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
<MyText style={tw`text-green-600 font-medium`}>
|
<MyText style={tw`text-green-600 font-medium`}>
|
||||||
-₹{Math.trunc(couponDiscounts[coupon.id] || 0)}
|
-₹{Math.trunc(couponDiscounts[coupon.id] || 0)}
|
||||||
</MyText>
|
</MyText>
|
||||||
|
|
@ -1645,6 +1669,14 @@ export default function CartPage({ isFlashDelivery = false }: FlashDeliveryProps
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
</AppContainer>
|
</AppContainer>
|
||||||
|
|
||||||
|
{/* Per-product discount split of one applied coupon (the bill's "i") */}
|
||||||
|
<CouponBreakdownDialog
|
||||||
|
coupon={breakdownCoupon ? { id: breakdownCoupon.id, code: breakdownCoupon.code } : null}
|
||||||
|
breakdown={breakdown ?? null}
|
||||||
|
cartLines={cartLines}
|
||||||
|
onClose={() => setBreakdownCouponId(null)}
|
||||||
|
/>
|
||||||
|
|
||||||
{/* Coupon Details Dialog */}
|
{/* Coupon Details Dialog */}
|
||||||
<BottomDialog
|
<BottomDialog
|
||||||
open={couponDialogOpen}
|
open={couponDialogOpen}
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,10 @@ import { useRegionalConsts } from '@/src/hooks/prominent-api-hooks';
|
||||||
import { useRegion } from '@/src/hooks/useRegion';
|
import { useRegion } from '@/src/hooks/useRegion';
|
||||||
import PaymentAndOrderComponent from '@/components/PaymentAndOrderComponent';
|
import PaymentAndOrderComponent from '@/components/PaymentAndOrderComponent';
|
||||||
import CheckoutAddressDisplay from '@/components/CheckoutAddressDisplay';
|
import CheckoutAddressDisplay from '@/components/CheckoutAddressDisplay';
|
||||||
|
import CouponBreakdownDialog from '@/src/components/CouponBreakdownDialog';
|
||||||
import { useAddressStore } from '@/src/store/addressStore';
|
import { useAddressStore } from '@/src/store/addressStore';
|
||||||
import type { FlashDeliveryProps } from '@packages/shared';
|
import type { FlashDeliveryProps } from '@packages/shared';
|
||||||
import { computeCouponStack, type CartLine } from '@packages/shared';
|
import { computeCouponStack, computeCouponLineBreakdowns, evaluateCouponEligibility, type CartLine, type CouponLineBreakdown } from '@packages/shared';
|
||||||
|
|
||||||
const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false }) => {
|
const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false }) => {
|
||||||
const params = useLocalSearchParams();
|
const params = useLocalSearchParams();
|
||||||
|
|
@ -58,6 +59,8 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
|
|
||||||
const { selectedAddressId } = useAddressStore();
|
const { selectedAddressId } = useAddressStore();
|
||||||
const [selectedCouponIds, setSelectedCouponIds] = useState<number[]>([]);
|
const [selectedCouponIds, setSelectedCouponIds] = useState<number[]>([]);
|
||||||
|
// Coupon whose per-product discount split is open (product-specific coupons only).
|
||||||
|
const [breakdownCouponId, setBreakdownCouponId] = useState<number | null>(null);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -170,36 +173,61 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
{ enabled: isAuthenticated }
|
{ enabled: isAuthenticated }
|
||||||
);
|
);
|
||||||
|
|
||||||
const eligibleCoupons = useMemo(() => {
|
// Lines being ordered, with their effective unit price, for the shared helpers.
|
||||||
if (!couponsRaw?.data) return [];
|
// Declared before the coupon list so eligibility can be evaluated locally.
|
||||||
return couponsRaw.data.map(coupon => {
|
const cartLines = useMemo<CartLine[]>(
|
||||||
let isEligible = true;
|
() =>
|
||||||
let ineligibilityReason = '';
|
selectedItems
|
||||||
if (coupon.maxLimitForUser && coupon.usages.length >= coupon.maxLimitForUser) {
|
.filter((item) => !productSlotsMap[item.skuId]?.isOutOfStock)
|
||||||
isEligible = false;
|
.map((item) => {
|
||||||
ineligibilityReason = 'Usage limit exceeded';
|
const product = productsById[item.skuId];
|
||||||
}
|
const unitPrice = isFlashDelivery
|
||||||
if (coupon.minOrder && parseFloat(coupon.minOrder) > totalPrice) {
|
? (product?.flashPrice ?? product?.price ?? 0)
|
||||||
isEligible = false;
|
: (product?.price || 0);
|
||||||
ineligibilityReason = `Min order ₹${coupon.minOrder}`;
|
return { skuId: item.skuId, quantity: item.quantity, unitPrice: Number(unitPrice) };
|
||||||
}
|
}),
|
||||||
return {
|
[selectedItems, productSlotsMap, productsById, isFlashDelivery]
|
||||||
id: coupon.id,
|
);
|
||||||
code: coupon.couponCode,
|
|
||||||
discountType: coupon.discountPercent ? 'percentage' : 'flat',
|
// Same local rules as the cart screen (and the backend's placeOrder checks), so
|
||||||
discountValue: parseFloat(coupon.discountPercent || coupon.flatDiscount || '0'),
|
// a coupon that was applied in the cart can never be silently carried into the
|
||||||
maxValue: coupon.maxValue ? parseFloat(coupon.maxValue) : undefined,
|
// order: it is either still valid here, or it is listed below with its reason.
|
||||||
minOrder: coupon.minOrder ? parseFloat(coupon.minOrder) : undefined,
|
const eligibleCoupons = useMemo(() => {
|
||||||
description: '',
|
if (!couponsRaw?.data) return [];
|
||||||
exclusiveApply: coupon.exclusiveApply,
|
const isFirstOrder = couponsRaw.isFirstOrder ?? true;
|
||||||
discountPercent: coupon.discountPercent,
|
|
||||||
flatDiscount: coupon.flatDiscount,
|
return couponsRaw.data.map(coupon => {
|
||||||
applicableSkuIds: Array.isArray(coupon.skuIds) ? (coupon.skuIds as number[]) : [],
|
const applicableSkuIds = Array.isArray(coupon.skuIds) ? (coupon.skuIds as number[]) : [];
|
||||||
isEligible,
|
|
||||||
ineligibilityReason: isEligible ? undefined : ineligibilityReason,
|
const { isEligible, reason: ineligibilityReason } = evaluateCouponEligibility(
|
||||||
};
|
{
|
||||||
}).filter(coupon => coupon.ineligibilityReason !== 'Usage limit exceeded');
|
regionId: coupon.regionId,
|
||||||
}, [couponsRaw, totalPrice]);
|
isFirstOrderOnly: coupon.isFirstOrderOnly,
|
||||||
|
minOrder: coupon.minOrder,
|
||||||
|
maxLimitForUser: coupon.maxLimitForUser,
|
||||||
|
usages: coupon.usages,
|
||||||
|
applicableSkuIds,
|
||||||
|
},
|
||||||
|
{ cartLines, regionId, isFirstOrder }
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: coupon.id,
|
||||||
|
code: coupon.couponCode,
|
||||||
|
discountType: coupon.discountPercent ? 'percentage' : 'flat',
|
||||||
|
discountValue: parseFloat(coupon.discountPercent || coupon.flatDiscount || '0'),
|
||||||
|
maxValue: coupon.maxValue ? parseFloat(coupon.maxValue) : undefined,
|
||||||
|
minOrder: coupon.minOrder ? parseFloat(coupon.minOrder) : undefined,
|
||||||
|
description: '',
|
||||||
|
exclusiveApply: coupon.exclusiveApply,
|
||||||
|
discountPercent: coupon.discountPercent,
|
||||||
|
flatDiscount: coupon.flatDiscount,
|
||||||
|
applicableSkuIds,
|
||||||
|
isEligible,
|
||||||
|
ineligibilityReason,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}, [couponsRaw, cartLines, regionId]);
|
||||||
|
|
||||||
// Coupons applied, kept in the order the user selected them: coupons stack
|
// Coupons applied, kept in the order the user selected them: coupons stack
|
||||||
// sequentially, so the order changes the result.
|
// sequentially, so the order changes the result.
|
||||||
|
|
@ -216,19 +244,14 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
[selectedCouponIds, couponById]
|
[selectedCouponIds, couponById]
|
||||||
);
|
);
|
||||||
|
|
||||||
// Lines being ordered, with their effective unit price, for the shared helpers.
|
// Coupons the customer picked in the cart that no longer apply to this order —
|
||||||
const cartLines = useMemo<CartLine[]>(
|
// shown, not silently dropped.
|
||||||
|
const droppedCoupons = useMemo(
|
||||||
() =>
|
() =>
|
||||||
selectedItems
|
selectedCouponIds
|
||||||
.filter((item) => !productSlotsMap[item.skuId]?.isOutOfStock)
|
.map((id) => couponById.get(id))
|
||||||
.map((item) => {
|
.filter((coupon): coupon is NonNullable<typeof coupon> => !!coupon && !coupon.isEligible),
|
||||||
const product = productsById[item.skuId];
|
[selectedCouponIds, couponById]
|
||||||
const unitPrice = isFlashDelivery
|
|
||||||
? (product?.flashPrice ?? product?.price ?? 0)
|
|
||||||
: (product?.price || 0);
|
|
||||||
return { skuId: item.skuId, quantity: item.quantity, unitPrice: Number(unitPrice) };
|
|
||||||
}),
|
|
||||||
[selectedItems, productSlotsMap, productsById, isFlashDelivery]
|
|
||||||
);
|
);
|
||||||
|
|
||||||
const discountAmount = useMemo(
|
const discountAmount = useMemo(
|
||||||
|
|
@ -236,6 +259,22 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
[selectedCoupons, cartLines]
|
[selectedCoupons, cartLines]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Where each applied coupon's discount landed, per cart line — the "i" next to a
|
||||||
|
// product-specific coupon. Same waterfall as the discount above, so the popup's
|
||||||
|
// rows always add up to what this page charges.
|
||||||
|
const couponBreakdowns = useMemo(() => {
|
||||||
|
const byId = new Map<number, CouponLineBreakdown>();
|
||||||
|
computeCouponLineBreakdowns(cartLines, selectedCoupons).forEach((entry) => {
|
||||||
|
byId.set(entry.couponId, entry);
|
||||||
|
});
|
||||||
|
return byId;
|
||||||
|
}, [cartLines, selectedCoupons]);
|
||||||
|
|
||||||
|
const breakdownCoupon =
|
||||||
|
breakdownCouponId != null ? couponById.get(breakdownCouponId) : undefined;
|
||||||
|
const breakdown =
|
||||||
|
breakdownCouponId != null ? couponBreakdowns.get(breakdownCouponId) : undefined;
|
||||||
|
|
||||||
const finalTotal = totalPrice - discountAmount;
|
const finalTotal = totalPrice - discountAmount;
|
||||||
|
|
||||||
const deliveryCharge = useMemo(() => {
|
const deliveryCharge = useMemo(() => {
|
||||||
|
|
@ -360,12 +399,25 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{/* Coupon */}
|
{/* Coupon */}
|
||||||
{selectedCoupons.length > 0 && (
|
{(selectedCoupons.length > 0 || droppedCoupons.length > 0) && (
|
||||||
<View style={tw`bg-white p-5 rounded-2xl shadow-sm mb-4 border border-gray-100`}>
|
<View style={tw`bg-white p-5 rounded-2xl shadow-sm mb-4 border border-gray-100`}>
|
||||||
<MyText style={tw`text-base font-bold text-gray-900 mb-3`}>Coupon</MyText>
|
<MyText style={tw`text-base font-bold text-gray-900 mb-3`}>Coupon</MyText>
|
||||||
{selectedCoupons.map((coupon) => (
|
{selectedCoupons.map((coupon) => (
|
||||||
<View key={coupon.id} style={tw`flex-row items-center justify-between py-2`}>
|
<View key={coupon.id} style={tw`flex-row items-center justify-between py-2`}>
|
||||||
<MyText style={tw`text-sm font-medium text-gray-900`}>{coupon.code}</MyText>
|
<View style={tw`flex-row items-center flex-1 mr-2`}>
|
||||||
|
<MyText style={tw`text-sm font-medium text-gray-900`}>{coupon.code}</MyText>
|
||||||
|
{/* Product-specific coupon: the per-product split behind it. */}
|
||||||
|
{coupon.applicableSkuIds.length > 0 && (
|
||||||
|
<MyTouchableOpacity
|
||||||
|
testID={`coupon-breakdown-${coupon.id}`}
|
||||||
|
onPress={() => setBreakdownCouponId(coupon.id)}
|
||||||
|
style={tw`p-1 ml-0.5`}
|
||||||
|
activeOpacity={0.7}
|
||||||
|
>
|
||||||
|
<MaterialIcons name="info-outline" size={14} color="#EC4899" />
|
||||||
|
</MyTouchableOpacity>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
<MyText style={tw`text-sm font-bold text-green-600`}>
|
<MyText style={tw`text-sm font-bold text-green-600`}>
|
||||||
{coupon.discountType === 'percentage'
|
{coupon.discountType === 'percentage'
|
||||||
? `${coupon.discountValue}% off`
|
? `${coupon.discountValue}% off`
|
||||||
|
|
@ -373,15 +425,34 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
</MyText>
|
</MyText>
|
||||||
</View>
|
</View>
|
||||||
))}
|
))}
|
||||||
|
{/* Picked in the cart but no longer applicable to this order — shown with
|
||||||
|
the reason instead of vanishing (the cart has the full picker). */}
|
||||||
|
{droppedCoupons.map((coupon) => (
|
||||||
|
<View key={coupon.id} style={tw`py-2`}>
|
||||||
|
<View style={tw`flex-row items-center justify-between`}>
|
||||||
|
<MyText style={tw`text-sm font-medium text-gray-400 line-through`}>
|
||||||
|
{coupon.code}
|
||||||
|
</MyText>
|
||||||
|
<MyText style={tw`text-sm text-gray-400`}>Not applied</MyText>
|
||||||
|
</View>
|
||||||
|
{!!coupon.ineligibilityReason && (
|
||||||
|
<MyText style={tw`text-xs text-gray-400 mt-0.5`}>
|
||||||
|
{coupon.ineligibilityReason}
|
||||||
|
</MyText>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
))}
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<CheckoutAddressDisplay />
|
<CheckoutAddressDisplay />
|
||||||
|
|
||||||
|
{/* Only the coupons that survived the local check: the ids sent to
|
||||||
|
placeOrder are the ids the discount above is computed from. */}
|
||||||
<PaymentAndOrderComponent
|
<PaymentAndOrderComponent
|
||||||
selectedAddress={selectedAddressId}
|
selectedAddress={selectedAddressId}
|
||||||
selectedSlots={selectedSlots}
|
selectedSlots={selectedSlots}
|
||||||
selectedCouponIds={selectedCouponIds}
|
selectedCouponIds={selectedCoupons.map((coupon) => coupon.id)}
|
||||||
cartItems={selectedItems}
|
cartItems={selectedItems}
|
||||||
totalPrice={totalPrice}
|
totalPrice={totalPrice}
|
||||||
totalSavings={totalSavings}
|
totalSavings={totalSavings}
|
||||||
|
|
@ -395,6 +466,13 @@ const CheckoutPage: React.FC<FlashDeliveryProps> = ({ isFlashDelivery = false })
|
||||||
/>
|
/>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
|
{/* Per-product discount split of one applied coupon (the coupon block's "i") */}
|
||||||
|
<CouponBreakdownDialog
|
||||||
|
coupon={breakdownCoupon ? { id: breakdownCoupon.id, code: breakdownCoupon.code } : null}
|
||||||
|
breakdown={breakdown ?? null}
|
||||||
|
cartLines={cartLines}
|
||||||
|
onClose={() => setBreakdownCouponId(null)}
|
||||||
|
/>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
127
apps/user-ui/src/components/CouponBreakdownDialog.tsx
Normal file
127
apps/user-ui/src/components/CouponBreakdownDialog.tsx
Normal file
|
|
@ -0,0 +1,127 @@
|
||||||
|
import React, { useMemo } from 'react';
|
||||||
|
import { Image, View } from 'react-native';
|
||||||
|
import { tw, BottomDialog, MyText, MyTouchableOpacity } from 'common-ui';
|
||||||
|
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
|
||||||
|
import { useCentralProductStore } from '@/src/store/centralProductStore';
|
||||||
|
import type { CartLine, CouponLineBreakdown } from '@packages/shared';
|
||||||
|
|
||||||
|
interface CouponBreakdownDialogProps {
|
||||||
|
/** The applied coupon whose split is shown; null keeps the dialog closed. */
|
||||||
|
coupon: { id: number; code: string } | null;
|
||||||
|
/** Its per-line discount split (from computeCouponLineBreakdowns). */
|
||||||
|
breakdown: CouponLineBreakdown | null;
|
||||||
|
/** The cart lines the order is priced from, for the qty × price line. */
|
||||||
|
cartLines: CartLine[];
|
||||||
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Where a product-specific coupon's discount landed, product by product — the
|
||||||
|
* dialog behind the "i" next to an applied coupon (cart bill and checkout coupon
|
||||||
|
* block). The rows come from `computeCouponLineBreakdowns`, the same waterfall the
|
||||||
|
* bill uses, and they are reconciled to whole rupees, so they always add up to the
|
||||||
|
* coupon's total shown here and on the bill.
|
||||||
|
*
|
||||||
|
* Note: this must be opened from an inline row, never from inside another dialog —
|
||||||
|
* a BottomDialog is a native Modal and must not be nested.
|
||||||
|
*/
|
||||||
|
const CouponBreakdownDialog: React.FC<CouponBreakdownDialogProps> = ({
|
||||||
|
coupon,
|
||||||
|
breakdown,
|
||||||
|
cartLines,
|
||||||
|
onClose,
|
||||||
|
}) => {
|
||||||
|
const productsById = useCentralProductStore((state) => state.productsById);
|
||||||
|
|
||||||
|
const cartLineBySkuId = useMemo(
|
||||||
|
() => new Map(cartLines.map((line) => [line.skuId, line])),
|
||||||
|
[cartLines]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Only the lines the money actually landed on, biggest first.
|
||||||
|
const rows = useMemo(
|
||||||
|
() =>
|
||||||
|
(breakdown?.lines ?? [])
|
||||||
|
.filter((line) => line.discount > 0)
|
||||||
|
.sort((a, b) => b.discount - a.discount),
|
||||||
|
[breakdown]
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<BottomDialog open={!!coupon && !!breakdown} onClose={onClose}>
|
||||||
|
<View style={tw`p-6`} testID="coupon-breakdown-dialog">
|
||||||
|
<View style={tw`flex-row items-start justify-between mb-1`}>
|
||||||
|
<View style={tw`flex-1 mr-3`}>
|
||||||
|
<MyText style={tw`text-lg font-bold text-gray-900`}>
|
||||||
|
Product discount
|
||||||
|
</MyText>
|
||||||
|
<MyText style={tw`text-xs text-gray-500 mt-0.5`}>
|
||||||
|
{coupon?.code} · applied to specific products
|
||||||
|
</MyText>
|
||||||
|
</View>
|
||||||
|
<MyTouchableOpacity onPress={onClose} style={tw`p-1`}>
|
||||||
|
<MaterialIcons name="close" size={22} color="#9CA3AF" />
|
||||||
|
</MyTouchableOpacity>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
{rows.length === 0 ? (
|
||||||
|
<MyText style={tw`text-sm text-gray-500 mt-4`}>
|
||||||
|
No per-product split to show for this order.
|
||||||
|
</MyText>
|
||||||
|
) : (
|
||||||
|
rows.map((row) => {
|
||||||
|
const product = productsById[row.skuId];
|
||||||
|
const line = cartLineBySkuId.get(row.skuId);
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
key={row.skuId}
|
||||||
|
testID={`coupon-breakdown-row-${row.skuId}`}
|
||||||
|
style={tw`flex-row items-center py-3 border-b border-gray-50`}
|
||||||
|
>
|
||||||
|
<Image
|
||||||
|
source={{ uri: product?.images?.[0] }}
|
||||||
|
style={tw`w-10 h-10 rounded-lg bg-gray-100 mr-3`}
|
||||||
|
/>
|
||||||
|
<View style={tw`flex-1 mr-2`}>
|
||||||
|
<MyText style={tw`text-sm text-gray-900`} numberOfLines={2}>
|
||||||
|
{product?.name || `Product #${row.skuId}`}
|
||||||
|
</MyText>
|
||||||
|
{!!line && (
|
||||||
|
<MyText style={tw`text-xs text-gray-500 mt-0.5`}>
|
||||||
|
{line.quantity} × ₹{Math.trunc(line.unitPrice)}
|
||||||
|
</MyText>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
<MyText style={tw`text-sm font-bold text-green-600`}>
|
||||||
|
−₹{row.discount}
|
||||||
|
</MyText>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
)}
|
||||||
|
|
||||||
|
<View style={tw`flex-row justify-between items-center mt-4`}>
|
||||||
|
<MyText style={tw`text-sm font-bold text-gray-900`}>
|
||||||
|
Total from this coupon
|
||||||
|
</MyText>
|
||||||
|
<MyText style={tw`text-base font-bold text-green-600`}>
|
||||||
|
−₹{Math.trunc(breakdown?.discount ?? 0)}
|
||||||
|
</MyText>
|
||||||
|
</View>
|
||||||
|
<MyText style={tw`text-xs text-gray-400 mt-1`}>
|
||||||
|
Applies to the listed products only — the rest of the cart is not
|
||||||
|
discounted by this coupon.
|
||||||
|
</MyText>
|
||||||
|
|
||||||
|
<MyTouchableOpacity
|
||||||
|
style={tw`mt-4 bg-gray-900 py-3.5 rounded-xl items-center`}
|
||||||
|
onPress={onClose}
|
||||||
|
>
|
||||||
|
<MyText style={tw`text-white font-bold`}>Close</MyText>
|
||||||
|
</MyTouchableOpacity>
|
||||||
|
</View>
|
||||||
|
</BottomDialog>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default CouponBreakdownDialog;
|
||||||
|
|
@ -50,27 +50,40 @@ const coupon = (over: Record<string, unknown> = {}) => ({
|
||||||
...over,
|
...over,
|
||||||
})
|
})
|
||||||
|
|
||||||
/** Mount the cart with one line (2 x 215) and the given eligible coupons. */
|
const SECOND_SKU_ID = 4 // Mutton, price 839
|
||||||
async function mountCart(coupons: unknown[]) {
|
|
||||||
|
/** Mount the cart with one line (2 x 215), optionally a second (1 x 839). */
|
||||||
|
async function mountCart(coupons: unknown[], withSecondLine = false) {
|
||||||
setupApiMocks({
|
setupApiMocks({
|
||||||
procedures: {
|
procedures: {
|
||||||
'user.cart.getCartSlots': { [PRODUCT_ID]: [futureSlot()] },
|
'user.cart.getCartSlots': {
|
||||||
|
[PRODUCT_ID]: [futureSlot()],
|
||||||
|
...(withSecondLine ? { [SECOND_SKU_ID]: [futureSlot()] } : {}),
|
||||||
|
},
|
||||||
'user.coupon.getEligible': { data: coupons },
|
'user.coupon.getEligible': { data: coupons },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
await StorageServiceCasual.setItem(
|
const lines = [
|
||||||
'cart_items',
|
{
|
||||||
JSON.stringify([
|
id: 1,
|
||||||
{
|
skuId: PRODUCT_ID,
|
||||||
id: 1,
|
quantity: 2,
|
||||||
skuId: PRODUCT_ID,
|
slotId: SLOT_ID,
|
||||||
quantity: 2,
|
addedAt: new Date().toISOString(),
|
||||||
slotId: SLOT_ID,
|
},
|
||||||
addedAt: new Date().toISOString(),
|
]
|
||||||
},
|
if (withSecondLine) {
|
||||||
])
|
lines.push({
|
||||||
)
|
id: 2,
|
||||||
|
skuId: SECOND_SKU_ID,
|
||||||
|
quantity: 1,
|
||||||
|
slotId: SLOT_ID,
|
||||||
|
addedAt: new Date().toISOString(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
await StorageServiceCasual.setItem('cart_items', JSON.stringify(lines))
|
||||||
|
|
||||||
renderWithProviders(<CartPage />)
|
renderWithProviders(<CartPage />)
|
||||||
await waitFor(() => expect(screen.getByText('Chicken Breast 500 g')).toBeVisible())
|
await waitFor(() => expect(screen.getByText('Chicken Breast 500 g')).toBeVisible())
|
||||||
|
|
@ -245,6 +258,65 @@ describe('Cart coupon application', () => {
|
||||||
expect(screen.queryByTestId(`coupon-dropdown-option-${COUPON_ID}-detail-list`)).toBeNull()
|
expect(screen.queryByTestId(`coupon-dropdown-option-${COUPON_ID}-detail-list`)).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('measures minOrder on the coupon-targeted items, not the whole cart', async () => {
|
||||||
|
// Cart = 430 (2 x 215) + 839 (1 x Mutton) = 1269. The coupon only targets the
|
||||||
|
// 430 line and needs 500: measured against the whole cart it would look
|
||||||
|
// eligible, which is exactly what the backend refuses at placeOrder.
|
||||||
|
await mountCart([coupon({ discountPercent: '10', skuIds: [PRODUCT_ID], minOrder: '500' })], true)
|
||||||
|
|
||||||
|
fireEvent.press(screen.getByText('Select a coupon'))
|
||||||
|
|
||||||
|
await waitFor(() =>
|
||||||
|
expect(screen.getAllByText(/Add ₹70 more to use this coupon/).length).toBeGreaterThan(0)
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('reports missing targets ahead of minOrder', async () => {
|
||||||
|
// Target set matches nothing in the cart and minOrder is above the whole cart:
|
||||||
|
// "no applicable items" is the truthful reason, not "add ₹N more".
|
||||||
|
await mountCart([coupon({ discountPercent: '10', skuIds: [999999], minOrder: '2000' })], true)
|
||||||
|
|
||||||
|
fireEvent.press(screen.getByText('Select a coupon'))
|
||||||
|
|
||||||
|
await waitFor(() =>
|
||||||
|
expect(screen.getAllByText(/No applicable items in your cart/).length).toBeGreaterThan(0)
|
||||||
|
)
|
||||||
|
expect(screen.queryByText(/Add ₹/)).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('shows a per-product breakdown for a product-specific coupon', async () => {
|
||||||
|
// 2 x 215 (targeted) + 1 x 839 (Mutton, not targeted): the coupon is 10% of the
|
||||||
|
// 430 targeted line only, so its whole discount lands on product 2.
|
||||||
|
await mountCart([coupon({ discountPercent: '10', skuIds: [PRODUCT_ID] })], true)
|
||||||
|
|
||||||
|
await selectCoupon()
|
||||||
|
// The bill line for the coupon: 10% of 430.
|
||||||
|
expect(screen.getByText('-₹43')).toBeVisible()
|
||||||
|
|
||||||
|
fireEvent.press(screen.getByTestId(`coupon-breakdown-${COUPON_ID}`))
|
||||||
|
|
||||||
|
expect(screen.getByTestId('coupon-breakdown-dialog')).toBeVisible()
|
||||||
|
expect(screen.getByText('Product discount')).toBeVisible()
|
||||||
|
// Only the targeted product gets a row…
|
||||||
|
expect(screen.getByTestId(`coupon-breakdown-row-${PRODUCT_ID}`)).toBeVisible()
|
||||||
|
expect(screen.queryByTestId(`coupon-breakdown-row-${SECOND_SKU_ID}`)).toBeNull()
|
||||||
|
// …and its share is the coupon's whole discount, shown twice: the row and the
|
||||||
|
// "total from this coupon" line below it.
|
||||||
|
expect(screen.getAllByText('−₹43').length).toBe(2)
|
||||||
|
|
||||||
|
fireEvent.press(screen.getByText('Close'))
|
||||||
|
expect(screen.queryByTestId('coupon-breakdown-dialog')).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('offers no breakdown for a coupon that applies to the whole cart', async () => {
|
||||||
|
await mountCart([coupon({ discountPercent: '10' })], true)
|
||||||
|
|
||||||
|
await selectCoupon()
|
||||||
|
|
||||||
|
expect(screen.getByTestId(`coupon-chip-SAVE10`)).toBeVisible()
|
||||||
|
expect(screen.queryByTestId(`coupon-breakdown-${COUPON_ID}`)).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
it('hides a coupon that has hit its per-user usage limit', async () => {
|
it('hides a coupon that has hit its per-user usage limit', async () => {
|
||||||
await mountCart([
|
await mountCart([
|
||||||
coupon({ discountPercent: '10', maxLimitForUser: 1, usages: [{ id: 1 }] }),
|
coupon({ discountPercent: '10', maxLimitForUser: 1, usages: [{ id: 1 }] }),
|
||||||
|
|
|
||||||
|
|
@ -187,6 +187,46 @@ describe('Checkout coupon discount calculation', () => {
|
||||||
expect(screen.getByText('Free')).toBeVisible()
|
expect(screen.getByText('Free')).toBeVisible()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('does not apply or send a coupon whose targets are gone from the order', async () => {
|
||||||
|
// Picked in the cart (?coupons=77) but its target SKU is not in this order:
|
||||||
|
// the old code showed it as applied and still sent the id, which placeOrder
|
||||||
|
// rejects. It is now shown as not applied, with the reason, and dropped.
|
||||||
|
const api = await mountCheckout([coupon({ discountPercent: '10', skuIds: [999999] })])
|
||||||
|
|
||||||
|
expect(screen.queryByText('Product Discount')).toBeNull()
|
||||||
|
expect(screen.getByText('Not applied')).toBeVisible()
|
||||||
|
expect(screen.getByText('No applicable items in your cart')).toBeVisible()
|
||||||
|
expect(screen.getAllByText(`₹${TOTAL}`).length).toBeGreaterThan(0)
|
||||||
|
|
||||||
|
fireEvent.press(screen.getByTestId('place-order-button'))
|
||||||
|
|
||||||
|
await waitFor(() => expectProcedureCalled(api.fetchMock, 'user.order.placeOrder'))
|
||||||
|
expect(lastProcedureInput(api.fetchMock, 'user.order.placeOrder')).toMatchObject({
|
||||||
|
couponIds: undefined,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it('shows the per-product split for an applied product-specific coupon', async () => {
|
||||||
|
// 2 x 215, coupon targets product 2 only: the whole 10% (43) lands on it.
|
||||||
|
await mountCheckout([coupon({ discountPercent: '10', skuIds: [PRODUCT_ID] })])
|
||||||
|
|
||||||
|
expect(screen.getByText('-₹43')).toBeVisible()
|
||||||
|
// The "i" only exists for product-specific coupons.
|
||||||
|
fireEvent.press(screen.getByTestId(`coupon-breakdown-${COUPON_ID}`))
|
||||||
|
|
||||||
|
expect(screen.getByTestId('coupon-breakdown-dialog')).toBeVisible()
|
||||||
|
expect(screen.getByTestId(`coupon-breakdown-row-${PRODUCT_ID}`)).toBeVisible()
|
||||||
|
// Row plus the "Total from this coupon" line.
|
||||||
|
expect(screen.getAllByText('−₹43').length).toBe(2)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('offers no per-product split for a whole-cart coupon', async () => {
|
||||||
|
await mountCheckout([coupon({ discountPercent: '10' })])
|
||||||
|
|
||||||
|
expect(screen.getByText('-₹43')).toBeVisible()
|
||||||
|
expect(screen.queryByTestId(`coupon-breakdown-${COUPON_ID}`)).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
it('sends the selected coupon id with the order', async () => {
|
it('sends the selected coupon id with the order', async () => {
|
||||||
const api = await mountCheckout([coupon({ discountPercent: '10' })])
|
const api = await mountCheckout([coupon({ discountPercent: '10' })])
|
||||||
|
|
||||||
|
|
|
||||||
123
change-log.txt
123
change-log.txt
|
|
@ -5380,3 +5380,126 @@ user-ui
|
||||||
Verified statically in node_modules/twrnc/dist/esm/resolve/flex.js: `flex-1` -> {flexGrow: 1,
|
Verified statically in node_modules/twrnc/dist/esm/resolve/flex.js: `flex-1` -> {flexGrow: 1,
|
||||||
flexBasis: '0%'} (no flexShrink), which is exactly the collapse the earlier sheet work hit.
|
flexBasis: '0%'} (no flexShrink), which is exactly the collapse the earlier sheet work hit.
|
||||||
apps/user-ui typechecks clean.
|
apps/user-ui typechecks clean.
|
||||||
|
|
||||||
|
2026-10-17 12:20:41 shared + user-ui: one local coupon-eligibility rule set for cart and checkout.
|
||||||
|
|
||||||
|
Context (user): "previously our api endpoint returned only eligible coupons. On every product change
|
||||||
|
we needed to call backend because eligibility changed. Now that we return all eligible ones. We don't
|
||||||
|
need to keep calling again. Just locally compute and enable/disable coupons."
|
||||||
|
|
||||||
|
Verified before changing anything: the endpoint already returns every coupon the customer may see
|
||||||
|
(apps/backend/src/trpc/apis/user-apis/apis/coupon.ts:36-64 - its own comment says region / first-order
|
||||||
|
/ usage / min-order ineligibility is deliberately NOT filtered, "the client shows those coupons
|
||||||
|
disabled with a reason"), both readers send only { regionId } (cart-page.tsx:334,
|
||||||
|
checkout-page.tsx:168), so no cart change ever refetches them; the only invalidation is after
|
||||||
|
redeeming a code (me/coupons/index.tsx:140). So no backend change is needed - the gap was that the
|
||||||
|
LOCAL rules were duplicated and incomplete on checkout.
|
||||||
|
|
||||||
|
packages/shared/cart-pricing.ts
|
||||||
|
+ CouponEligibilityFields / CouponEligibilityContext / CouponEligibility +
|
||||||
|
evaluateCouponEligibility(coupon, { cartLines, regionId, isFirstOrder })
|
||||||
|
Rules in the server's order (validateAndGetCoupons): region -> first-order-only ->
|
||||||
|
targeted-with-no-eligible-line -> minOrder vs the ELIGIBLE subtotal. Targeting is checked BEFORE
|
||||||
|
minOrder on purpose: with no eligible line the subtotal is 0 and "Add Rs X more" would be a lie.
|
||||||
|
apps/user-ui/components/cart-page.tsx
|
||||||
|
~ eligibleCoupons now calls the shared resolver (same strings as before); baseTotalPrice memo,
|
||||||
|
which existed only for the old whole-cart minOrder check, is deleted.
|
||||||
|
BEHAVIOUR CHANGE (agreed): minOrder is measured against the eligible (targeted) subtotal, not the
|
||||||
|
whole cart, so the cart now agrees with the backend for product-specific coupons.
|
||||||
|
apps/user-ui/components/checkout-page.tsx
|
||||||
|
+ cartLines memo MOVED above the coupon block (the resolver needs it; same move cart-page made).
|
||||||
|
~ eligibility mapped through the shared resolver: adds the region, first-order and product-target
|
||||||
|
checks the checkout page was missing, and drops its ad-hoc 'Usage limit exceeded' filter (the
|
||||||
|
server never returns used-up coupons).
|
||||||
|
+ dropped coupons are no longer silent: they are listed under the applied ones with their reason.
|
||||||
|
~ selectedCouponIds passed to PaymentAndOrderComponent is now the LOCALLY ELIGIBLE set
|
||||||
|
(selectedCoupons.map(c => c.id)) instead of the raw URL list, so the ids sent to placeOrder match
|
||||||
|
the discount shown on screen.
|
||||||
|
|
||||||
|
2026-10-17 12:41:09 Correction/extension to 12:20:41 - the resolver also carries the usage limit.
|
||||||
|
|
||||||
|
The checkout test "Usage-limit coupons are filtered out of the eligible list entirely" pins that a
|
||||||
|
coupon with maxLimitForUser reached is not applied. The endpoint already filters those out, but the
|
||||||
|
client check is worth keeping: a coupon used within the session can still sit in the CACHED list, and
|
||||||
|
without the local rule the customer would only find out at placeOrder ("Coupon usage limit exceeded").
|
||||||
|
|
||||||
|
packages/shared/cart-pricing.ts
|
||||||
|
+ CouponEligibilityFields.maxLimitForUser / usages, and a 'Usage limit exceeded' rule placed FIRST
|
||||||
|
(the backend's order in validateAndGetCoupons is usage-limit -> region -> first-order -> targeting
|
||||||
|
-> minOrder).
|
||||||
|
apps/user-ui/components/{cart-page,checkout-page}.tsx: pass maxLimitForUser/usages through.
|
||||||
|
|
||||||
|
Tests (written, NOT run - no suite runs unless asked):
|
||||||
|
apps/user-ui/tests/screens/cart-coupons.test.tsx
|
||||||
|
~ mountCart(coupons, withSecondLine?) - can seed 2 x 215 + 1 x 839 now
|
||||||
|
+ 'measures minOrder on the coupon-targeted items, not the whole cart': targets only the 430
|
||||||
|
line, minOrder 500 => "Add Rs 70 more" (against the whole cart it would look eligible)
|
||||||
|
+ 'reports missing targets ahead of minOrder': target 999999 + minOrder 2000 => "No applicable
|
||||||
|
items in your cart", not "Add Rs N more"
|
||||||
|
apps/user-ui/tests/screens/checkout-coupons.test.tsx
|
||||||
|
+ 'does not apply or send a coupon whose targets are gone from the order': shown as "Not applied"
|
||||||
|
with the reason, discount untouched, and couponIds: undefined in the placeOrder input.
|
||||||
|
Typecheck: user-ui, admin-ui, web-ui, fallback-ui, db_helper_sqlite, backend - all clean.
|
||||||
|
|
||||||
|
2026-10-17 13:02:58 user-ui + shared: per-product discount breakdown for product-specific coupons in the bill.
|
||||||
|
|
||||||
|
Request: "in the billing section, if there is a product specific coupon applied, show an i symbol
|
||||||
|
beside it. On clicking it, open a bottom dialog and then show the per product discount applied there."
|
||||||
|
|
||||||
|
The per-line split did not exist: runStack() computed a per-line `portion` but only kept it grouped
|
||||||
|
into shareByGroup (sub-orders), which is what computeCartPricing needs. So:
|
||||||
|
|
||||||
|
packages/shared/cart-pricing.ts
|
||||||
|
+ StackCouponResult.shareByLine (Map<line index, raw portion>) - additive, the existing consumer
|
||||||
|
(computeCartPricing -> shareByGroup) is untouched.
|
||||||
|
+ roundSharesOnto(rawShares, total) - extracted from computeCartPricing's inline
|
||||||
|
scale/round/fold-drift block; computeCartPricing now calls it, same behaviour.
|
||||||
|
+ computeCouponLineBreakdowns(lines, coupons): CouponLineBreakdown[] =
|
||||||
|
{ couponId, discount, lines: [{ skuId, discount }] } - same sequential waterfall as
|
||||||
|
computeCouponStack, and each coupon's per-line shares are reconciled onto its rounded discount,
|
||||||
|
so the popup's rows sum exactly to the figure on the bill.
|
||||||
|
apps/user-ui/components/cart-page.tsx
|
||||||
|
+ state breakdownCouponId; memos couponBreakdowns (by coupon id), cartLineBySkuId, breakdownRows
|
||||||
|
(only non-zero lines, biggest first).
|
||||||
|
~ bill row: the coupon code keeps opening "Applied Coupons", and a SIBLING info-outline button
|
||||||
|
(testID coupon-breakdown-<id>) is rendered only when applicableSkuIds.length > 0.
|
||||||
|
+ BottomDialog (no nesting — a sibling dialog, like the others on this screen) with
|
||||||
|
testID coupon-breakdown-dialog: one row per discounted product (image, name, qty x unit price,
|
||||||
|
its share), a "Total from this coupon" line and a note that the rest of the cart is not
|
||||||
|
discounted. Closes if the coupon stops being applied.
|
||||||
|
|
||||||
|
Maths verified by running the shared module directly (npx tsx, not the test suite):
|
||||||
|
10% whole cart on 430+839 -> coupon 127, rows 43 + 84 = 127 OK
|
||||||
|
10% targeted at sku 2 -> coupon 43, rows 43 OK (one row)
|
||||||
|
10% then flat 50 -> 127 (43+84) and 50 (17+33) OK (waterfall preserved)
|
||||||
|
10% whole + 20% on sku 4 -> 127 (43+84) and 151 (single row) OK
|
||||||
|
maxValue 50 on 10% -> 50 (17+33) OK
|
||||||
|
3 lines, 10% / 33% -> 30 / 99, rows sum OK (rounding drift folded into the largest share)
|
||||||
|
Tests added (written, NOT run): cart-coupons.test.tsx - per-product breakdown opens with only the
|
||||||
|
targeted product's row and a total matching the bill line; a whole-cart coupon shows no info button.
|
||||||
|
Typecheck: user-ui, admin-ui, web-ui, fallback-ui, db_helper_sqlite, backend - all clean.
|
||||||
|
|
||||||
|
2026-10-17 13:21:33 user-ui: the per-product breakdown is now on checkout's coupon block too, and shared.
|
||||||
|
|
||||||
|
Request: "show in the coupon block too, if applied".
|
||||||
|
|
||||||
|
apps/user-ui/src/components/CouponBreakdownDialog.tsx (NEW)
|
||||||
|
+ The dialog extracted from cart-page: props { coupon, breakdown, cartLines, onClose }, reads
|
||||||
|
productsById from the store itself, and keeps the same testIDs (coupon-breakdown-dialog,
|
||||||
|
coupon-breakdown-row-<skuId>). One implementation -> both screens' numbers and wording cannot
|
||||||
|
drift. Its comment records that it must be opened from an inline row, never from inside another
|
||||||
|
dialog (a BottomDialog is a native Modal; nesting is what we avoid elsewhere).
|
||||||
|
apps/user-ui/components/cart-page.tsx
|
||||||
|
~ the inline dialog (and its cartLineBySkuId / breakdownRows memos, now inside the component) is
|
||||||
|
replaced by <CouponBreakdownDialog .../>; keeps breakdownCoupon/breakdown + couponBreakdowns.
|
||||||
|
Deliberately NOT added inside the cart's "Applied Coupons" dialog: that is already a dialog, so an
|
||||||
|
"i" there would mean nesting one BottomDialog in another.
|
||||||
|
apps/user-ui/components/checkout-page.tsx
|
||||||
|
+ couponBreakdowns memo (computeCouponLineBreakdowns over its own cartLines/selectedCoupons),
|
||||||
|
breakdownCouponId state, and breakdownCoupon/breakdown lookups.
|
||||||
|
+ the "i" (testID coupon-breakdown-<id>) beside each APPLIED coupon that has applicableSkuIds, in
|
||||||
|
the same row as the code; the dropped ones keep their "Not applied" + reason row and get no "i".
|
||||||
|
+ <CouponBreakdownDialog .../> next to the other dialogs.
|
||||||
|
Tests (written, NOT run): checkout-coupons.test.tsx - the split opens for a product-specific applied
|
||||||
|
coupon (row + total = the coupon's discount) and a whole-cart coupon shows no "i".
|
||||||
|
Typecheck: user-ui, admin-ui, web-ui, fallback-ui, db_helper_sqlite, backend - all clean.
|
||||||
|
|
|
||||||
|
|
@ -128,11 +128,102 @@ interface StackLine extends CartLine {
|
||||||
group: number
|
group: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- *
|
||||||
|
* Local coupon eligibility
|
||||||
|
*
|
||||||
|
* The coupon endpoint hands the customer every coupon they may SEE (it only
|
||||||
|
* drops expired / invalidated / used-up / other people's coupons); whether a
|
||||||
|
* coupon applies to the CURRENT cart is decided locally, so a cart change never
|
||||||
|
* costs a request. These rules are the local twin of the backend's
|
||||||
|
* `validateAndGetCoupons` cart checks — keep them, and their wording, in step
|
||||||
|
* with packages/db_helper_sqlite/src/user-apis/order.ts.
|
||||||
|
* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
/** The coupon fields that decide whether it may be applied to a cart. */
|
||||||
|
export interface CouponEligibilityFields {
|
||||||
|
regionId?: number | null
|
||||||
|
isFirstOrderOnly?: boolean | null
|
||||||
|
minOrder?: string | number | null
|
||||||
|
/** per-user spending limit, and how many times THIS user has already used it */
|
||||||
|
maxLimitForUser?: number | null
|
||||||
|
usages?: unknown[] | null
|
||||||
|
/** targeted SKU ids; empty/null => the whole cart */
|
||||||
|
applicableSkuIds?: number[] | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CouponEligibilityContext {
|
||||||
|
/** in-stock cart lines — exactly what the coupon would discount */
|
||||||
|
cartLines: CartLine[]
|
||||||
|
/** the region the cart is being built in */
|
||||||
|
regionId: number | null
|
||||||
|
/** whether the customer is still eligible for first-order-only coupons */
|
||||||
|
isFirstOrder: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CouponEligibility {
|
||||||
|
isEligible: boolean
|
||||||
|
/** Why it cannot be applied — the string the UI shows. Absent when eligible. */
|
||||||
|
reason?: string
|
||||||
|
/** Goods subtotal the coupon discounts (whole cart, or just its targeted lines). */
|
||||||
|
eligibleSubtotal: number
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether a coupon can be applied to this cart, and why not when it can't.
|
||||||
|
* Rule order matches the backend: region, then first-order-only, then product
|
||||||
|
* targeting, then minOrder — targeting BEFORE minOrder, because a coupon whose
|
||||||
|
* targets are all missing has an eligible subtotal of 0 and "add ₹X more" would
|
||||||
|
* be the wrong reason (the server reports "does not apply to any items").
|
||||||
|
* minOrder is compared against the ELIGIBLE subtotal, exactly as the server does.
|
||||||
|
*/
|
||||||
|
export function evaluateCouponEligibility(
|
||||||
|
coupon: CouponEligibilityFields,
|
||||||
|
context: CouponEligibilityContext
|
||||||
|
): CouponEligibility {
|
||||||
|
const applicableSkuIds = Array.isArray(coupon.applicableSkuIds) ? coupon.applicableSkuIds : []
|
||||||
|
const targets = applicableSkuIds.length > 0 ? applicableSkuIds : null
|
||||||
|
const eligibleSubtotal = computeEligibleSubtotal(context.cartLines, {
|
||||||
|
applicableSkuIds: targets,
|
||||||
|
})
|
||||||
|
|
||||||
|
const fail = (reason: string): CouponEligibility => ({
|
||||||
|
isEligible: false,
|
||||||
|
reason,
|
||||||
|
eligibleSubtotal,
|
||||||
|
})
|
||||||
|
|
||||||
|
if (coupon.maxLimitForUser && (coupon.usages?.length ?? 0) >= coupon.maxLimitForUser) {
|
||||||
|
return fail('Usage limit exceeded')
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
coupon.regionId != null &&
|
||||||
|
context.regionId != null &&
|
||||||
|
coupon.regionId !== context.regionId
|
||||||
|
) {
|
||||||
|
return fail('Not valid in your region')
|
||||||
|
}
|
||||||
|
if (coupon.isFirstOrderOnly && !context.isFirstOrder) {
|
||||||
|
return fail('Valid on your first order only')
|
||||||
|
}
|
||||||
|
if (targets && eligibleSubtotal <= 0) {
|
||||||
|
return fail('No applicable items in your cart')
|
||||||
|
}
|
||||||
|
|
||||||
|
const minOrder = toNum(coupon.minOrder)
|
||||||
|
if (minOrder > eligibleSubtotal) {
|
||||||
|
return fail(`Add ₹${Math.ceil(minOrder - eligibleSubtotal)} more to use this coupon`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return { isEligible: true, eligibleSubtotal }
|
||||||
|
}
|
||||||
|
|
||||||
interface StackCouponResult {
|
interface StackCouponResult {
|
||||||
couponId: number
|
couponId: number
|
||||||
discount: number
|
discount: number
|
||||||
/** where this coupon's discount landed, keyed by the line's group (sub-order) */
|
/** where this coupon's discount landed, keyed by the line's group (sub-order) */
|
||||||
shareByGroup: Map<number, number>
|
shareByGroup: Map<number, number>
|
||||||
|
/** the same money, keyed by the index of the line it landed on */
|
||||||
|
shareByLine: Map<number, number>
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -157,6 +248,7 @@ function runStack(
|
||||||
const eligible = idx.reduce((sum, i) => sum + remaining[i], 0)
|
const eligible = idx.reduce((sum, i) => sum + remaining[i], 0)
|
||||||
let discount = 0
|
let discount = 0
|
||||||
const shareByGroup = new Map<number, number>()
|
const shareByGroup = new Map<number, number>()
|
||||||
|
const shareByLine = new Map<number, number>()
|
||||||
|
|
||||||
if (eligible > 0) {
|
if (eligible > 0) {
|
||||||
const raw = computeCouponDiscount(eligible, coupon)
|
const raw = computeCouponDiscount(eligible, coupon)
|
||||||
|
|
@ -167,16 +259,85 @@ function runStack(
|
||||||
remaining[i] = Math.max(0, remaining[i] - portion)
|
remaining[i] = Math.max(0, remaining[i] - portion)
|
||||||
const group = lines[i].group
|
const group = lines[i].group
|
||||||
shareByGroup.set(group, (shareByGroup.get(group) ?? 0) + portion)
|
shareByGroup.set(group, (shareByGroup.get(group) ?? 0) + portion)
|
||||||
|
shareByLine.set(i, (shareByLine.get(i) ?? 0) + portion)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
perCoupon.push({ couponId: coupon.id, discount, shareByGroup })
|
perCoupon.push({ couponId: coupon.id, discount, shareByGroup, shareByLine })
|
||||||
}
|
}
|
||||||
|
|
||||||
return { perCoupon, remaining }
|
return { perCoupon, remaining }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scale raw proportional shares onto `total` whole rupees so they sum exactly:
|
||||||
|
* round each share, then fold the 1-rupee drift into the largest one.
|
||||||
|
*/
|
||||||
|
function roundSharesOnto(rawShares: number[], total: number): number[] {
|
||||||
|
const rawSum = rawShares.reduce((sum, v) => sum + v, 0)
|
||||||
|
if (rawSum <= 0 || rawShares.length === 0) return rawShares.map(() => 0)
|
||||||
|
|
||||||
|
const scaled = rawShares.map((v) => (v * total) / rawSum)
|
||||||
|
const rounded = scaled.map((v) => Math.round(v))
|
||||||
|
const drift = total - rounded.reduce((sum, v) => sum + v, 0)
|
||||||
|
|
||||||
|
if (drift !== 0) {
|
||||||
|
let maxI = 0
|
||||||
|
for (let i = 1; i < scaled.length; i++) {
|
||||||
|
if (scaled[i] > scaled[maxI]) maxI = i
|
||||||
|
}
|
||||||
|
rounded[maxI] += drift
|
||||||
|
}
|
||||||
|
|
||||||
|
return rounded
|
||||||
|
}
|
||||||
|
|
||||||
|
/** One cart line's share of a coupon's discount. */
|
||||||
|
export interface CouponLineDiscount {
|
||||||
|
skuId: number
|
||||||
|
discount: number
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A coupon's discount split over the cart lines it landed on. */
|
||||||
|
export interface CouponLineBreakdown {
|
||||||
|
couponId: number
|
||||||
|
/** the coupon's total discount — the figure the bill shows for it */
|
||||||
|
discount: number
|
||||||
|
/** per-line shares, reconciled so they sum exactly to `discount` */
|
||||||
|
lines: CouponLineDiscount[]
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Where each applied coupon's discount went, per cart line — what the bill's
|
||||||
|
* "applies to specific products" popup shows. Uses the same sequential waterfall
|
||||||
|
* as `computeCouponStack`, so the total here always matches the coupon's line in
|
||||||
|
* the bill, and the per-line shares are reconciled onto that total (whole rupees)
|
||||||
|
* so the popup's rows add up exactly.
|
||||||
|
*/
|
||||||
|
export function computeCouponLineBreakdowns(
|
||||||
|
lines: CartLine[],
|
||||||
|
coupons: TargetedCoupon[]
|
||||||
|
): CouponLineBreakdown[] {
|
||||||
|
const grouped: StackLine[] = lines.map((line) => ({ ...line, group: 0 }))
|
||||||
|
const { perCoupon } = runStack(grouped, coupons)
|
||||||
|
|
||||||
|
return perCoupon.map((entry) => {
|
||||||
|
const indexes = [...entry.shareByLine.keys()].sort((a, b) => a - b)
|
||||||
|
const rawShares = indexes.map((i) => entry.shareByLine.get(i) ?? 0)
|
||||||
|
const rounded = roundSharesOnto(rawShares, entry.discount)
|
||||||
|
|
||||||
|
return {
|
||||||
|
couponId: entry.couponId,
|
||||||
|
discount: entry.discount,
|
||||||
|
lines: indexes.map((i, position) => ({
|
||||||
|
skuId: grouped[i].skuId,
|
||||||
|
discount: rounded[position],
|
||||||
|
})),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The per-coupon discount each coupon contributes when applied in the given order,
|
* The per-coupon discount each coupon contributes when applied in the given order,
|
||||||
* rounded to whole rupees, plus the total. This is the single source of truth the
|
* rounded to whole rupees, plus the total. This is the single source of truth the
|
||||||
|
|
@ -249,21 +410,10 @@ export function computeCartPricing(params: {
|
||||||
|
|
||||||
const groups = [...coupon.shareByGroup.keys()].sort((a, b) => a - b)
|
const groups = [...coupon.shareByGroup.keys()].sort((a, b) => a - b)
|
||||||
const rawShares = groups.map((g) => coupon.shareByGroup.get(g) ?? 0)
|
const rawShares = groups.map((g) => coupon.shareByGroup.get(g) ?? 0)
|
||||||
const rawSum = rawShares.reduce((sum, v) => sum + v, 0)
|
|
||||||
|
|
||||||
// Scale the raw shares onto the rounded discount, round each sub-order share,
|
// Scale the raw shares onto the rounded discount, round each sub-order share,
|
||||||
// and fold the 1-rupee drift into the largest share so they sum exactly.
|
// and fold the 1-rupee drift into the largest share so they sum exactly.
|
||||||
const scaled =
|
const rounded = roundSharesOnto(rawShares, coupon.discount)
|
||||||
rawSum > 0 ? rawShares.map((v) => (v * coupon.discount) / rawSum) : rawShares
|
|
||||||
const rounded = scaled.map((v) => Math.round(v))
|
|
||||||
const drift = coupon.discount - rounded.reduce((sum, v) => sum + v, 0)
|
|
||||||
if (drift !== 0 && rounded.length > 0) {
|
|
||||||
let maxI = 0
|
|
||||||
for (let i = 1; i < rounded.length; i++) {
|
|
||||||
if (scaled[i] > scaled[maxI]) maxI = i
|
|
||||||
}
|
|
||||||
rounded[maxI] += drift
|
|
||||||
}
|
|
||||||
|
|
||||||
groups.forEach((group, i) => {
|
groups.forEach((group, i) => {
|
||||||
if (rounded[i] !== 0) {
|
if (rounded[i] !== 0) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue