Merge branch 'main' of https://git.technocracy.ovh/shafi/freshyo

apps/backend/index.ts

@@ -180,6 +180,6 @@ app.use((err: any, req: express.Request, res: express.Response, next: express.Ne
   res.status(status).json({ message });
 });
 
-app.listen(4000, () => {
+app.listen(4000, '::', () => {
   console.log("Server is running on http://localhost:4000/api/mobile/");
 });

apps/backend/package.json

@@ -42,7 +42,6 @@
     "multer": "^2.0.2",
     "node-cron": "^4.2.1",
     "pg": "^8.16.3",
-    "pg-sdk-node": "https://phonepe.mycloudrepo.io/public/repositories/phonepe-pg-sdk-node/releases/v2/phonepe-pg-sdk-node.tgz",
     "razorpay": "^2.9.6",
     "redis": "^5.9.0",
     "zod": "^4.1.12"

apps/backend/src/lib/post-order-handler.ts

@@ -35,7 +35,10 @@ const formatOrderMessageWithFullData = (ordersData: any[]): string => {
 
     message += '📦 <b>Items:</b>\n';
     order.orderItems?.forEach((item: any) => {
-      message += `  • ${item.product?.name || 'Unknown'} x${item.quantity}\n`;
+      const productQuantity = item.product?.productQuantity ?? 1
+      const unitNotation = item.product?.unit?.shortNotation || ''
+      const quantityWithUnit = unitNotation ? `${productQuantity}${unitNotation}` : `${productQuantity}`
+      message += `  • ${item.product?.name || 'Unknown'} ${quantityWithUnit} x${item.quantity}\n`;
     });
 
     message += `\n💰 <b>Total:</b> ₹${order.totalAmount}\n`;
@@ -72,7 +75,12 @@ const formatCancellationMessage = (orderData: any, cancellationData: Cancellatio
 📞 <b>Phone:</b> ${orderData.address?.phone || 'N/A'}
 
 📦 <b>Items:</b>
-${orderData.orderItems?.map((item: any) => `  • ${item.product?.name || 'Unknown'} x${item.quantity}`).join('\n') || '  N/A'}
+${orderData.orderItems?.map((item: any) => {
+  const productQuantity = item.product?.productQuantity ?? 1
+  const unitNotation = item.product?.unit?.shortNotation || ''
+  const quantityWithUnit = unitNotation ? `${productQuantity}${unitNotation}` : `${productQuantity}`
+  return `  • ${item.product?.name || 'Unknown'} ${quantityWithUnit} x${item.quantity}`
+}).join('\n') || '  N/A'}
 
 💰 <b>Total:</b> ₹${orderData.totalAmount}
 💳 <b>Refund:</b> ${orderData.refundStatus === 'na' ? 'N/A (COD)' : orderData.refundStatus || 'Pending'}
@@ -102,7 +110,7 @@ export const startOrderHandler = async (): Promise<void> => {
           where: inArray(orders.id, orderIds),
           with: {
             address: true,
-            orderItems: { with: { product: true } },
+            orderItems: { with: { product: { with: { unit: true } } } },
             slot: true,
           },
         });
@@ -147,7 +155,7 @@ export const startCancellationHandler = async (): Promise<void> => {
           where: eq(orders.id, cancellationData.orderId),
           with: {
             address: true,
-            orderItems: { with: { product: true } },
+            orderItems: { with: { product: { with: { unit: true } } } },
             refunds: true,
           },
         });

apps/user-ui/components/ProductCard.tsx

@@ -15,6 +15,7 @@ import {
 import { useProductSlotIdentifier } from '@/hooks/useProductSlotIdentifier';
 import { useCartStore } from '@/src/store/cartStore';
 import { trpc } from '@/src/trpc-client';
+import { Image as RnImage } from 'react-native'
 
 
 interface ProductCardProps {
@@ -129,7 +130,7 @@ const ProductCard: React.FC<ProductCardProps> = ({
         activeOpacity={0.9}
       >
         <View style={tw`relative`}>
-          <Image
+          <RnImage
             source={{ uri: item.images?.[0] }}
             style={{ width: "100%", height: itemWidth, resizeMode: "cover" }}
           />