diff --git a/apps/admin-ui/app/(drawer)/order-details/[id].tsx b/apps/admin-ui/app/(drawer)/order-details/[id].tsx index 50b287f..67e2093 100644 --- a/apps/admin-ui/app/(drawer)/order-details/[id].tsx +++ b/apps/admin-ui/app/(drawer)/order-details/[id].tsx @@ -246,7 +246,7 @@ export default function OrderDetails() { - {order.isFlashDelivery ? "Flash Delivery:" : "Delivery at:"} {order.isFlashDelivery + {order.isFlashDelivery ? "1 Hr Delivery:" : "Delivery at:"} {order.isFlashDelivery ? dayjs(order.createdAt).add(30, 'minutes').format("MMM DD, YYYY • h:mm A") : order.slotInfo?.time ? dayjs(order.slotInfo.time).format("MMM DD, YYYY • h:mm A") : 'Not scheduled'} @@ -255,7 +255,7 @@ export default function OrderDetails() { - ⚡ 30-Minute Flash Delivery • High Priority + ⚡ 1 Hr Delivery • High Priority )} @@ -505,7 +505,7 @@ export default function OrderDetails() { - {/* Flash Delivery Priority Notice */} + {/* 1 Hr Delivery Priority Notice */} {order.isFlashDelivery && ( - Flash Delivery Order + 1 Hr Delivery Order - ⚡ This is a high-priority flash delivery order that must be delivered within 30 minutes of placement. + ⚡ This is a high-priority flash delivery order that must be delivered within 1 hr of placement. diff --git a/apps/admin-ui/app/(drawer)/orders/index.tsx b/apps/admin-ui/app/(drawer)/orders/index.tsx index 0ad338e..f342cf1 100644 --- a/apps/admin-ui/app/(drawer)/orders/index.tsx +++ b/apps/admin-ui/app/(drawer)/orders/index.tsx @@ -249,14 +249,14 @@ const OrderItem = ({ order, refetch }: { order: OrderType; refetch: () => void } - {order.isFlashDelivery ? "Flash 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 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 && ( - 30-Minute Delivery • High Priority + 1 Hour Delivery • High Priority )} @@ -761,7 +761,7 @@ export default function Orders() { } }} /> - ⚡ Flash Delivery + ⚡ 1 Hr Delivery - Flash Delivery Unavailable + 1 Hr Delivery Unavailable - Flash Delivery is not available at the moment. Please opt for a scheduled delivery. + 1 Hr Delivery is not available at the moment. Please opt for a scheduled delivery. router.replace('/(drawer)/(tabs)/home')} diff --git a/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/order-success.tsx b/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/order-success.tsx index c4cd705..80fbbc2 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/order-success.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/order-success.tsx @@ -27,7 +27,7 @@ export default function FlashDeliveryOrderSuccess() { weight="bold" style={tw`text-3xl mb-4 text-center text-gray-900`} > - Flash Order Placed! + 1 Hr Order Placed! @@ -35,14 +35,14 @@ export default function FlashDeliveryOrderSuccess() { - Your order will be delivered in just 30 minutes + Your order will be delivered in just within 1 hour {/* Order Details (if available) */} {orderId && ( - Flash Order #{orderId} + 1 Hr Order #{orderId} {totalAmount && ( diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx index 4cea5a2..33537f5 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/[id].tsx @@ -138,7 +138,7 @@ export default function OrderDetails() { Order #{order.orderId} {dayjs(order.orderDate).format("DD MMM, h:mm A")} {order.isFlashDelivery && ( - ⚡ 30-Minute Flash Delivery + ⚡ 1 Hr Delivery )} @@ -157,15 +157,15 @@ export default function OrderDetails() { - {/* Flash Delivery Banner */} + {/* 1 Hr Delivery Banner */} {order.isFlashDelivery && ( - Flash Delivery Order + 1 Hr Delivery Order - Your order will be delivered within 30 minutes of placement + Your order will be delivered within 1 hr of placement @@ -208,12 +208,12 @@ export default function OrderDetails() { )} - {/* Flash Delivery Info */} + {/* 1 Hr Delivery Info */} {order.isFlashDelivery && !["delivered", "success"].includes(order.deliveryStatus?.toLowerCase() || "") && ( - Flash Delivery: {dayjs(order.createdAt || order.orderDate).add(30, 'minutes').format("DD MMM YYYY, h:mm A")} + 1 Hr Delivery: {dayjs(order.createdAt || order.orderDate).add(30, 'minutes').format("DD MMM YYYY, h:mm A")} )} diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx index 2f0fb88..d4bfc3c 100755 --- a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx @@ -165,7 +165,7 @@ const OrderItem: React.FC = ({ - {item.isFlashDelivery ? "Flash Delivery" : "Delivery Time"} + {item.isFlashDelivery ? "1 Hr Delivery" : "Delivery Time"} {item.isFlashDelivery @@ -262,7 +262,7 @@ const OrderItem: React.FC = ({ )} - {item.isFlashDelivery ? "Flash Delivery:" : "Shipping Status:"} + {item.isFlashDelivery ? "1 Hr Delivery:" : "Shipping Status:"} {item.deliveryStatus} diff --git a/apps/user-ui/app/(drawer)/_layout.tsx b/apps/user-ui/app/(drawer)/_layout.tsx index d886b98..b7233d0 100755 --- a/apps/user-ui/app/(drawer)/_layout.tsx +++ b/apps/user-ui/app/(drawer)/_layout.tsx @@ -88,7 +88,7 @@ export default function Layout() { > - Flash Delivery + 1 Hr Delivery ), diff --git a/apps/user-ui/components/FlashDeliveryNote.tsx b/apps/user-ui/components/FlashDeliveryNote.tsx index 0f36f17..b8eb730 100644 --- a/apps/user-ui/components/FlashDeliveryNote.tsx +++ b/apps/user-ui/components/FlashDeliveryNote.tsx @@ -45,10 +45,10 @@ const FlashDeliveryNote: React.FC = ({ - Flash Delivery Notice + 1 Hr Delivery Notice - Prices may differ for Flash Delivery and not all products are available for flash delivery + Prices may differ for 1 Hr Delivery and not all products are available for flash delivery diff --git a/apps/user-ui/components/ProductDetail.tsx b/apps/user-ui/components/ProductDetail.tsx index 87d2e94..76f2005 100644 --- a/apps/user-ui/components/ProductDetail.tsx +++ b/apps/user-ui/components/ProductDetail.tsx @@ -236,7 +236,7 @@ const ProductDetail: React.FC = ({ productId, isFlashDeliver {productDetail.isFlashAvailable && ( - Flash Delivery + 1 Hr Delivery )} {productDetail.isOutOfStock && ( @@ -272,7 +272,7 @@ const ProductDetail: React.FC = ({ productId, isFlashDeliver {productDetail.isFlashAvailable && productDetail.flashPrice && productDetail.flashPrice !== productDetail.price && ( - Flash Delivery: ₹{productDetail.flashPrice} / {formatQuantity(productDetail.productQuantity || 1, productDetail.unitNotation).display} + 1 Hr Delivery: ₹{productDetail.flashPrice} / {formatQuantity(productDetail.productQuantity || 1, productDetail.unitNotation).display} )} diff --git a/apps/user-ui/components/QuickDeliveryAddressSelector.tsx b/apps/user-ui/components/QuickDeliveryAddressSelector.tsx index 4d7922a..e407084 100644 --- a/apps/user-ui/components/QuickDeliveryAddressSelector.tsx +++ b/apps/user-ui/components/QuickDeliveryAddressSelector.tsx @@ -77,7 +77,7 @@ const QuickDeliveryAddressSelector: React.FC // Get current selected slot display const getCurrentSlotDisplay = () => { - if (isForFlashDelivery) return '30 minutes'; + if (isForFlashDelivery) return 'within 1 hour'; if (slotId) { const slot = slotsData?.slots?.find(s => s.id === slotId); return slot ? formatTimeRange(slot.deliveryTime) : 'Select time'; @@ -115,7 +115,7 @@ const QuickDeliveryAddressSelector: React.FC - Delivery in 30 minutes + Delivery in within 1 hour )} @@ -196,7 +196,7 @@ const QuickDeliveryAddressSelector: React.FC - Flash Delivery - 30 minutes + 1 Hr Delivery - within 1 hour diff --git a/apps/user-ui/components/SlotSpecificView.tsx b/apps/user-ui/components/SlotSpecificView.tsx index 2e7c475..09c1d31 100644 --- a/apps/user-ui/components/SlotSpecificView.tsx +++ b/apps/user-ui/components/SlotSpecificView.tsx @@ -449,7 +449,7 @@ export function FlashDeliveryProducts({ storeId:storeIdParent, baseUrl, onProduc return ( - Loading Flash Delivery... + Loading 1 Hr Delivery... ); @@ -461,7 +461,7 @@ export function FlashDeliveryProducts({ storeId:storeIdParent, baseUrl, onProduc Oops! - Failed to load Flash Delivery + Failed to load 1 Hr Delivery ); @@ -502,7 +502,7 @@ export function FlashDeliveryProducts({ storeId:storeIdParent, baseUrl, onProduc onRefresh={() => productsQuery.refetch()} ListEmptyComponent={ - No Flash Delivery products available. + No 1 Hr Delivery products available. } /> diff --git a/apps/user-ui/components/cart-page.tsx b/apps/user-ui/components/cart-page.tsx index 1906be4..58538d2 100644 --- a/apps/user-ui/components/cart-page.tsx +++ b/apps/user-ui/components/cart-page.tsx @@ -359,7 +359,7 @@ export default function CartPage({ isFlashDelivery = false }: CartPageProps) { tw`text-lg font-bold ml-2`, { color: isFlashDelivery ? '#f81260' : '#374151' } ]}> - {isFlashDelivery ? "Flash Delivery Cart" : "Scheduled Delivery Cart"} + {isFlashDelivery ? "1 Hr Delivery Cart" : "Scheduled Delivery Cart"} @@ -508,7 +508,7 @@ export default function CartPage({ isFlashDelivery = false }: CartPageProps) { - {/* Delivery Slot Selection per Product - Hidden for Flash Delivery */} + {/* Delivery Slot Selection per Product - Hidden for 1 Hr Delivery */} {!isFlashDelivery && ( @@ -608,7 +608,7 @@ export default function CartPage({ isFlashDelivery = false }: CartPageProps) { )} - {/* Price for Flash Delivery (already in same row as slot) */} + {/* Price for 1 Hr Delivery (already in same row as slot) */} {isFlashDelivery && ( @@ -699,11 +699,11 @@ export default function CartPage({ isFlashDelivery = false }: CartPageProps) { - {isFlashDelivery ? "Flash Delivery" : "Scheduled Delivery"} + {isFlashDelivery ? "1 Hr Delivery" : "Scheduled Delivery"} {isFlashDelivery - ? "30 min delivery • Immediate pickup" + ? "within 1 hour delivery • Immediate pickup" : "Choose your preferred delivery time" } @@ -725,7 +725,7 @@ export default function CartPage({ isFlashDelivery = false }: CartPageProps) { activeOpacity={0.8} > - {isFlashDelivery ? "Go to Scheduled Delivery" : "Go to Flash Delivery"} + {isFlashDelivery ? "Go to Scheduled Delivery" : "Go to 1 Hr Delivery"} = ({ isFlashDelivery = false }) tw`text-lg font-bold ml-2`, { color: isFlashDelivery ? '#f81260' : '#374151' } ]}> - {isFlashDelivery ? "Flash Delivery Checkout" : "Scheduled Delivery Checkout"} + {isFlashDelivery ? "1 Hr Delivery Checkout" : "Scheduled Delivery Checkout"}