diff --git a/apps/admin-ui/app/(drawer)/manage-orders/orders/index_old.tsx b/apps/admin-ui/app/(drawer)/manage-orders/orders/index_old.tsx
new file mode 100644
index 0000000..fd17855
--- /dev/null
+++ b/apps/admin-ui/app/(drawer)/manage-orders/orders/index_old.tsx
@@ -0,0 +1,801 @@
+import React, { useState , useEffect } from 'react';
+import { View, TouchableOpacity, Alert, TextInput, ActivityIndicator, Linking } from 'react-native';
+import { AppContainer, MyText, tw, MyFlatList, BottomDialog, BottomDropdown, Checkbox, theme, MyTextInput } from 'common-ui';
+import { trpc } from '@/src/trpc-client';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import dayjs from 'dayjs';
+import MaterialIcons from '@expo/vector-icons/MaterialIcons';
+import { Entypo } from '@expo/vector-icons';
+import CancelOrderDialog from '@/components/CancelOrderDialog';
+import { OrderOptionsMenu } from '@/components/OrderOptionsMenu';
+import * as Location from 'expo-location';
+
+const AdminNotesForm = ({ orderId, existingNotes, onClose, refetch }: { orderId: string; existingNotes?: string | null; onClose: () => void; refetch: () => void }) => {
+ const [notesText, setNotesText] = useState(existingNotes || '');
+ const updateNotesMutation = trpc.admin.order.updateNotes.useMutation();
+
+ return (
+
+ Admin Notes
+
+
+ {
+ updateNotesMutation.mutate(
+ { orderId: parseInt(orderId), adminNotes: notesText },
+ {
+ onSuccess: () => {
+ onClose();
+ Alert.alert('Success', 'Notes updated successfully');
+ refetch();
+ },
+ onError: (error: any) => {
+ Alert.alert('Error', error.message || 'Failed to update notes');
+ },
+ }
+ );
+ }}
+ >
+ Save
+
+
+
+ );
+};
+
+
+interface OrderType {
+ id: number;
+ orderId: string;
+ readableId: number;
+ customerName: string | null;
+ customerMobile?: string | null;
+ address: string;
+ addressId: number;
+ latitude: number | null;
+ longitude: number | null;
+ totalAmount: number;
+ deliveryCharge: number;
+ items: {
+ id?: number;
+ name: string;
+ quantity: number;
+ price: number;
+ amount: number;
+ unit: string;
+ isPackaged?: boolean;
+ isPackageVerified?: boolean;
+ productSize: number;
+ }[];
+ createdAt: string;
+ deliveryTime: string | null;
+ status: 'pending' | 'delivered' | 'cancelled';
+ isPackaged: boolean;
+ isDelivered: boolean;
+ isCod: boolean;
+ isFlashDelivery: boolean;
+ couponCode?: string;
+ couponDescription?: string;
+ discountAmount?: number;
+ adminNotes?: string | null;
+ userNotes?: string | null;
+ userNegativityScore?: number;
+}
+
+const OrderItem = ({ order, refetch }: { order: OrderType; refetch: () => void }) => {
+ const id = order.orderId;
+ const router = useRouter();
+ const [menuOpen, setMenuOpen] = useState(false);
+ const [itemsDialogOpen, setItemsDialogOpen] = useState(false);
+ const [notesDialogOpen, setNotesDialogOpen] = useState(false);
+ const [cancelDialogOpen, setCancelDialogOpen] = useState(false);
+ const [userNotesDialogOpen, setUserNotesDialogOpen] = useState(false);
+ const [adminNotesDialogOpen, setAdminNotesDialogOpen] = useState(false);
+ const [updatingItems, setUpdatingItems] = useState>(new Set());
+
+ const updatePackagedMutation = trpc.admin.order.updatePackaged.useMutation();
+ const updateDeliveredMutation = trpc.admin.order.updateDelivered.useMutation();
+ const updateItemPackagingMutation = trpc.admin.order.updateOrderItemPackaging.useMutation();
+
+ const handleOrderPress = () => {
+ router.push(`/manage-orders/order-details/${order.orderId}` as any);
+ };
+
+ const handleMenuOption = () => {
+ setMenuOpen(false);
+ router.push(`/manage-orders/order-details/${order.orderId}` as any);
+ };
+
+ const handleMarkPackaged = (isPackaged: boolean) => {
+ updatePackagedMutation.mutate(
+ { orderId: order.orderId.toString(), isPackaged },
+ {
+ onSuccess: () => {
+ refetch();
+ },
+ }
+ );
+ };
+
+ const handleMarkDelivered = (isDelivered: boolean) => {
+ updateDeliveredMutation.mutate(
+ { orderId: order.orderId.toString(), isDelivered },
+ {
+ onSuccess: () => {
+ refetch();
+ },
+ }
+ );
+ };
+
+ const handleItemPackagingToggle = (itemId: number, field: 'isPackaged' | 'isPackageVerified', value: boolean) => {
+ setUpdatingItems(prev => new Set(prev).add(itemId));
+
+ updateItemPackagingMutation.mutate(
+ { orderItemId: itemId, [field]: value },
+ {
+ onSuccess: () => {
+ setUpdatingItems(prev => {
+ const newSet = new Set(prev);
+ newSet.delete(itemId);
+ return newSet;
+ });
+ refetch();
+ },
+ onError: (error: any) => {
+ setUpdatingItems(prev => {
+ const newSet = new Set(prev);
+ newSet.delete(itemId);
+ return newSet;
+ });
+ Alert.alert("Error", error.message || "Failed to update packaging status");
+ },
+ }
+ );
+ };
+
+ return (
+ <>
+
+ {/* Header Section */}
+
+
+
+
+ 0 ? 'text-yellow-600' : 'text-gray-900')}`}>
+ {order.customerName || order.customerMobile || 'Unknown Customer'}
+
+
+ #{order.readableId}
+
+ {order.isFlashDelivery && (
+
+
+ FLASH
+
+ )}
+
+
+
+
+ {dayjs(order.createdAt).format('MMM D, h:mm A')}
+
+ {order.userNegativityScore && order.userNegativityScore > 0 && (
+
+
+ Negative Customer
+
+ )}
+
+
+
+ setMenuOpen(true)}
+ style={tw`p-2 -mr-2 -mt-2 rounded-full`}
+ >
+
+
+
+
+
+ {/* Main Content */}
+
+ {/* Status Badges */}
+
+ {/*
+ {order.status}
+ */}
+ {/* {order.isCod && (
+
+ COD
+
+ )} */}
+
+ Packaged
+ handleMarkPackaged(!order.isPackaged)}
+ onPress={() => {}}
+ size={18}
+ fillColor={theme.colors.gray500}
+ checkColor="#FFFFFF"
+ />
+
+
+ Delivered
+ handleMarkDelivered(!order.isDelivered)}
+ size={18}
+ fillColor="#10B981"
+ checkColor="#FFFFFF"
+ />
+
+ {order.status === 'cancelled' && (
+
+ CANCELLED
+
+ )}
+
+
+ {/* Delivery Info */}
+
+
+
+ Delivery Address
+
+ {order.address}
+
+
+
+
+ {order.isFlashDelivery ? "1 Hr Delivery:" : "Slot:"} {order.isFlashDelivery ? dayjs(order.createdAt).add(30, 'minutes').format('MMM D, h:mm A') : order.deliveryTime ? dayjs(order.deliveryTime).format("ddd, MMM D • h:mm A") : 'Not scheduled'}
+
+
+ {order.isFlashDelivery && (
+
+
+
+ 1 Hour Delivery • High Priority
+
+
+ )}
+
+
+
+ {/* Items Summary & Total */}
+
+
+
+ setItemsDialogOpen(true)}
+ style={tw`flex-row items-center py-2 px-3 bg-blue-50 rounded-lg flex-1 mr-3`}
+ >
+
+
+ {order.items.length} {order.items.length === 1 ? 'item' : 'items'}
+
+ {order.isFlashDelivery && (
+
+ ⚡
+
+ )}
+
+
+ Total:
+ ₹{order.totalAmount}
+
+
+
+
+
+ {/* Coupons */}
+ {order.couponCode && (
+
+ Applied Coupons
+
+
+ {order.couponCode}
+
+ {order.couponDescription && (
+
+ {order.couponDescription}
+
+ )}
+ {order.discountAmount && (
+
+ Discount: ₹{order.discountAmount}
+
+ )}
+
+
+ )}
+
+ {/* Notes Section */}
+
+ {order.userNotes && (
+ setUserNotesDialogOpen(true)}
+ >
+
+
+ User Notes
+
+
+ )}
+ {order.adminNotes && (
+ setNotesDialogOpen(true)}
+ >
+
+
+ Admin Notes
+
+
+ )}
+
+
+ {/* Footer / Delivery Charge */}
+ {order.deliveryCharge > 0 && (
+
+
+ Delivery Charge
+ ₹{order.deliveryCharge}
+
+
+ )}
+
+
+
+ setMenuOpen(false)}
+ order={{
+ id: order.id,
+ readableId: order.readableId,
+ isPackaged: order.isPackaged,
+ isDelivered: order.isDelivered,
+ isFlashDelivery: order.isFlashDelivery,
+ address: order.address,
+ addressId: order.addressId,
+ adminNotes: order.adminNotes,
+ userNotes: order.userNotes,
+ latitude: order.latitude,
+ longitude: order.longitude,
+ status: order.status,
+ }}
+ onViewDetails={handleMenuOption}
+ onTogglePackaged={() => handleMarkPackaged(!order.isPackaged)}
+ onToggleDelivered={() => handleMarkDelivered(!order.isDelivered)}
+ onOpenAdminNotes={() => {
+ setMenuOpen(false);
+ setNotesDialogOpen(true);
+ }}
+ onCancelOrder={() => {
+ setMenuOpen(false);
+ setCancelDialogOpen(true);
+ }}
+ onAttachLocation={() => refetch()}
+ onWhatsApp={() => {}}
+ onDial={() => {}}
+ />
+
+ setItemsDialogOpen(false)}>
+
+
+
+ Order Items
+
+ {order.isFlashDelivery && (
+
+
+ FLASH
+
+ )}
+
+
+ Total: ₹{order.totalAmount}
+
+ {order.items.map((item, idx) => (
+
+
+
+ {item.quantity * item.productSize } {item.unit}
+
+
+ {item.name.length > 30 ? `${item.name.substring(0, 30)}...` : item.name}
+
+ {item.isPackaged !== undefined && item.isPackageVerified !== undefined && (
+ <>
+
+ pkg
+ handleItemPackagingToggle(item.id!, 'isPackaged', !item.isPackaged)}
+ size={18}
+ fillColor={updatingItems.has(item.id!) ? "#F59E0B" : "#10B981"}
+ checkColor="#FFFFFF"
+ />
+
+
+ verf
+ handleItemPackagingToggle(item.id!, 'isPackageVerified', !item.isPackageVerified)}
+ size={18}
+ fillColor={updatingItems.has(item.id!) ? "#F59E0B" : "#10B981"}
+ checkColor="#FFFFFF"
+ />
+
+ {updatingItems.has(item.id!) && (
+
+ )}
+
+ )}
+
+
+ ))}
+
+
+
+ setNotesDialogOpen(false)}>
+ setNotesDialogOpen(false)} refetch={refetch} />
+
+
+ setCancelDialogOpen(false)}
+ onSuccess={refetch}
+ />
+
+ setUserNotesDialogOpen(false)}>
+
+
+ User Notes
+
+
+
+ {order.userNotes}
+
+
+
+
+
+ setAdminNotesDialogOpen(false)}>
+
+
+ Admin Notes
+
+
+
+ {order.adminNotes}
+
+
+
+
+
+ );
+ };
+
+export default function Orders() {
+ const router = useRouter();
+ const { filter } = useLocalSearchParams<{ filter?: string }>();
+ const [selectedSlot, setSelectedSlot] = useState(null);
+ const [selectedSlotType, setSelectedSlotType] = useState<'slot' | 'flash' | null>(null);
+ const [packagedFilter, setPackagedFilter] = useState<'all' | 'packaged' | 'not_packaged'>('all');
+ const [packagedChecked, setPackagedChecked] = useState(false);
+ const [notPackagedChecked, setNotPackagedChecked] = useState(false);
+ const [deliveredFilter, setDeliveredFilter] = useState<'all' | 'delivered' | 'not_delivered'>('all');
+ const [deliveredChecked, setDeliveredChecked] = useState(false);
+ const [notDeliveredChecked, setNotDeliveredChecked] = useState(false);
+ const [cancellationFilter, setCancellationFilter] = useState<'all' | 'cancelled' | 'not_cancelled'>('all');
+ const [cancelledChecked, setCancelledChecked] = useState(false);
+ const [notCancelledChecked, setNotCancelledChecked] = useState(false);
+ const [flashDeliveryFilter, setFlashDeliveryFilter] = useState<'all' | 'flash' | 'regular'>('all');
+ const [flashChecked, setFlashChecked] = useState(false);
+ const [regularChecked, setRegularChecked] = useState(false);
+ const [filterDialogOpen, setFilterDialogOpen] = useState(false);
+
+ // Handle initial filter from URL params
+ useEffect(() => {
+ if (filter === 'flash') {
+ setSelectedSlotType('flash');
+ setFlashDeliveryFilter('flash');
+ setFlashChecked(true);
+ setRegularChecked(false);
+ }
+ }, [filter]);
+ const { data: slotsData } = trpc.admin.slots.getAll.useQuery();
+ const { data, isLoading, isFetchingNextPage, fetchNextPage, hasNextPage, refetch } = trpc.admin.order.getAll.useInfiniteQuery(
+ {
+ limit: 20,
+ slotId: selectedSlotType === 'slot' ? selectedSlot : null,
+ packagedFilter,
+ deliveredFilter,
+ cancellationFilter,
+ flashDeliveryFilter: selectedSlotType === 'flash' ? 'flash' : flashDeliveryFilter
+ },
+ {
+ getNextPageParam: (lastPage) => lastPage?.nextCursor,
+ }
+ );
+
+ const orders = data?.pages.flatMap(page => page?.orders) || [];
+
+ if (isLoading) {
+ return (
+
+
+ Loading orders...
+
+ );
+ }
+
+ const slotOptions = [
+ { label: '⚡ Flash Deliveries', value: 'flash' },
+ ...(slotsData?.slots?.map(slot => ({
+ label: dayjs(slot.deliveryTime).format('ddd DD MMM, h:mm a'),
+ value: slot.id.toString(),
+ })) || [])
+ ];
+
+
+ return (
+ <>
+ item!.orderId}
+ renderItem={({ item }) => item ? : null}
+ onEndReached={() => {
+ if (hasNextPage && !isFetchingNextPage) {
+ fetchNextPage();
+ }
+ }}
+ onEndReachedThreshold={0.5}
+ onRefresh={() => refetch()}
+ ListHeaderComponent={
+ <>
+
+
+ {
+ if (val === 'flash') {
+ setSelectedSlotType('flash');
+ setSelectedSlot(null);
+ setFlashDeliveryFilter('flash');
+ // Reset other filters when switching to flash
+ setPackagedFilter('all');
+ setPackagedChecked(false);
+ setNotPackagedChecked(false);
+ setDeliveredFilter('all');
+ setDeliveredChecked(false);
+ setNotDeliveredChecked(false);
+ setCancellationFilter('all');
+ setCancelledChecked(false);
+ setNotCancelledChecked(false);
+ } else {
+ setSelectedSlotType('slot');
+ setSelectedSlot(val ? Number(val) : null);
+ setFlashDeliveryFilter('all');
+ }
+ }}
+ placeholder="All slots"
+ />
+
+ setFilterDialogOpen(true)}
+ style={tw`p-2`}
+ >
+
+
+
+ {!isLoading && selectedSlotType && (
+
+
+ {selectedSlotType === 'flash'
+ ? `${orders.length} Flash delivery orders`
+ : `${orders.length} Orders in slot`
+ }
+
+
+ )}
+
+ }
+ ListFooterComponent={
+ isFetchingNextPage ? (
+
+
+ Loading more...
+
+ ) : null
+ }
+ />
+
+ setFilterDialogOpen(false)}>
+
+
+ Packaged Status
+
+ {
+ const newValue = !packagedChecked;
+ setPackagedChecked(newValue);
+ if (newValue && notPackagedChecked) {
+ setPackagedFilter('all');
+ } else if (newValue) {
+ setPackagedFilter('packaged');
+ } else if (notPackagedChecked) {
+ setPackagedFilter('not_packaged');
+ } else {
+ setPackagedFilter('all');
+ }
+ }}
+ />
+ Packaged
+
+
+ {
+ const newValue = !notPackagedChecked;
+ setNotPackagedChecked(newValue);
+ if (packagedChecked && newValue) {
+ setPackagedFilter('all');
+ } else if (newValue) {
+ setPackagedFilter('not_packaged');
+ } else if (packagedChecked) {
+ setPackagedFilter('packaged');
+ } else {
+ setPackagedFilter('all');
+ }
+ }}
+ />
+ Not Packaged
+
+
+
+ Delivered Status
+
+ {
+ const newValue = !deliveredChecked;
+ setDeliveredChecked(newValue);
+ if (newValue && notDeliveredChecked) {
+ setDeliveredFilter('all');
+ } else if (newValue) {
+ setDeliveredFilter('delivered');
+ } else if (notDeliveredChecked) {
+ setDeliveredFilter('not_delivered');
+ } else {
+ setDeliveredFilter('all');
+ }
+ }}
+ />
+ Delivered
+
+
+ {
+ const newValue = !notDeliveredChecked;
+ setNotDeliveredChecked(newValue);
+ if (deliveredChecked && newValue) {
+ setDeliveredFilter('all');
+ } else if (newValue) {
+ setDeliveredFilter('not_delivered');
+ } else if (deliveredChecked) {
+ setDeliveredFilter('delivered');
+ } else {
+ setDeliveredFilter('all');
+ }
+ }}
+ />
+ Not Delivered
+
+
+
+ Cancellation Status
+
+ {
+ const newValue = !cancelledChecked;
+ setCancelledChecked(newValue);
+ if (newValue && notCancelledChecked) {
+ setCancellationFilter('all');
+ } else if (newValue) {
+ setCancellationFilter('cancelled');
+ } else if (notCancelledChecked) {
+ setCancellationFilter('not_cancelled');
+ } else {
+ setCancellationFilter('all');
+ }
+ }}
+ />
+ Cancelled
+
+
+ {
+ const newValue = !notCancelledChecked;
+ setNotCancelledChecked(newValue);
+ if (cancelledChecked && newValue) {
+ setCancellationFilter('all');
+ } else if (newValue) {
+ setCancellationFilter('not_cancelled');
+ } else if (cancelledChecked) {
+ setCancellationFilter('cancelled');
+ } else {
+ setCancellationFilter('all');
+ }
+ }}
+ />
+ Not Cancelled
+
+
+
+ Delivery Type
+
+ {
+ const newValue = !flashChecked;
+ setFlashChecked(newValue);
+ if (newValue && regularChecked) {
+ setFlashDeliveryFilter('all');
+ } else if (newValue) {
+ setFlashDeliveryFilter('flash');
+ } else if (regularChecked) {
+ setFlashDeliveryFilter('regular');
+ } else {
+ setFlashDeliveryFilter('all');
+ }
+ }}
+ />
+ ⚡ 1 Hr Delivery
+
+
+ {
+ const newValue = !regularChecked;
+ setRegularChecked(newValue);
+ if (flashChecked && newValue) {
+ setFlashDeliveryFilter('all');
+ } else if (newValue) {
+ setFlashDeliveryFilter('regular');
+ } else if (flashChecked) {
+ setFlashDeliveryFilter('flash');
+ } else {
+ setFlashDeliveryFilter('all');
+ }
+ }}
+ />
+ Regular Delivery
+
+
+
+
+
+ );
+}
diff --git a/apps/admin-ui/app/(drawer)/prices-overview/index.tsx b/apps/admin-ui/app/(drawer)/prices-overview/index.tsx
index 091a8bb..1a192b9 100644
--- a/apps/admin-ui/app/(drawer)/prices-overview/index.tsx
+++ b/apps/admin-ui/app/(drawer)/prices-overview/index.tsx
@@ -21,31 +21,32 @@ import { trpc } from "@/src/trpc-client";
import MaterialIcons from "@expo/vector-icons/MaterialIcons";
import { Entypo } from "@expo/vector-icons";
-interface ProductItemProps {
- item: any;
- hasChanges: (productId: number) => boolean;
+interface SkuItemProps {
+ sku: any;
+ productName: string;
+ hasChanges: (skuId: number) => boolean;
pendingChanges: Record;
setPendingChanges: React.Dispatch>>;
- openEditDialog: (product: any) => void;
+ openEditDialog: (sku: any, productName: string) => void;
}
-const ProductItemComponent: React.FC = ({
- item: product,
+const SkuItemComponent: React.FC = ({
+ sku,
+ productName,
hasChanges,
pendingChanges,
setPendingChanges,
openEditDialog,
}) => {
- const changed = hasChanges(product.id);
- const change = pendingChanges[product.id] || {};
- const displayPrice = change.price !== undefined ? change.price : product.price;
- const displayMarketPrice = change.marketPrice !== undefined ? change.marketPrice : product.marketPrice;
- const displayFlashPrice = change.flashPrice !== undefined ? change.flashPrice : product.flashPrice;
- const displayProductQuantity = change.productQuantity !== undefined ? change.productQuantity : product.productQuantity;
+ const changed = hasChanges(sku.id);
+ const change = pendingChanges[sku.id] || {};
+ const displayPrice = change.price !== undefined ? change.price : sku.price;
+ const displayMarketPrice = change.marketPrice !== undefined ? change.marketPrice : sku.marketPrice;
+ const displayFlashPrice = change.flashPrice !== undefined ? change.flashPrice : sku.flashPrice;
+ const displayProductQuantity = change.productQuantity !== undefined ? change.productQuantity : sku.productQuantity;
return (
- {/* Change indicator */}
= ({
- {/* First row: Image and Name */}
- {/* Product image */}
-{/* Product name and Flash Checkbox */}
-
- {product.name.length > 25 ? product.name.substring(0, 25) + '...' : product.name}
-
+
+
+ {productName.length > 20 ? productName.substring(0, 20) + '...' : productName}
+
+
+ {sku.displayName || sku.name || ''}
+
+
{
- const currentValue = change.isFlashAvailable ?? product.isFlashAvailable ?? false;
+ const currentValue = change.isFlashAvailable ?? sku.isFlashAvailable ?? false;
setPendingChanges(prev => ({
...prev,
- [product.id]: {
- ...change,
+ [sku.id]: {
+ ...prev[sku.id],
isFlashAvailable: !currentValue,
},
}));
@@ -93,47 +96,42 @@ const ProductItemComponent: React.FC = ({
-{/* Prices and Product Size Row */}
- {/* Our Price */}
Our Price
₹{displayPrice}
- openEditDialog(product)} style={tw`ml-1`}>
+ openEditDialog(sku, productName)} style={tw`ml-1`}>
- {/* Market Price */}
Market Price
{displayMarketPrice ? `₹${displayMarketPrice}` : "N/A"}
- openEditDialog(product)} style={tw`ml-1`}>
+ openEditDialog(sku, productName)} style={tw`ml-1`}>
- {/* Flash Price */}
Flash Price
{displayFlashPrice ? `₹${displayFlashPrice}` : "N/A"}
- openEditDialog(product)} style={tw`ml-1`}>
+ openEditDialog(sku, productName)} style={tw`ml-1`}>
- {/* Product Size */}
Size
- {displayProductQuantity ? `${displayProductQuantity}${product.unit.shortNotation || ''}` : "N/A"}
- openEditDialog(product)} style={tw`ml-1`}>
+ {displayProductQuantity ? `${displayProductQuantity}${sku.unit?.shortNotation || ''}` : "N/A"}
+ openEditDialog(sku, productName)} style={tw`ml-1`}>
@@ -153,7 +151,8 @@ interface PendingChange {
interface EditDialogState {
open: boolean;
- product: any;
+ sku: any;
+ productName: string;
tempPrice: string;
tempMarketPrice: string;
tempFlashPrice: string;
@@ -166,7 +165,8 @@ export default function PricesOverview() {
const [pendingChanges, setPendingChanges] = useState>({});
const [editDialog, setEditDialog] = useState({
open: false,
- product: null,
+ sku: null,
+ productName: "",
tempPrice: "",
tempMarketPrice: "",
tempFlashPrice: "",
@@ -184,13 +184,11 @@ export default function PricesOverview() {
const stores = storesData?.stores || [];
const allProducts = productsData?.products || [];
- // Sort stores alphabetically
const sortedStores = useMemo(() =>
[...stores].sort((a, b) => a.name.localeCompare(b.name)),
[stores]
);
- // Store options for dropdown
const storeOptions = useMemo(() =>
sortedStores.map(store => ({
label: store.name,
@@ -199,38 +197,46 @@ export default function PricesOverview() {
[sortedStores]
);
- // Initialize selectedStores to all if not set
useEffect(() => {
if (stores.length > 0 && selectedStores.length === 0) {
setSelectedStores(stores.map(s => s.id.toString()));
}
}, [stores, selectedStores]);
- // Filter products by selected stores
- const filteredProducts = useMemo(() => {
- if (selectedStores.length === 0) return allProducts;
- return allProducts.filter(product =>
- product.storeId && selectedStores.includes(product.storeId.toString())
+ const allSkus = useMemo(() => {
+ const skus: any[] = [];
+ for (const product of allProducts) {
+ if (product.skus && product.skus.length > 0) {
+ for (const sku of product.skus) {
+ skus.push({ ...sku, _productName: product.name, _storeId: product.storeId });
+ }
+ }
+ }
+ return skus;
+ }, [allProducts]);
+
+ const filteredSkus = useMemo(() => {
+ if (selectedStores.length === 0) return allSkus;
+ return allSkus.filter(sku =>
+ sku._storeId && selectedStores.includes(sku._storeId.toString())
);
- }, [allProducts, selectedStores]);
+ }, [allSkus, selectedStores]);
- // Check if a product has changes
- const hasChanges = (productId: number) => !!pendingChanges[productId];
+ const hasChanges = (skuId: number) => !!pendingChanges[skuId];
- // Open edit dialog
- const openEditDialog = (product: any) => {
- const change = pendingChanges[product.id] || {};
+ const openEditDialog = (sku: any, productName: string) => {
+ const change = pendingChanges[sku.id] || {};
setEditDialog({
open: true,
- product,
- tempPrice: (change.price ?? product.price)?.toString() || "",
- tempMarketPrice: (change.marketPrice ?? product.marketPrice)?.toString() || "",
- tempFlashPrice: (change.flashPrice ?? product.flashPrice)?.toString() || "",
- tempProductQuantity: (change.productQuantity ?? product.productQuantity)?.toString() || "",
+ sku,
+ productName,
+ tempPrice: (change.price ?? sku.price)?.toString() || "",
+ tempMarketPrice: (change.marketPrice ?? sku.marketPrice)?.toString() || "",
+ tempFlashPrice: (change.flashPrice ?? sku.flashPrice)?.toString() || "",
+ tempProductQuantity: (change.productQuantity ?? sku.productQuantity)?.toString() || "",
});
};
- // Save edit dialog
const saveEditDialog = () => {
const price = parseFloat(editDialog.tempPrice);
const marketPrice = editDialog.tempMarketPrice ? parseFloat(editDialog.tempMarketPrice) : null;
@@ -253,27 +259,27 @@ export default function PricesOverview() {
}
if (editDialog.tempProductQuantity && (isNaN(productQuantity!) || productQuantity! <= 0)) {
- Alert.alert("Error", "Please enter a valid product size");
+ Alert.alert("Error", "Please enter a valid size");
return;
}
setPendingChanges(prev => ({
...prev,
- [editDialog.product.id]: {
- price: price !== editDialog.product.price ? price : undefined,
- marketPrice: marketPrice !== editDialog.product.marketPrice ? marketPrice : undefined,
- flashPrice: flashPrice !== editDialog.product.flashPrice ? flashPrice : undefined,
- productQuantity: productQuantity !== editDialog.product.productQuantity ? productQuantity : undefined,
+ [editDialog.sku.id]: {
+ price: price !== parseFloat(editDialog.sku.price) ? price : undefined,
+ marketPrice: marketPrice !== parseFloat(editDialog.sku.marketPrice || '0') ? marketPrice : undefined,
+ flashPrice: flashPrice !== parseFloat(editDialog.sku.flashPrice || '0') ? flashPrice : undefined,
+ productQuantity: productQuantity !== (editDialog.sku.productQuantity || 1) ? productQuantity : undefined,
},
}));
- setEditDialog({ open: false, product: null, tempPrice: "", tempMarketPrice: "", tempFlashPrice: "", tempProductQuantity: "" });
+ setEditDialog({ open: false, sku: null, productName: "", tempPrice: "", tempMarketPrice: "", tempFlashPrice: "", tempProductQuantity: "" });
};
- // Handle save all changes
const handleSave = () => {
- const updates = Object.entries(pendingChanges).map(([productId, change]) => {
- const update: any = { productId: parseInt(productId) };
+ const updates = Object.entries(pendingChanges).map(([skuId, change]) => {
+ const sku = allSkus.find(s => s.id === parseInt(skuId));
+ const update: any = { productId: sku?.productId };
if (change.price !== undefined) update.price = change.price;
if (change.marketPrice !== undefined) update.marketPrice = change.marketPrice;
if (change.flashPrice !== undefined) update.flashPrice = change.flashPrice;
@@ -297,13 +303,10 @@ export default function PricesOverview() {
);
};
-
-
const changeCount = Object.keys(pendingChanges).length;
return (
- {/* Stores filter, save button, and menu */}
- {/* Content */}
{productsLoading || storesLoading ? (
@@ -358,10 +360,11 @@ export default function PricesOverview() {
) : (
(
-
)}
- {/* Edit Dialog */}
setEditDialog({ ...editDialog, open: false, tempFlashPrice: "", tempMarketPrice: "", tempPrice: "", tempProductQuantity: "" })}>
- {editDialog.product?.name}
+ {editDialog.productName}
+ {editDialog.sku?.displayName || editDialog.sku?.name || ''}
Our Price
@@ -413,13 +416,13 @@ export default function PricesOverview() {
- Product Size
+ Size
setEditDialog({ ...editDialog, tempProductQuantity: text })}
keyboardType="decimal-pad"
- placeholder="Enter product size"
+ placeholder="Enter size"
/>
@@ -432,7 +435,6 @@ export default function PricesOverview() {
- {/* Menu Dialog */}
setShowMenu(false)}>
@@ -452,8 +454,6 @@ export default function PricesOverview() {
-
-
);
-}
\ No newline at end of file
+}
diff --git a/apps/admin-ui/app/(drawer)/products/add.tsx b/apps/admin-ui/app/(drawer)/products/add.tsx
index 33b9a71..2e6e461 100644
--- a/apps/admin-ui/app/(drawer)/products/add.tsx
+++ b/apps/admin-ui/app/(drawer)/products/add.tsx
@@ -1,73 +1,88 @@
-import React from 'react';
-import { Alert } from 'react-native';
-import { AppContainer, ImageUploaderNeoPayload } from 'common-ui';
-import ProductForm from '@/src/components/ProductForm';
-import { trpc } from '@/src/trpc-client';
-import { useUploadToObjectStorage } from '@/hooks/useUploadToObjectStore';
+import React from 'react'
+import { Alert } from 'react-native'
+import { AppContainer, ImageUploaderNeoPayload } from 'common-ui'
+import ProductForm from '@/src/components/ProductForm'
+import { trpc } from '@/src/trpc-client'
+import { useUploadToObjectStorage } from '@/hooks/useUploadToObjectStore'
export default function AddProduct() {
- const createProduct = trpc.admin.product.createProduct.useMutation();
+ const createProduct = trpc.admin.product.createProduct.useMutation()
const { refetch: refetchProducts } = trpc.admin.product.getProducts.useQuery(undefined, {
enabled: false,
- });
- const { upload, isUploading } = useUploadToObjectStorage();
+ })
+ const { upload, isUploading } = useUploadToObjectStorage()
- const handleSubmit = async (values: any, images: ImageUploaderNeoPayload[]) => {
+ const handleSubmit = async (values: any, variantImages: ImageUploaderNeoPayload[][], _deletedImageKeys?: string[]) => {
try {
- let uploadUrls: string[] = [];
+ const allBlobs: { blob: Blob; mimeType: string }[] = []
+ const imageCounts: number[] = variantImages.map((imgs) => imgs.length)
- if (images.length > 0) {
- const blobs = await Promise.all(
- images.map(async (img) => {
- const response = await fetch(img.url);
- const blob = await response.blob();
- return { blob, mimeType: img.mimeType || 'image/jpeg' };
- })
- );
-
- const result = await upload({ images: blobs, contextString: 'product_info' });
- uploadUrls = result.presignedUrls;
+ for (const imgs of variantImages) {
+ for (const img of imgs) {
+ const response = await fetch(img.url)
+ const blob = await response.blob()
+ allBlobs.push({ blob, mimeType: img.mimeType || 'image/jpeg' })
+ }
}
+ let allUploadUrls: string[] = []
+ if (allBlobs.length > 0) {
+ const result = await upload({ images: allBlobs, contextString: 'product_info' })
+ allUploadUrls = result.presignedUrls
+ }
+
+ let urlCursor = 0
+ const skus = values.variants.map((variant: any, vIndex: number) => {
+ const count = imageCounts[vIndex]
+ const variantUrls = allUploadUrls.slice(urlCursor, urlCursor + count)
+ urlCursor += count
+
+ return {
+ name: variant.name || null,
+ price: parseFloat(variant.price),
+ marketPrice: variant.marketPrice ? parseFloat(variant.marketPrice) : undefined,
+ images: variantUrls,
+ isFlashAvailable: variant.isFlashAvailable || false,
+ flashPrice: variant.flashPrice ? parseFloat(variant.flashPrice) : undefined,
+ features: variant.attributes.map((attr: any) => ({
+ featureName: attr.featureName,
+ featureValue: attr.featureValue,
+ })),
+ }
+ })
+
await createProduct.mutateAsync({
name: values.name,
- shortDescription: values.shortDescription,
- longDescription: values.longDescription,
- unitId: parseInt(values.unitId),
- storeId: parseInt(values.storeId),
- price: parseFloat(values.price),
- marketPrice: values.marketPrice ? parseFloat(values.marketPrice) : undefined,
+ shortDescription: values.shortDescription || undefined,
+ longDescription: values.longDescription || undefined,
+ storeId: values.storeId,
incrementStep: 1,
- productQuantity: values.productQuantity || 1,
- isSuspended: values.isSuspended || false,
- isFlashAvailable: values.isFlashAvailable || false,
- flashPrice: values.flashPrice ? parseFloat(values.flashPrice) : undefined,
- uploadUrls,
- tagIds: values.tagIds || [],
- });
+ skus,
+ })
- await refetchProducts();
- Alert.alert('Success', 'Product created successfully!');
+ await refetchProducts()
+ Alert.alert('Success', 'Product created successfully!')
} catch (error: any) {
- Alert.alert('Error', error.message || 'Failed to create product');
+ Alert.alert('Error', error.message || 'Failed to create product')
}
- };
+ }
const initialValues = {
- name: '',
- shortDescription: '',
- longDescription: '',
- unitId: 0,
- price: '',
- storeId: 1,
- marketPrice: '',
- deals: [{ quantity: '', price: '', validTill: new Date() }],
- tagIds: [],
- isSuspended: false,
- isFlashAvailable: false,
- flashPrice: '',
- productQuantity: 1,
- };
+ name: '',
+ shortDescription: '',
+ longDescription: '',
+ storeId: 1,
+ variants: [
+ {
+ name: '',
+ price: '',
+ marketPrice: '',
+ isFlashAvailable: false,
+ flashPrice: '',
+ attributes: [{ featureName: 'quantity', featureValue: '' }],
+ },
+ ],
+ }
return (
@@ -78,5 +93,5 @@ export default function AddProduct() {
isLoading={createProduct.isPending || isUploading}
/>
- );
+ )
}
diff --git a/apps/admin-ui/app/(drawer)/products/add_old.tsx b/apps/admin-ui/app/(drawer)/products/add_old.tsx
new file mode 100644
index 0000000..33b9a71
--- /dev/null
+++ b/apps/admin-ui/app/(drawer)/products/add_old.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { Alert } from 'react-native';
+import { AppContainer, ImageUploaderNeoPayload } from 'common-ui';
+import ProductForm from '@/src/components/ProductForm';
+import { trpc } from '@/src/trpc-client';
+import { useUploadToObjectStorage } from '@/hooks/useUploadToObjectStore';
+
+export default function AddProduct() {
+ const createProduct = trpc.admin.product.createProduct.useMutation();
+ const { refetch: refetchProducts } = trpc.admin.product.getProducts.useQuery(undefined, {
+ enabled: false,
+ });
+ const { upload, isUploading } = useUploadToObjectStorage();
+
+ const handleSubmit = async (values: any, images: ImageUploaderNeoPayload[]) => {
+ try {
+ let uploadUrls: string[] = [];
+
+ if (images.length > 0) {
+ const blobs = await Promise.all(
+ images.map(async (img) => {
+ const response = await fetch(img.url);
+ const blob = await response.blob();
+ return { blob, mimeType: img.mimeType || 'image/jpeg' };
+ })
+ );
+
+ const result = await upload({ images: blobs, contextString: 'product_info' });
+ uploadUrls = result.presignedUrls;
+ }
+
+ await createProduct.mutateAsync({
+ name: values.name,
+ shortDescription: values.shortDescription,
+ longDescription: values.longDescription,
+ unitId: parseInt(values.unitId),
+ storeId: parseInt(values.storeId),
+ price: parseFloat(values.price),
+ marketPrice: values.marketPrice ? parseFloat(values.marketPrice) : undefined,
+ incrementStep: 1,
+ productQuantity: values.productQuantity || 1,
+ isSuspended: values.isSuspended || false,
+ isFlashAvailable: values.isFlashAvailable || false,
+ flashPrice: values.flashPrice ? parseFloat(values.flashPrice) : undefined,
+ uploadUrls,
+ tagIds: values.tagIds || [],
+ });
+
+ await refetchProducts();
+ Alert.alert('Success', 'Product created successfully!');
+ } catch (error: any) {
+ Alert.alert('Error', error.message || 'Failed to create product');
+ }
+ };
+
+ const initialValues = {
+ name: '',
+ shortDescription: '',
+ longDescription: '',
+ unitId: 0,
+ price: '',
+ storeId: 1,
+ marketPrice: '',
+ deals: [{ quantity: '', price: '', validTill: new Date() }],
+ tagIds: [],
+ isSuspended: false,
+ isFlashAvailable: false,
+ flashPrice: '',
+ productQuantity: 1,
+ };
+
+ return (
+
+
+
+ );
+}
diff --git a/apps/admin-ui/app/(drawer)/products/detail/[id].tsx b/apps/admin-ui/app/(drawer)/products/detail/[id].tsx
index cba7c26..842b448 100644
--- a/apps/admin-ui/app/(drawer)/products/detail/[id].tsx
+++ b/apps/admin-ui/app/(drawer)/products/detail/[id].tsx
@@ -149,9 +149,8 @@ export default function ProductDetail() {
refetch();
});
- const toggleOutOfStock = trpc.admin.product.toggleOutOfStock.useMutation();
-
const product = productData?.product;
+ const defaultSku = product?.skus?.[0]
const handleEdit = () => {
router.push(`/products/edit?id=${productId}` as any);
@@ -188,9 +187,9 @@ export default function ProductDetail() {
{/* Hero Section */}
- {product.images && product.images.length > 0 ? (
+ {defaultSku?.images && defaultSku.images.length > 0 ? (
{product.name}
- {
- toggleOutOfStock.mutate({ id: productId }, {
- onSuccess: () => Alert.alert('Success', 'Stock status updated'),
- onError: (err) => Alert.alert('Error', err.message)
- });
- }}
- activeOpacity={0.9}
- >
-
-
- {product.isOutOfStock ? 'Out of Stock' : 'In Stock'}
-
-
-
- ₹{product.price}
- / {product.unit?.shortNotation}
- {product.marketPrice && (
-
- ₹{product.marketPrice}
-
- )}
-
-
- {/* Increment Step Info */}
-
-
-
- Increment: {product.incrementStep || 1}
-
-
-
+
+
+ {product.skus?.length ?? 0} Variant{(product.skus?.length ?? 0) !== 1 ? 's' : ''}
+
+
+
{/* Quick Stats Row */}
@@ -287,29 +255,10 @@ export default function ProductDetail() {
{reviewsData?.reviews.length || 0}
Reviews
- {/*
- {
- toggleOutOfStock.mutate({ id: productId }, {
- onSuccess: () => Alert.alert('Success', 'Stock status updated'),
- onError: (err) => Alert.alert('Error', err.message)
- });
- }}
- activeOpacity={0.9}
- >
-
-
- {product.isOutOfStock ? 'Out of Stock' : 'In Stock'}
-
-
-
- Stock
- */}
+
+ {product.incrementStep || 1}
+ Step
+
@@ -331,45 +280,69 @@ export default function ProductDetail() {
{product.longDescription || "No detailed description available for this product."}
-
+
- {/* Availability */}
-
-
-
-
-
-
- Availability
-
+ {/* Variants Section */}
+
+
+
+
+
+
+ Variants
+
+ {product.skus?.length ?? 0}
+
+
-
- This product is currently {product.isOutOfStock ? 'out of stock' : 'in stock'}.
-
+ {product.skus?.map((sku) => (
+
+ {/* Attributes */}
+ {sku.features?.map((f) => (
+
+ {f.featureName}
+ {f.featureValue}
+
+ ))}
- {
- toggleOutOfStock.mutate({ id: productId }, {
- onSuccess: () => {
- Alert.alert('Success', 'Stock status updated');
- refetch();
- },
- onError: (err) => Alert.alert('Error', err.message)
- });
- }}
- activeOpacity={0.8}
- style={tw`bg-gray-100 px-4 py-2 rounded-full border border-gray-200 self-start`}
- >
-
- Mark as {product.isOutOfStock ? 'In Stock' : 'Out of Stock'}
-
-
-
-
+ {/* Pricing row */}
+
+
+ ₹{sku.price}
+ {sku.marketPrice && (
+ ₹{sku.marketPrice}
+ )}
+
+
+ {sku.isFlashAvailable && (
+
+ Flash ₹{sku.flashPrice}
+
+ )}
+
+
+ {sku.isOutOfStock ? 'Out of Stock' : 'In Stock'}
+
+
+
+
- {/* Special Deals */}
+ {/* SKU Images */}
+ {sku.images && sku.images.length > 0 && (
+
+ {sku.images.map((url, idx) => (
+
+ ))}
+
+ )}
+
+ ))}
+
+
+
+ {/* Special Deals */}
{product.deals && product.deals.length > 0 && (
-
+
(null);
- const { data: product, isLoading: isFetching, refetch } = trpc.admin.product.getProductById.useQuery(
+ const { data: productResponse, isLoading: isFetching, refetch } = trpc.admin.product.getProductById.useQuery(
{ id: productId },
{ enabled: !!productId }
);
@@ -24,50 +24,119 @@ export default function EditProduct() {
useManualRefresh(() => refetch());
- const handleSubmit = async (values: any, images: ImageUploaderNeoPayload[], imagesToDelete: string[]) => {
- try {
- // New images have mimeType !== null, existing images have mimeType === null
- const newImages = images.filter(img => img.mimeType !== null);
- let uploadUrls: string[] = [];
+ const productData = productResponse?.product;
- if (newImages.length > 0) {
- const blobs = await Promise.all(
- newImages.map(async (img) => {
- const response = await fetch(img.url);
- const blob = await response.blob();
- return { blob, mimeType: img.mimeType || 'image/jpeg' };
- })
- );
-
- const result = await upload({ images: blobs, contextString: 'product_info' });
- uploadUrls = result.presignedUrls;
+ const initialValues = useMemo(() => {
+ if (!productData) {
+ return {
+ name: '',
+ shortDescription: '',
+ longDescription: '',
+ storeId: 0,
+ variants: [],
}
+ }
+ return {
+ name: productData.name,
+ shortDescription: productData.shortDescription || '',
+ longDescription: productData.longDescription || '',
+ storeId: productData.storeId || 1,
+ variants: (productData.skus || []).map((sku) => ({
+ name: sku.name || '',
+ price: sku.price || '',
+ marketPrice: sku.marketPrice || '',
+ isFlashAvailable: sku.isFlashAvailable || false,
+ flashPrice: sku.flashPrice || '',
+ attributes: (sku.features || []).map((f) => ({
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ })),
+ })),
+ }
+ }, [productData])
+
+ const existingVariantImages = useMemo(() => {
+ if (!productData) return []
+ return (productData.skus || []).map((sku) =>
+ (sku.images || []).map((url) => ({ imgUrl: url, mimeType: null } as ImageUploaderNeoItem))
+ )
+ }, [productData])
+
+ const existingVariantImageKeys = useMemo(() => {
+ if (!productData) return []
+ return (productData.skus || []).map((sku) =>
+ (sku.imageKeys || []).map(String)
+ )
+ }, [productData])
+
+ const handleSubmit = async (values: any, variantImages: ImageUploaderNeoPayload[][], deletedImageKeys: string[]) => {
+ try {
+ const allBlobs: { blob: Blob; mimeType: string }[] = []
+ const imageCounts: number[] = variantImages.map((imgs) =>
+ imgs.filter((img) => img.mimeType !== null).length
+ )
+
+ for (const imgs of variantImages) {
+ for (const img of imgs) {
+ if (img.mimeType === null) continue // existing image, skip
+ const response = await fetch(img.url)
+ const blob = await response.blob()
+ allBlobs.push({ blob, mimeType: img.mimeType || 'image/jpeg' })
+ }
+ }
+
+ let allUploadUrls: string[] = []
+ if (allBlobs.length > 0) {
+ const result = await upload({ images: allBlobs, contextString: 'product_info' })
+ allUploadUrls = result.presignedUrls
+ }
+
+ // Build SKU inputs with images (existing + new)
+ let urlCursor = 0
+ const skus = values.variants.map((variant: any, vIndex: number) => {
+ const count = imageCounts[vIndex]
+ const newUrls = allUploadUrls.slice(urlCursor, urlCursor + count)
+ urlCursor += count
+
+ // Existing images (mimeType === null) stay as-is
+ const existingUrls = variantImages[vIndex]
+ ?.filter((img) => img.mimeType === null)
+ .map((img) => img.url) || []
+
+ const allUrls = [...existingUrls, ...newUrls]
+
+ return {
+ name: variant.name || null,
+ price: parseFloat(variant.price),
+ marketPrice: variant.marketPrice ? parseFloat(variant.marketPrice) : undefined,
+ images: allUrls,
+ isFlashAvailable: variant.isFlashAvailable || false,
+ flashPrice: variant.flashPrice ? parseFloat(variant.flashPrice) : undefined,
+ features: variant.attributes.map((attr: any) => ({
+ featureName: attr.featureName,
+ featureValue: attr.featureValue,
+ })),
+ }
+ })
await updateProduct.mutateAsync({
id: productId,
name: values.name,
- shortDescription: values.shortDescription,
- longDescription: values.longDescription,
- unitId: parseInt(values.unitId),
- storeId: parseInt(values.storeId),
- price: parseFloat(values.price),
- marketPrice: values.marketPrice ? parseFloat(values.marketPrice) : undefined,
+ shortDescription: values.shortDescription || undefined,
+ longDescription: values.longDescription || undefined,
+ storeId: values.storeId,
incrementStep: 1,
- productQuantity: values.productQuantity || 1,
- isSuspended: values.isSuspended || false,
- isFlashAvailable: values.isFlashAvailable || false,
- flashPrice: values.flashPrice ? parseFloat(values.flashPrice) : null,
- uploadUrls,
- imagesToDelete,
- tagIds: values.tagIds || [],
- });
+ skus,
+ deletedImageKeys,
+ newImageUrls: allUploadUrls,
+ } as any)
- await refetch();
- await refetchProducts();
- Alert.alert('Success', 'Product updated successfully!');
- productFormRef.current?.clearImages();
+ await refetch()
+ await refetchProducts()
+ Alert.alert('Success', 'Product updated successfully!')
+ productFormRef.current?.clearImages()
} catch (error: any) {
- Alert.alert('Error', error.message || 'Failed to update product');
+ Alert.alert('Error', error.message || 'Failed to update product')
}
};
@@ -81,7 +150,7 @@ export default function EditProduct() {
);
}
- if (!product) {
+ if (!productData) {
return (
@@ -91,34 +160,6 @@ export default function EditProduct() {
);
}
- const productData = product.product;
-
- const existingImages: ImageUploaderNeoItem[] = (productData.images || []).map((url) => ({
- imgUrl: url,
- mimeType: null,
- }));
- const existingImageKeys = productData.imageKeys || [];
-
- const initialValues = {
- name: productData.name,
- shortDescription: productData.shortDescription || '',
- longDescription: productData.longDescription || '',
- unitId: productData.unitId,
- storeId: productData.storeId || 1,
- price: productData.price.toString(),
- marketPrice: productData.marketPrice?.toString() || '',
- deals: productData.deals?.map(deal => ({
- quantity: deal.quantity,
- price: deal.price,
- validTill: deal.validTill ? new Date(deal.validTill) : null,
- })) || [{ quantity: '', price: '', validTill: null }],
- tagIds: productData.tags?.map((tag: any) => tag.id) || [],
- isSuspended: productData.isSuspended || false,
- isFlashAvailable: productData.isFlashAvailable || false,
- flashPrice: productData.flashPrice?.toString() || '',
- productQuantity: productData.productQuantity || 1,
- };
-
return (
);
diff --git a/apps/admin-ui/app/(drawer)/products/index.tsx b/apps/admin-ui/app/(drawer)/products/index.tsx
index eea72b4..a7125fd 100644
--- a/apps/admin-ui/app/(drawer)/products/index.tsx
+++ b/apps/admin-ui/app/(drawer)/products/index.tsx
@@ -1,15 +1,19 @@
import React, { useState, useMemo } from 'react';
-import { View, ScrollView, TouchableOpacity, Alert, RefreshControl } from 'react-native';
+import { View, ScrollView, TouchableOpacity, RefreshControl } from 'react-native';
import { Image } from 'expo-image';
import { useRouter } from 'expo-router';
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
-import { AppContainer, MyText, tw, MyButton, useManualRefresh, MyTextInput, SearchBar, useMarkDataFetchers } from 'common-ui';
+import { AppContainer, MyText, tw, MyButton, useManualRefresh, SearchBar, useMarkDataFetchers } from 'common-ui';
import { trpc } from '@/src/trpc-client';
-import type { AdminProduct } from '@packages/shared';
+import type { AdminSku } from '@packages/shared';
type FilterType = 'all' | 'in-stock' | 'out-of-stock';
+function getDefaultSku(product: { skus: AdminSku[] }): AdminSku | null {
+ return product.skus?.[0] ?? null
+}
+
export default function Products() {
const router = useRouter();
const [searchTerm, setSearchTerm] = useState('');
@@ -18,8 +22,6 @@ export default function Products() {
const { data: productsData, isLoading, error, refetch } = trpc.admin.product.getProducts.useQuery();
- const toggleOutOfStockMutation = trpc.admin.product.toggleOutOfStock.useMutation();
-
useManualRefresh(refetch);
useMarkDataFetchers(() => {
@@ -36,12 +38,14 @@ export default function Products() {
const filteredProducts = useMemo(() => {
return products.filter(product => {
+ const defaultSku = getDefaultSku(product)
+
const matchesSearch = product.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
(product.shortDescription?.toLowerCase().includes(searchTerm.toLowerCase()));
const matchesFilter = activeFilter === 'all' ||
- (activeFilter === 'in-stock' && !product.isOutOfStock) ||
- (activeFilter === 'out-of-stock' && product.isOutOfStock);
+ (activeFilter === 'in-stock' && !defaultSku?.isOutOfStock) ||
+ (activeFilter === 'out-of-stock' && defaultSku?.isOutOfStock);
return matchesSearch && matchesFilter;
});
@@ -51,34 +55,6 @@ export default function Products() {
router.push(`/products/edit?id=${productId}` as any);
};
-
-
- // const handleToggleStock = (product: any) => {
- const handleToggleStock = (product: Pick) => {
- const action = product.isOutOfStock ? 'mark as in stock' : 'mark as out of stock';
- Alert.alert(
- 'Update Stock Status',
- `Are you sure you want to ${action} "${product.name}"?`,
- [
- { text: 'Cancel', style: 'cancel' },
- {
- text: 'Confirm',
- onPress: () => {
- toggleOutOfStockMutation.mutate({ id: product.id }, {
- onSuccess: (data) => {
- Alert.alert('Success', data.message);
- refetch(); // Refresh the list
- },
- onError: (error: any) => {
- Alert.alert('Error', error.message || 'Failed to update stock status');
- },
- });
- },
- },
- ]
- );
- };
-
const handleViewDetails = (productId: number) => {
router.push(`/products/detail/${productId}` as any);
};
@@ -120,8 +96,8 @@ export default function Products() {
);
}
- const inStockCount = products.filter(p => !p.isOutOfStock).length;
- const outOfStockCount = products.filter(p => p.isOutOfStock).length;
+ const inStockCount = products.filter(p => getDefaultSku(p) && !getDefaultSku(p)!.isOutOfStock).length;
+ const outOfStockCount = products.filter(p => getDefaultSku(p)?.isOutOfStock).length;
return (
@@ -184,12 +160,17 @@ export default function Products() {
) : (
- {filteredProducts.map(product => (
+ {filteredProducts.map(product => {
+ const defaultSku = getDefaultSku(product)
+ const skuImages = defaultSku?.images ?? null
+ const isOut = defaultSku?.isOutOfStock ?? false
+
+ return (
{/* Product Image */}
- {product.images && product.images.length > 0 ? (
+ {skuImages && skuImages.length > 0 ? (
@@ -206,9 +187,9 @@ export default function Products() {
{product.name}
-
-
- {product.isOutOfStock ? 'Out' : 'In'}
+
+
+ {isOut ? 'Out' : 'In'}
@@ -220,16 +201,9 @@ export default function Products() {
)}
-
-
- ₹{product.price}
-
- {product.marketPrice && (
-
- ₹{product.marketPrice}
-
- )}
-
+
+ {product.skus?.length ?? 0} Variants
+
{/* Action Buttons */}
@@ -249,20 +223,11 @@ export default function Products() {
Edit
-
- handleToggleStock(product)}
- style={tw`flex-1 ${product.isOutOfStock ? 'bg-green-500' : 'bg-orange-500'} p-3 rounded-lg flex-row items-center justify-center`}
- >
-
-
- {product.isOutOfStock ? 'Stock' : 'Out'}
-
-
- ))}
+ )
+ })}
)}
diff --git a/apps/admin-ui/components/ProductsSelector.tsx b/apps/admin-ui/components/ProductsSelector.tsx
index 6894032..30eba0b 100644
--- a/apps/admin-ui/components/ProductsSelector.tsx
+++ b/apps/admin-ui/components/ProductsSelector.tsx
@@ -4,22 +4,17 @@ import BottomDropdown, { DropdownOption } from 'common-ui/src/components/bottom-
import { trpc } from '../src/trpc-client';
import { tw } from 'common-ui';
-interface Product {
+interface SkuSummary {
id: number;
- name: string;
- price: number;
- unit?: string;
- shortDescription?: string | null;
- isOutOfStock?: boolean;
- isSuspended?: boolean;
- storeId?: number | null;
- unitNotation?: string;
+ productId: number;
+ productName: string;
+ label: string;
}
interface Group {
id: number;
groupName: string;
- products: Product[];
+ products: { id: number }[];
}
interface ProductsSelectorProps {
@@ -30,8 +25,8 @@ interface ProductsSelectorProps {
placeholder?: string;
disabled?: boolean;
error?: boolean;
- isDisabled?: (product: Product) => boolean;
- labelFormat?: (product: Product) => string;
+ isDisabled?: (product: SkuSummary) => boolean;
+ labelFormat?: (product: SkuSummary) => string;
groups?: Group[];
selectedGroupIds?: number[];
onGroupChange?: (groupIds: number[]) => void;
@@ -53,85 +48,78 @@ export default function ProductsSelector({
selectedGroupIds = [],
onGroupChange,
}: ProductsSelectorProps) {
- const { data: productsData } = trpc.common.product.getAllProductsSummary.useQuery({});
- const products = productsData?.products || [];
+ const { data: skusData } = trpc.common.product.getAllSkusSummary.useQuery({});
+ const allSkus: SkuSummary[] = skusData?.skus || [];
const [searchQuery, setSearchQuery] = useState('');
- // Format product label: name (unit) (₹price)
- const formatProductLabel = (product: Product): string => {
- if (labelFormat) {
- return labelFormat(product);
- }
- const unit = product.unit ? ` (${product.unit})` : '';
- const price = ` (₹${product.price})`;
- return `${product.name}${unit}${price}`;
- };
-
// Handle group selection changes
const handleGroupChange = (newGroupIds: number[]) => {
if (!onGroupChange) return;
const previousGroupIds = selectedGroupIds;
- // Find which groups were added and which were removed
const addedGroups = newGroupIds.filter(id => !previousGroupIds.includes(id));
const removedGroups = previousGroupIds.filter(id => !newGroupIds.includes(id));
- // Get current selected products
- let currentProducts = Array.isArray(value) ? [...value] : value ? [value] : [];
+ let currentSkus = Array.isArray(value) ? [...value] : value ? [value] : [];
- // Add products from newly selected groups
- const addedProducts = addedGroups.flatMap(groupId => {
+ const addedSkus = addedGroups.flatMap(groupId => {
const group = groups.find(g => g.id === groupId);
- return group?.products.map(p => p.id) || [];
+ if (!group) return [];
+ const productIds = new Set(group.products.map(p => p.id));
+ return allSkus.filter(s => productIds.has(s.productId)).map(s => s.id);
});
- // Remove products from deselected groups
- const removedProducts = removedGroups.flatMap(groupId => {
+ const removedSkus = removedGroups.flatMap(groupId => {
const group = groups.find(g => g.id === groupId);
- return group?.products.map(p => p.id) || [];
+ if (!group) return [];
+ const productIds = new Set(group.products.map(p => p.id));
+ return allSkus.filter(s => productIds.has(s.productId)).map(s => s.id);
});
- // Update product list: add new ones, remove deselected group ones
- currentProducts = [...new Set([...currentProducts, ...addedProducts])];
- currentProducts = currentProducts.filter(id => !removedProducts.includes(id));
+ currentSkus = [...new Set([...currentSkus, ...addedSkus])];
+ currentSkus = currentSkus.filter(id => !removedSkus.includes(id));
onGroupChange(newGroupIds);
if (multiple) {
- onChange(currentProducts.length > 0 ? currentProducts : []);
+ onChange(currentSkus.length > 0 ? currentSkus : []);
} else {
- onChange(currentProducts.length > 0 ? currentProducts[0] : 0);
+ onChange(currentSkus.length > 0 ? currentSkus[0] : 0);
}
};
// Filter products based on search query
- const filteredProducts = useMemo(() => {
- if (!searchQuery.trim()) return products;
+ const filteredSkus = useMemo(() => {
+ if (!searchQuery.trim()) return allSkus;
const query = searchQuery.toLowerCase();
- return products.filter(product =>
- product.name.toLowerCase().includes(query) ||
- (product.shortDescription && product.shortDescription.toLowerCase().includes(query)) ||
- (product.unit && product.unit.toLowerCase().includes(query))
+ return allSkus.filter(sku =>
+ sku.label.toLowerCase().includes(query) ||
+ sku.productName.toLowerCase().includes(query)
);
- }, [products, searchQuery]);
+ }, [allSkus, searchQuery]);
// Build dropdown options
const productOptions: DropdownOption[] = useMemo(() => {
- return filteredProducts.map((product) => {
- const isFromGroup = selectedGroupIds.length > 0 && groups.some(group =>
- selectedGroupIds.includes(group.id) && group.products.some(p => p.id === product.id)
- );
+ return filteredSkus.map((sku) => {
+ const isFromGroup = selectedGroupIds.length > 0 && groups.some(group => {
+ if (!selectedGroupIds.includes(group.id)) return false;
+ return group.products.some(p => p.id === sku.productId);
+ });
- const isProductDisabled = isDisabled ? isDisabled(product as Product) : false;
+ const isProductDisabled = isDisabled ? isDisabled(sku) : false;
+
+ const displayLabel = labelFormat
+ ? labelFormat(sku)
+ : sku.label;
return {
- label: `${formatProductLabel(product as Product)}${isFromGroup ? ' (from group)' : ''}`,
- value: product.id.toString(),
+ label: `${displayLabel}${isFromGroup ? ' (from group)' : ''}`,
+ value: sku.id.toString(),
disabled: isProductDisabled,
};
});
- }, [filteredProducts, selectedGroupIds, groups, isDisabled, labelFormat]);
+ }, [filteredSkus, selectedGroupIds, groups, isDisabled, labelFormat]);
// Build group options if groups are provided
const groupOptions: DropdownOption[] = useMemo(() => {
@@ -143,7 +131,6 @@ export default function ProductsSelector({
return (
- {/* Groups selector (if groups are provided and showGroups is true) */}
{showGroups && groups.length > 0 && (
id.toString())}
- onValueChange={(value) => {
- const selectedValues = Array.isArray(value) ? value : typeof value === 'string' ? [value] : [];
+ onValueChange={(selectedValue) => {
+ const selectedValues = Array.isArray(selectedValue) ? selectedValue : typeof selectedValue === 'string' ? [selectedValue] : [];
const newGroupIds = selectedValues.map(v => parseInt(v as string));
handleGroupChange(newGroupIds);
}}
@@ -162,7 +149,6 @@ export default function ProductsSelector({
)}
- {/* Products selector */}
({
name: snippet.name || '',
groupIds: snippet.groupIds || [],
- productIds: snippet.productIds || [],
+ skuIds: snippet.skuIds || [],
validTill: snippet.validTill || undefined,
})) as VendorSnippet[];
@@ -48,7 +48,7 @@ export default function SlotForm({
deliveryTime: initialDeliveryTime || (slotData?.slot?.deliveryTime ? new Date(slotData.slot.deliveryTime) : null),
freezeTime: initialFreezeTime || (slotData?.slot?.freezeTime ? new Date(slotData.slot.freezeTime) : null),
selectedGroupIds: initialGroupIds.length > 0 ? initialGroupIds : (slotData?.slot?.groupIds || []),
- selectedProductIds: initialProductIds.length > 0 ? initialProductIds : (slotData?.slot?.products?.map((p: any) => p.id) || []),
+ selectedSkuIds: initialProductIds.length > 0 ? initialProductIds : (slotData?.slot?.products?.map((p: any) => p.id) || []),
vendorSnippetList: vendorSnippetsFromSlot,
};
@@ -58,15 +58,8 @@ export default function SlotForm({
const isEditMode = !!slotId;
const isPending = isCreating || isUpdating;
- // Fetch groups
const { data: groupsData } = trpc.admin.product.getGroups.useQuery();
-
-
-
-
-
-
const handleFormSubmit = (values: typeof initialValues) => {
if (!values.deliveryTime || !values.freezeTime) {
Alert.alert('Error', 'Please fill all fields');
@@ -78,23 +71,22 @@ export default function SlotForm({
return;
}
- const slotData = {
+ const slotInputData = {
deliveryTime: values.deliveryTime.toISOString(),
freezeTime: values.freezeTime.toISOString(),
isActive: initialIsActive,
groupIds: values.selectedGroupIds,
- productIds: values.selectedProductIds,
+ skuIds: values.selectedSkuIds,
vendorSnippets: values.vendorSnippetList.map((snippet: VendorSnippet) => ({
name: snippet.name,
- productIds: snippet.productIds,
+ skuIds: snippet.skuIds,
validTill: snippet.validTill,
})),
};
-
if (isEditMode && slotId) {
updateSlot(
- { id: slotId, ...slotData },
+ { id: slotId, ...slotInputData },
{
onSuccess: () => {
Alert.alert('Success', 'Slot updated successfully!');
@@ -109,12 +101,10 @@ export default function SlotForm({
);
} else {
createSlot(
- slotData,
+ slotInputData,
{
onSuccess: () => {
Alert.alert('Success', 'Slot created successfully!');
- // Reset form
- // Formik will handle reset
onSlotAdded?.();
},
onError: (error: any) => {
@@ -131,12 +121,11 @@ export default function SlotForm({
onSubmit={handleFormSubmit}
>
{({ handleSubmit, values, setFieldValue }) => {
- // Map groups data to match ProductsSelector types (convert price from string to number)
const mappedGroups = (groupsData?.groups || []).map(group => ({
...group,
products: group.products.map(product => ({
...product,
- price: parseFloat(product.price as unknown as string) || 0,
+ id: product.id,
})),
}));
@@ -168,8 +157,8 @@ export default function SlotForm({
setFieldValue('selectedProductIds', newProductIds)}
+ value={values.selectedSkuIds}
+ onChange={(newSkuIds) => setFieldValue('selectedSkuIds', newSkuIds)}
groups={mappedGroups}
selectedGroupIds={values.selectedGroupIds}
onGroupChange={(newGroupIds) => setFieldValue('selectedGroupIds', newGroupIds)}
@@ -196,19 +185,19 @@ export default function SlotForm({
setFieldValue(`vendorSnippetList.${index}.productIds`, newProductIds)}
+ value={snippet.skuIds || []}
+ onChange={(newSkuIds) => setFieldValue(`vendorSnippetList.${index}.skuIds`, newSkuIds)}
groups={mappedGroups.filter(group =>
values.selectedGroupIds.includes(group.id)
).map(group => ({
...group,
- products: group.products.filter(p => values.selectedProductIds.includes(p.id))
+ products: group.products.filter((p: any) => values.selectedSkuIds.includes(p.id))
}))}
selectedGroupIds={snippet.groupIds || []}
onGroupChange={(newGroupIds) => setFieldValue(`vendorSnippetList.${index}.groupIds`, newGroupIds)}
label="Select Products"
placeholder="Select products for snippet"
- isDisabled={(product) => !values.selectedProductIds.includes(product.id)}
+ isDisabled={(sku) => !values.selectedSkuIds.includes(sku.id)}
/>
))}
push({ name: '', groupIds: [], productIds: [], validTill: '' })}
+ onPress={() => push({ name: '', groupIds: [], skuIds: [], validTill: '' })}
style={tw`bg-blue-500 px-4 py-3 rounded-lg items-center`}
>
Add Vendor Snippet
@@ -244,4 +233,4 @@ export default function SlotForm({
)}}
);
-}
\ No newline at end of file
+}
diff --git a/apps/admin-ui/src/components/ProductForm.tsx b/apps/admin-ui/src/components/ProductForm.tsx
index ac8d4e3..7b660ca 100644
--- a/apps/admin-ui/src/components/ProductForm.tsx
+++ b/apps/admin-ui/src/components/ProductForm.tsx
@@ -1,262 +1,296 @@
-import React, { useState, useEffect, useCallback, forwardRef, useImperativeHandle, useMemo } from 'react';
-import { View, TouchableOpacity } from 'react-native';
-import { Formik, FieldArray } from 'formik';
-import * as Yup from 'yup';
-import { MyTextInput, BottomDropdown, MyText, useTheme, DatePicker, tw, useFocusCallback, Checkbox, ImageUploaderNeo, ImageUploaderNeoItem, ImageUploaderNeoPayload } from 'common-ui';
-import MaterialIcons from '@expo/vector-icons/MaterialIcons';
-import { trpc } from '../trpc-client';
+import React, { useState, useImperativeHandle, forwardRef } from 'react'
+import { View, TouchableOpacity, ScrollView } from 'react-native'
+import { Formik, FieldArray } from 'formik'
+import { MyTextInput, BottomDropdown, MyText, tw, ImageUploaderNeo, ImageUploaderNeoItem, ImageUploaderNeoPayload, Checkbox } from 'common-ui'
+import MaterialIcons from '@expo/vector-icons/MaterialIcons'
+import { trpc } from '../trpc-client'
-interface ProductFormData {
- name: string;
- shortDescription: string;
- longDescription: string;
- unitId: number;
- storeId: number;
- price: string;
- marketPrice: string;
- isSuspended: boolean;
- isFlashAvailable: boolean;
- flashPrice: string;
- deals: Deal[];
- tagIds: number[];
- productQuantity: number;
+interface Attribute {
+ featureName: string
+ featureValue: string
}
-interface Deal {
- quantity: string;
- price: string;
- validTill: Date | null;
+interface Variant {
+ name: string
+ price: string
+ marketPrice: string
+ isFlashAvailable: boolean
+ flashPrice: string
+ attributes: Attribute[]
+}
+
+interface ProductFormData {
+ name: string
+ shortDescription: string
+ longDescription: string
+ storeId: number
+ variants: Variant[]
}
export interface ProductFormRef {
- clearImages: () => void;
+ clearImages: () => void
}
interface ProductFormProps {
- mode: 'create' | 'edit';
- initialValues: ProductFormData;
- onSubmit: (values: ProductFormData, images: ImageUploaderNeoPayload[], imagesToDelete: string[]) => void;
- isLoading: boolean;
- existingImages?: ImageUploaderNeoItem[];
- existingImageKeys?: string[];
+ mode: 'create' | 'edit'
+ initialValues: ProductFormData
+ onSubmit: (values: ProductFormData, variantImages: ImageUploaderNeoPayload[][], deletedImageKeys: string[]) => void
+ isLoading: boolean
+ existingVariantImages?: ImageUploaderNeoItem[][]
+ existingVariantImageKeys?: string[][]
}
-const unitOptions = [
- { label: 'Kg', value: 1 },
- { label: 'Litre', value: 2 },
- { label: 'Dozen', value: 3 },
- { label: 'Unit Piece', value: 4 },
-];
+const defaultAttribute = (): Attribute => ({ featureName: 'quantity', featureValue: '' })
+
+const defaultVariant = (): Variant => ({
+ name: '',
+ price: '',
+ marketPrice: '',
+ isFlashAvailable: false,
+ flashPrice: '',
+ attributes: [defaultAttribute()],
+})
const ProductForm = forwardRef(({
mode,
initialValues,
onSubmit,
isLoading,
- existingImages:existingImagesRaw,
- existingImageKeys = [],
+ existingVariantImages = [],
+ existingVariantImageKeys = [],
}, ref) => {
- const { theme } = useTheme();
- const [images, setImages] = useState([]);
+ const [variantImages, setVariantImages] = useState(() =>
+ initialValues.variants.length > 0
+ ? initialValues.variants.map((_, i) => existingVariantImages[i] || [])
+ : [[]]
+ )
- const existingImages = existingImagesRaw || []
- // Sync images state when existingImages prop changes (e.g., when async query data arrives)
- useEffect(() => {
- setImages(existingImages);
- }, [existingImagesRaw]);
+ useImperativeHandle(ref, () => ({
+ clearImages: () => setVariantImages(initialValues.variants.map(() => [])),
+ }), [initialValues.variants])
- const { data: storesData } = trpc.common.getStoresSummary.useQuery();
- const storeOptions = storesData?.stores.map(store => ({
+ const { data: storesData } = trpc.common.getStoresSummary.useQuery()
+ const storeOptions = storesData?.stores.map((store) => ({
label: store.name,
value: store.id,
- })) || [];
-
- const { data: tagsData } = trpc.admin.product.getProductTags.useQuery();
- const tagOptions = tagsData?.tags.map(tag => ({
- label: tag.tagName,
- value: tag.id.toString(),
- })) || [];
-
- // Build signed URL -> S3 key mapping for existing images
- const signedUrlToKey = useMemo(() => {
- const map: Record = {};
- existingImages.forEach((img, i) => {
- if (existingImageKeys[i]) {
- map[img.imgUrl] = existingImageKeys[i];
- }
- });
- return map;
- }, [existingImages, existingImageKeys]);
+ })) || []
return (
{
- // New images have mimeType set, existing images have mimeType === null
- const newImages = images.filter(img => img.mimeType !== null);
- const deletedImageKeys = existingImages
- .filter(existing => !images.some(current => current.imgUrl === existing.imgUrl))
- .map(deleted => signedUrlToKey[deleted.imgUrl])
- .filter(Boolean);
-
- onSubmit(
- values,
- newImages.map(img => ({ url: img.imgUrl, mimeType: img.mimeType })),
- deletedImageKeys,
- );
+ const images = variantImages.map((imgs) =>
+ imgs.map((img) => ({ url: img.imgUrl, mimeType: img.mimeType }))
+ )
+ const deletedKeys: string[] = []
+ if (mode === 'edit') {
+ variantImages.forEach((currentImgs, vIndex) => {
+ const existing = existingVariantImages[vIndex] || []
+ existing.forEach((existingImg) => {
+ if (!currentImgs.some((cur) => cur.imgUrl === existingImg.imgUrl)) {
+ const key = existingVariantImageKeys[vIndex]?.[existingVariantImages[vIndex]?.indexOf(existingImg)]
+ if (key) deletedKeys.push(key)
+ }
+ })
+ })
+ }
+ onSubmit(values, images, deletedKeys)
}}
enableReinitialize
>
- {({ handleChange, handleSubmit, values, setFieldValue, resetForm }) => {
- const clearForm = useCallback(() => {
- setImages([]);
- resetForm();
- }, [resetForm]);
+ {({ handleChange, handleSubmit, values, setFieldValue }) => (
+
+
+
+
+ setFieldValue('storeId', value)}
+ placeholder="Select store"
+ style={{ marginBottom: 16 }}
+ />
- useFocusCallback(clearForm);
+
+ {({ push, remove }) => (
+
+
+ Variants
+ {
+ push(defaultVariant())
+ setVariantImages((prev) => [...prev, []])
+ }}
+ style={tw`bg-blue-500 px-3 py-1 rounded-lg flex-row items-center`}
+ >
+
+ Add Variant
+
+
- useImperativeHandle(ref, () => ({
- clearImages: clearForm,
- }), [clearForm]);
+ {values.variants.map((variant, vIndex) => (
+
+
+ Variant {vIndex + 1}
+ {values.variants.length > 1 && (
+ {
+ remove(vIndex)
+ setVariantImages((prev) => prev.filter((_, i) => i !== vIndex))
+ }}
+ >
+
+
+ )}
+
- const submit = () => handleSubmit();
+
+ {({ push: pushAttr, remove: removeAttr }) => (
+
+
+ Attributes
+ pushAttr(defaultAttribute())}
+ style={tw`bg-gray-200 px-2 py-0.5 rounded flex-row items-center`}
+ >
+
+ Add
+
+
+ {variant.attributes.map((attr, aIndex) => (
+
+
+
+
+
+
+
+ {variant.attributes.length > 1 && (
+ removeAttr(aIndex)}>
+
+
+ )}
+
+ ))}
+
+ )}
+
- return (
-
-
-
-
+
+
+
+
+
+
+
+
- setImages(prev => [...prev, ...payloads.map(p => ({ imgUrl: p.url, mimeType: p.mimeType }))])}
- onImageRemove={(payload) => setImages(prev => prev.filter(img => img.imgUrl !== payload.url))}
- allowMultiple={true}
- />
+
+ {
+ setFieldValue(`variants.${vIndex}.isFlashAvailable`, !variant.isFlashAvailable)
+ if (variant.isFlashAvailable) setFieldValue(`variants.${vIndex}.flashPrice`, '')
+ }}
+ style={tw`mr-3`}
+ />
+ Flash Available
+
- setFieldValue('unitId', value)}
- placeholder="Select unit"
- style={{ marginBottom: 16 }}
- />
- setFieldValue('productQuantity', text)}
- style={{ marginBottom: 16 }}
- />
- setFieldValue('storeId', value)}
- placeholder="Select store"
- style={{ marginBottom: 16 }}
- />
- id.toString())}
- options={tagOptions}
- onValueChange={(value) => setFieldValue('tagIds', (value as string[]).map(id => parseInt(id)))}
- multiple={true}
- placeholder="Select tags"
- style={{ marginBottom: 16 }}
- />
-
-
+ {variant.isFlashAvailable && (
+
+ )}
-
- setFieldValue('isSuspended', !values.isSuspended)}
- style={tw`mr-3`}
- />
- Suspend Product
-
+
+ setVariantImages((prev) => {
+ const next = [...prev]
+ next[vIndex] = [...(next[vIndex] || []), ...payloads.map((p) => ({ imgUrl: p.url, mimeType: p.mimeType }))]
+ return next
+ })
+ }
+ onImageRemove={(payload) =>
+ setVariantImages((prev) => {
+ const next = [...prev]
+ next[vIndex] = (next[vIndex] || []).filter((img) => img.imgUrl !== payload.url)
+ return next
+ })
+ }
+ allowMultiple={true}
+ />
+
+ ))}
+
+ )}
+
-
- {
- setFieldValue('isFlashAvailable', !values.isFlashAvailable);
- if (values.isFlashAvailable) setFieldValue('flashPrice', '');
- }}
- style={tw`mr-3`}
- />
- Flash Available
-
-
- {values.isFlashAvailable && (
-
- )}
-
-
-
- {isLoading ? (mode === 'create' ? 'Creating...' : 'Updating...') : (mode === 'create' ? 'Create Product' : 'Update Product')}
-
-
-
- );
- }}
+ handleSubmit()}
+ disabled={isLoading}
+ style={tw`px-4 py-3 rounded-lg shadow-lg items-center mt-4 ${isLoading ? 'bg-gray-400' : 'bg-blue-500'}`}
+ >
+
+ {isLoading ? 'Creating...' : 'Create Product'}
+
+
+
+ )}
- );
-});
+ )
+})
-ProductForm.displayName = 'ProductForm';
+ProductForm.displayName = 'ProductForm'
-export default ProductForm;
+export default ProductForm
diff --git a/apps/admin-ui/src/components/ProductForm_old.tsx b/apps/admin-ui/src/components/ProductForm_old.tsx
new file mode 100644
index 0000000..ac8d4e3
--- /dev/null
+++ b/apps/admin-ui/src/components/ProductForm_old.tsx
@@ -0,0 +1,262 @@
+import React, { useState, useEffect, useCallback, forwardRef, useImperativeHandle, useMemo } from 'react';
+import { View, TouchableOpacity } from 'react-native';
+import { Formik, FieldArray } from 'formik';
+import * as Yup from 'yup';
+import { MyTextInput, BottomDropdown, MyText, useTheme, DatePicker, tw, useFocusCallback, Checkbox, ImageUploaderNeo, ImageUploaderNeoItem, ImageUploaderNeoPayload } from 'common-ui';
+import MaterialIcons from '@expo/vector-icons/MaterialIcons';
+import { trpc } from '../trpc-client';
+
+interface ProductFormData {
+ name: string;
+ shortDescription: string;
+ longDescription: string;
+ unitId: number;
+ storeId: number;
+ price: string;
+ marketPrice: string;
+ isSuspended: boolean;
+ isFlashAvailable: boolean;
+ flashPrice: string;
+ deals: Deal[];
+ tagIds: number[];
+ productQuantity: number;
+}
+
+interface Deal {
+ quantity: string;
+ price: string;
+ validTill: Date | null;
+}
+
+export interface ProductFormRef {
+ clearImages: () => void;
+}
+
+interface ProductFormProps {
+ mode: 'create' | 'edit';
+ initialValues: ProductFormData;
+ onSubmit: (values: ProductFormData, images: ImageUploaderNeoPayload[], imagesToDelete: string[]) => void;
+ isLoading: boolean;
+ existingImages?: ImageUploaderNeoItem[];
+ existingImageKeys?: string[];
+}
+
+const unitOptions = [
+ { label: 'Kg', value: 1 },
+ { label: 'Litre', value: 2 },
+ { label: 'Dozen', value: 3 },
+ { label: 'Unit Piece', value: 4 },
+];
+
+const ProductForm = forwardRef(({
+ mode,
+ initialValues,
+ onSubmit,
+ isLoading,
+ existingImages:existingImagesRaw,
+ existingImageKeys = [],
+}, ref) => {
+ const { theme } = useTheme();
+ const [images, setImages] = useState([]);
+
+ const existingImages = existingImagesRaw || []
+ // Sync images state when existingImages prop changes (e.g., when async query data arrives)
+ useEffect(() => {
+ setImages(existingImages);
+ }, [existingImagesRaw]);
+
+ const { data: storesData } = trpc.common.getStoresSummary.useQuery();
+ const storeOptions = storesData?.stores.map(store => ({
+ label: store.name,
+ value: store.id,
+ })) || [];
+
+ const { data: tagsData } = trpc.admin.product.getProductTags.useQuery();
+ const tagOptions = tagsData?.tags.map(tag => ({
+ label: tag.tagName,
+ value: tag.id.toString(),
+ })) || [];
+
+ // Build signed URL -> S3 key mapping for existing images
+ const signedUrlToKey = useMemo(() => {
+ const map: Record = {};
+ existingImages.forEach((img, i) => {
+ if (existingImageKeys[i]) {
+ map[img.imgUrl] = existingImageKeys[i];
+ }
+ });
+ return map;
+ }, [existingImages, existingImageKeys]);
+
+ return (
+ {
+ // New images have mimeType set, existing images have mimeType === null
+ const newImages = images.filter(img => img.mimeType !== null);
+ const deletedImageKeys = existingImages
+ .filter(existing => !images.some(current => current.imgUrl === existing.imgUrl))
+ .map(deleted => signedUrlToKey[deleted.imgUrl])
+ .filter(Boolean);
+
+ onSubmit(
+ values,
+ newImages.map(img => ({ url: img.imgUrl, mimeType: img.mimeType })),
+ deletedImageKeys,
+ );
+ }}
+ enableReinitialize
+ >
+ {({ handleChange, handleSubmit, values, setFieldValue, resetForm }) => {
+ const clearForm = useCallback(() => {
+ setImages([]);
+ resetForm();
+ }, [resetForm]);
+
+ useFocusCallback(clearForm);
+
+ useImperativeHandle(ref, () => ({
+ clearImages: clearForm,
+ }), [clearForm]);
+
+ const submit = () => handleSubmit();
+
+ return (
+
+
+
+
+
+ setImages(prev => [...prev, ...payloads.map(p => ({ imgUrl: p.url, mimeType: p.mimeType }))])}
+ onImageRemove={(payload) => setImages(prev => prev.filter(img => img.imgUrl !== payload.url))}
+ allowMultiple={true}
+ />
+
+ setFieldValue('unitId', value)}
+ placeholder="Select unit"
+ style={{ marginBottom: 16 }}
+ />
+ setFieldValue('productQuantity', text)}
+ style={{ marginBottom: 16 }}
+ />
+ setFieldValue('storeId', value)}
+ placeholder="Select store"
+ style={{ marginBottom: 16 }}
+ />
+ id.toString())}
+ options={tagOptions}
+ onValueChange={(value) => setFieldValue('tagIds', (value as string[]).map(id => parseInt(id)))}
+ multiple={true}
+ placeholder="Select tags"
+ style={{ marginBottom: 16 }}
+ />
+
+
+
+
+ setFieldValue('isSuspended', !values.isSuspended)}
+ style={tw`mr-3`}
+ />
+ Suspend Product
+
+
+
+ {
+ setFieldValue('isFlashAvailable', !values.isFlashAvailable);
+ if (values.isFlashAvailable) setFieldValue('flashPrice', '');
+ }}
+ style={tw`mr-3`}
+ />
+ Flash Available
+
+
+ {values.isFlashAvailable && (
+
+ )}
+
+
+
+ {isLoading ? (mode === 'create' ? 'Creating...' : 'Updating...') : (mode === 'create' ? 'Create Product' : 'Update Product')}
+
+
+
+ );
+ }}
+
+ );
+});
+
+ProductForm.displayName = 'ProductForm';
+
+export default ProductForm;
diff --git a/apps/backend/src/trpc/apis/admin-apis/apis/product.ts b/apps/backend/src/trpc/apis/admin-apis/apis/product.ts
index 0c3c366..0eb8a5d 100644
--- a/apps/backend/src/trpc/apis/admin-apis/apis/product.ts
+++ b/apps/backend/src/trpc/apis/admin-apis/apis/product.ts
@@ -35,6 +35,7 @@ import {
} from '@/src/dbService'
import type {
AdminProduct,
+ AdminProductWithRelations,
AdminSpecialDeal,
AdminProductGroupsResult,
AdminProductGroupResponse,
@@ -70,7 +71,12 @@ export const productRouter = router({
const productsWithSignedUrls = await Promise.all(
products.map(async (product) => ({
...product,
- images: await generateSignedUrlsFromS3Urls((product.images as string[]) || []),
+ skus: await Promise.all(
+ product.skus.map(async (sku) => ({
+ ...sku,
+ images: await generateSignedUrlsFromS3Urls((sku.images as string[]) || []),
+ }))
+ ),
}))
)
@@ -135,7 +141,12 @@ export const productRouter = router({
const productWithSignedUrls = {
...product,
- images: await generateSignedUrlsFromS3Urls((product.images as string[]) || []),
+ skus: await Promise.all(
+ product.skus.map(async (sku) => ({
+ ...sku,
+ images: await generateSignedUrlsFromS3Urls((sku.images as string[]) || []),
+ }))
+ ),
}
return {
@@ -221,72 +232,71 @@ export const productRouter = router({
name: z.string().min(1, 'Name is required'),
shortDescription: z.string().optional(),
longDescription: z.string().optional(),
- unitId: z.number().min(1, 'Unit is required'),
storeId: z.number().min(1, 'Store is required'),
- price: z.number().positive('Price must be positive'),
- marketPrice: z.number().optional(),
incrementStep: z.number().optional().default(1),
- productQuantity: z.union([z.number(), z.string()]).optional().default(1),
- isSuspended: z.boolean().optional().default(false),
- isFlashAvailable: z.boolean().optional().default(false),
- flashPrice: z.number().optional(),
- uploadUrls: z.array(z.string()).optional().default([]),
- deals: z.array(z.object({
- quantity: z.number(),
- price: z.number(),
- validTill: z.string(),
- })).optional(),
- tagIds: z.array(z.number()).optional().default([]),
+ skus: z.array(z.object({
+ name: z.string().optional().nullable(),
+ price: z.number().positive('Price must be positive'),
+ marketPrice: z.number().optional().nullable(),
+ images: z.array(z.string()).optional().default([]),
+ isFlashAvailable: z.boolean().optional().default(false),
+ flashPrice: z.number().optional().nullable(),
+ features: z.array(z.object({
+ featureName: z.string().min(1, 'Attribute name is required'),
+ featureValue: z.string().min(1, 'Value is required'),
+ })).min(1, 'At least one feature is required'),
+ })).min(1, 'At least one SKU is required'),
}))
- .mutation(async ({ input }): Promise<{ product: AdminProduct; deals: AdminSpecialDeal[]; message: string }> => {
- const { name, shortDescription, longDescription, unitId, storeId, price, marketPrice, incrementStep, productQuantity, isSuspended, isFlashAvailable, flashPrice, uploadUrls, deals, tagIds } = input
+ .mutation(async ({ input }): Promise<{ product: AdminProductWithRelations; message: string }> => {
+ const { name, shortDescription, longDescription, storeId, incrementStep, skus } = input
const existingProduct = await checkProductExistsByName(name.trim())
if (existingProduct) {
throw new ApiError('A product with this name already exists', 400)
}
- const unitExists = await checkUnitExists(unitId)
- if (!unitExists) {
- throw new ApiError('Invalid unit ID', 400)
- }
+ const allUploadUrls: string[] = skus.flatMap((sku) => sku.images)
- const imageKeys = uploadUrls.map(url => extractKeyFromPresignedUrl(url))
+ const skuInputs = skus.map((sku) => ({
+ name: sku.name ?? null,
+ price: sku.price,
+ marketPrice: sku.marketPrice ?? null,
+ images: sku.images.map((url) => extractKeyFromPresignedUrl(url)),
+ isFlashAvailable: sku.isFlashAvailable,
+ flashPrice: sku.flashPrice ?? null,
+ features: sku.features.map((f) => ({
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ })),
+ }))
const newProduct = await createProductInDb({
name,
shortDescription,
longDescription,
- unitId,
storeId,
- price: price.toString(),
- marketPrice: marketPrice?.toString(),
incrementStep,
- productQuantity: productQuantity as any,
- isSuspended,
- isFlashAvailable,
- flashPrice: flashPrice?.toString(),
- images: imageKeys,
- })
+ skus: skuInputs,
+ } as any)
- let createdDeals: AdminSpecialDeal[] = []
- if (deals && deals.length > 0) {
- createdDeals = await createSpecialDealsForProduct(newProduct.id, deals)
- }
-
- if (tagIds.length > 0) {
- await replaceProductTags(newProduct.id, tagIds)
- }
-
- if (uploadUrls.length > 0) {
- await Promise.all(uploadUrls.map(url => claimUploadUrl(url)))
+ if (allUploadUrls.length > 0) {
+ await Promise.all(allUploadUrls.map((url) => claimUploadUrl(url)))
}
await scheduleStoreInitialization()
+ const productWithSignedUrls = {
+ ...newProduct,
+ skus: await Promise.all(
+ newProduct.skus.map(async (sku) => ({
+ ...sku,
+ images: await generateSignedUrlsFromS3Urls((sku.images as string[]) || []),
+ }))
+ ),
+ }
+
return {
- product: newProduct,
- deals: createdDeals,
+ product: productWithSignedUrls,
message: 'Product created successfully',
}
}),
@@ -297,83 +307,76 @@ export const productRouter = router({
name: z.string().min(1, 'Name is required'),
shortDescription: z.string().optional(),
longDescription: z.string().optional(),
- unitId: z.number().min(1, 'Unit is required'),
storeId: z.number().min(1, 'Store is required'),
- price: z.number().positive('Price must be positive'),
- marketPrice: z.number().optional(),
incrementStep: z.number().optional().default(1),
- productQuantity: z.union([z.number(), z.string()]).optional().default(1),
- isSuspended: z.boolean().optional().default(false),
- isFlashAvailable: z.boolean().optional().default(false),
- flashPrice: z.number().nullable().optional(),
- uploadUrls: z.array(z.string()).optional().default([]),
- imagesToDelete: z.array(z.string()).optional().default([]),
- deals: z.array(z.object({
- quantity: z.number(),
- price: z.number(),
- validTill: z.string(),
- })).optional(),
- tagIds: z.array(z.number()).optional().default([]),
+ skus: z.array(z.object({
+ name: z.string().optional().nullable(),
+ price: z.number().positive('Price must be positive'),
+ marketPrice: z.number().optional().nullable(),
+ images: z.array(z.string()).optional().default([]),
+ isFlashAvailable: z.boolean().optional().default(false),
+ flashPrice: z.number().optional().nullable(),
+ features: z.array(z.object({
+ featureName: z.string().min(1, 'Attribute name is required'),
+ featureValue: z.string().min(1, 'Value is required'),
+ })).min(1, 'At least one feature is required'),
+ })).min(1, 'At least one SKU is required'),
+ deletedImageKeys: z.array(z.string()).optional().default([]),
+ newImageUrls: z.array(z.string()).optional().default([]),
}))
- .mutation(async ({ input }): Promise<{ product: AdminProduct; message: string }> => {
- const { id, name, shortDescription, longDescription, unitId, storeId, price, marketPrice, incrementStep, productQuantity, isSuspended, isFlashAvailable, flashPrice, uploadUrls, imagesToDelete, deals, tagIds } = input
+ .mutation(async ({ input }): Promise<{ product: AdminProductWithRelations; message: string }> => {
+ const { id, name, shortDescription, longDescription, storeId, incrementStep, skus, deletedImageKeys, newImageUrls } = input
- const unitExists = await checkUnitExists(unitId)
- if (!unitExists) {
- throw new ApiError('Invalid unit ID', 400)
+ if (deletedImageKeys.length > 0) {
+ await deleteImageUtil({ keys: deletedImageKeys })
}
- const currentImages = await getProductImagesById(id)
- if (!currentImages) {
- throw new ApiError('Product not found', 404)
- }
+ const allUploadUrls: string[] = skus.flatMap((sku) => sku.images)
- let updatedImages = currentImages || []
- if (imagesToDelete.length > 0) {
- const imagesToRemove = updatedImages.filter(img => imagesToDelete.includes(img))
- await deleteImageUtil({ keys: imagesToRemove })
- updatedImages = updatedImages.filter(img => !imagesToRemove.includes(img))
- }
-
- const newImageKeys = uploadUrls.map(url => extractKeyFromPresignedUrl(url))
- const finalImages = [...updatedImages, ...newImageKeys]
+ const skuInputs = skus.map((sku) => ({
+ name: sku.name ?? null,
+ price: sku.price,
+ marketPrice: sku.marketPrice ?? null,
+ images: sku.images.map((url) => extractKeyFromPresignedUrl(url)),
+ isFlashAvailable: sku.isFlashAvailable,
+ flashPrice: sku.flashPrice ?? null,
+ features: sku.features.map((f) => ({
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ })),
+ }))
const updatedProduct = await updateProductInDb(id, {
name,
shortDescription,
longDescription,
- unitId,
storeId,
- price: price.toString(),
- marketPrice: marketPrice?.toString(),
incrementStep,
- productQuantity: productQuantity as any,
- isSuspended,
- isFlashAvailable,
- flashPrice: flashPrice?.toString() ?? null,
- images: finalImages,
- })
+ skus: skuInputs,
+ } as any)
if (!updatedProduct) {
throw new ApiError('Product not found', 404)
}
- if (deals && deals.length > 0) {
- await updateProductDeals(id, deals)
- }
-
- if (tagIds.length > 0) {
- await replaceProductTags(id, tagIds)
- }
-
- if (uploadUrls.length > 0) {
- await Promise.all(uploadUrls.map(url => claimUploadUrl(url)))
+ if (newImageUrls.length > 0) {
+ await Promise.all(newImageUrls.map((url) => claimUploadUrl(url)))
}
await scheduleStoreInitialization()
+ const productWithSignedUrls = {
+ ...updatedProduct,
+ skus: await Promise.all(
+ updatedProduct.skus.map(async (sku) => ({
+ ...sku,
+ images: await generateSignedUrlsFromS3Urls((sku.images as string[]) || []),
+ }))
+ ),
+ }
+
return {
- product: updatedProduct,
+ product: productWithSignedUrls,
message: 'Product updated successfully',
}
}),
diff --git a/apps/backend/src/trpc/apis/admin-apis/apis/slots.ts b/apps/backend/src/trpc/apis/admin-apis/apis/slots.ts
index dcfbfdf..2de0549 100644
--- a/apps/backend/src/trpc/apis/admin-apis/apis/slots.ts
+++ b/apps/backend/src/trpc/apis/admin-apis/apis/slots.ts
@@ -46,10 +46,10 @@ const createSlotSchema = z.object({
deliveryTime: z.string(),
freezeTime: z.string(),
isActive: z.boolean().optional(),
- productIds: z.array(z.number()).optional(),
+ skuIds: z.array(z.number()).optional(),
vendorSnippets: z.array(z.object({
name: z.string().min(1),
- productIds: z.array(z.number().int().positive()).min(1),
+ skuIds: z.array(z.number().int().positive()).min(1),
validTill: z.string().optional(),
})).optional(),
groupIds: z.array(z.number()).optional(),
@@ -64,10 +64,10 @@ const updateSlotSchema = z.object({
deliveryTime: z.string(),
freezeTime: z.string(),
isActive: z.boolean().optional(),
- productIds: z.array(z.number()).optional(),
+ skuIds: z.array(z.number()).optional(),
vendorSnippets: z.array(z.object({
name: z.string().min(1),
- productIds: z.array(z.number().int().positive()).min(1),
+ skuIds: z.array(z.number().int().positive()).min(1),
validTill: z.string().optional(),
})).optional(),
groupIds: z.array(z.number()).optional(),
@@ -192,7 +192,7 @@ export const slotsRouter = router({
.input(
z.object({
slotId: z.number(),
- productIds: z.array(z.number()),
+ skuIds: z.array(z.number()),
})
)
.mutation(async ({ input, ctx }): Promise => {
@@ -200,12 +200,12 @@ export const slotsRouter = router({
throw new TRPCError({ code: "UNAUTHORIZED", message: "Access denied" });
}
- const { slotId, productIds } = input;
+ const { slotId, skuIds } = input;
- if (!Array.isArray(productIds)) {
+ if (!Array.isArray(skuIds)) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "productIds must be an array",
+ message: "skuIds must be an array",
});
}
@@ -282,7 +282,7 @@ export const slotsRouter = router({
throw new TRPCError({ code: "UNAUTHORIZED", message: "Access denied" });
}
- const { deliveryTime, freezeTime, isActive, productIds, vendorSnippets: snippets, groupIds } = input;
+ const { deliveryTime, freezeTime, isActive, skuIds, vendorSnippets: snippets, groupIds } = input;
// Validate required fields
if (!deliveryTime || !freezeTime) {
@@ -293,7 +293,7 @@ export const slotsRouter = router({
deliveryTime,
freezeTime,
isActive,
- productIds,
+ skuIds,
vendorSnippets: snippets,
groupIds,
})
@@ -445,7 +445,7 @@ export const slotsRouter = router({
throw new TRPCError({ code: "UNAUTHORIZED", message: "Access denied" });
}
try{
- const { id, deliveryTime, freezeTime, isActive, productIds, vendorSnippets: snippets, groupIds } = input;
+ const { id, deliveryTime, freezeTime, isActive, skuIds, vendorSnippets: snippets, groupIds } = input;
if (!deliveryTime || !freezeTime) {
throw new ApiError("Delivery time and orders close time are required", 400);
@@ -456,7 +456,7 @@ export const slotsRouter = router({
deliveryTime,
freezeTime,
isActive,
- productIds,
+ skuIds,
vendorSnippets: snippets,
groupIds,
})
diff --git a/apps/backend/src/trpc/apis/common-apis/common.ts b/apps/backend/src/trpc/apis/common-apis/common.ts
index 64cac9b..2869025 100644
--- a/apps/backend/src/trpc/apis/common-apis/common.ts
+++ b/apps/backend/src/trpc/apis/common-apis/common.ts
@@ -3,6 +3,7 @@ import {
getSuspendedProductIds,
getNextDeliveryDateWithCapacity,
getStoresSummary,
+ getAllSkusSummary as getAllSkusSummaryInDb,
} from '@/src/dbService'
import { generateSignedUrlsFromS3Urls, generateSignedUrlFromS3Url } from '@/src/lib/s3-client'
import { getAllProducts as getAllProductsFromCache } from '@/src/stores/product-store'
@@ -81,6 +82,12 @@ export const commonRouter = router({
return response;
}),
+ getAllSkusSummary: publicProcedure
+ .query(async () => {
+ const skus = await getAllSkusSummaryInDb()
+ return { skus }
+ }),
+
/*
// Old implementation - moved to common-trpc-index.ts:
getStoresSummary: publicProcedure
diff --git a/packages/db_helper_sqlite/index.ts b/packages/db_helper_sqlite/index.ts
index 96826c2..789b16d 100644
--- a/packages/db_helper_sqlite/index.ts
+++ b/packages/db_helper_sqlite/index.ts
@@ -233,7 +233,9 @@ export {
getProductById as getUserProductByIdBasic,
createProductReview as createUserProductReview,
getAllProductsWithUnits,
+ getAllSkusSummary,
type ProductSummaryData,
+ type SkuSummary,
} from './src/user-apis/product'
export {
diff --git a/packages/db_helper_sqlite/src/admin-apis/order.ts b/packages/db_helper_sqlite/src/admin-apis/order.ts
index 221a67a..7dd8ac7 100644
--- a/packages/db_helper_sqlite/src/admin-apis/order.ts
+++ b/packages/db_helper_sqlite/src/admin-apis/order.ts
@@ -116,9 +116,10 @@ export async function getOrderDetails(orderId: number): Promise ({
id: item.id,
- name: item.product.name,
+ name: item.sku.product?.name ?? 'Unknown',
+ skuName: item.sku.name ?? null,
quantity: item.quantity,
- productSize: item.product.productQuantity,
+ productSize: 1,
price: item.price,
- unit: item.product.unit?.shortNotation,
+ unit: (item.sku.features || []).map((f: any) => f.featureValue).join(' '),
amount: parseFloat(item.price.toString()) * parseFloat(item.quantity || '0'),
isPackaged: item.is_packaged,
isPackageVerified: item.is_package_verified,
+ features: (item.sku.features || []).map((f: any) => ({
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ })),
})),
payment: orderData.payment
? {
@@ -341,9 +347,10 @@ export async function getSlotOrders(slotId: string): Promise ({
id: item.id,
- name: item.product.name,
+ name: item.sku.product?.name ?? 'Unknown',
+ skuName: item.sku.name ?? null,
quantity: parseFloat(item.quantity),
price: parseFloat(item.price.toString()),
amount: parseFloat(item.quantity) * parseFloat(item.price.toString()),
- unit: item.product.unit?.shortNotation || '',
+ unit: (item.sku.features || []).map((f: any) => f.featureValue).join(' '),
isPackaged: item.is_packaged,
isPackageVerified: item.is_package_verified,
+ features: (item.sku.features || []).map((f: any) => ({
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ })),
}))
const paymentMode: 'COD' | 'Online' = order.isCod ? 'COD' : 'Online'
@@ -501,9 +513,10 @@ export async function getAllOrders(input: GetAllOrdersInput): Promise ({
id: item.id,
- name: item.product.name,
+ name: item.sku.product?.name ?? 'Unknown',
+ skuName: item.sku.name ?? null,
quantity: parseFloat(item.quantity),
price: parseFloat(item.price.toString()),
amount: parseFloat(item.quantity) * parseFloat(item.price.toString()),
- unit: item.product.unit?.shortNotation || '',
- productSize: item.product.productQuantity,
+ unit: (item.sku.features || []).map((f: any) => f.featureValue).join(' '),
+ productSize: 1,
isPackaged: item.is_packaged,
isPackageVerified: item.is_package_verified,
+ features: (item.sku.features || []).map((f: any) => ({
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ })),
}))
.sort((first: any, second: any) => first.id - second.id)
diff --git a/packages/db_helper_sqlite/src/admin-apis/product.ts b/packages/db_helper_sqlite/src/admin-apis/product.ts
index ba7da13..c2f5c10 100644
--- a/packages/db_helper_sqlite/src/admin-apis/product.ts
+++ b/packages/db_helper_sqlite/src/admin-apis/product.ts
@@ -1,6 +1,9 @@
+// @ts-nocheck -- temporary: file partially updated for SKU migration; remaining functions to be fixed later
import { db } from '../db/db_index'
import {
productInfo,
+ productSkus,
+ skuFeatures,
units,
specialDeals,
deliverySlotInfo,
@@ -22,6 +25,8 @@ import type {
AdminProductReview,
AdminProductWithDetails,
AdminProductWithRelations,
+ AdminSku,
+ AdminSkuFeature,
AdminSpecialDeal,
AdminUnit,
AdminUpdateSlotProductsResult,
@@ -29,6 +34,8 @@ import type {
} from '@packages/shared'
type ProductRow = InferSelectModel
+type SkuRow = InferSelectModel
+type SkuFeatureRow = InferSelectModel
type UnitRow = InferSelectModel
type StoreRow = InferSelectModel
type SpecialDealRow = InferSelectModel
@@ -64,19 +71,32 @@ const mapProduct = (product: ProductRow): AdminProduct => ({
name: product.name,
shortDescription: product.shortDescription ?? null,
longDescription: product.longDescription ?? null,
- unitId: product.unitId,
- price: String(product.price ?? '0'),
- marketPrice: product.marketPrice ? String(product.marketPrice) : null,
- images: getStringArray(product.images),
- imageKeys: getStringArray(product.images),
- isOutOfStock: product.isOutOfStock,
- isSuspended: product.isSuspended,
- isFlashAvailable: product.isFlashAvailable,
- flashPrice: product.flashPrice ? String(product.flashPrice) : null,
- createdAt: product.createdAt,
- incrementStep: product.incrementStep,
- productQuantity: product.productQuantity,
storeId: product.storeId,
+ incrementStep: product.incrementStep,
+ createdAt: product.createdAt,
+})
+
+const mapSkuFeature = (feature: SkuFeatureRow): AdminSkuFeature => ({
+ id: feature.id,
+ skuId: feature.skuId,
+ featureName: feature.featureName,
+ featureValue: feature.featureValue,
+})
+
+const mapSku = (sku: SkuRow, features: SkuFeatureRow[] = []): AdminSku => ({
+ id: sku.id,
+ productId: sku.productId,
+ name: sku.name ?? null,
+ price: String(sku.price ?? '0'),
+ marketPrice: sku.marketPrice ? String(sku.marketPrice) : null,
+ images: getStringArray(sku.images),
+ imageKeys: getStringArray(sku.images),
+ isOutOfStock: sku.isOutOfStock,
+ isSuspended: sku.isSuspended,
+ isFlashAvailable: sku.isFlashAvailable,
+ flashPrice: sku.flashPrice ? String(sku.flashPrice) : null,
+ createdAt: sku.createdAt,
+ features: features.map(mapSkuFeature),
})
const mapSpecialDeal = (deal: SpecialDealRow): AdminSpecialDeal => ({
@@ -98,19 +118,26 @@ const mapTagInfo = (tag: ProductTagInfoRow): AdminProductTagInfo => ({
})
export async function getAllProducts(): Promise {
- type ProductWithRelationsRow = ProductRow & { unit: UnitRow; store: StoreRow | null }
+ type ProductWithRelationsRow = ProductRow & {
+ store: StoreRow | null
+ skus: Array
+ }
const products = await db.query.productInfo.findMany({
orderBy: productInfo.name,
with: {
- unit: true,
store: true,
+ skus: {
+ with: {
+ features: true,
+ },
+ },
},
}) as ProductWithRelationsRow[]
return products.map((product) => ({
...mapProduct(product),
- unit: mapUnit(product.unit),
store: product.store ? mapStore(product.store) : null,
+ skus: product.skus.map((sku) => mapSku(sku, sku.features)),
}))
}
@@ -118,7 +145,12 @@ export async function getProductById(id: number): Promise sku.id)
+
+ const deals = skuIds.length > 0
+ ? await db.query.specialDeals.findMany({
+ where: inArray(specialDeals.skuId, skuIds),
+ orderBy: specialDeals.quantity,
+ })
+ : []
const productTagsData = await db.query.productTags.findMany({
where: eq(productTags.productId, id),
@@ -140,7 +176,8 @@ export async function getProductById(id: number): Promise mapSku(sku, sku.features)),
deals: deals.map(mapSpecialDeal),
tags: productTagsData.map((tag) => mapTagInfo(tag.tag)),
}
@@ -162,46 +199,150 @@ export async function deleteProduct(id: number): Promise {
type ProductInfoInsert = InferInsertModel
type ProductInfoUpdate = Partial
-export async function createProduct(input: ProductInfoInsert): Promise {
- const productQuantityRaw = (input as any).productQuantity
- const productQuantity = typeof productQuantityRaw === 'string'
- ? Number(productQuantityRaw)
- : productQuantityRaw
+export async function createProduct(input: CreateProductInput): Promise {
+ if (!input.skus || input.skus.length === 0) {
+ throw new Error('At least one SKU is required')
+ }
- const safeProductQuantity = typeof productQuantity === 'number' && Number.isFinite(productQuantity)
- ? productQuantity
- : 1
+ const featuresHaveQuantity = input.skus.every((sku) =>
+ sku.features.some((f) => f.featureName === 'quantity')
+ )
+ if (!featuresHaveQuantity) {
+ throw new Error('Every SKU must have a quantity feature')
+ }
+
+ const { skus, ...productData } = input
const [product] = await db.insert(productInfo).values({
- ...input,
- productQuantity: safeProductQuantity,
+ name: productData.name,
+ shortDescription: productData.shortDescription ?? null,
+ longDescription: productData.longDescription ?? null,
+ storeId: productData.storeId ?? null,
+ incrementStep: productData.incrementStep ?? 1,
}).returning()
- return mapProduct(product)
+
+ const skuRows = await db.insert(productSkus).values(
+ skus.map((sku) => ({
+ productId: product.id,
+ name: sku.name ?? null,
+ price: String(sku.price),
+ marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
+ images: sku.images ?? null,
+ isFlashAvailable: sku.isFlashAvailable ?? false,
+ flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
+ }))
+ ).returning()
+
+ for (let i = 0; i < skuRows.length; i++) {
+ const skuRow = skuRows[i]
+ const sku = skus[i]
+ await db.insert(skuFeatures).values(
+ sku.features.map((f) => ({
+ skuId: skuRow.id,
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ }))
+ )
+ }
+
+ const createdSkus = await db.query.productSkus.findMany({
+ where: eq(productSkus.productId, product.id),
+ with: { features: true },
+ })
+
+ return {
+ ...mapProduct(product),
+ store: null,
+ skus: createdSkus.map((s) => mapSku(s, s.features)),
+ }
}
-export async function updateProduct(id: number, updates: ProductInfoUpdate): Promise {
- const productQuantityRaw = (updates as any).productQuantity
- const productQuantity = typeof productQuantityRaw === 'string'
- ? Number(productQuantityRaw)
- : productQuantityRaw
- const safeUpdates = typeof productQuantityRaw === 'undefined'
- ? updates
- : {
- ...updates,
- productQuantity: typeof productQuantity === 'number' && Number.isFinite(productQuantity)
- ? productQuantity
- : 1,
- }
+export async function updateProduct(id: number, input: any): Promise {
+ const product = await db.query.productInfo.findFirst({
+ where: eq(productInfo.id, id),
+ })
- const [product] = await db.update(productInfo)
- .set(safeUpdates)
- .where(eq(productInfo.id, id))
- .returning()
if (!product) {
return null
}
- return mapProduct(product)
+ const { skus, ...productData } = input
+
+ await db.update(productInfo)
+ .set({
+ name: productData.name,
+ shortDescription: productData.shortDescription ?? null,
+ longDescription: productData.longDescription ?? null,
+ storeId: productData.storeId ?? null,
+ incrementStep: productData.incrementStep ?? 1,
+ })
+ .where(eq(productInfo.id, id))
+
+ if (skus !== undefined) {
+ if (skus.length === 0) {
+ throw new Error('At least one SKU is required')
+ }
+
+ const featuresHaveQuantity = skus.every((sku: any) =>
+ sku.features.some((f: any) => f.featureName === 'quantity')
+ )
+ if (!featuresHaveQuantity) {
+ throw new Error('Every SKU must have a quantity feature')
+ }
+
+ const existingSkuIds = await db.query.productSkus.findMany({
+ where: eq(productSkus.productId, id),
+ columns: { id: true },
+ }).then((skus) => skus.map((sku) => sku.id))
+
+ if (existingSkuIds.length > 0) {
+ await db.delete(skuFeatures).where(inArray(skuFeatures.skuId, existingSkuIds))
+ await db.delete(productSkus).where(inArray(productSkus.id, existingSkuIds))
+ }
+
+ const skuRows = await db.insert(productSkus).values(
+ skus.map((sku: any) => ({
+ productId: id,
+ name: sku.name ?? null,
+ price: String(sku.price),
+ marketPrice: sku.marketPrice != null ? String(sku.marketPrice) : null,
+ images: sku.images ?? null,
+ isFlashAvailable: sku.isFlashAvailable ?? false,
+ flashPrice: sku.flashPrice != null ? String(sku.flashPrice) : null,
+ }))
+ ).returning()
+
+ for (let i = 0; i < skuRows.length; i++) {
+ const sku = skus[i]
+ await db.insert(skuFeatures).values(
+ sku.features.map((f: any) => ({
+ skuId: skuRows[i].id,
+ featureName: f.featureName,
+ featureValue: f.featureValue,
+ }))
+ )
+ }
+ }
+
+ const updatedProduct = await db.query.productInfo.findFirst({
+ where: eq(productInfo.id, id),
+ with: {
+ store: true,
+ skus: {
+ with: { features: true },
+ },
+ },
+ })
+
+ if (!updatedProduct) {
+ return null
+ }
+
+ return {
+ ...mapProduct(updatedProduct),
+ store: updatedProduct.store ? mapStore(updatedProduct.store) : null,
+ skus: updatedProduct.skus.map((s) => mapSku(s, s.features)),
+ }
}
export async function toggleProductOutOfStock(id: number): Promise {
diff --git a/packages/db_helper_sqlite/src/admin-apis/slots.ts b/packages/db_helper_sqlite/src/admin-apis/slots.ts
index 68afef0..fe2cc78 100644
--- a/packages/db_helper_sqlite/src/admin-apis/slots.ts
+++ b/packages/db_helper_sqlite/src/admin-apis/slots.ts
@@ -2,6 +2,8 @@ import { db } from '../db/db_index'
import {
deliverySlotInfo,
productInfo,
+ productSkus,
+ skuFeatures,
vendorSnippets,
productGroupInfo,
} from '../db/schema'
@@ -20,7 +22,7 @@ import { coerceDate } from '../lib/date'
type SlotSnippetInput = {
name: string
- productIds: number[]
+ skuIds: number[]
validTill?: string
}
@@ -34,7 +36,7 @@ const getNumberArray = (value: unknown): number[] => {
return value.map((item) => Number(item))
}
-const normalizeProductIds = (value: unknown): number[] => {
+const normalizeSkuIds = (value: unknown): number[] => {
if (!Array.isArray(value)) return []
const ids = value
.map((item) => Number(item))
@@ -52,18 +54,18 @@ const chunkArray = (items: T[], size: number): T[][] => {
return chunks
}
-const PRODUCT_ID_CHUNK_SIZE = 40
+const SKU_ID_CHUNK_SIZE = 40
-const fetchExistingProductIds = async (tx: any, productIds: number[]) => {
+const fetchExistingSkuIds = async (tx: any, skuIds: number[]) => {
const existingIds = new Set()
- const chunks = chunkArray(productIds, PRODUCT_ID_CHUNK_SIZE)
+ const chunks = chunkArray(skuIds, SKU_ID_CHUNK_SIZE)
for (const chunk of chunks) {
if (chunk.length === 0) continue
- const products = await tx.query.productInfo.findMany({
- where: inArray(productInfo.id, chunk),
+ const skus = await tx.query.productSkus.findMany({
+ where: inArray(productSkus.id, chunk),
columns: { id: true },
})
- products.forEach((product: { id: number }) => existingIds.add(product.id))
+ skus.forEach((sku: { id: number }) => existingIds.add(sku.id))
}
return existingIds
}
@@ -79,17 +81,19 @@ const mapDeliverySlot = (slot: typeof deliverySlotInfo.$inferSelect): AdminDeliv
groupIds: slot.groupIds,
})
-const mapSlotProductSummary = (product: { id: number; name: string; images: unknown }): AdminSlotProductSummary => ({
- id: product.id,
- name: product.name,
- images: getStringArray(product.images),
+const mapSlotSkuSummary = (sku: { id: number; images: unknown; name: string | null; product: { name: string } | null; features: Array<{ featureName: string; featureValue: string }> }): AdminSlotProductSummary => ({
+ id: sku.id,
+ name: sku.product?.name ?? 'Unknown',
+ images: getStringArray(sku.images),
+ skuName: sku.name ?? null,
+ features: (sku.features || []).map((f) => ({ featureName: f.featureName, featureValue: f.featureValue })),
})
const mapVendorSnippet = (snippet: typeof vendorSnippets.$inferSelect): AdminVendorSnippet => ({
id: snippet.id,
snippetCode: snippet.snippetCode,
slotId: snippet.slotId ?? null,
- productIds: snippet.productIds || [],
+ skuIds: snippet.skuIds || [],
isPermanent: snippet.isPermanent,
validTill: coerceDate(snippet.validTill),
createdAt: coerceDate(snippet.createdAt) ?? new Date(0),
@@ -103,37 +107,33 @@ export async function getActiveSlotsWithProducts(limit: number = 20): Promise()
+ // Get all unique SKU IDs from all slots
+ const allSkuIds = new Set()
for (const slot of slots) {
- for (const productId of (slot.productIds || [])) {
- allProductIds.add(productId)
+ for (const skuId of (slot.skuIds || [])) {
+ allSkuIds.add(skuId)
}
}
- // Fetch all products in one query
- const productIdsArray = Array.from(allProductIds)
- const productIdsSet = new Set(productIdsArray)
- // const productsData = productIdsArray.length > 0
- // ? await db.query.productInfo.findMany({
- // where: inArray(productInfo.id, productIdsArray),
- // columns: { id: true, name: true, images: true },
- // })
- // : []
+ // Fetch all SKUs in one query
+ const skuIdsArray = Array.from(allSkuIds)
+ const skuIdsSet = new Set(skuIdsArray)
- let productsData = await db.query.productInfo.findMany({});
- productsData = productsData.filter(item => productIdsSet.has(item.id))
+ let skusData = await db.query.productSkus.findMany({
+ with: { features: true, product: true },
+ })
+ skusData = skusData.filter((item: any) => skuIdsSet.has(item.id))
// Create a map for quick lookup
- const productMap = new Map(productsData.map(p => [p.id, p]))
+ const skuMap = new Map(skusData.map((s: any) => [s.id, s]))
return slots.map((slot) => ({
...mapDeliverySlot(slot),
deliverySequence: getNumberArray(slot.deliverySequence),
- products: (slot.productIds || [])
- .map(productId => productMap.get(productId))
+ products: (slot.skuIds || [])
+ .map((skuId: number) => skuMap.get(skuId))
.filter((p): p is NonNullable => p != null)
- .map(product => mapSlotProductSummary(product)),
+ .map((sku: any) => mapSlotSkuSummary(sku)),
}))
}
@@ -155,7 +155,7 @@ export async function staleSlotsCleanup(): Promise {
// Clear productIds for all slots older than threshold
const result = await db
.update(deliverySlotInfo)
- .set({ productIds: [] })
+ .set({ skuIds: [] })
.where(eq(deliverySlotInfo.id, threshold))
return 1
@@ -193,26 +193,21 @@ export async function getSlotByIdWithRelations(id: number): Promise 0
- // ? await db.query.productInfo.findMany({
- // where: inArray(productInfo.id, productIds),
- // columns: { id: true, name: true, images: true },
- // })
- // : []
- let productsData = productIds.length > 0
- ? await db.query.productInfo.findMany({
- columns: { id: true, name: true, images: true },
+ // Fetch SKUs for this slot
+ const skuIds = slot.skuIds || []
+ const skuIdSet = new Set(skuIds)
+ let skusData = skuIds.length > 0
+ ? await db.query.productSkus.findMany({
+ with: { features: true, product: true },
+ columns: { id: true, images: true, name: true },
})
: []
- productsData = productsData.filter(item => productIdSet.has(item.id))
+ skusData = skusData.filter((item: any) => skuIdSet.has(item.id))
return {
...mapDeliverySlot(slot),
deliverySequence: getNumberArray(slot.deliverySequence),
groupIds: getNumberArray(slot.groupIds),
- products: productsData.map(product => mapSlotProductSummary(product)),
+ products: skusData.map((sku: any) => mapSlotSkuSummary(sku)),
vendorSnippets: slot.vendorSnippets.map(mapVendorSnippet),
}
}
@@ -221,21 +216,21 @@ export async function createSlotWithRelations(input: {
deliveryTime: string
freezeTime: string
isActive?: boolean
- productIds?: number[]
+ skuIds?: number[]
vendorSnippets?: SlotSnippetInput[]
groupIds?: number[]
}): Promise {
- const { deliveryTime, freezeTime, isActive, productIds, vendorSnippets: snippets, groupIds } = input
+ const { deliveryTime, freezeTime, isActive, skuIds, vendorSnippets: snippets, groupIds } = input
- const normalizedProductIds = normalizeProductIds(productIds)
+ const normalizedSkuIds = normalizeSkuIds(skuIds)
const result = await db.transaction(async (tx) => {
- // Validate product IDs if provided
- if (normalizedProductIds.length > 0) {
- const existingIds = await fetchExistingProductIds(tx, normalizedProductIds)
- const missingIds = normalizedProductIds.filter((productId) => !existingIds.has(productId))
+ // Validate SKU IDs if provided
+ if (normalizedSkuIds.length > 0) {
+ const existingIds = await fetchExistingSkuIds(tx, normalizedSkuIds)
+ const missingIds = normalizedSkuIds.filter((skuId) => !existingIds.has(skuId))
if (missingIds.length > 0) {
- throw new Error(`Invalid product IDs: ${missingIds.join(', ')}`)
+ throw new Error(`Invalid SKU IDs: ${missingIds.join(', ')}`)
}
}
@@ -246,18 +241,18 @@ export async function createSlotWithRelations(input: {
freezeTime: new Date(freezeTime),
isActive: isActive !== undefined ? isActive : true,
groupIds: groupIds !== undefined ? groupIds : [],
- productIds: normalizedProductIds,
+ skuIds: normalizedSkuIds,
})
.returning()
let createdSnippets: AdminVendorSnippet[] = []
if (snippets && snippets.length > 0) {
for (const snippet of snippets) {
- const products = await tx.query.productInfo.findMany({
- where: inArray(productInfo.id, snippet.productIds),
+ const skus = await tx.query.productSkus.findMany({
+ where: inArray(productSkus.id, snippet.skuIds),
})
- if (products.length !== snippet.productIds.length) {
- throw new Error(`One or more invalid product IDs in snippet "${snippet.name}"`)
+ if (skus.length !== snippet.skuIds.length) {
+ throw new Error(`One or more invalid SKU IDs in snippet "${snippet.name}"`)
}
const existingSnippet = await tx.query.vendorSnippets.findFirst({
@@ -270,7 +265,7 @@ export async function createSlotWithRelations(input: {
const [createdSnippet] = await tx.insert(vendorSnippets).values({
snippetCode: snippet.name,
slotId: newSlot.id,
- productIds: snippet.productIds,
+ skuIds: snippet.skuIds,
validTill: snippet.validTill ? new Date(snippet.validTill) : undefined,
}).returning()
@@ -293,11 +288,11 @@ export async function updateSlotWithRelations(input: {
deliveryTime: string
freezeTime: string
isActive?: boolean
- productIds?: number[]
+ skuIds?: number[]
vendorSnippets?: SlotSnippetInput[]
groupIds?: number[]
}): Promise {
- const { id, deliveryTime, freezeTime, isActive, productIds, vendorSnippets: snippets, groupIds } = input
+ const { id, deliveryTime, freezeTime, isActive, skuIds, vendorSnippets: snippets, groupIds } = input
let validGroupIds = groupIds
if (groupIds && groupIds.length > 0) {
@@ -308,15 +303,15 @@ export async function updateSlotWithRelations(input: {
validGroupIds = existingGroups.map((group: { id: number }) => group.id)
}
- const normalizedProductIds = productIds !== undefined ? normalizeProductIds(productIds) : undefined
+ const normalizedSkuIds = skuIds !== undefined ? normalizeSkuIds(skuIds) : undefined
const result = await db.transaction(async (tx) => {
- // Validate product IDs if provided
- if (normalizedProductIds !== undefined && normalizedProductIds.length > 0) {
- const existingIds = await fetchExistingProductIds(tx, normalizedProductIds)
- const missingIds = normalizedProductIds.filter((productId) => !existingIds.has(productId))
+ // Validate SKU IDs if provided
+ if (normalizedSkuIds !== undefined && normalizedSkuIds.length > 0) {
+ const existingIds = await fetchExistingSkuIds(tx, normalizedSkuIds)
+ const missingIds = normalizedSkuIds.filter((skuId) => !existingIds.has(skuId))
if (missingIds.length > 0) {
- throw new Error(`Invalid product IDs: ${missingIds.join(', ')}`)
+ throw new Error(`Invalid SKU IDs: ${missingIds.join(', ')}`)
}
}
@@ -327,7 +322,7 @@ export async function updateSlotWithRelations(input: {
freezeTime: new Date(freezeTime),
isActive: isActive !== undefined ? isActive : true,
groupIds: validGroupIds !== undefined ? validGroupIds : [],
- ...(normalizedProductIds !== undefined && { productIds: normalizedProductIds }),
+ ...(normalizedSkuIds !== undefined && { skuIds: normalizedSkuIds }),
})
.where(eq(deliverySlotInfo.id, id))
.returning()
@@ -339,11 +334,11 @@ export async function updateSlotWithRelations(input: {
let createdSnippets: AdminVendorSnippet[] = []
if (snippets && snippets.length > 0) {
for (const snippet of snippets) {
- const products = await tx.query.productInfo.findMany({
- where: inArray(productInfo.id, snippet.productIds),
+ const skus = await tx.query.productSkus.findMany({
+ where: inArray(productSkus.id, snippet.skuIds),
})
- if (products.length !== snippet.productIds.length) {
- throw new Error(`One or more invalid product IDs in snippet "${snippet.name}"`)
+ if (skus.length !== snippet.skuIds.length) {
+ throw new Error(`One or more invalid SKU IDs in snippet "${snippet.name}"`)
}
const existingSnippet = await tx.query.vendorSnippets.findFirst({
@@ -356,7 +351,7 @@ export async function updateSlotWithRelations(input: {
const [createdSnippet] = await tx.insert(vendorSnippets).values({
snippetCode: snippet.name,
slotId: id,
- productIds: snippet.productIds,
+ skuIds: snippet.skuIds,
validTill: snippet.validTill ? new Date(snippet.validTill) : undefined,
}).returning()
diff --git a/packages/db_helper_sqlite/src/user-apis/product.ts b/packages/db_helper_sqlite/src/user-apis/product.ts
index 308a44f..3373d19 100644
--- a/packages/db_helper_sqlite/src/user-apis/product.ts
+++ b/packages/db_helper_sqlite/src/user-apis/product.ts
@@ -254,3 +254,34 @@ export async function getNextDeliveryDateWithCapacity(productId: number): Promis
return null
}
+
+export interface SkuSummary {
+ id: number
+ productId: number
+ productName: string
+ label: string
+ images: unknown
+}
+
+export async function getAllSkusSummary(): Promise {
+ const skus = await db.query.productSkus.findMany({
+ with: {
+ features: true,
+ product: {
+ columns: { name: true },
+ },
+ },
+ })
+
+ return skus.map((sku) => {
+ const featureValues = (sku.features || []).map((f) => f.featureValue)
+ const label = [sku.product?.name ?? 'Unknown', ...featureValues].join(' ')
+ return {
+ id: sku.id,
+ productId: sku.productId,
+ productName: sku.product?.name ?? 'Unknown',
+ label,
+ images: sku.images,
+ }
+ })
+}
diff --git a/packages/shared/types/admin.ts b/packages/shared/types/admin.ts
index 909019b..809df52 100644
--- a/packages/shared/types/admin.ts
+++ b/packages/shared/types/admin.ts
@@ -5,7 +5,7 @@ export interface Banner {
name: string;
imageUrl: string;
description: string | null;
- productIds: number[] | null;
+ skuIds: number[] | null;
redirectUrl: string | null;
serialNum: number | null;
isActive: boolean;
@@ -47,7 +47,7 @@ export interface Coupon {
discountPercent: string | null;
flatDiscount: string | null;
minOrder: string | null;
- productIds: number[] | null;
+ skuIds: number[] | null;
maxValue: string | null;
isApplyForAll: boolean;
validTill: Date | null;
@@ -170,6 +170,8 @@ export interface AdminOrderDetailsItem {
amount: number;
isPackaged: boolean;
isPackageVerified: boolean;
+ skuName?: string | null;
+ features?: { featureName: string; featureValue: string }[];
}
export interface AdminOrderDetailsPayment {
@@ -248,6 +250,8 @@ export interface AdminSlotOrderItem {
unit: string;
isPackaged: boolean;
isPackageVerified: boolean;
+ skuName?: string | null;
+ features?: { featureName: string; featureValue: string }[];
}
export interface AdminSlotOrder {
@@ -287,6 +291,8 @@ export interface AdminOrderListItemProduct {
productSize: number;
isPackaged: boolean;
isPackageVerified: boolean;
+ skuName?: string | null;
+ features?: { featureName: string; featureValue: string }[];
}
export interface AdminOrderListItem {
@@ -354,32 +360,89 @@ export interface AdminUnit {
fullName: string;
}
+export interface AdminSkuVariant {
+ id: number
+ skuId: number
+ name: string
+ value: string
+ unitId: number | null
+ sortOrder: number
+}
+
+export interface AdminSku {
+ id: number
+ productId: number
+ productName?: string
+ skuCode: string | null
+ displayName: string
+ unitId: number
+ unit?: AdminUnit
+ productQuantity: number
+ incrementStep: number
+ price: string
+ marketPrice: string | null
+ images: string[] | null
+ imageKeys: string[] | null
+ isOutOfStock: boolean
+ isSuspended: boolean
+ isFlashAvailable: boolean
+ flashPrice: string | null
+ isComboOnly: boolean
+ sortOrder: number
+ isDefault: boolean
+ createdAt: Date
+ variants: AdminSkuVariant[]
+}
+
export interface AdminProduct {
id: number;
name: string;
shortDescription: string | null;
longDescription: string | null;
- unitId: number;
- price: string;
- marketPrice: string | null;
- images: string[] | null;
- imageKeys: string[] | null;
- isOutOfStock: boolean;
- isSuspended: boolean;
- isFlashAvailable: boolean;
- flashPrice: string | null;
- createdAt: Date;
- incrementStep: number;
- productQuantity: number;
storeId: number | null;
+ incrementStep: number;
+ createdAt: Date;
}
export interface AdminProductWithRelations extends AdminProduct {
- unit: AdminUnit;
store: Store | null;
+ skus: AdminSku[];
}
-export interface AdminProductTagInfo {
+export interface CreateSkuVariantInput {
+ name: string
+ value: string
+ unitId?: number | null
+ sortOrder?: number
+}
+
+export interface CreateSkuInput {
+ skuCode?: string | null
+ displayName: string
+ unitId: number
+ productQuantity?: number
+ incrementStep?: number
+ price: number | string
+ marketPrice?: number | string | null
+ images?: string[] | null
+ isOutOfStock?: boolean
+ isSuspended?: boolean
+ isFlashAvailable?: boolean
+ flashPrice?: number | string | null
+ isComboOnly?: boolean
+ sortOrder?: number
+ isDefault?: boolean
+ variants?: CreateSkuVariantInput[]
+}
+
+export interface CreateProductInput {
+ name: string
+ shortDescription?: string | null
+ longDescription?: string | null
+ storeId: number
+ incrementStep?: number
+ skus: CreateSkuInput[]
+}
id: number;
tagName: string;
tagDescription: string | null;
@@ -515,13 +578,15 @@ export interface AdminSlotProductSummary {
id: number;
name: string;
images: string[] | null;
+ skuName?: string | null;
+ features?: { featureName: string; featureValue: string }[];
}
export interface AdminVendorSnippet {
id: number;
snippetCode: string;
slotId: number | null;
- productIds: number[];
+ skuIds: number[];
isPermanent: boolean;
validTill: Date | null;
createdAt: Date;
@@ -613,7 +678,7 @@ export interface AdminUpdateSlotCapacityResult {
export interface AdminVendorSnippetCreateInput {
snippetCode: string;
slotId?: number;
- productIds: number[];
+ skuIds: number[];
validTill?: string;
isPermanent: boolean;
}
@@ -621,7 +686,7 @@ export interface AdminVendorSnippetCreateInput {
export interface AdminVendorSnippetUpdateInput {
snippetCode?: string;
slotId?: number;
- productIds?: number[];
+ skuIds?: number[];
validTill?: string | null;
isPermanent?: boolean;
}
@@ -664,7 +729,7 @@ export interface AdminVendorSnippetOrdersResult {
id: number;
snippetCode: string;
slotId: number | null;
- productIds: number[];
+ skuIds: number[];
validTill?: string;
createdAt: string;
isPermanent: boolean;