@mohasinac/appkit 4.1.3 → 4.3.0

package/dist/constants/field-names.js

@@ -75,7 +75,11 @@ export const PRODUCT_FIELDS = {
     PRIZE_REVEAL_STATUS: "prizeRevealStatus",
     PRIZE_REVEAL_WINDOW_START: "prizeRevealWindowStart",
     PRIZE_REVEAL_WINDOW_END: "prizeRevealWindowEnd",
-    PRIZE_REVEAL_DEADLINE: "prizeRevealDeadline",
+    PRIZE_DRAW_DURATION_DAYS: "prizeDrawDurationDays",
+    PRIZE_REVEAL_MODE: "prizeRevealMode",
+    PRIZE_CURRENT_ENTRIES: "prizeCurrentEntries",
+    PRIZE_MAX_ENTRIES: "prizeMaxEntries",
+    PRIZE_DRAW_MODE: "prizeDrawMode",
     IS_PART_OF_BUNDLE: "isPartOfBundle",
     SEARCH_TOKENS: "searchTokens",
     CREATED_AT: "createdAt",
@@ -116,6 +120,14 @@ export const PRODUCT_FIELDS = {
         OPEN: "open",
         CLOSED: "closed",
     },
+    PRIZE_REVEAL_MODE_VALUES: {
+        INSTANT: "instant",
+        SCHEDULED: "scheduled",
+    },
+    PRIZE_DRAW_MODE_VALUES: {
+        REVEAL: "reveal",
+        LOTTERY: "lottery",
+    },
     IS_ACTIVE: "isActive",
     DISPLAY_ORDER: "displayOrder",
     LISTING_TYPE_VALUES: {
@@ -185,6 +197,9 @@ export const ORDER_FIELDS = {
     PAYMENT_PROOF_URL: "paymentProofUrl",
     PAYMENT_PROOF_UPLOADED_AT: "paymentProofUploadedAt",
     PAYMENT_REVIEW_OUTCOME: "paymentReviewOutcome",
+    PRIZE_WON: "prizeWon",
+    PRIZE_DRAW_PRODUCT_ID: "prizeDrawProductId",
+    PRIZE_REVEAL_MODE: "prizeRevealMode",
     STATUS_VALUES: {
         PENDING: "pending",
         CONFIRMED: "confirmed",
@@ -466,6 +481,7 @@ export const CATEGORY_FIELDS = {
     BUNDLE_ITEM_DETAILS: "bundleItemDetails",
     BUNDLE_STOCK_STATUS: "bundleStockStatus",
     BUNDLE_QUERY_RESOLVED_AT: "bundleQueryResolvedAt",
+    BUNDLE_ORIGINAL_TOTAL: "bundleOriginalTotal",
     DISPLAY: "display",
     VIEW_COUNT: "viewCount",
     CREATED_AT: "createdAt",

package/dist/features/about/components/FeesView.js

@@ -65,6 +65,24 @@ export async function FeesView({} = {}) {
             who: t("paidByBuyer"),
             note: t("codHandlingFeeNote"),
         },
+        {
+            category: t("whatsappNotifyFeeTitle"),
+            rate: t("whatsappNotifyFeeRate"),
+            who: t("paidByBuyer"),
+            note: t("whatsappNotifyFeeNote"),
+        },
+        {
+            category: t("giftWrapFeeTitle"),
+            rate: t("giftWrapFeeRate"),
+            who: t("paidByBuyer"),
+            note: t("giftWrapFeeNote"),
+        },
+        {
+            category: t("shipmentProtectionFeeTitle"),
+            rate: t("shipmentProtectionFeeRate"),
+            who: t("paidByBuyer"),
+            note: t("shipmentProtectionFeeNote"),
+        },
     ];
     const OFFER_PAYOUT_ROWS = [
         { label: t("grossSale"), example: "₹1,000" },

package/dist/features/account/hooks/useNotifications.js

@@ -9,6 +9,11 @@ export function useNotifications(limit = 10, options) {
         queryKey: ["notifications", "list", String(limit)],
         queryFn: () => apiClient.get(`${notificationsEndpoint}?limit=${limit}`),
         staleTime: 30000,
+        // Notifications originate server-side (order/bid/moderation events) with
+        // no client-driven local-first path to short-circuit, unlike cart/
+        // wishlist. Poll on the same ~30s cadence as useSyncManager so the bell
+        // badge picks up new notifications without requiring a window refocus.
+        refetchInterval: 30000,
     });
     const { mutate: markRead } = useMutation({
         mutationFn: (id) => apiClient.patch(readEndpoint(id), {}),

package/dist/features/admin/actions/admin-actions.js

@@ -14,6 +14,7 @@ import { productRepository } from "../../products/repository/products.repository
 import { NotFoundError, ValidationError } from "../../../errors";
 import { finalizeStagedMediaUrl, finalizeStagedMediaField, finalizeStagedMediaArray, } from "../../media/finalize";
 import { getProviders } from "../../../contracts";
+import { assertPrizeDrawNotLocked, assertPrizeDrawWonItemsImmutable, } from "../../../_internal/server/features/products/service";
 const ERR_UID_REQUIRED = "uid is required";
 export async function revokeSession(adminId, sessionId) {
     if (!sessionId?.trim()) {
@@ -153,6 +154,10 @@ export async function adminUpdateProduct(adminId, id, input) {
     if (!existing) {
         throw new NotFoundError("Product not found");
     }
+    if (input.status && input.status !== "published" && existing.status === "published") {
+        assertPrizeDrawNotLocked(existing, "unpublished or archived");
+    }
+    assertPrizeDrawWonItemsImmutable(existing, input.prizeDrawItems);
     const finalized = { ...input };
     if (typeof finalized.mainImage === "string" && finalized.mainImage) {
         finalized.mainImage = await finalizeStagedMediaUrl(finalized.mainImage);
@@ -194,6 +199,7 @@ export async function adminDeleteProduct(adminId, id) {
     if (!existing) {
         throw new NotFoundError("Product not found");
     }
+    assertPrizeDrawNotLocked(existing, "deleted");
     await productRepository.delete(id);
     serverLogger.info("adminDeleteProduct", {
         adminId,

package/dist/features/admin/actions/notification-actions.d.ts

@@ -14,11 +14,14 @@ export interface SendNotificationInput extends NotificationCreateInput {
     userPhone?: string;
     /** Pre-rendered email HTML — falls back to a plain-text <p> when absent. */
     emailHtml?: string;
+    /** Buyer paid the ₹10 WhatsApp order-updates addon — enables WhatsApp channel for this notification even when the user has no standing WhatsApp subscription. */
+    orderWhatsappAddonPaid?: boolean;
 }
 export interface SendNotificationResult {
     notification: NotificationDocument;
     email: "sent" | "skipped" | "failed";
-    whatsapp: "sent" | "skipped" | "failed";
+    /** WhatsApp dispatch is now async (enqueued as a `whatsappNotify` job) — "queued" replaces "sent" as the immediate outcome; the real delivery result lands on `notification.whatsappStatus`. */
+    whatsapp: "queued" | "skipped" | "failed";
 }
 /**
  * Create an in-app notification and fan out to enabled external channels.

package/dist/features/admin/actions/notification-actions.js

@@ -3,10 +3,39 @@ import { notificationRepository } from "../repository/notification.repository";
 import { siteSettingsRepository } from "../repository/site-settings.repository";
 import { userRepository } from "../../auth/repository/user.repository";
 import { createResendProvider } from "../../../providers/email-resend/provider";
-import { sendWhatsAppBusinessMessage } from "../../whatsapp-bot/helpers/whatsapp";
+import { enqueueJob } from "../../jobs/actions/enqueue-job";
 import { serverLogger } from "../../../monitoring";
 import { decryptPii } from "../../../security/index";
 import { DEFAULT_NOTIFICATION_CHANNELS, meetsMinPriority, } from "../schemas/firestore";
+/**
+ * Notification types whose WhatsApp send is gated behind the buyer's
+ * per-order ₹10 WhatsApp-updates addon (`OrderDocument.whatsappNotifyAddon`)
+ * — see `orderWhatsappAddonPaid` on `SendNotificationInput`. Every other
+ * type (bid_won, offers, scam reports, support tickets, admin alerts, …)
+ * keeps the original two-gate behavior (admin channel enabled + user hasn't
+ * opted out) unchanged.
+ */
+const ORDER_GATED_TYPES = new Set([
+    "order_placed",
+    "order_confirmed",
+    "order_shipped",
+    "order_delivered",
+    "order_cancelled",
+    "refund_initiated",
+]);
+/** Notification type → the flat `SiteSettingsCredentials` field holding its approved Meta template name. */
+const WHATSAPP_TEMPLATE_FIELD = {
+    order_placed: "whatsappTemplateOrderPlaced",
+    order_confirmed: "whatsappTemplateOrderConfirmed",
+    order_shipped: "whatsappTemplateOrderShipped",
+    order_delivered: "whatsappTemplateOrderDelivered",
+    order_cancelled: "whatsappTemplateOrderCancelled",
+    refund_initiated: "whatsappTemplateRefundInitiated",
+};
+function resolveWhatsAppTemplateName(type, creds) {
+    const field = WHATSAPP_TEMPLATE_FIELD[type];
+    return (field ? creds[field] : undefined)?.trim() ?? "";
+}
 export async function markNotificationRead(id) {
     await notificationRepository.markAsRead(id);
 }
@@ -84,9 +113,8 @@ export async function sendNotification(input) {
         offer_expired: "offers", offer_counter_accepted: "offers",
         refund_initiated: "orderUpdates",
         product_available: "system",
-        prize_reveal_ready: "orderUpdates",
+        prize_won: "orderUpdates",
         prize_reveal_expired: "orderUpdates",
-        prize_reveal_reminder: "orderUpdates",
     };
     const typeKey = typeToPrefsKey[type];
     // If the user has explicitly disabled this notification type, skip all external channels.
@@ -121,28 +149,45 @@ export async function sendNotification(input) {
             }
         }
     }
-    // WhatsApp channel — admin enabled AND user hasn't opted out
+    // WhatsApp channel — admin enabled AND user hasn't opted out AND (for
+    // order-lifecycle types) the buyer paid the per-order WhatsApp addon.
     let whatsappStatus = "skipped";
     if (channels.whatsapp.enabled &&
         userChannelPrefs.whatsapp !== false &&
         resolvedPhone &&
         meetsMinPriority(priority, channels.whatsapp.minPriority) &&
-        (!channels.whatsapp.types?.length || channels.whatsapp.types.includes(type))) {
+        (!channels.whatsapp.types?.length || channels.whatsapp.types.includes(type)) &&
+        (!ORDER_GATED_TYPES.has(type) || input.orderWhatsappAddonPaid === true)) {
         const phoneNumberId = creds.whatsappPhoneNumberId?.trim() ?? "";
         const accessToken = creds.whatsappCloudApiToken?.trim() ?? "";
         if (phoneNumberId && accessToken) {
             try {
-                const ok = await sendWhatsAppBusinessMessage({
-                    toPhone: resolvedPhone,
-                    message: `*${title}*\n${message}`,
-                    phoneNumberId,
-                    accessToken,
+                const { jobId } = await enqueueJob({
+                    jobType: "whatsappNotify",
+                    payload: {
+                        toPhone: resolvedPhone,
+                        title,
+                        message,
+                        type,
+                        templateName: resolveWhatsAppTemplateName(type, creds),
+                        templateLanguage: creds.whatsappTemplateLanguage ?? "en",
+                        notificationId: notification.id,
+                        phoneNumberId,
+                        accessToken,
+                    },
+                    requestedBy: input.userId,
+                });
+                whatsappStatus = "queued";
+                await notificationRepository
+                    .update(notification.id, { whatsappStatus: "queued", whatsappJobId: jobId })
+                    .catch((err) => {
+                    void normalizeError(err);
+                    serverLogger.warn("sendNotification: failed to write whatsappJobId onto notification doc", { notificationId: notification.id });
                 });
-                whatsappStatus = ok ? "sent" : "failed";
             }
             catch (err) {
                 void normalizeError(err);
-                serverLogger.error("sendNotification: WhatsApp dispatch failed", { userId: input.userId, err });
+                serverLogger.error("sendNotification: WhatsApp job enqueue failed", { userId: input.userId, err });
                 whatsappStatus = "failed";
             }
         }

package/dist/features/admin/components/AdminAdsView.js

@@ -156,7 +156,7 @@ export function AdminAdsView({ endpoint = ADMIN_ENDPOINTS.ADS, labels = {}, crea
         settingsMutation.mutate(payload);
     };
     return (_jsx(StackedViewShell, { portal: "admin", ...rest, title: labels.title ?? "Ad Inventory", sections: [
-            _jsxs(Row, { align: "center", justify: "between", gap: "3", children: [_jsx(Text, { variant: "secondary", children: "Manage ad inventory, placement mapping, and publishing state." }), _jsx(TextLink, { variant: "bare", href: createHref, rounded: "md", paddingX: "sm", size: "sm", weight: "medium", layout: "inline-flex", align: "center", className: "h-9 bg-neutral-900 text-white bg-[var(--appkit-color-surface)] dark:text-[var(--appkit-color-text)]", children: "New ad" })] }),
+            _jsxs(Row, { align: "center", justify: "between", gap: "3", children: [_jsx(Text, { variant: "secondary", children: "Manage ad inventory, placement mapping, and publishing state." }), _jsx(TextLink, { variant: "bare", href: createHref, rounded: "md", paddingX: "sm", size: "sm", weight: "medium", layout: "inline-flex", align: "center", className: "h-9 bg-[var(--appkit-color-surface)] text-[var(--appkit-color-text)]", children: "New ad" })] }),
             adsQuery.error ? (_jsx(Alert, { variant: "error", title: "Could not load ads", children: adsQuery.error instanceof Error ? adsQuery.error.message : "Unknown error" })) : null,
             _jsx(AdsSettingsPanel, { adsenseClientId: adsenseClientId, setAdsenseClientId: setAdsenseClientId, thirdPartyScriptUrl: thirdPartyScriptUrl, setThirdPartyScriptUrl: setThirdPartyScriptUrl, consentRequired: consentRequired, setConsentRequired: setConsentRequired, serverCredentialIssues: serverCredentialIssues, localCredentialIssues: localCredentialIssues, credentialStatus: credentialStatus, providerCredentialsMasked: adsQuery.data?.providerCredentialsMasked, settingsMutation: settingsMutation, hasPendingCredentialInput: hasPendingCredentialInput, currentConsentRequired: Boolean(adsQuery.data?.consentRequired), settingsMessage: settingsMessage, onSave: saveSettings }),
             _jsx(AdsFilterRow, { q: q, setQ: setQ, status: status, setStatus: setStatus, provider: provider, setProvider: setProvider, placement: placement, setPlacement: setPlacement, placements: placements, onPageReset: () => setPage(1) }),

package/dist/features/admin/components/AdminBlogEditorView.js

@@ -114,7 +114,7 @@ export function AdminBlogEditorView({ postId, onSaved, onDeleted, embedded, ...r
                 slug: draft.slug || toSlug(draft.title),
                 excerpt: draft.excerpt,
                 content: draft.content,
-                coverImage: draft.coverImage || undefined,
+                coverImage: draft.coverImage ? { type: "image", url: draft.coverImage } : undefined,
                 youtubeId: draft.youtubeId || undefined,
                 category: draft.category,
                 tags: draft.tags,

package/dist/features/admin/components/AdminNewsletterView.js

@@ -1,10 +1,10 @@
 "use client";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { normalizeError } from "../../../errors/normalize";
-import { useApiMutation } from "@mohasinac/appkit/client";
+import { useApiMutation, useBulkEvent, RTDB_PATHS } from "@mohasinac/appkit/client";
 import { sieveFilter, SIEVE_OP } from "@mohasinac/appkit";
 import { sortBy } from "@mohasinac/appkit";
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 import { Button, ConfirmDeleteModal, FilterChipGroup, ListingLayout, RowActionMenu, useToast } from "../../../ui";
 import { ADMIN_ENDPOINTS } from "../../../constants/api-endpoints";
@@ -33,24 +33,55 @@ export function AdminNewsletterView({ children, onBulkUnsubscribe, ...props }) {
             showToast(err?.message ?? "Failed to unsubscribe.", "error");
         },
     });
+    // Export runs as an async `newsletterExport` job (Async Job Primitive) —
+    // the route only enqueues; this subscribes to the same RTDB bulk-event
+    // channel every other async job in the admin panel uses.
+    const [exporting, setExporting] = useState(false);
+    const exportEvent = useBulkEvent({ rtdbPath: RTDB_PATHS.BULK_EVENTS });
     const handleExportCsv = useCallback(async () => {
+        setExporting(true);
         try {
             const response = await fetch(ADMIN_ENDPOINTS.NEWSLETTER_EXPORT);
             if (!response.ok)
                 throw new Error("Export failed");
-            const blob = await response.blob();
-            const url = URL.createObjectURL(blob);
-            const a = document.createElement("a");
-            a.href = url;
-            a.download = "newsletter-subscribers.csv";
-            a.click();
-            URL.revokeObjectURL(url);
+            const body = (await response.json());
+            const { jobId, customToken } = body.data ?? {};
+            if (jobId && customToken) {
+                exportEvent.subscribe(jobId, customToken);
+            }
+            else {
+                throw new Error("Export failed to start");
+            }
         }
         catch (_err) {
             void normalizeError(_err);
+            setExporting(false);
             showToast("Failed to export CSV.", "error");
         }
-    }, [showToast]);
+    }, [showToast, exportEvent]);
+    useEffect(() => {
+        if (exportEvent.status === "success") {
+            setExporting(false);
+            const csv = exportEvent.result?.data?.csv;
+            if (csv) {
+                const blob = new Blob([csv], { type: "text/csv;charset=utf-8" });
+                const url = URL.createObjectURL(blob);
+                const a = document.createElement("a");
+                a.href = url;
+                a.download = `newsletter-subscribers-${new Date().toISOString().slice(0, 10)}.csv`;
+                a.click();
+                URL.revokeObjectURL(url);
+            }
+            else {
+                showToast("Export finished with no data.", "error");
+            }
+        }
+        else if (exportEvent.status === "failed" || exportEvent.status === "timeout") {
+            setExporting(false);
+            showToast(exportEvent.error ?? "Failed to export CSV.", "error");
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [exportEvent.status]);
     if (React.Children.count(children) > 0) {
         return (_jsx(ListingLayout, { portal: "admin", ...props, children: children }));
     }
@@ -85,7 +116,7 @@ export function AdminNewsletterView({ children, onBulkUnsubscribe, ...props }) {
             return mappedRows.length;
         },
         buildFilters: (state) => state.status && state.status !== "All" ? sieveFilter("status", SIEVE_OP.EQ, state.status) : undefined,
-        toolbarExtra: (_jsx(Button, { type: "button", variant: "outline", size: "sm", onClick: handleExportCsv, children: ACTIONS.ADMIN["export-csv"].label })),
+        toolbarExtra: (_jsx(Button, { type: "button", variant: "outline", size: "sm", onClick: handleExportCsv, isLoading: exporting, disabled: exporting, children: ACTIONS.ADMIN["export-csv"].label })),
         buildBulkActions: onBulkUnsubscribe
             ? (selection) => [
                 buildBulkAction(ACTIONS.ADMIN["unsubscribe-newsletter"], async () => {

package/dist/features/admin/components/AdminPrizeDrawsView.js

@@ -3,8 +3,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { SIEVE_OP, Stack, sieveFilter } from "@mohasinac/appkit";
 import { sortBy } from "@mohasinac/appkit";
 import React from "react";
-import { Pencil } from "lucide-react";
-import { Badge, Button, FilterChipGroup, ListingLayout, Span, Text, TextLink } from "../../../ui";
+import { Pencil, ListChecks } from "lucide-react";
+import { Badge, Button, FilterChipGroup, ListingLayout, Row, Span, Text, TextLink } from "../../../ui";
 import { ADMIN_ENDPOINTS } from "../../../constants/api-endpoints";
 import { ADMIN_BULK_ACTIONS, ROW_ACTION_META } from "../../products/constants/action-defs";
 import { ADMIN_PRODUCT_STATUS_TABS } from "../constants/filter-tabs";
@@ -101,7 +101,7 @@ export function AdminPrizeDrawsView({ children, ...props }) {
             destructive: ROW_ACTION_META[id].destructive,
             onClick: () => selection.clearSelection(),
         })),
-        renderRowActions: (row) => (_jsx(Button, { variant: "ghost", size: "sm", asChild: true, children: _jsx(TextLink, { href: String(ROUTES.ADMIN.PRIZE_DRAWS_EDIT(row.id)), "aria-label": "Edit", children: _jsx(Pencil, { className: "w-4 h-4" }) }) })),
+        renderRowActions: (row) => (_jsxs(Row, { gap: "xs", children: [_jsx(Button, { variant: "ghost", size: "sm", asChild: true, children: _jsx(TextLink, { href: String(ROUTES.ADMIN.PRIZE_DRAWS_EDIT(row.id)), "aria-label": "Edit", children: _jsx(Pencil, { className: "w-4 h-4" }) }) }), _jsx(Button, { variant: "ghost", size: "sm", asChild: true, children: _jsx(TextLink, { href: String(ROUTES.ADMIN.PRIZE_DRAWS_ENTRIES(row.id)), "aria-label": "View entries", children: _jsx(ListChecks, { className: "w-4 h-4" }) }) })] })),
         renderFilterPanel: ({ pendingFilters, setPendingFilters }) => (_jsx(FilterChipGroup, { label: "Status", tabs: ADMIN_PRODUCT_STATUS_TABS, value: pendingFilters.status ?? "", onChange: (id) => setPendingFilters((p) => ({ ...p, status: id })) })),
     };
     return _jsx(DataListingView, { config: config });