@mohasinac/appkit 4.25.0 → 4.27.0

package/dist/features/categories/components/BundleBuyNowCta.js

@@ -1,28 +1,40 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
- * BundleBuyNowCta — direct-checkout CTA for bundle detail pages.
+ * BundleBuyNowCta — purchase CTAs for bundle detail pages.
  *
- * Replaces BundleAddToCartCta (deleted). Bundles bypass the cart and go
- * straight to checkout via the `directBundleCheckoutAction` server action.
- * No qty input — bundles are always qty=1 per checkout.
+ * A bundle is ALL-OR-NOTHING: its members are not pickable, and the only
+ * quantity the buyer controls is how many COPIES of the whole bundle they want.
+ * That is why there is one stepper here and no per-member controls anywhere on
+ * the bundle page — the mirror image of `GroupMemberPicker`, which has
+ * per-member steppers and no line-level one.
+ *
+ * Two CTAs, not one. "Buy now" adds and jumps straight to checkout (the
+ * pre-existing express path). "Add to cart" adds and stays — without it a
+ * bundle could never sit in the cart to be edited, because the only route in
+ * pushed the buyer past the cart immediately.
  */
 import { useState, useCallback } from "react";
-import { Button, LoginRequiredModal, Stack, Text } from "../../../ui";
+import { Button, LoginRequiredModal, Row, Stack, Text } from "../../../ui";
+import { QuantityStepper } from "../../../ui/components/QuantityStepper";
 import { useToast } from "../../../ui";
 import { isAuthError } from "../../../utils/auth-error";
+import { ACTIONS } from "../../../_internal/shared/actions/action-registry";
 import { BUNDLE_COPY } from "../../../_internal/shared/features/categories/bundle-copy";
 import { normalizeError } from "../../../errors/normalize";
