Index: kupi-mk/backend/routes/orders.js
===================================================================
--- kupi-mk/backend/routes/orders.js	(revision 0d2644cc0a133ad5ba608fde6a066f5cf4559570)
+++ kupi-mk/backend/routes/orders.js	(revision 64ca6dd31aef9f30d26987b715072b0551813570)
@@ -157,7 +157,22 @@
                     ORDER BY oi.created_at
                 `, [order.id]);
-                
+                // Parse shipping/billing address if stored as JSON string
+                let shipping = order.shipping_address;
+                let billing = order.billing_address;
+                try {
+                    if (typeof shipping === 'string') shipping = JSON.parse(shipping);
+                } catch (e) {
+                    // leave as-is
+                }
+                try {
+                    if (typeof billing === 'string') billing = JSON.parse(billing);
+                } catch (e) {
+                    // leave as-is
+                }
+
                 return {
                     ...order,
+                    shipping_address: shipping,
+                    billing_address: billing,
                     items: itemsResult.rows
                 };
@@ -217,9 +232,16 @@
             ORDER BY oi.created_at
         `, [orderId]);
-        
+        // Parse addresses if needed
+        let shipping = order.shipping_address;
+        let billing = order.billing_address;
+        try { if (typeof shipping === 'string') shipping = JSON.parse(shipping); } catch (e) {}
+        try { if (typeof billing === 'string') billing = JSON.parse(billing); } catch (e) {}
+
         res.json({
             success: true,
             order: {
                 ...order,
+                shipping_address: shipping,
+                billing_address: billing,
                 items: itemsResult.rows
             }
@@ -391,7 +413,19 @@
             
             // Combine base order row with its items
+            // Parse shipping/billing addresses
+            let shipping = order.shipping_address;
+            let billing = order.billing_address;
+            try { if (typeof shipping === 'string') shipping = JSON.parse(shipping); } catch (e) {}
+            try { if (typeof billing === 'string') billing = JSON.parse(billing); } catch (e) {}
+
+            // Compute seller-specific total for this order (only items belonging to this seller)
+            const sellerTotal = itemsResult.rows.reduce((sum, it) => sum + (parseFloat(it.price_at_time || 0) * (it.quantity || 0)), 0);
+
             orders.push({
                 ...order,
-                order_items: itemsResult.rows
+                shipping_address: shipping,
+                billing_address: billing,
+                order_items: itemsResult.rows,
+                seller_total: sellerTotal
             });
         }
Index: kupi-mk/frontend/src/pages/Orders.js
===================================================================
--- kupi-mk/frontend/src/pages/Orders.js	(revision 0d2644cc0a133ad5ba608fde6a066f5cf4559570)
+++ kupi-mk/frontend/src/pages/Orders.js	(revision 64ca6dd31aef9f30d26987b715072b0551813570)
@@ -202,8 +202,8 @@
                                                 <h4 className="font-medium text-gray-800 mb-2">Shipping Address</h4>
                                                 <div className="text-sm text-gray-600">
-                                                    <p>{order.shipping_address.fullName}</p>
-                                                    <p>{order.shipping_address.street}</p>
-                                                    <p>{order.shipping_address.city}, {order.shipping_address.postalCode}</p>
-                                                    <p>{order.shipping_address.country}</p>
+                                                    <p>{order.shipping_address?.fullName}</p>
+                                                    <p>{order.shipping_address?.street}</p>
+                                                    <p>{order.shipping_address ? `${order.shipping_address.city || ''}${order.shipping_address.postalCode ? ', ' + order.shipping_address.postalCode : ''}` : ''}</p>
+                                                    <p>{order.shipping_address?.country}</p>
                                                 </div>
                                             </div>
Index: kupi-mk/frontend/src/pages/SellerDashboard.js
===================================================================
--- kupi-mk/frontend/src/pages/SellerDashboard.js	(revision 0d2644cc0a133ad5ba608fde6a066f5cf4559570)
+++ kupi-mk/frontend/src/pages/SellerDashboard.js	(revision 64ca6dd31aef9f30d26987b715072b0551813570)
@@ -220,5 +220,5 @@
                                             </td>
                                             <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
-                                                {parseFloat(order.total_amount || 0).toLocaleString('mk-MK')} ден.
+                                                {parseFloat(order.seller_total ?? order.total_amount ?? 0).toLocaleString('mk-MK')} ден.
                                             </td>
                                             <td className="px-6 py-4 whitespace-nowrap">
@@ -292,8 +292,8 @@
                                                                 <h4 className="font-semibold text-gray-800 mb-2">Shipping Address</h4>
                                                                 <div className="bg-white p-3 rounded-md text-sm text-gray-700">
-                                                                    <p>{order.shipping_address.fullName}</p>
-                                                                    <p>{order.shipping_address.street}</p>
-                                                                    <p>{order.shipping_address.city}, {order.shipping_address.postalCode}</p>
-                                                                    <p>{order.shipping_address.country}</p>
+                                                                    <p>{order.shipping_address?.fullName}</p>
+                                                                    <p>{order.shipping_address?.street}</p>
+                                                                    <p>{order.shipping_address ? `${order.shipping_address.city || ''}${order.shipping_address.postalCode ? ', ' + order.shipping_address.postalCode : ''}` : ''}</p>
+                                                                    <p>{order.shipping_address?.country}</p>
                                                                 </div>
                                                             </div>