Checkout
-
-
-
Delivery Information
- - +
+
+
-
diff --git a/menu.php b/menu.php
index 257f6bd7..89a7dcfc 100644
--- a/menu.php
+++ b/menu.php
@@ -69,111 +69,85 @@ try {
}
?>
-
-
+
+ Order Summary
--
-
-
- - (x) - $ - - -
- - Delivery Fee - $ - -
- - Service Fee (%) - $ - -
- - Total - $ - -
+
+
+
+ 1. Delivery Details
+ +
+
Order Summary
+
+
+
+
+ (x)
+ $
+
+
+
+
+ Subtotal
+ $
+
+
+ Delivery Fee
+ $
+
+
+ Service Fee
+ $
+
+ 0): ?>
+
+ Discount
+ -$
+
+
+
+ Total
+ $
+
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
- ★
- ( reviews)
-
-
-
- ![Image of <?php echo htmlspecialchars($restaurant['name']); ?>](<?php echo htmlspecialchars($restaurant['image_url']); ?>)
-
-
- - -
Menu
-
-
-
-
- -
-
-
-
-
-
- ![<?php echo htmlspecialchars($item['name']); ?>](<?php echo htmlspecialchars($item['image_url']); ?>)
-
-
-
-
-
-
- $
- -
-
+
- This restaurant has no menu items yet.
-- -
-
-
Reviews & Ratings
- - 0): ?> -
- You have already reviewed this restaurant.
-
-
-
- Leave a review for a completed order.
-
-
-
- Log in to see reviews or leave your own.
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/migrations/00000000_drop_all_tables.sql b/migrations/00000000_drop_all_tables.sql
new file mode 100644
index 00000000..f0e751ef
--- /dev/null
+++ b/migrations/00000000_drop_all_tables.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS cart CASCADE;
+DROP TABLE IF EXISTS ratings CASCADE;
+DROP TABLE IF EXISTS favorite_restaurants CASCADE;
+DROP TABLE IF EXISTS driver_assignments CASCADE;
+DROP TABLE IF EXISTS order_items CASCADE;
+DROP TABLE IF EXISTS orders CASCADE;
+DROP TABLE IF EXISTS menu_items CASCADE;
+DROP TABLE IF EXISTS special_promotions CASCADE;
+DROP TABLE IF EXISTS coupons CASCADE;
+DROP TABLE IF EXISTS restaurants CASCADE;
+DROP TABLE IF EXISTS cuisines CASCADE;
+DROP TABLE IF EXISTS drivers CASCADE;
+DROP TABLE IF EXISTS password_resets CASCADE;
+DROP TABLE IF EXISTS settings CASCADE;
+DROP TABLE IF EXISTS users CASCADE;
\ No newline at end of file
diff --git a/migrations/00000000_drop_users_table.sql b/migrations/00000000_drop_users_table.sql
new file mode 100644
index 00000000..365a2107
--- /dev/null
+++ b/migrations/00000000_drop_users_table.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS users;
\ No newline at end of file
diff --git a/migrations/20251011_create_cart_table.sql b/migrations/20251011_create_cart_table.sql
new file mode 100644
index 00000000..88b54606
--- /dev/null
+++ b/migrations/20251011_create_cart_table.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS cart (
+ id SERIAL PRIMARY KEY,
+ user_id INT,
+ menu_item_id INT NOT NULL,
+ quantity INT NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
\ No newline at end of file
diff --git a/migrations/20251011_create_ratings_table.sql b/migrations/20251011_create_ratings_table.sql
new file mode 100644
index 00000000..33a46112
--- /dev/null
+++ b/migrations/20251011_create_ratings_table.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS ratings (
+ id SERIAL PRIMARY KEY,
+ user_id INT NOT NULL,
+ order_id INT NOT NULL,
+ rating INT NOT NULL,
+ comment TEXT,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
\ No newline at end of file
diff --git a/migrations/20251015_create_restaurants_and_menu_items_tables.sql b/migrations/20251012_create_restaurants_and_menu_items_tables.sql
similarity index 100%
rename from migrations/20251015_create_restaurants_and_menu_items_tables.sql
rename to migrations/20251012_create_restaurants_and_menu_items_tables.sql
diff --git a/migrations/20251013_create_users_table.sql b/migrations/20251013_create_users_table.sql
new file mode 100644
index 00000000..f9fdfd42
--- /dev/null
+++ b/migrations/20251013_create_users_table.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS users (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(255) NOT NULL,
+ email VARCHAR(255) NOT NULL UNIQUE,
+ password VARCHAR(255) NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
\ No newline at end of file
diff --git a/migrations/20251014_create_orders_tables.sql b/migrations/20251014_create_orders_tables.sql
index 969b6da0..91cf3e97 100644
--- a/migrations/20251014_create_orders_tables.sql
+++ b/migrations/20251014_create_orders_tables.sql
@@ -1,18 +1,17 @@
-CREATE TABLE IF NOT EXISTS `orders` (
- `id` INT AUTO_INCREMENT PRIMARY KEY,
- `user_id` INT NOT NULL,
- `restaurant_id` INT NOT NULL,
- `total_price` DECIMAL(10, 2) NOT NULL,
- `status` VARCHAR(50) NOT NULL DEFAULT 'pending',
- `created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- FOREIGN KEY (`user_id`) REFERENCES `users`(`id`)
+CREATE TABLE IF NOT EXISTS orders (
+ id SERIAL PRIMARY KEY,
+ user_id INT NOT NULL,
+ restaurant_id INT NOT NULL,
+ total_price DECIMAL(10, 2) NOT NULL,
+ status VARCHAR(50) NOT NULL DEFAULT 'pending',
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
-CREATE TABLE IF NOT EXISTS `order_items` (
- `id` INT AUTO_INCREMENT PRIMARY KEY,
- `order_id` INT NOT NULL,
- `menu_item_id` INT NOT NULL,
- `quantity` INT NOT NULL,
- `price` DECIMAL(10, 2) NOT NULL,
- FOREIGN KEY (`order_id`) REFERENCES `orders`(`id`)
+CREATE TABLE IF NOT EXISTS order_items (
+ id SERIAL PRIMARY KEY,
+ order_id INT NOT NULL,
+ menu_item_id INT NOT NULL,
+ quantity INT NOT NULL,
+ price DECIMAL(10, 2) NOT NULL,
+ FOREIGN KEY (order_id) REFERENCES orders(id)
);
diff --git a/migrations/20251015_add_order_id_to_ratings.sql b/migrations/20251015_add_order_id_to_ratings.sql
deleted file mode 100644
index f1b29640..00000000
--- a/migrations/20251015_add_order_id_to_ratings.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE ratings ADD COLUMN order_id INT;
diff --git a/migrations/20251015_add_password_to_users.sql b/migrations/20251015_add_password_to_users.sql
deleted file mode 100644
index 1b24a1a7..00000000
--- a/migrations/20251015_add_password_to_users.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE users ADD COLUMN password VARCHAR(255);
diff --git a/migrations/20251015_add_status_to_orders.sql b/migrations/20251015_add_status_to_orders.sql
deleted file mode 100644
index bb88dc5a..00000000
--- a/migrations/20251015_add_status_to_orders.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE orders ADD COLUMN status VARCHAR(50) NOT NULL DEFAULT 'Pending';
\ No newline at end of file
diff --git a/migrations/20251015_add_token_to_orders.sql b/migrations/20251015_add_token_to_orders.sql
new file mode 100644
index 00000000..0bd8c334
--- /dev/null
+++ b/migrations/20251015_add_token_to_orders.sql
@@ -0,0 +1 @@
+ALTER TABLE orders ADD COLUMN token VARCHAR(255) UNIQUE;
\ No newline at end of file
diff --git a/migrations/20251015_allow_guest_orders.sql b/migrations/20251015_allow_guest_orders.sql
new file mode 100644
index 00000000..ea4c7857
--- /dev/null
+++ b/migrations/20251015_allow_guest_orders.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "orders" ALTER COLUMN "user_id" DROP NOT NULL;
+ALTER TABLE "orders" ADD COLUMN "guest_name" VARCHAR(255) NULL, ADD COLUMN "guest_email" VARCHAR(255) NULL;
\ No newline at end of file
diff --git a/migrations/20251015_create_admin_user_with_password.sql b/migrations/20251015_create_admin_user_with_password.sql
index f6ab28fb..93e69b08 100644
--- a/migrations/20251015_create_admin_user_with_password.sql
+++ b/migrations/20251015_create_admin_user_with_password.sql
@@ -1 +1 @@
-INSERT INTO users (email, role, password, is_admin) VALUES ('admin@example.com', 'owner', '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', TRUE) ON CONFLICT (email) DO UPDATE SET role = 'owner', password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', is_admin = TRUE;
+INSERT INTO users (name, email, role, password, is_admin) VALUES ('Admin User', 'admin@example.com', 'owner', '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', TRUE) ON CONFLICT (email) DO UPDATE SET name = 'Admin User', role = 'owner', password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', is_admin = TRUE;
diff --git a/migrations/20251015_create_users_table.sql b/migrations/20251015_create_users_table.sql
deleted file mode 100644
index fcb4fd90..00000000
--- a/migrations/20251015_create_users_table.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE IF NOT EXISTS `users` (
- `id` INT AUTO_INCREMENT PRIMARY KEY,
- `name` VARCHAR(255) NOT NULL,
- `email` VARCHAR(255) NOT NULL UNIQUE,
- `password` VARCHAR(255) NOT NULL,
- `created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
diff --git a/migrations/20251015_update_cart_table.sql b/migrations/20251015_update_cart_table.sql
deleted file mode 100644
index 93e9f825..00000000
--- a/migrations/20251015_update_cart_table.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `cart` ADD `session_id` VARCHAR(255) NULL AFTER `user_id`;
-ALTER TABLE `cart` MODIFY `user_id` INT NULL;
diff --git a/migrations/20251016_update_cart_table.sql b/migrations/20251016_update_cart_table.sql
new file mode 100644
index 00000000..ab09bd01
--- /dev/null
+++ b/migrations/20251016_update_cart_table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE cart ADD COLUMN session_id VARCHAR(255) NULL;
+ALTER TABLE cart ALTER COLUMN user_id DROP NOT NULL;
diff --git a/order_confirmation.php b/order_confirmation.php
index 172ec498..de7e5bdd 100644
--- a/order_confirmation.php
+++ b/order_confirmation.php
@@ -2,31 +2,128 @@
session_start();
require_once 'db/config.php';
-if (!isset($_SESSION['user_id'])) {
- header("Location: login.php");
- exit();
-}
+$order_id = $_SESSION['order_id'] ?? $_GET['order_id'] ?? null;
+$user_id = $_SESSION['user_id'] ?? null;
+$guest_token = $_SESSION['token'] ?? $_GET['token'] ?? null;
-if (!isset($_GET['id'])) {
+if (!$order_id) {
header("Location: index.php");
exit();
}
-$orderId = $_GET['id'];
+$pdo = db();
+$order = null;
+
+if ($user_id) {
+ $stmt = $pdo->prepare("SELECT * FROM orders WHERE id = ? AND user_id = ?");
+ $stmt->execute([$order_id, $user_id]);
+ $order = $stmt->fetch(PDO::FETCH_ASSOC);
+} elseif ($guest_token) {
+ $stmt = $pdo->prepare("SELECT * FROM orders WHERE id = ? AND token = ?");
+ $stmt->execute([$order_id, $guest_token]);
+ $order = $stmt->fetch(PDO::FETCH_ASSOC);
+}
+
+if (!$order) {
+ // If the order is not found or doesn't belong to the user/guest, redirect.
+ header("Location: index.php");
+ exit();
+}
+
+// Fetch order items
+$itemsStmt = $pdo->prepare("
+ SELECT oi.quantity, mi.name, mi.price
+ FROM order_items oi
+ JOIN menu_items mi ON oi.menu_item_id = mi.id
+ WHERE oi.order_id = :order_id
+");
+$itemsStmt->bindParam(':order_id', $order_id);
+$itemsStmt->execute();
+$orderItems = $itemsStmt->fetchAll(PDO::FETCH_ASSOC);
+
+// Determine the correct tracking URL
+$tracking_url = "order_status.php?order_id=" . $order_id;
+if (!$user_id && $guest_token) {
+ $tracking_url .= "&token=" . $guest_token;
+}
include 'header.php';
?>
-
+
+
+ Menu
+
+
+
+
+
+
+
+
- This restaurant has no reviews yet. Be the first!
+This restaurant has no menu items yet.
+
+
+
+ Reviews
+ + +
+
+
+
+
+
+
+
+ ""
+ +This restaurant has no reviews yet.
+ - -Restaurant not found.
- + + Leave a Review + +Log in to leave a review.
+ +
-
- ";
+ include 'header.php';
+ echo "";
include 'footer.php';
exit();
}
// Fetch order items
-$p_items = $pdo->prepare("SELECT oi.*, mi.name as item_name FROM order_items oi JOIN menu_items mi ON oi.menu_item_id = mi.id WHERE oi.order_id = ?");
-$p_items->execute([$order_id]);
-$items = $p_items->fetchAll(PDO::FETCH_ASSOC);
+$stmt = $pdo->prepare("SELECT oi.*, mi.name as item_name FROM order_items oi JOIN menu_items mi ON oi.menu_item_id = mi.id WHERE oi.order_id = ?");
+$stmt->execute([$order_id]);
+$items = $stmt->fetchAll(PDO::FETCH_ASSOC);
+include 'header.php';
?>
-
";
- include 'footer.php';
- exit();
-}
-
-$order_id = $_GET['order_id'];
-$user_id = $_SESSION['user_id'];
$pdo = db();
+$order = null;
-// Fetch order details to ensure the user owns this order
-$p_order = $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 = ?");
-$p_order->execute([$order_id, $user_id]);
-$order = $p_order->fetch(PDO::FETCH_ASSOC);
+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);
+} 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);
+}
if (!$order) {
- echo "Thank You for Your Order!
-Your order has been placed successfully.
-Your Order ID is:
-We have received your order and will begin processing it shortly.
- Continue Shopping +
+
-
+
diff --git a/order_status.php b/order_status.php
index 87b595b4..1a1fd2d4 100644
--- a/order_status.php
+++ b/order_status.php
@@ -1,124 +1,175 @@
+
+
+
+
+ Thank You for Your Order!
+
+
+
+
+
+ Your order has been placed successfully.
+Your Order ID is:
+
+
+
+
+
+ Delivery Details
+
+ Name:
+ Address:
+ Phone:
+
+
+ Order Summary
+
+ Date:
+ Status:
+
Items Ordered
+-
+
+
- + (x) + $ + + +
-
+
- + Subtotal + $ + + 0): ?> +
- + Discount + -$ + + +
- + Total + $ + +
+
+ We've received your order and will begin processing it shortly. You can track the progress of your order using the button below.
+ Continue Shopping + Track Order +No order specified.
Order not found or you do not have permission to view it.
Order not found or you do not have permission to view it.
-
-
Order Status for #
--
-
-
Live Status
-Restaurant:
-Order Date:
-
-
-
+
\ No newline at end of file
diff --git a/payment-success.php b/payment-success.php
index cebfb2e1..ab8e3ef4 100644
--- a/payment-success.php
+++ b/payment-success.php
@@ -11,25 +11,44 @@ if (!isset($_GET['session_id'])) {
$stripe_session_id = $_GET['session_id'];
$pdo = db();
+$session_id = session_id();
\Stripe\Stripe::setApiKey($stripeSecretKey);
try {
$checkout_session = \Stripe\Checkout\Session::retrieve($stripe_session_id);
$metadata = $checkout_session->metadata;
- $user_id = $metadata->user_id;
- $coupon_id = $metadata->coupon_id;
+ $user_id = $metadata->user_id ?? null;
+ $is_guest = !$user_id;
if ($checkout_session->payment_status == 'paid') {
- // Fetch user's address
- $stmt = $pdo->prepare("SELECT address FROM users WHERE id = ?");
- $stmt->execute([$user_id]);
- $user = $stmt->fetch();
- $delivery_address = $user ? $user['address'] : 'N/A';
+ $delivery_address = null;
+ $phone_number = null;
+ $guest_name = null;
+ $guest_email = null;
+ $guest_token = null;
+
+ if ($is_guest) {
+ $guest_name = $metadata->guest_name ?? '';
+ $guest_email = $metadata->guest_email ?? '';
+ $delivery_address = $metadata->guest_address ?? 'N/A';
+ $phone_number = $metadata->guest_phone ?? 'N/A';
+ $cart_identifier = $session_id;
+ $cart_column = 'session_id';
+ $guest_token = $metadata->token ?? null; // Use token from metadata
+ } else {
+ $stmt = $pdo->prepare("SELECT address, phone FROM users WHERE id = ?");
+ $stmt->execute([$user_id]);
+ $user = $stmt->fetch();
+ $delivery_address = $user ? $user['address'] : 'N/A';
+ $phone_number = $user ? $user['phone'] : 'N/A';
+ $cart_identifier = $user_id;
+ $cart_column = 'user_id';
+ }
// Fetch cart items
- $stmt = $pdo->prepare("SELECT c.*, mi.price, mi.restaurant_id FROM cart c JOIN menu_items mi ON c.menu_item_id = mi.id WHERE c.user_id = ?");
- $stmt->execute([$user_id]);
+ $stmt = $pdo->prepare("SELECT c.*, mi.price, mi.restaurant_id FROM cart c JOIN menu_items mi ON c.menu_item_id = mi.id WHERE c.$cart_column = ?");
+ $stmt->execute([$cart_identifier]);
$cart_items = $stmt->fetchAll();
if (empty($cart_items)) {
@@ -39,11 +58,12 @@ try {
$total_price = $_SESSION['total_price'] ?? 0;
$discount_amount = $_SESSION['discount_amount'] ?? 0;
+ $coupon_id = $metadata->coupon_id ?? null;
$restaurant_id = $cart_items[0]['restaurant_id']; // Assuming order from one restaurant
// Create order
- $stmt = $pdo->prepare("INSERT INTO orders (user_id, restaurant_id, total_price, status, stripe_session_id, delivery_address, coupon_id, discount_amount) VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
- $stmt->execute([$user_id, $restaurant_id, $total_price, 'paid', $stripe_session_id, $delivery_address, $coupon_id, $discount_amount]);
+ $stmt = $pdo->prepare("INSERT INTO orders (user_id, restaurant_id, total_price, status, stripe_session_id, delivery_address, phone_number, coupon_id, discount_amount, guest_name, guest_email, token) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+ $stmt->execute([$user_id, $restaurant_id, $total_price, 'paid', $stripe_session_id, $delivery_address, $phone_number, $coupon_id, $discount_amount, $guest_name, $guest_email, $guest_token]);
$order_id = $pdo->lastInsertId();
// Insert order items
@@ -53,8 +73,8 @@ try {
}
// Clear cart
- $stmt = $pdo->prepare("DELETE FROM cart WHERE user_id = ?");
- $stmt->execute([$user_id]);
+ $stmt = $pdo->prepare("DELETE FROM cart WHERE $cart_column = ?");
+ $stmt->execute([$cart_identifier]);
// Clear coupon session variables
unset($_SESSION['coupon_id']);
@@ -64,8 +84,11 @@ try {
unset($_SESSION['discount_amount']);
unset($_SESSION['subtotal']);
-
$_SESSION['order_id'] = $order_id;
+ if ($is_guest) {
+ $_SESSION['token'] = $guest_token;
+ }
+
header("Location: order_confirmation.php");
exit();
diff --git a/paypal-capture.php b/paypal-capture.php
index d0bac939..8c7d6839 100644
--- a/paypal-capture.php
+++ b/paypal-capture.php
@@ -5,13 +5,15 @@ require_once 'includes/api_keys.php';
header('Content-Type: application/json');
-if (!isset($_SESSION['user_id']) || !isset($_POST['orderID'])) {
+if (!isset($_POST['orderID'])) {
echo json_encode(['error' => 'Invalid request.']);
exit();
}
$orderID = $_POST['orderID'];
-$user_id = $_SESSION['user_id'];
+$user_id = $_SESSION['user_id'] ?? null;
+$is_guest = !$user_id;
+$session_id = session_id();
// Helper function to get PayPal access token
function get_paypal_access_token($clientId, $secret, $apiBase) {
@@ -56,15 +58,26 @@ $details = json_decode($result);
if (isset($details->status) && $details->status == 'COMPLETED') {
$pdo = db();
- // Fetch user's address
- $stmt = $pdo->prepare("SELECT address FROM users WHERE id = ?");
- $stmt->execute([$user_id]);
- $user = $stmt->fetch();
- $delivery_address = $user ? $user['address'] : 'N/A';
+ $delivery_address = $_POST['address'] ?? 'N/A';
+ $phone_number = $_POST['phone'] ?? 'N/A';
+ $guest_name = null;
+ $guest_email = null;
+ $guest_token = null;
+
+ if ($is_guest) {
+ $guest_name = $_POST['name'] ?? '';
+ $guest_email = $_POST['email'] ?? '';
+ $cart_identifier = $session_id;
+ $cart_column = 'session_id';
+ $guest_token = bin2hex(random_bytes(16)); // Generate a unique token for guest orders
+ } else {
+ $cart_identifier = $user_id;
+ $cart_column = 'user_id';
+ }
// Fetch cart items
- $stmt = $pdo->prepare("SELECT c.*, mi.price, mi.restaurant_id FROM cart c JOIN menu_items mi ON c.menu_item_id = mi.id WHERE c.user_id = ?");
- $stmt->execute([$user_id]);
+ $stmt = $pdo->prepare("SELECT c.*, mi.price, mi.restaurant_id FROM cart c JOIN menu_items mi ON c.menu_item_id = mi.id WHERE c.$cart_column = ?");
+ $stmt->execute([$cart_identifier]);
$cart_items = $stmt->fetchAll();
if (empty($cart_items)) {
@@ -78,8 +91,8 @@ if (isset($details->status) && $details->status == 'COMPLETED') {
$restaurant_id = $cart_items[0]['restaurant_id']; // Assuming order from one restaurant
// Create order
- $stmt = $pdo->prepare("INSERT INTO orders (user_id, restaurant_id, total_price, status, stripe_session_id, delivery_address, coupon_id, discount_amount) VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
- $stmt->execute([$user_id, $restaurant_id, $total_price, 'paid', $orderID, $delivery_address, $coupon_id, $discount_amount]);
+ $stmt = $pdo->prepare("INSERT INTO orders (user_id, restaurant_id, total_price, status, stripe_session_id, delivery_address, phone_number, coupon_id, discount_amount, guest_name, guest_email, token) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+ $stmt->execute([$user_id, $restaurant_id, $total_price, 'paid', $orderID, $delivery_address, $phone_number, $coupon_id, $discount_amount, $guest_name, $guest_email, $guest_token]);
$order_id = $pdo->lastInsertId();
// Insert order items
@@ -89,8 +102,8 @@ if (isset($details->status) && $details->status == 'COMPLETED') {
}
// Clear cart
- $stmt = $pdo->prepare("DELETE FROM cart WHERE user_id = ?");
- $stmt->execute([$user_id]);
+ $stmt = $pdo->prepare("DELETE FROM cart WHERE $cart_column = ?");
+ $stmt->execute([$cart_identifier]);
// Clear coupon session variables
unset($_SESSION['coupon_id']);
@@ -101,6 +114,10 @@ if (isset($details->status) && $details->status == 'COMPLETED') {
unset($_SESSION['subtotal']);
$_SESSION['order_id'] = $order_id;
+ if ($is_guest) {
+ $_SESSION['token'] = $guest_token;
+ }
+
echo json_encode(['success' => true, 'order_id' => $order_id]);
} else {
Status:
+
+
-
+
-
+
-
+
Thank You For Your Order!
+Order #
+Restaurant:
+
-
-
-
-
- Back to Order History
-
Order Summary
--
-
-
- - (x) - $ - - -
- - Total - $ - -
+
+
+
+
+ Order Status
+
+
+
+
+
+
+
+ Order Summary
+-
+
+
- + (x) + $ + + +
- + Total + $ + +
+ Back to Home
+