diff --git a/admin/includes/header.php b/admin/includes/header.php index 1cc7abe..93361f4 100644 --- a/admin/includes/header.php +++ b/admin/includes/header.php @@ -140,6 +140,16 @@ function isActive($page) { Loyalty +
  • + + Payment Types + +
    • +
  • + + Integrations + +
  • Company diff --git a/admin/integrations.php b/admin/integrations.php new file mode 100644 index 0000000..474df33 --- /dev/null +++ b/admin/integrations.php @@ -0,0 +1,170 @@ +prepare("INSERT INTO integration_settings (provider, setting_key, setting_value) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)"); + $stmt->execute(['thawani', $k, $val]); + } + $message = 'saved'; + + if ($action === 'save') { + header("Location: integrations.php?msg=saved"); + exit; + } + } + + // Wablas + if ($provider === 'wablas') { + $keys = ['domain', 'token', 'secret_key']; + foreach ($keys as $k) { + $val = $_POST[$k] ?? ''; + $stmt = $pdo->prepare("INSERT INTO integration_settings (provider, setting_key, setting_value) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)"); + $stmt->execute(['wablas', $k, $val]); + } + + if ($action === 'save') { + header("Location: integrations.php?msg=saved"); + exit; + } elseif ($action === 'test') { + // Instantiate service (loads from DB, which we just updated) + $wablasService = new WablasService($pdo); + $testPhone = $_POST['test_phone'] ?? ''; + + if (!empty($testPhone)) { + $wablasTestResult = $wablasService->sendMessage($testPhone, "Test message from Flatlogic POS. Connection verified!"); + } else { + $wablasTestResult = $wablasService->testConnection(); + } + } + } +} + +// Fetch current settings +$stmt = $pdo->query("SELECT provider, setting_key, setting_value FROM integration_settings"); +$allSettings = $stmt->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_ASSOC); + +function getSetting($settings, $provider, $key) { + if (isset($settings[$provider])) { + foreach ($settings[$provider] as $s) { + if ($s['setting_key'] === $key) return $s['setting_value']; + } + } + return ''; +} + +$thawaniEnv = getSetting($allSettings, 'thawani', 'environment'); +$thawaniPub = getSetting($allSettings, 'thawani', 'public_key'); +$thawaniSec = getSetting($allSettings, 'thawani', 'secret_key'); + +$wablasDom = getSetting($allSettings, 'wablas', 'domain'); +$wablasTok = getSetting($allSettings, 'wablas', 'token'); +$wablasSecKey = getSetting($allSettings, 'wablas', 'secret_key'); + +require_once __DIR__ . '/includes/header.php'; +?> + +
    +
    +

    Integrations

    +
    + + + + + + + + + +
    + +
    +
    +
    +
    Thawani Payments
    +
    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    + +
    +
    +
    +
    + + +
    +
    +
    +
    Wablas WhatsApp
    +
    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    + + +
    + Enter a phone number to send a real test message. +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/admin/payment_type_edit.php b/admin/payment_type_edit.php new file mode 100644 index 0000000..542f2ad --- /dev/null +++ b/admin/payment_type_edit.php @@ -0,0 +1,85 @@ + '', + 'type' => 'cash', + 'api_provider' => '', + 'is_active' => 1 +]; + +if ($id) { + $stmt = $pdo->prepare("SELECT * FROM payment_types WHERE id = ?"); + $stmt->execute([$id]); + $existing = $stmt->fetch(PDO::FETCH_ASSOC); + if ($existing) { + $pt = $existing; + } else { + header("Location: payment_types.php"); + exit; + } +} + +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + $name = $_POST['name']; + $type = $_POST['type']; + $api_provider = $_POST['api_provider'] ?: null; + $is_active = isset($_POST['is_active']) ? 1 : 0; + + if ($id) { + $stmt = $pdo->prepare("UPDATE payment_types SET name = ?, type = ?, api_provider = ?, is_active = ? WHERE id = ?"); + $stmt->execute([$name, $type, $api_provider, $is_active, $id]); + } else { + $stmt = $pdo->prepare("INSERT INTO payment_types (name, type, api_provider, is_active) VALUES (?, ?, ?, ?)"); + $stmt->execute([$name, $type, $api_provider, $is_active]); + } + + header("Location: payment_types.php?msg=saved"); + exit; +} + +require_once __DIR__ . '/includes/header.php'; +?> + +
    +
    +

    Payment Type

    +
    + +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + > + +
    + +     Cancel +
    +
    +
    +
    + + \ No newline at end of file diff --git a/admin/payment_types.php b/admin/payment_types.php new file mode 100644 index 0000000..3b0df04 --- /dev/null +++ b/admin/payment_types.php @@ -0,0 +1,88 @@ +prepare("DELETE FROM payment_types WHERE id = ?"); + $stmt->execute([$_GET['delete_id']]); + header("Location: payment_types.php?msg=deleted"); + exit; +} + +// Fetch Payment Types +$stmt = $pdo->query("SELECT * FROM payment_types ORDER BY id DESC"); +$paymentTypes = $stmt->fetchAll(PDO::FETCH_ASSOC); + +require_once __DIR__ . '/includes/header.php'; +?> + +
    +
    +

    Payment Types

    + + Add Payment Type + +
    + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IDNameTypeProviderStatusActions
    No payment types found.
    + + + + Active + + Inactive + + + + + + + + +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/api/kitchen.php b/api/kitchen.php new file mode 100644 index 0000000..40e6272 --- /dev/null +++ b/api/kitchen.php @@ -0,0 +1,84 @@ + preparing -> ready -> completed + // Kitchen sees: pending, preparing, ready + $stmt = $pdo->prepare(" + SELECT + o.id, o.table_number, o.order_type, o.status, o.created_at, o.customer_name, + oi.quantity, p.name as product_name, v.name as variant_name + FROM orders o + JOIN order_items oi ON o.id = oi.order_id + JOIN products p ON oi.product_id = p.id + LEFT JOIN product_variants v ON oi.variant_id = v.id + WHERE o.status IN ('pending', 'preparing', 'ready') + ORDER BY o.created_at ASC + "); + $stmt->execute(); + $rows = $stmt->fetchAll(PDO::FETCH_ASSOC); + + $orders = []; + foreach ($rows as $row) { + $id = $row['id']; + if (!isset($orders[$id])) { + $orders[$id] = [ + 'id' => $row['id'], + 'table_number' => $row['table_number'], + 'order_type' => $row['order_type'], + 'status' => $row['status'], + 'created_at' => $row['created_at'], + 'customer_name' => $row['customer_name'], + 'items' => [] + ]; + } + $orders[$id]['items'][] = [ + 'quantity' => $row['quantity'], + 'product_name' => $row['product_name'], + 'variant_name' => $row['variant_name'] + ]; + } + + echo json_encode(array_values($orders)); + } catch (Exception $e) { + http_response_code(500); + echo json_encode(['error' => $e->getMessage()]); + } + exit; +} + +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + // Update order status + $data = json_decode(file_get_contents('php://input'), true); + $orderId = $data['order_id'] ?? null; + $newStatus = $data['status'] ?? null; + + if (!$orderId || !$newStatus) { + http_response_code(400); + echo json_encode(['error' => 'Missing order_id or status']); + exit; + } + + $allowedStatuses = ['pending', 'preparing', 'ready', 'completed', 'cancelled']; + if (!in_array($newStatus, $allowedStatuses)) { + http_response_code(400); + echo json_encode(['error' => 'Invalid status']); + exit; + } + + try { + $stmt = $pdo->prepare("UPDATE orders SET status = ? WHERE id = ?"); + $stmt->execute([$newStatus, $orderId]); + echo json_encode(['success' => true]); + } catch (Exception $e) { + http_response_code(500); + echo json_encode(['error' => $e->getMessage()]); + } + exit; +} diff --git a/api/order.php b/api/order.php index b98a7de..db23f32 100644 --- a/api/order.php +++ b/api/order.php @@ -20,24 +20,41 @@ try { ? $data['order_type'] : 'dine-in'; + // Get outlet_id from input, default to 1 if missing + $outlet_id = isset($data['outlet_id']) ? intval($data['outlet_id']) : 1; + $table_id = null; $table_number = null; if ($order_type === 'dine-in') { $tid = $data['table_number'] ?? null; // Front-end sends ID as table_number if ($tid) { - $stmt = $pdo->prepare("SELECT id, name FROM tables WHERE id = ?"); - $stmt->execute([$tid]); + // Validate table exists AND belongs to the correct outlet + $stmt = $pdo->prepare(" + SELECT t.id, t.name + FROM tables t + JOIN areas a ON t.area_id = a.id + WHERE t.id = ? AND a.outlet_id = ? + "); + $stmt->execute([$tid, $outlet_id]); $table = $stmt->fetch(PDO::FETCH_ASSOC); if ($table) { $table_id = $table['id']; $table_number = $table['name']; } } - // If not found or not provided, leave null (Walk-in/Counter) or default to 1 if it exists + + // If not found or not provided, leave null (Walk-in/Counter) or try to find a default table for this outlet if (!$table_id) { - // Optional: try to find table 1 - $stmt = $pdo->query("SELECT id, name FROM tables LIMIT 1"); + // Optional: try to find the first available table for this outlet + $stmt = $pdo->prepare(" + SELECT t.id, t.name + FROM tables t + JOIN areas a ON t.area_id = a.id + WHERE a.outlet_id = ? + LIMIT 1 + "); + $stmt->execute([$outlet_id]); $table = $stmt->fetch(PDO::FETCH_ASSOC); if ($table) { $table_id = $table['id']; @@ -67,7 +84,7 @@ try { $total_amount = isset($data['total_amount']) ? floatval($data['total_amount']) : 0.00; $stmt = $pdo->prepare("INSERT INTO orders (outlet_id, table_id, table_number, order_type, customer_id, customer_name, customer_phone, total_amount, discount, status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending')"); - $stmt->execute([1, $table_id, $table_number, $order_type, $customer_id, $customer_name, $customer_phone, $total_amount, $discount]); + $stmt->execute([$outlet_id, $table_id, $table_number, $order_type, $customer_id, $customer_name, $customer_phone, $total_amount, $discount]); $order_id = $pdo->lastInsertId(); $item_stmt = $pdo->prepare("INSERT INTO order_items (order_id, product_id, variant_id, quantity, unit_price) VALUES (?, ?, ?, ?, ?)"); diff --git a/api/tables.php b/api/tables.php index d71f0b7..f020ea3 100644 --- a/api/tables.php +++ b/api/tables.php @@ -5,14 +5,18 @@ require_once __DIR__ . '/../db/config.php'; try { $pdo = db(); - // Fetch all tables with their area names + $outlet_id = isset($_GET['outlet_id']) ? intval($_GET['outlet_id']) : 1; + + // Fetch all tables with their area names, filtered by outlet_id $sql = " SELECT t.id, t.name, t.capacity, a.name AS area_name FROM tables t LEFT JOIN areas a ON t.area_id = a.id + WHERE a.outlet_id = :outlet_id ORDER BY a.name ASC, t.name ASC "; - $stmt = $pdo->query($sql); + $stmt = $pdo->prepare($sql); + $stmt->execute(['outlet_id' => $outlet_id]); $tables = $stmt->fetchAll(PDO::FETCH_ASSOC); // Fetch currently occupied table IDs @@ -22,8 +26,10 @@ try { FROM orders WHERE status NOT IN ('completed', 'cancelled') AND table_id IS NOT NULL + AND outlet_id = :outlet_id "; - $occupiedStmt = $pdo->query($occupiedSql); + $occupiedStmt = $pdo->prepare($occupiedSql); + $occupiedStmt->execute(['outlet_id' => $outlet_id]); $occupiedTableIds = $occupiedStmt->fetchAll(PDO::FETCH_COLUMN); // Mark tables as occupied @@ -36,4 +42,4 @@ try { } catch (Exception $e) { http_response_code(500); echo json_encode(['success' => false, 'error' => $e->getMessage()]); -} +} \ No newline at end of file diff --git a/assets/images/company/favicon_699b1c9b2edeb.png b/assets/images/company/favicon_699b1c9b2edeb.png new file mode 100644 index 0000000..2ae8817 Binary files /dev/null and b/assets/images/company/favicon_699b1c9b2edeb.png differ diff --git a/assets/images/company/favicon_699b1ccab91a1.png b/assets/images/company/favicon_699b1ccab91a1.png new file mode 100644 index 0000000..2ae8817 Binary files /dev/null and b/assets/images/company/favicon_699b1ccab91a1.png differ diff --git a/assets/js/main.js b/assets/js/main.js index 527dcbd..dad2553 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -167,8 +167,9 @@ document.addEventListener('DOMContentLoaded', () => { const container = document.getElementById('table-list-container'); container.innerHTML = '
    '; tableSelectionModal.show(); - - fetch('api/tables.php') + + const outletId = new URLSearchParams(window.location.search).get('outlet_id') || 1; + fetch(`api/tables.php?outlet_id=${outletId}`) .then(res => res.json()) .then(data => { if (data.success) { @@ -390,6 +391,7 @@ document.addEventListener('DOMContentLoaded', () => { table_number: (orderType === 'dine-in') ? currentTableId : null, order_type: orderType, customer_id: custId || null, + outlet_id: new URLSearchParams(window.location.search).get('outlet_id') || 1, total_amount: totalAmount, discount: discount, items: cart.map(item => ({ diff --git a/db/migrations/001_add_payments.sql b/db/migrations/001_add_payments.sql new file mode 100644 index 0000000..d75ecec --- /dev/null +++ b/db/migrations/001_add_payments.sql @@ -0,0 +1,20 @@ +CREATE TABLE IF NOT EXISTS payment_types ( + id INT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) NOT NULL, + type ENUM('cash', 'card', 'api') DEFAULT 'cash', + api_provider VARCHAR(50) DEFAULT NULL, + is_active BOOLEAN DEFAULT 1, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); + +CREATE TABLE IF NOT EXISTS integration_settings ( + id INT AUTO_INCREMENT PRIMARY KEY, + provider VARCHAR(50) NOT NULL, + setting_key VARCHAR(100) NOT NULL, + setting_value TEXT, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + UNIQUE KEY unique_setting (provider, setting_key) +); + +-- Attempt to add column, ignore if exists (standard SQL doesn't support IF NOT EXISTS for columns easily without procedures, but for this env we'll try) +-- We will run this via PHP and handle errors if column exists diff --git a/includes/ThawaniService.php b/includes/ThawaniService.php new file mode 100644 index 0000000..e8ad1e8 --- /dev/null +++ b/includes/ThawaniService.php @@ -0,0 +1,37 @@ +pdo = $pdo; + $this->loadConfig(); + } + + private function loadConfig() { + $stmt = $this->pdo->prepare("SELECT setting_key, setting_value FROM integration_settings WHERE provider = 'thawani'"); + $stmt->execute(); + $settings = $stmt->fetchAll(PDO::FETCH_KEY_PAIR); + + $this->publicKey = $settings['public_key'] ?? ''; + $this->secretKey = $settings['secret_key'] ?? ''; + $this->isSandbox = ($settings['environment'] ?? 'sandbox') === 'sandbox'; + } + + public function createCheckoutSession($orderId, $amount, $customerData) { + // Implementation for creating a checkout session + // This is a placeholder for actual API integration + return [ + 'success' => true, + 'session_id' => 'sess_' . uniqid(), + 'redirect_url' => 'https://uat.thawani.om/pay/...' // Example URL + ]; + } + + public function handleWebhook($payload) { + // Implementation for webhook handling + return true; + } +} diff --git a/includes/WablasService.php b/includes/WablasService.php new file mode 100644 index 0000000..37ac70e --- /dev/null +++ b/includes/WablasService.php @@ -0,0 +1,107 @@ +pdo = $pdo; + $this->loadConfig(); + } + + private function loadConfig() { + $stmt = $this->pdo->prepare("SELECT setting_key, setting_value FROM integration_settings WHERE provider = 'wablas'"); + $stmt->execute(); + $rows = $stmt->fetchAll(PDO::FETCH_ASSOC); + + $settings = []; + foreach ($rows as $r) { + $settings[$r['setting_key']] = $r['setting_value']; + } + + $this->domain = $settings['domain'] ?? ''; + $this->token = $settings['token'] ?? ''; + $this->secret_key = $settings['secret_key'] ?? ''; + } + + public function testConnection() { + if (empty($this->domain) || empty($this->token)) { + return ['success' => false, 'message' => 'Missing Domain or Token']; + } + + // Common Wablas endpoint to check device status + $url = rtrim($this->domain, '/') . '/api/device/info?token=' . $this->token; + + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_TIMEOUT, 10); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + + $response = curl_exec($ch); + $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + $curlError = curl_error($ch); + curl_close($ch); + + if ($curlError) { + return ['success' => false, 'message' => 'Connection failed: ' . $curlError]; + } + + if ($httpCode >= 200 && $httpCode < 300) { + $data = json_decode($response, true); + // Some APIs return 200 even on logical error, check for status field if exists + if (isset($data['status']) && $data['status'] === false) { + return ['success' => false, 'message' => 'API Error: ' . ($data['message'] ?? 'Unknown error')]; + } + return ['success' => true, 'message' => 'Connection successful! Device info retrieved.']; + } + + return ['success' => false, 'message' => 'HTTP Error: ' . $httpCode]; + } + + public function sendMessage($phone, $message) { + if (empty($this->domain) || empty($this->token)) { + return ['success' => false, 'message' => 'Wablas configuration missing']; + } + + $payload = [ + 'phone' => $phone, + 'message' => $message, + 'secret' => $this->secret_key + ]; + + // Assuming standard endpoint. If users use v2, it might be /api/v2/send-message + $url = rtrim($this->domain, '/') . '/api/send-message'; + + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_HTTPHEADER, [ + "Authorization: " . $this->token, + "Content-Type: application/json" + ]); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload)); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + + $response = curl_exec($ch); + $curlError = curl_error($ch); + $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + curl_close($ch); + + if ($curlError) { + return ['success' => false, 'message' => 'cURL Error: ' . $curlError]; + } + + $data = json_decode($response, true); + $msg = $data['message'] ?? $response; + + if ($httpCode >= 200 && $httpCode < 300) { + if (isset($data['status']) && $data['status'] === false) { + return ['success' => false, 'message' => 'Wablas Error: ' . ($data['message'] ?? 'Unknown error')]; + } + return ['success' => true, 'message' => 'Message sent successfully. Response: ' . (is_string($msg) ? substr($msg, 0, 100) : 'OK')]; + } + + return ['success' => false, 'message' => 'HTTP Error ' . $httpCode . ': ' . (is_string($msg) ? $msg : 'Unknown')]; + } +} \ No newline at end of file diff --git a/index.php b/index.php index 992d9ea..cfbbc37 100644 --- a/index.php +++ b/index.php @@ -119,6 +119,9 @@ $settings = get_company_settings(); Staff Login + + Kitchen Display + diff --git a/kitchen.php b/kitchen.php new file mode 100644 index 0000000..6868bb4 --- /dev/null +++ b/kitchen.php @@ -0,0 +1,173 @@ + + + + + + Kitchen Display System + + + + + + + +
    +
    +

    Kitchen Display

    +
    + + Back to Home +
    +
    + +
    + +
    + Loading orders... +
    +
    +
    + + + + \ No newline at end of file