From 5db529f225dc886b8be66ea7f6be999afa8dd168 Mon Sep 17 00:00:00 2001 From: Flatlogic Bot Date: Sun, 22 Feb 2026 13:52:18 +0000 Subject: [PATCH] Autosave: 20260222-135217 --- admin/areas.php | 17 ++- admin/categories.php | 15 +- admin/customers.php | 12 +- admin/includes/header.php | 5 + admin/loyalty.php | 14 +- admin/orders.php | 17 ++- admin/outlets.php | 12 +- admin/product_variants.php | 90 +++++++++++- admin/products.php | 234 +++++++++++++++++++---------- admin/suppliers.php | 12 +- admin/tables.php | 17 ++- api/order.php | 17 ++- assets/css/custom.css | 91 ++++++++++++ assets/js/main.js | 101 +++++++++++-- includes/functions.php | 149 +++++++++++++++++++ index.php | 293 ++++++++++++++----------------------- pos.php | 268 +++++++++++++++++++++++++++++++++ 17 files changed, 1056 insertions(+), 308 deletions(-) create mode 100644 pos.php diff --git a/admin/areas.php b/admin/areas.php index 688a9e1..20a5b14 100644 --- a/admin/areas.php +++ b/admin/areas.php @@ -16,12 +16,13 @@ if (isset($_GET['delete'])) { } // Fetch areas with outlet names -$areas = $pdo->query(" - SELECT areas.*, outlets.name as outlet_name +$query = "SELECT areas.*, outlets.name as outlet_name FROM areas LEFT JOIN outlets ON areas.outlet_id = outlets.id - ORDER BY areas.id DESC -")->fetchAll(); + ORDER BY areas.id DESC"; + +$areas_pagination = paginate_query($pdo, $query); +$areas = $areas_pagination['data']; // Fetch outlets for dropdown $outlets = $pdo->query("SELECT id, name FROM outlets ORDER BY name ASC")->fetchAll(); @@ -38,6 +39,10 @@ include 'includes/header.php';
+ +
+ +
@@ -68,6 +73,10 @@ include 'includes/header.php';
+ +
+ +
diff --git a/admin/categories.php b/admin/categories.php index 32ccebe..d5a40f4 100644 --- a/admin/categories.php +++ b/admin/categories.php @@ -3,12 +3,15 @@ require_once __DIR__ . '/../db/config.php'; $pdo = db(); if (isset($_GET['delete'])) { - $pdo->prepare("DELETE FROM categories WHERE id = ?")->execute([$_GET['delete']]); + $id = $_GET['delete']; + $pdo->prepare("DELETE FROM categories WHERE id = ?")->execute([$id]); header("Location: categories.php"); exit; } -$categories = $pdo->query("SELECT * FROM categories ORDER BY sort_order ASC, name ASC")->fetchAll(); +$query = "SELECT * FROM categories ORDER BY sort_order ASC, name ASC"; +$categories_pagination = paginate_query($pdo, $query); +$categories = $categories_pagination['data']; include 'includes/header.php'; ?> @@ -22,6 +25,10 @@ include 'includes/header.php';
+ +
+ +
@@ -65,6 +72,10 @@ include 'includes/header.php';
+ +
+ +
diff --git a/admin/customers.php b/admin/customers.php index 3ef17bd..02dabdc 100644 --- a/admin/customers.php +++ b/admin/customers.php @@ -28,7 +28,9 @@ if (isset($_GET['delete'])) { } // Fetch Customers -$customers = $pdo->query("SELECT * FROM customers ORDER BY id DESC")->fetchAll(); +$query = "SELECT * FROM customers ORDER BY id DESC"; +$customers_pagination = paginate_query($pdo, $query); +$customers = $customers_pagination['data']; include 'includes/header.php'; ?> @@ -44,6 +46,10 @@ include 'includes/header.php';
+ +
+ +
@@ -78,6 +84,10 @@ include 'includes/header.php';
+ +
+ +
diff --git a/admin/includes/header.php b/admin/includes/header.php index bde3348..1cc7abe 100644 --- a/admin/includes/header.php +++ b/admin/includes/header.php @@ -90,6 +90,11 @@ function isActive($page) { Dashboard +
  • + + POS Terminal + +
  • Orders (POS) diff --git a/admin/loyalty.php b/admin/loyalty.php index 9f0557f..477502e 100644 --- a/admin/loyalty.php +++ b/admin/loyalty.php @@ -2,7 +2,9 @@ require_once __DIR__ . '/../db/config.php'; $pdo = db(); -$customers = $pdo->query("SELECT * FROM loyalty_customers ORDER BY points DESC")->fetchAll(); +$query = "SELECT * FROM loyalty_customers ORDER BY points DESC"; +$customers_pagination = paginate_query($pdo, $query); +$customers = $customers_pagination['data']; include 'includes/header.php'; ?> @@ -16,6 +18,10 @@ include 'includes/header.php';
    + +
    + +
    @@ -49,7 +55,11 @@ include 'includes/header.php';
    + +
    + +
    - + \ No newline at end of file diff --git a/admin/orders.php b/admin/orders.php index 5e94790..05dac41 100644 --- a/admin/orders.php +++ b/admin/orders.php @@ -13,10 +13,13 @@ if (isset($_POST['action']) && $_POST['action'] === 'update_status') { exit; } -$orders = $pdo->query("SELECT o.*, +$query = "SELECT o.*, (SELECT GROUP_CONCAT(CONCAT(p.name, ' x', oi.quantity) SEPARATOR ', ') FROM order_items oi JOIN products p ON oi.product_id = p.id WHERE oi.order_id = o.id) as items_summary FROM orders o - ORDER BY o.created_at DESC")->fetchAll(); + ORDER BY o.created_at DESC"; + +$orders_pagination = paginate_query($pdo, $query); +$orders = $orders_pagination['data']; include 'includes/header.php'; ?> @@ -30,6 +33,10 @@ include 'includes/header.php';
    + +
    + +
    @@ -113,7 +120,11 @@ include 'includes/header.php';
    + +
    + +
    - + \ No newline at end of file diff --git a/admin/outlets.php b/admin/outlets.php index a63fd6f..e2bd32a 100644 --- a/admin/outlets.php +++ b/admin/outlets.php @@ -15,7 +15,9 @@ if (isset($_GET['delete'])) { exit; } -$outlets = $pdo->query("SELECT * FROM outlets ORDER BY id DESC")->fetchAll(); +$query = "SELECT * FROM outlets ORDER BY id DESC"; +$outlets_pagination = paginate_query($pdo, $query); +$outlets = $outlets_pagination['data']; include 'includes/header.php'; ?> @@ -29,6 +31,10 @@ include 'includes/header.php';
    + +
    + +
    @@ -54,6 +60,10 @@ include 'includes/header.php';
    + +
    + +
    diff --git a/admin/product_variants.php b/admin/product_variants.php index 21656ea..bb0f9f8 100644 --- a/admin/product_variants.php +++ b/admin/product_variants.php @@ -30,6 +30,18 @@ if (isset($_POST['action']) && $_POST['action'] === 'add_variant') { exit; } +// Handle Edit Variant +if (isset($_POST['action']) && $_POST['action'] === 'edit_variant') { + $id = $_POST['variant_id']; + $name = $_POST['name']; + $price_adj = $_POST['price_adjustment']; + + $stmt = $pdo->prepare("UPDATE product_variants SET name = ?, price_adjustment = ? WHERE id = ?"); + $stmt->execute([$name, $price_adj, $id]); + header("Location: product_variants.php?product_id=$product_id"); + exit; +} + // Handle Delete if (isset($_GET['delete'])) { $pdo->prepare("DELETE FROM product_variants WHERE id = ?")->execute([$_GET['delete']]); @@ -37,9 +49,9 @@ if (isset($_GET['delete'])) { exit; } -$variants = $pdo->prepare("SELECT * FROM product_variants WHERE product_id = ? ORDER BY price_adjustment ASC"); -$variants->execute([$product_id]); -$variants = $variants->fetchAll(); +$query = "SELECT * FROM product_variants WHERE product_id = ? ORDER BY price_adjustment ASC"; +$variants_pagination = paginate_query($pdo, $query, [$product_id]); +$variants = $variants_pagination['data']; include 'includes/header.php'; ?> @@ -59,6 +71,10 @@ include 'includes/header.php';
    + +
    + $product_id]); ?> +
    @@ -86,6 +102,14 @@ include 'includes/header.php'; @@ -98,6 +122,10 @@ include 'includes/header.php';
    +
    + +
    + $product_id]); ?> +
    @@ -134,4 +162,58 @@ include 'includes/header.php'; - \ No newline at end of file + + + + + + diff --git a/admin/products.php b/admin/products.php index 396fea4..6b758d6 100644 --- a/admin/products.php +++ b/admin/products.php @@ -36,9 +36,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST[' $stmt = $pdo->prepare("INSERT INTO products (name, category_id, price, description, image_url) VALUES (?, ?, ?, ?, ?)"); if ($stmt->execute([$name, $category_id, $price, $description, $image_url])) { - $message = '
    Product added successfully!
    '; + $message = '
    Product added successfully!
    '; } else { - $message = '
    Error adding product.
    '; + $message = '
    Error adding product.
    '; } } @@ -50,107 +50,189 @@ if (isset($_GET['delete'])) { exit; } -// Fetch Products with Category Name -$products = $pdo->query("SELECT p.*, c.name as category_name - FROM products p - LEFT JOIN categories c ON p.category_id = c.id - ORDER BY p.id DESC")->fetchAll(); - -// Fetch Categories for Dropdown +// Fetch Categories for Dropdown (moved up for filter usage) $categories = $pdo->query("SELECT * FROM categories ORDER BY name")->fetchAll(); +// Handle Search and Filter +$search = $_GET['search'] ?? ''; +$category_filter = $_GET['category_filter'] ?? ''; + +$params = []; +$where = []; + +$query = "SELECT p.*, c.name as category_name + FROM products p + LEFT JOIN categories c ON p.category_id = c.id"; + +if ($search) { + $where[] = "(p.name LIKE ? OR p.description LIKE ?)"; + $params[] = "%$search%"; + $params[] = "%$search%"; +} + +if ($category_filter) { + $where[] = "p.category_id = ?"; + $params[] = $category_filter; +} + +if (!empty($where)) { + $query .= " WHERE " . implode(" AND ", $where); +} + +$query .= " ORDER BY p.id DESC"; + +$products_pagination = paginate_query($pdo, $query, $params); +$products = $products_pagination['data']; + include 'includes/header.php'; ?>
    -

    Products

    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    ImageNameCategoryPriceActions
    - - -
    - ... -     		-
    - - - -
    -
    + +
    +
    +
    +
    + + +
    -
    +
    + +
    +
    + + Clear Filters + +
    +
    + + +
    +
    +

    No products found

    +

    Try adjusting your search or filters.

    + + Clear All Filters + +
    + +
    + + + + + + + + + + + + + + + + + + + +
    ProductCategoryPriceActions
    +
    + +
    +
    +
    +
    +
    +     		+ + + + +
    + + + + + + + + + +
    +
    +
    + + +
    + +
    + +