-export function BundleBuyNowCta({ bundleSlug, outOfStock = false, onBuyNow, compact = false, }) {
+export function BundleBuyNowCta({ bundleSlug, outOfStock = false, onBuyNow, onAddToCart, compact = false, }) {
     const { showToast } = useToast();
     const [submitting, setSubmitting] = useState(false);
+    const [quantity, setQuantity] = useState(1);
     const [error, setError] = useState(null);
     const [showLoginModal, setShowLoginModal] = useState(false);
-    const handleClick = useCallback(async () => {
+    const run = useCallback(async (fn, successMsg) => {
         setError(null);
         setSubmitting(true);
         try {
-            await onBuyNow({ bundleSlug });
+            await fn({ bundleSlug, quantity });
+            if (successMsg)
+                showToast(successMsg, "success");
         }
         catch (err) {
             void normalizeError(err);
@@ -38,9 +50,11 @@ export function BundleBuyNowCta({ bundleSlug, outOfStock = false, onBuyNow, comp
         finally {
             setSubmitting(false);
         }
-    }, [bundleSlug, onBuyNow, showToast]);
+    }, [bundleSlug, quantity, showToast]);
+    const handleClick = useCallback(() => run(onBuyNow), [run, onBuyNow]);
+    const handleAddToCart = useCallback(() => (onAddToCart ? run(onAddToCart, "Bundle added to your cart.") : Promise.resolve()), [run, onAddToCart]);
     if (outOfStock) {
         return (_jsxs(Stack, { gap: "xs", "aria-live": "polite", children: [_jsx(Button, { variant: "primary", size: compact ? "sm" : "md", disabled: true, "aria-disabled": true, className: compact ? "w-full" : undefined, children: BUNDLE_COPY.detail.ctaOutOfStock }), !compact && (_jsx(Text, { size: "xs", color: "muted", children: BUNDLE_COPY.detail.ctaHint }))] }));
     }
-    return (_jsxs(_Fragment, { children: [_jsx(LoginRequiredModal, { isOpen: showLoginModal, onClose: () => setShowLoginModal(false), message: "You need to be signed in to purchase this bundle. Please log in or create an account to continue." }), _jsxs(Stack, { gap: "sm", children: [_jsx(Button, { variant: "primary", size: compact ? "sm" : "md", onClick: handleClick, disabled: submitting, "aria-busy": submitting, className: compact ? "w-full" : undefined, children: submitting ? BUNDLE_COPY.detail.ctaAdding : BUNDLE_COPY.detail.ctaBuyNow }), error && (_jsx(Text, { size: "sm", color: "danger", role: "alert", children: error }))] })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(LoginRequiredModal, { isOpen: showLoginModal, onClose: () => setShowLoginModal(false), message: "You need to be signed in to purchase this bundle. Please log in or create an account to continue." }), _jsxs(Stack, { gap: "sm", children: [!compact && (_jsxs(Row, { gap: "sm", align: "center", children: [_jsx(Text, { size: "sm", color: "muted", children: "Copies" }), _jsx(QuantityStepper, { value: quantity, onChange: setQuantity, min: 1, max: 99, disabled: submitting, size: "md", ariaLabel: "Number of copies of this bundle", decrementLabel: ACTIONS.CART["decrease-quantity"].ariaLabel, incrementLabel: ACTIONS.CART["increase-quantity"].ariaLabel })] })), _jsxs(Row, { gap: "sm", wrap: true, className: compact ? "w-full" : undefined, children: [_jsx(Button, { variant: "primary", size: compact ? "sm" : "md", onClick: handleClick, disabled: submitting, "aria-busy": submitting, className: compact ? "w-full" : undefined, children: submitting ? BUNDLE_COPY.detail.ctaAdding : BUNDLE_COPY.detail.ctaBuyNow }), onAddToCart && !compact && (_jsx(Button, { action: ACTIONS.CART["add-bundle-to-cart"], variant: "outline", size: "md", onClick: handleAddToCart, disabled: submitting, "aria-busy": submitting }))] }), error && (_jsx(Text, { size: "sm", color: "danger", role: "alert", children: error }))] })] }));
 }

package/dist/features/categories/components/BundleDetailView.d.ts

@@ -17,8 +17,15 @@ export interface BundleDetailViewProps {
     /** Direct-checkout callback (S-SBUNI-RULES). When supplied, renders the "Buy now" CTA. */
     onBuyNow?: (input: {
         bundleSlug: string;
+        quantity: number;
+    }) => Promise<unknown>;
+    /** Adds the bundle without leaving the page — the only way it can reach the
+     *  cart and stay there to be edited. */
+    onAddToCart?: (input: {
+        bundleSlug: string;
+        quantity: number;
     }) => Promise<unknown>;
     /** Other active bundles, excluding this one — renders a "Related Bundles" section when non-empty. */
     relatedBundles?: CategoryDocument[];
 }
-export declare function BundleDetailView({ bundle, members, onBuyNow, relatedBundles, }: BundleDetailViewProps): React.JSX.Element;
+export declare function BundleDetailView({ bundle, members, onBuyNow, onAddToCart, relatedBundles, }: BundleDetailViewProps): React.JSX.Element;

package/dist/features/categories/components/BundleDetailView.js

@@ -17,7 +17,7 @@ const STOCK_BADGE_TEXT = {
     out_of_stock: BUNDLE_COPY.stockBadge.out_of_stock,
 };
 const PLACEHOLDER_EMOJI = "📦";
-export function BundleDetailView({ bundle, members = [], onBuyNow, relatedBundles = [], }) {
+export function BundleDetailView({ bundle, members = [], onBuyNow, onAddToCart, relatedBundles = [], }) {
     const memberCount = members.length || bundle.bundleProductIds?.length || 0;
     const stock = bundle.bundleStockStatus ?? "in_stock";
     const cover = bundle.display?.coverImage;
@@ -25,5 +25,5 @@ export function BundleDetailView({ bundle, members = [], onBuyNow, relatedBundle
         ? formatCurrency(bundle.bundlePrice, "INR")
         : BUNDLE_COPY.detail.priceFallback;
     const discount = computeBundleDiscount(bundle.bundlePrice, bundle.bundleOriginalTotal);
-    return (_jsxs(Main, { children: [_jsx(Section, { padding: "y-2xl", children: _jsx(Container, { size: "xl", children: _jsxs(Stack, { gap: "lg", children: [_jsxs(Stack, { gap: "lg", direction: "md-row", align: "start", children: [_jsx(Div, { className: "w-full md:w-2/5", children: members.length > 0 ? (_jsx(BundleCollage, { members: members })) : (_jsx(Div, { className: `aspect-video w-full ${__O.hidden}`, rounded: "2xl", surface: "subtle", children: _jsx(Div, { className: "h-full w-full", children: _jsx(MediaImage, { src: cover, alt: bundle.name, size: "hero", fallback: PLACEHOLDER_EMOJI }) }) })) }), _jsxs(Stack, { gap: "md", className: "flex-1", children: [_jsx(Heading, { level: 1, size: "3xl", weight: "semibold", color: "primary", children: bundle.name }), _jsxs(Row, { gap: "sm", align: "center", wrap: true, children: [_jsx(Text, { size: "lg", weight: "bold", children: priceLabel }), discount && (_jsxs(_Fragment, { children: [_jsx(Text, { size: "sm", color: "muted", className: "line-through", children: formatCurrency(discount.originalTotal, "INR") }), _jsx(Badge, { variant: "success", children: BUNDLE_COPY.detail.discountBadge(discount.percent) })] })), _jsxs(Text, { size: "sm", color: "muted", children: ["\u00B7 ", BUNDLE_COPY.detail.itemCount(memberCount)] }), _jsx(Badge, { variant: BUNDLE_STOCK_VARIANT[stock], children: STOCK_BADGE_TEXT[stock] })] }), discount && (_jsx(Text, { size: "sm", color: "success", weight: "medium", children: BUNDLE_COPY.detail.savingsLabel(formatCurrency(discount.savings, "INR")) })), bundle.description && (_jsxs(Stack, { gap: "xs", children: [_jsx(Heading, { level: 2, className: "text-[var(--appkit-color-text-muted)]", size: "sm", weight: "semibold", children: BUNDLE_COPY.detailDescriptionHeading }), _jsx(Text, { className: "whitespace-pre-line", children: bundle.description })] })), onBuyNow ? (_jsx(BundleBuyNowCta, { bundleSlug: bundle.slug, outOfStock: stock === "out_of_stock", onBuyNow: onBuyNow })) : (_jsxs(Div, { textSize: "sm", className: "border-dashed", border: "strong", surface: "muted", rounded: "xl", padding: "md", "aria-live": "polite", children: [_jsx(Text, { weight: "semibold", className: "mb-1 block", children: BUNDLE_COPY.detail.ctaDisabled }), _jsx(Text, { size: "sm", color: "muted", children: BUNDLE_COPY.detail.ctaHint })] }))] })] }), _jsxs(Stack, { gap: "md", children: [_jsx(Heading, { level: 2, size: "xl", weight: "semibold", color: "primary", children: BUNDLE_COPY.detailItemsHeading }), members.length === 0 ? (_jsx(Text, { color: "muted", children: BUNDLE_COPY.detail.emptyMembers })) : (_jsx(Ul, { gap: "2", className: "grid grid-cols-1 sm:grid-cols-2", children: members.map((p, i) => (_jsxs(Li, { layout: "flex-center", gap: "2", rounded: "lg", border: "subtle", padding: "inlineSm", textSize: "sm", children: [_jsxs(Span, { size: "xs", weight: "semibold", className: "w-5", color: "faint", children: ["#", i + 1] }), _jsx(Link, { href: String(ROUTES.PUBLIC.PRODUCT_DETAIL?.(p.slug ?? p.id) ?? "#"), className: "flex-1 truncate font-medium hover:underline hover:text-primary", children: p.title }), _jsx(Span, { size: "xs", color: "muted", children: formatCurrency(p.price ?? 0, p.currency ?? "INR") })] }, p.id))) }))] })] }) }) }), relatedBundles.length > 0 && (_jsx(Section, { border: "subtle", surface: "default", className: "border-t", padding: "y-lg", children: _jsxs(Container, { size: "xl", children: [_jsx(Heading, { level: 2, className: "mb-4", size: "xl", weight: "semibold", children: "Related Bundles" }), _jsx(CategoryGrid, { categories: relatedBundles, getHref: (c) => String(ROUTES.PUBLIC.BUNDLE_DETAIL(c.slug)) })] }) }))] }));
+    return (_jsxs(Main, { children: [_jsx(Section, { padding: "y-2xl", children: _jsx(Container, { size: "xl", children: _jsxs(Stack, { gap: "lg", children: [_jsxs(Stack, { gap: "lg", direction: "md-row", align: "start", children: [_jsx(Div, { className: "w-full md:w-2/5", children: members.length > 0 ? (_jsx(BundleCollage, { members: members })) : (_jsx(Div, { className: `aspect-video w-full ${__O.hidden}`, rounded: "2xl", surface: "subtle", children: _jsx(Div, { className: "h-full w-full", children: _jsx(MediaImage, { src: cover, alt: bundle.name, size: "hero", fallback: PLACEHOLDER_EMOJI }) }) })) }), _jsxs(Stack, { gap: "md", className: "flex-1", children: [_jsx(Heading, { level: 1, size: "3xl", weight: "semibold", color: "primary", children: bundle.name }), _jsxs(Row, { gap: "sm", align: "center", wrap: true, children: [_jsx(Text, { size: "lg", weight: "bold", children: priceLabel }), discount && (_jsxs(_Fragment, { children: [_jsx(Text, { size: "sm", color: "muted", className: "line-through", children: formatCurrency(discount.originalTotal, "INR") }), _jsx(Badge, { variant: "success", children: BUNDLE_COPY.detail.discountBadge(discount.percent) })] })), _jsxs(Text, { size: "sm", color: "muted", children: ["\u00B7 ", BUNDLE_COPY.detail.itemCount(memberCount)] }), _jsx(Badge, { variant: BUNDLE_STOCK_VARIANT[stock], children: STOCK_BADGE_TEXT[stock] })] }), discount && (_jsx(Text, { size: "sm", color: "success", weight: "medium", children: BUNDLE_COPY.detail.savingsLabel(formatCurrency(discount.savings, "INR")) })), bundle.description && (_jsxs(Stack, { gap: "xs", children: [_jsx(Heading, { level: 2, className: "text-[var(--appkit-color-text-muted)]", size: "sm", weight: "semibold", children: BUNDLE_COPY.detailDescriptionHeading }), _jsx(Text, { className: "whitespace-pre-line", children: bundle.description })] })), onBuyNow ? (_jsx(BundleBuyNowCta, { bundleSlug: bundle.slug, outOfStock: stock === "out_of_stock", onBuyNow: onBuyNow, onAddToCart: onAddToCart })) : (_jsxs(Div, { textSize: "sm", className: "border-dashed", border: "strong", surface: "muted", rounded: "xl", padding: "md", "aria-live": "polite", children: [_jsx(Text, { weight: "semibold", className: "mb-1 block", children: BUNDLE_COPY.detail.ctaDisabled }), _jsx(Text, { size: "sm", color: "muted", children: BUNDLE_COPY.detail.ctaHint })] }))] })] }), _jsxs(Stack, { gap: "md", children: [_jsx(Heading, { level: 2, size: "xl", weight: "semibold", color: "primary", children: BUNDLE_COPY.detailItemsHeading }), members.length === 0 ? (_jsx(Text, { color: "muted", children: BUNDLE_COPY.detail.emptyMembers })) : (_jsx(Ul, { gap: "2", className: "grid grid-cols-1 sm:grid-cols-2", children: members.map((p, i) => (_jsxs(Li, { layout: "flex-center", gap: "2", rounded: "lg", border: "subtle", padding: "inlineSm", textSize: "sm", children: [_jsxs(Span, { size: "xs", weight: "semibold", className: "w-5", color: "faint", children: ["#", i + 1] }), _jsx(Link, { href: String(ROUTES.PUBLIC.PRODUCT_DETAIL?.(p.slug ?? p.id) ?? "#"), className: "flex-1 truncate font-medium hover:underline hover:text-primary", children: p.title }), _jsx(Span, { size: "xs", color: "muted", children: formatCurrency(p.price ?? 0, p.currency ?? "INR") })] }, p.id))) }))] })] }) }) }), relatedBundles.length > 0 && (_jsx(Section, { border: "subtle", surface: "default", className: "border-t", padding: "y-lg", children: _jsxs(Container, { size: "xl", children: [_jsx(Heading, { level: 2, className: "mb-4", size: "xl", weight: "semibold", children: "Related Bundles" }), _jsx(CategoryGrid, { categories: relatedBundles, getHref: (c) => String(ROUTES.PUBLIC.BUNDLE_DETAIL(c.slug)) })] }) }))] }));
 }

package/dist/features/categories/components/BundlesListView.d.ts

@@ -4,6 +4,7 @@ export interface BundlesListViewProps {
     searchParams?: SearchParams;
     onBuyNow?: (input: {
         bundleSlug: string;
+        quantity: number;
     }) => Promise<unknown>;
 }
 /**

package/dist/features/categories/components/CategoryBundlesListing.d.ts

@@ -3,8 +3,11 @@ import type { CategoryDocument } from "../schemas";
 export interface CategoryBundlesListingProps {
     initialBundles: CategoryDocument[];
     brandName?: string;
+    /** Cards render the CTA in `compact` mode, which has no stepper — quantity
+     *  is always 1 from here. The full stepper lives on the bundle detail page. */
     onBuyNow?: (input: {
         bundleSlug: string;
+        quantity: number;
     }) => Promise<unknown>;
 }
 export declare function CategoryBundlesListing({ initialBundles, brandName, onBuyNow, }: CategoryBundlesListingProps): React.JSX.Element;

package/dist/features/grouped/components/GroupedListingDetailView.d.ts

@@ -0,0 +1,21 @@
+/**
+ * GroupedListingDetailView — the public page for a `groupedListings` document.
+ *
+ * Before this, a grouped listing had no page at all: it existed only as a
+ * horizontal carousel on other pages, so there was nowhere to see the whole
+ * group and nothing to link to from a cart line built out of it.
+ *
+ * A grouped listing has NO price of its own — SB-UNI-V removed its pricing
+ * fields on purpose. That is not a gap to fill: under "pick as you wish" the
+ * price simply IS the sum of what the buyer selected, which is exactly what
+ * `GroupMemberPicker` computes and what `unitPriceFor` recomputes server-side.
+ */
+import React from "react";
+import { type GroupPickerMember } from "../../products/components/GroupMemberPicker";
+import type { GroupedListingDocument } from "../schemas/firestore";
+export interface GroupedListingDetailViewProps {
+    group: GroupedListingDocument;
+    /** Members, already projected for public consumption. */
+    members: GroupPickerMember[];
+}
+export declare function GroupedListingDetailView({ group, members }: GroupedListingDetailViewProps): React.JSX.Element;

package/dist/features/grouped/components/GroupedListingDetailView.js

@@ -0,0 +1,17 @@
+"use client";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Container, Div, Heading, Section, Span, Stack, Text, } from "../../../ui";
+import { MediaImage } from "../../media/MediaImage";
+import { GroupMemberPicker } from "../../products/components/GroupMemberPicker";
+const __O = { hidden: "overflow-hidden" };
+/** Human label per theme — mirrors GROUP_THEME_TITLE on the carousel. */
+const THEME_LABEL = {
+    related: "Related items",
+    character: "Same character",
+    lineage: "Same lineage",
+    set: "Complete the set",
+    generic: "Grouped listing",
+};
+export function GroupedListingDetailView({ group, members }) {
+    return (_jsx(Section, { padding: "section", children: _jsx(Container, { children: _jsxs(Stack, { gap: "comfortable", children: [group.coverImage && (_jsx(Div, { className: `relative h-48 w-full md:h-64 ${__O.hidden}`, rounded: "xl", surface: "muted", children: _jsx(MediaImage, { src: group.coverImage, alt: group.title, size: "banner" }) })), _jsxs(Stack, { gap: "xs", children: [_jsx(Span, { size: "xs", color: "muted", transform: "uppercase", weight: "semibold", children: THEME_LABEL[group.groupTheme] }), _jsx(Heading, { level: 1, children: group.title }), group.description && (_jsx(Text, { color: "muted", children: group.description })), _jsxs(Text, { size: "sm", color: "muted", children: [members.length, " item", members.length === 1 ? "" : "s", " in this group"] })] }), members.length > 0 ? (_jsxs(Stack, { gap: "sm", children: [_jsx(Heading, { level: 2, size: "lg", children: "Pick what you want" }), _jsx(Text, { size: "sm", color: "muted", children: "Choose a quantity for each item \u2014 they'll go into your cart as a single line you can edit later." }), _jsx(GroupMemberPicker, { groupId: group.id, groupSource: "grouped-listing", members: members })] })) : (_jsx(Text, { color: "muted", children: "Nothing in this group is available right now." }))] }) }) }));
+}

package/dist/features/grouped/components/GroupedListingsCarousel.js

@@ -9,6 +9,7 @@ import { ProductCard } from "../../products/components/ProductGrid";
 import { toProductItem } from "../../../_internal/shared/features/products/to-product-item";
 import { CAROUSEL_PER_VIEW } from "../../homepage/constants/carousel-per-view";
 import { Stack } from "../../../ui";
+import { ROUTES } from "../../../next/routing/route-map";
 const GROUP_THEME_TITLE = {
     related: "Other listings you might like",
     character: "Same character",
@@ -29,6 +30,10 @@ export function GroupedListingsCarousel({ groups }) {
         return null;
     return (_jsx(Stack, { gap: "xl", children: visibleGroups.map((group) => {
             const items = group.items.map((p) => toProductItem(p));
-            return (_jsx(SectionCarousel, { title: group.title || GROUP_THEME_TITLE[group.groupTheme], pillLabel: "Grouped Listings", headingVariant: "editorial", items: items, isLoading: false, perView: CAROUSEL_PER_VIEW.standard, keyExtractor: (item) => item.id, renderItem: (item) => (_jsx(ProductCard, { product: item, href: item.slug || item.id ? pluginFor(item.listingType ?? "standard").detailRoute(item.slug || item.id) : undefined })) }, group.id));
+            return (_jsx(SectionCarousel, { title: group.title || GROUP_THEME_TITLE[group.groupTheme], pillLabel: "Grouped Listings", headingVariant: "editorial", 
+                // The group now has a page of its own, where the buyer can pick
+                // several members and add them as one cart line. Until it existed,
+                // this carousel was the only way a grouped listing was ever seen.
+                viewMoreHref: group.slug ? String(ROUTES.PUBLIC.GROUP_DETAIL(group.slug)) : undefined, viewMoreLabel: "Pick items from this group \u2192", items: items, isLoading: false, perView: CAROUSEL_PER_VIEW.standard, keyExtractor: (item) => item.id, renderItem: (item) => (_jsx(ProductCard, { product: item, href: item.slug || item.id ? pluginFor(item.listingType ?? "standard").detailRoute(item.slug || item.id) : undefined })) }, group.id));
         }) }));
 }

package/dist/features/orders/index.d.ts

@@ -4,5 +4,5 @@ export * from "./components";
 export * from "./schemas";
 export * from "./columns";
 export * from "./utils/order-splitter";
-export { groupOrderItemsByBundle, type BundleOrderGroup, type OrderItemForBundleGrouping, } from "./utils/bundle-grouping";
+export { groupOrderItemsByLine, type LineOrderGroup, type OrderItemForLineGrouping, } from "./utils/bundle-grouping";
 export { manifest } from "./manifest";

package/dist/features/orders/index.js

@@ -5,5 +5,5 @@ export * from "./schemas";
 export * from "./columns";
 export * from "./utils/order-splitter";
 // S-SBUNI-5 2026-05-13 — bundle-aware order item grouping.
-export { groupOrderItemsByBundle, } from "./utils/bundle-grouping";
+export { groupOrderItemsByLine, } from "./utils/bundle-grouping";
 export { manifest } from "./manifest";

package/dist/features/orders/schemas/firestore.d.ts

@@ -188,7 +188,18 @@ export interface OrderDocumentItem {
     cancelledReason?: string;
     /** SB-UNI-5 — forwarded from the cart line when this order item is an expanded bundle, so the order-detail UI can collapse it back under a "Bundle: <name>" header and stock-restore logic can fan back out to member products. */
     bundleCategorySlug?: string;
+    /** @deprecated Legacy collapsed rows only — expanded rows carry one product each. */
     bundleProductIds?: string[];
+    /**
+     * Collapse key for a multi-member cart line, shared by every row the line
+     * expanded into. `groupOrderItemsByLine` groups on it so the receipt still
+     * reads as one "Bundle: X" / "Group: X" block.
+     */
+    groupSlug?: string;
+    /** Display name of the bundle / group these rows came from. */
+    groupTitle?: string;
+    /** Which kind of multi-member line produced these rows. */
+    groupSource?: "bundle" | "product-group" | "grouped-listing";
     /** P-8 GST — snapshotted from the product at order time so the invoice stays accurate even if the product's HSN/rate later changes. */
     hsnCode?: string;
     gstRate?: 0 | 5 | 12 | 18 | 28;

package/dist/features/orders/utils/bundle-grouping.d.ts

@@ -7,42 +7,52 @@
  * checkout receipt mirrors the buyer's intent. This helper is the pure
  * grouping logic — the UI primitive lives next to the consumer view.
  *
- * Two flavours of "bundle row" can appear on an order:
- *   1. ONE order row whose `bundleCategorySlug` + `bundleProductIds[]` set
- *      describe the bundle (this is what S-SBUNI-4's checkout writes — the
- *      bundle stays a single row in the order with the locked
- *      bundlePrice as its line total).
- *   2. (Future) Expanded N rows, each tagged with the same
- *      `bundleCategorySlug`. The grouping handles this too in case a future
- *      session pivots to row expansion.
+ * Two flavours of multi-member row can appear on an order:
+ *   1. LEGACY — ONE row whose `bundleCategorySlug` + `bundleProductIds[]`
+ *      describe the whole bundle, with the locked bundlePrice as its line
+ *      total. Every bundle order placed before row expansion looks like this,
+ *      and they keep rendering unchanged.
+ *   2. CURRENT — expanded N rows, one per member, all sharing a `groupSlug`
+ *      (and, for bundles, the same `bundleCategorySlug`). This is what
+ *      checkout writes now, so each row can carry its own HSN/GST and be
+ *      cancelled independently.
  *
- * Either way, `groupOrderItemsByBundle` returns a stable, ordered list of
- * "groups" so the renderer can iterate once.
+ * Either way this returns a stable, ordered list of groups so the renderer
+ * iterates once and the buyer's receipt reads the same.
  */
 /** Minimal shape consumed from an order item (Firestore wire format). */
-export interface OrderItemForBundleGrouping {
-    /** Bundle discriminator — set when this row is part of a bundle. */
+export interface OrderItemForLineGrouping {
+    /** Collapse key for expanded rows (bundle OR buyer-assembled group). */
+    groupSlug?: string;
+    /** Display name of the bundle / group. */
+    groupTitle?: string;
+    /** Bundle discriminator — also set on expanded bundle rows. */
     bundleCategorySlug?: string;
-    /** Snapshot of bundle members at order-creation time. */
+    /** @deprecated Legacy collapsed rows only. */
     bundleProductIds?: string[];
 }
-export type BundleOrderGroup<T extends OrderItemForBundleGrouping> = {
+export type LineOrderGroup<T extends OrderItemForLineGrouping> = {
     kind: "single";
     item: T;
     index: number;
 } | {
     kind: "bundle";
+    /** The key these rows were collapsed on. */
     bundleCategorySlug: string;
+    groupTitle?: string;
     items: Array<{
         item: T;
         index: number;
     }>;
-    /** Pulled from the first row in the group; reflects what checkout snapshotted. */
+    /** Members represented: the row count when expanded, the snapshot length when legacy. */
     memberCount: number;
 };
 /**
- * Walk the items array preserving original order; collapse contiguous (or
- * non-contiguous) bundle rows sharing the same `bundleCategorySlug` into a
- * single group. Single rows pass through unchanged.
+ * Walk the items array preserving original order; collapse rows sharing a
+ * collapse key into one group. Single rows pass through unchanged.
+ *
+ * The key is `groupSlug ?? bundleCategorySlug` — the fallback is what keeps
+ * legacy collapsed bundle rows (written before `groupSlug` existed) grouping
+ * exactly as they always did, with no order migration.
  */
-export declare function groupOrderItemsByBundle<T extends OrderItemForBundleGrouping>(items: T[]): Array<BundleOrderGroup<T>>;
+export declare function groupOrderItemsByLine<T extends OrderItemForLineGrouping>(items: T[]): Array<LineOrderGroup<T>>;

package/dist/features/orders/utils/bundle-grouping.js

@@ -7,47 +7,57 @@
  * checkout receipt mirrors the buyer's intent. This helper is the pure
  * grouping logic — the UI primitive lives next to the consumer view.
  *
- * Two flavours of "bundle row" can appear on an order:
- *   1. ONE order row whose `bundleCategorySlug` + `bundleProductIds[]` set
- *      describe the bundle (this is what S-SBUNI-4's checkout writes — the
- *      bundle stays a single row in the order with the locked
- *      bundlePrice as its line total).
- *   2. (Future) Expanded N rows, each tagged with the same
- *      `bundleCategorySlug`. The grouping handles this too in case a future
- *      session pivots to row expansion.
+ * Two flavours of multi-member row can appear on an order:
+ *   1. LEGACY — ONE row whose `bundleCategorySlug` + `bundleProductIds[]`
+ *      describe the whole bundle, with the locked bundlePrice as its line
+ *      total. Every bundle order placed before row expansion looks like this,
+ *      and they keep rendering unchanged.
+ *   2. CURRENT — expanded N rows, one per member, all sharing a `groupSlug`
+ *      (and, for bundles, the same `bundleCategorySlug`). This is what
+ *      checkout writes now, so each row can carry its own HSN/GST and be
+ *      cancelled independently.
  *
- * Either way, `groupOrderItemsByBundle` returns a stable, ordered list of
- * "groups" so the renderer can iterate once.
+ * Either way this returns a stable, ordered list of groups so the renderer
+ * iterates once and the buyer's receipt reads the same.
  */
 /**
- * Walk the items array preserving original order; collapse contiguous (or
- * non-contiguous) bundle rows sharing the same `bundleCategorySlug` into a
- * single group. Single rows pass through unchanged.
+ * Walk the items array preserving original order; collapse rows sharing a
+ * collapse key into one group. Single rows pass through unchanged.
+ *
+ * The key is `groupSlug ?? bundleCategorySlug` — the fallback is what keeps
+ * legacy collapsed bundle rows (written before `groupSlug` existed) grouping
+ * exactly as they always did, with no order migration.
  */
-export function groupOrderItemsByBundle(items) {
+export function groupOrderItemsByLine(items) {
     const groups = [];
-    const bundleIndexBySlug = new Map();
+    const indexByKey = new Map();
     items.forEach((item, index) => {
-        const slug = item.bundleCategorySlug;
-        if (!slug) {
+        const key = item.groupSlug ?? item.bundleCategorySlug;
+        if (!key) {
             groups.push({ kind: "single", item, index });
             return;
         }
-        const existingIdx = bundleIndexBySlug.get(slug);
+        const existingIdx = indexByKey.get(key);
         if (existingIdx === undefined) {
-            const memberCount = item.bundleProductIds?.length ?? 1;
             groups.push({
                 kind: "bundle",
-                bundleCategorySlug: slug,
+                bundleCategorySlug: key,
+                groupTitle: item.groupTitle,
+                // Legacy rows carry the member list; expanded rows ARE the members, so
+                // the count is grown as siblings arrive below.
+                memberCount: item.bundleProductIds?.length ?? 1,
                 items: [{ item, index }],
-                memberCount,
             });
-            bundleIndexBySlug.set(slug, groups.length - 1);
+            indexByKey.set(key, groups.length - 1);
             return;
         }
         const existing = groups[existingIdx];
         if (existing.kind === "bundle") {
             existing.items.push({ item, index });
+            // Expanded rows: one row per member, so the row count IS the member count.
+            if (!item.bundleProductIds?.length) {
+                existing.memberCount = existing.items.length;
+            }
         }
     });
     return groups;

package/dist/features/tester/seed-data/categories-tester-seed-data.js

@@ -188,6 +188,12 @@ export const categoriesTesterSeedData = [
         bundleProductIds: ["product-tester-standard-1", "product-tester-standard-2"],
         bundleOriginalTotal: 348, // 199 + 149
         bundleStockStatus: "in_stock",
+        // Without these, `addBundleToCartAction` wrote `storeId: ""` on the cart
+        // line, which produced an order group keyed `standard:` with an undefined
+        // storeId — no seller notification, no shipping resolution, no payout. The
+        // bug was seeded in, so it reproduced on every tester run.
+        createdByStoreId: "store-tester-qa-seller",
+        createdByStoreName: "Tester Sandbox Store",
         rootId: "bundle-tester-sandbox",
         parentIds: [],
         childrenIds: [],

package/dist/features/tester/seed-data/products-tester-seed-data.js

@@ -232,6 +232,9 @@ export const productsTesterSeedData = [
         customSections: [],
         isPromoted: false,
         isOnSale: false,
+        // 18% — contrasts with member #3's 12% so one grouped line spans two rates.
+        gstRate: 18,
+        hsnCode: "95030090",
         // Child of the "group-tester-sandbox-bundle" product-group ("Set") parent
         // below — findByGroupId() queries products by this field directly, so
         // without it the parent's groupChildSlugs[] mirror is never actually
@@ -265,12 +268,151 @@ export const productsTesterSeedData = [
         customSections: [],
         isPromoted: false,
         isOnSale: false,
+        gstRate: 18,
+        hsnCode: "95030090",
         groupId: "group-tester-sandbox-bundle",
         groupParentSlug: "group-tester-sandbox-bundle",
         groupTitle: TESTER_GROUP_TITLE,
         createdAt: new Date(),
         updatedAt: new Date(),
     }),
+    withTokens({
+        id: "product-tester-standard-3",
+        slug: "product-tester-standard-3",
+        title: "Test Sticker Pack — Standard Listing #3",
+        description: "Third member of the test product group. Carries a DIFFERENT gstRate from its siblings on purpose: it is the only fixture that exercises per-member GST proration on a grouped/bundled cart line, where taxing the whole line at one product's rate would be wrong in both directions. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 99,
+        currency: "INR",
+        stockQuantity: 10,
+        availableQuantity: 10,
+        isSold: false,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-standard-3-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-standard-3-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        // 12% against the siblings' 18% — the whole point of this fixture.
+        gstRate: 12,
+        hsnCode: "49081000",
+        groupId: "group-tester-sandbox-bundle",
+        groupParentSlug: "group-tester-sandbox-bundle",
+        groupTitle: TESTER_GROUP_TITLE,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
+    // ── Grouped-cart-line fixtures ───────────────────────────────────────────
+    // Each of the three below exists to make ONE picker branch testable by hand.
+    // Without them the branch can only be reached by editing data live, which a
+    // reseed silently wipes out.
+    withTokens({
+        id: "product-tester-group-soldout",
+        slug: "product-tester-group-soldout",
+        title: "Test Part — Sold Out (Group Member)",
+        description: "A member of the tester product group that is deliberately out of stock. Exists so the group picker's blocked-member branch has real data: it must render a reason chip instead of a +/- stepper, and must not be selectable. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 129,
+        currency: "INR",
+        stockQuantity: 0,
+        availableQuantity: 0,
+        isSold: true,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-group-soldout-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-group-soldout-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        gstRate: 18,
+        hsnCode: "95030090",
+        groupId: "group-tester-sandbox-bundle",
+        groupParentSlug: "group-tester-sandbox-bundle",
+        groupTitle: TESTER_GROUP_TITLE,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
+    // A group whose members span TWO stores. `storeId` is the order-splitting key
+    // and the key per-store add-ons/coupons/shipping/payout hang off, so such a
+    // group can never become one cart line — the picker must stand down to a
+    // read-only table rather than offer a button that always fails.
+    // `withTokens` spreads `...p` last, so the storeId below overrides the
+    // sandbox default on purpose.
+    withTokens({
+        id: "product-tester-crossstore-a",
+        slug: "product-tester-crossstore-a",
+        title: "Test Cross-Store Set — Seller A",
+        description: "Parent of a deliberately CROSS-STORE tester group. Its sibling belongs to a different seller, so the group picker must render read-only with no quantity column and no \"Add selected\" button. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 259,
+        currency: "INR",
+        stockQuantity: 6,
+        availableQuantity: 6,
+        isSold: false,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-a-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-a-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        gstRate: 18,
+        isGroupParent: true,
+        groupId: "group-tester-cross-store",
+        groupTitle: "Tester Cross-Store Set",
+        groupChildSlugs: ["product-tester-crossstore-b"],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
+    withTokens({
+        id: "product-tester-crossstore-b",
+        slug: "product-tester-crossstore-b",
+        title: "Test Cross-Store Set — Seller B",
+        description: "Sibling of product-tester-crossstore-a, deliberately owned by a DIFFERENT store so the group spans two sellers. Still isTestData, so filterTestDataForViewer keeps it off that store's public listings for non-testers. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 189,
+        currency: "INR",
+        stockQuantity: 6,
+        availableQuantity: 6,
+        isSold: false,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-b-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-b-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        gstRate: 12,
+        // The whole point of this fixture — a different seller from its sibling.
+        storeId: "store-beyblade-arena",
+        storeName: "Beyblade Arena",
+        groupId: "group-tester-cross-store",
+        groupParentSlug: "product-tester-crossstore-a",
+        groupTitle: "Tester Cross-Store Set",
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
     withTokens({
         id: "product-tester-standard-sold",
         slug: "product-tester-standard-sold",
@@ -644,7 +786,14 @@ export const productsTesterSeedData = [
         isGroupParent: true,
         groupId: "group-tester-sandbox-bundle",
         groupTitle: TESTER_GROUP_TITLE,
-        groupChildSlugs: ["product-tester-standard-1", "product-tester-standard-2"],
+        // Parent↔child mirror: every id here must also carry `groupId` on its own
+        // document. The pair drifting is Root Cause #42's second instance.
+        groupChildSlugs: [
+            "product-tester-standard-1",
+            "product-tester-standard-2",
+            "product-tester-standard-3",
+            "product-tester-group-soldout",
+        ],
         createdAt: new Date(),
         updatedAt: new Date(),
     }),