-
- $0 Delivery Fee
-On your first order
-
-
- Earn Rewards
-With every meal
-
-
Support Local
-Majuro Restaurants
+
+
+
- query("
- SELECT r.id, r.name, r.image_url, GROUP_CONCAT(c.name SEPARATOR ', ') as cuisines, AVG(rt.rating) as average_rating
- FROM restaurants r
- LEFT JOIN restaurant_cuisines rc ON r.id = rc.restaurant_id
- LEFT JOIN cuisines c ON rc.cuisine_id = c.id
- LEFT JOIN ratings rt ON r.id = rt.restaurant_id
- GROUP BY r.id
- ORDER BY average_rating DESC
- LIMIT 4
- ");
- $top_restaurants = $top_restaurants_stmt->fetchAll(PDO::FETCH_ASSOC);
-
- // Fetch Featured Cuisines
- $featured_cuisines_stmt = $db->query("
- SELECT c.id, c.name, c.image_url
- FROM cuisines c
- JOIN (
- SELECT cuisine_id, COUNT(*) as restaurant_count
- FROM restaurant_cuisines
- GROUP BY cuisine_id
- ORDER BY restaurant_count DESC
- LIMIT 4
- ) as popular_cuisines ON c.id = popular_cuisines.cuisine_id
- ");
- $featured_cuisines = $featured_cuisines_stmt->fetchAll(PDO::FETCH_ASSOC);
- ?>
-
-
-
How It Works
+
+
+
+
+ 
+
+
+ Choose A Restaurant
+Browse from our extensive list of local restaurants.
+
+
+
+ 
+
+
+ Pick Your Meal
+Select your favorite dishes and add them to your cart.
+
+
+ 
+
+
+ Fast Delivery
+Get your food delivered right to your doorstep, fast!
+Top-rated restaurants
-
-
-
-
-
-
-
-
-
-
- ★
-
- New
-
+
+
-
-
Top-Rated Restaurants
+Featured Cuisines
-
-
-
-
- ";
+ include 'footer.php';
+ exit();
}
+$stmt = $pdo->prepare($sql);
+$stmt->execute($params);
+$order = $stmt->fetch(PDO::FETCH_ASSOC);
+
+
if (!$order) {
include 'header.php';
echo "";
@@ -165,115 +176,94 @@ document.addEventListener('DOMContentLoaded', function() {
renderTimeline(data.status);
} else if(data.error) {
console.error('Error fetching status:', data.error);
- timelineContainer.innerHTML = '
-
+
+
-
-
+
diff --git a/order_status.php b/order_status.php
index 2742e3a5..4654885e 100644
--- a/order_status.php
+++ b/order_status.php
@@ -15,18 +15,29 @@ if (!$order_id) {
$pdo = db();
$order = null;
+// Fetch order details along with restaurant location
+$sql = "SELECT o.*, r.name as restaurant_name, r.lat as restaurant_lat, r.lng as restaurant_lng FROM orders o JOIN restaurants r ON o.restaurant_id = r.id WHERE o.id = ?";
+$params = [$order_id];
+
if ($user_id) {
- // User is logged in, verify order belongs to them
- $stmt = $pdo->prepare("SELECT o.*, r.name as restaurant_name FROM orders o JOIN restaurants r ON o.restaurant_id = r.id WHERE o.id = ? AND o.user_id = ?");
- $stmt->execute([$order_id, $user_id]);
- $order = $stmt->fetch(PDO::FETCH_ASSOC);
+ $sql .= " AND o.user_id = ?";
+ $params[] = $user_id;
} elseif ($token) {
- // Guest access, verify token
- $stmt = $pdo->prepare("SELECT o.*, r.name as restaurant_name FROM orders o JOIN restaurants r ON o.restaurant_id = r.id WHERE o.id = ? AND o.guest_token = ?");
- $stmt->execute([$order_id, $token]);
- $order = $stmt->fetch(PDO::FETCH_ASSOC);
+ $sql .= " AND o.token = ?";
+ $params[] = $token;
+} else {
+ // No user and no token, deny access
+ include 'header.php';
+ echo "Featured Cuisines
+
+ 0): ?>
+
+
+
+ ![<?php echo htmlspecialchars($cuisine['name']); ?>](<?php echo htmlspecialchars($cuisine['image_url']); ?>)
+
+
-
-
+
+
+ No cuisines found.
+Authentication required to view this order.
Order not found or you do not have permission to view it.
Could not retrieve order status. Please try again later.
';
}
})
.catch(error => {
console.error('Fetch error:', error);
- timelineContainer.innerHTML = 'An error occurred while trying to update the order status.
';
});
}
renderTimeline(currentStatus);
setInterval(fetchStatus, 10000); // Poll every 10 seconds
- // --- Map Logic ---
+ // --- New Map Logic ---
let map = null;
let driverMarker = null;
- let restaurantMarker = null;
- let homeMarker = null;
+ const restaurantLocation = {
+ lat: ,
+ lng:
+ };
- // Define custom icons
const driverIcon = L.icon({
- iconUrl: 'https://unpkg.com/leaflet@1.7.1/dist/images/marker-icon-2x.png', // A different color or style
- iconSize: [25, 41],
- iconAnchor: [12, 41],
- popupAnchor: [1, -34],
- shadowSize: [41, 41]
+ iconUrl: 'assets/images/driver-icon.svg', // Custom driver icon
+ iconSize: [38, 38],
+ iconAnchor: [19, 38],
+ popupAnchor: [0, -38]
});
const restaurantIcon = L.icon({
- iconUrl: 'https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-red.png',
- iconSize: [25, 41],
- iconAnchor: [12, 41],
- popupAnchor: [1, -34],
- shadowSize: [41, 41]
+ iconUrl: 'assets/images/restaurant-icon.svg', // Custom restaurant icon
+ iconSize: [38, 38],
+ iconAnchor: [19, 38],
+ popupAnchor: [0, -38]
});
- const homeIcon = L.icon({
- iconUrl: 'https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-green.png',
- iconSize: [25, 41],
- iconAnchor: [12, 41],
- popupAnchor: [1, -34],
- shadowSize: [41, 41]
- });
+ function initializeMap() {
+ if (map || !restaurantLocation.lat) return;
+ map = L.map('map').setView([restaurantLocation.lat, restaurantLocation.lng], 14);
- function initializeMap(restaurantLocation) {
- if (map) return;
- map = L.map('map').setView([restaurantLocation.lat, restaurantLocation.lng], 13);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
- attribution: '© OpenStreetMap contributors'
+ attribution: '© OpenStreetMap contributors'
}).addTo(map);
- restaurantMarker = L.marker([restaurantLocation.lat, restaurantLocation.lng], {icon: restaurantIcon}).addTo(map)
- .bindPopup(`${restaurantLocation.name}`).openPopup();
+ L.marker([restaurantLocation.lat, restaurantLocation.lng], { icon: restaurantIcon })
+ .addTo(map)
+ .bindPopup('');
}
- function updateMap(data) {
- if (!data.restaurant_location || !data.restaurant_location.lat) return;
-
- if (!map) {
- initializeMap(data.restaurant_location);
+ function fetchDriverLocation() {
+ // Only start fetching if the order is 'Out For Delivery'
+ if (currentStatus.toLowerCase() !== 'out for delivery') {
+ // You might want to hide the map or show a message until the driver is on the way
+ // For now, we just won't fetch the location.
+ return;
}
- if (data.driver_location && data.driver_location.lat) {
- const { lat, lng } = data.driver_location;
- if (driverMarker) {
- driverMarker.setLatLng([lat, lng]);
- } else {
- driverMarker = L.marker([lat, lng], {icon: driverIcon}).addTo(map)
- .bindPopup('Your Driver');
- }
- // Center map between driver and restaurant
- if (restaurantMarker) {
- const bounds = L.latLngBounds(driverMarker.getLatLng(), restaurantMarker.getLatLng());
- map.fitBounds(bounds.pad(0.3));
- }
- }
-
- // Geocode delivery address to show home marker
- // This requires a geocoding service. For now, we will skip this.
- // Example using a hypothetical geocoding service:
- // if (!homeMarker && data.delivery_address) {
- // geocode(data.delivery_address).then(coords => {
- // homeMarker = L.marker(coords, {icon: homeIcon}).addTo(map).bindPopup('Your Address');
- // });
- // }
- }
-
- function fetchMapData() {
- let url = `api/get_order_status.php?order_id=${orderId}`;
+ let url = `api/get_driver_location.php?order_id=${orderId}`;
if (token) {
url += `&token=${token}`;
}
+
fetch(url)
.then(response => response.json())
.then(data => {
- if (data.error) {
- console.error('Error fetching map data:', data.error);
+ if (data.lat && data.lng) {
+ const driverLatLng = [data.lat, data.lng];
+ if (!driverMarker) {
+ driverMarker = L.marker(driverLatLng, { icon: driverIcon }).addTo(map)
+ .bindPopup('Your Driver');
+ map.setView(driverLatLng, 15);
+ } else {
+ driverMarker.setLatLng(driverLatLng);
+ }
+ // Optional: Adjust map bounds to show both restaurant and driver
+ if (driverMarker) {
+ const bounds = L.latLngBounds([restaurantLocation.lat, restaurantLocation.lng], driverMarker.getLatLng());
+ map.fitBounds(bounds.pad(0.3));
+ }
} else {
- updateMap(data);
+ console.warn('Driver location not available yet.');
}
})
- .catch(error => console.error('Fetch error for map:', error));
+ .catch(error => console.error('Error fetching driver location:', error));
}
- fetchMapData();
- setInterval(fetchMapData, 5000); // Poll every 5 seconds for map updates
+ initializeMap();
+ // Start polling for driver location immediately and repeat every 5 seconds
+ fetchDriverLocation();
+ setInterval(fetchDriverLocation, 5000);
});
-
-
\ No newline at end of file