@@ -272,4 +337,4 @@ function getStatusColor($status) {
][$status] ?? 'info';
}
require_once __DIR__ . '/includes/footer.php';
-?>
\ No newline at end of file
+?>
diff --git a/orders.php b/orders.php
index dcb6f70..7e45c61 100644
--- a/orders.php
+++ b/orders.php
@@ -2,64 +2,143 @@
$title = 'orders';
require_once __DIR__ . '/includes/header.php';
-$branch_id = $_SESSION['branch_id'];
+$current_role = $_SESSION['role'] ?? 'cashier';
+$session_branch_id = $_SESSION['branch_id'];
+
+// Filters
$status_filter = $_GET['status'] ?? '';
$payment_filter = $_GET['payment_status'] ?? '';
+$branch_filter = $_GET['branch_id'] ?? '';
+$from_date = $_GET['from_date'] ?? '';
+$to_date = $_GET['to_date'] ?? '';
+$search = $_GET['search'] ?? '';
-$sql = "SELECT o.*, c.name_en as customer_name_en, c.name_ar as customer_name_ar, c.phone as customer_phone
- FROM orders o
- LEFT JOIN customers c ON o.customer_id = c.id
- WHERE o.branch_id = ?";
-$params = [$branch_id];
+// Pagination
+$page = isset($_GET['page']) ? (int)$_GET['page'] : 1;
+if ($page < 1) $page = 1;
+$limit = 10;
+$offset = ($page - 1) * $limit;
+
+$sql_base = " FROM orders o
+ LEFT JOIN customers c ON o.customer_id = c.id
+ LEFT JOIN branches b ON o.branch_id = b.id
+ WHERE 1=1";
+$params = [];
+
+// Branch restriction
+if ($current_role !== 'super_admin') {
+ $sql_base .= " AND o.branch_id = ?";
+ $params[] = $session_branch_id;
+} elseif ($branch_filter) {
+ $sql_base .= " AND o.branch_id = ?";
+ $params[] = $branch_filter;
+}
if ($status_filter) {
- $sql .= " AND o.status = ?";
+ $sql_base .= " AND o.status = ?";
$params[] = $status_filter;
}
if ($payment_filter) {
- $sql .= " AND o.payment_status = ?";
+ $sql_base .= " AND o.payment_status = ?";
$params[] = $payment_filter;
}
+if ($from_date) {
+ $sql_base .= " AND DATE(o.created_at) >= ?";
+ $params[] = $from_date;
+}
+if ($to_date) {
+ $sql_base .= " AND DATE(o.created_at) <= ?";
+ $params[] = $to_date;
+}
+if ($search) {
+ $sql_base .= " AND (o.order_number LIKE ? OR c.phone LIKE ? OR c.name_en LIKE ? OR c.name_ar LIKE ?)";
+ $search_param = "%$search%";
+ $params[] = $search_param;
+ $params[] = $search_param;
+ $params[] = $search_param;
+ $params[] = $search_param;
+}
-$sql .= " ORDER BY o.created_at DESC";
+// Total count for pagination
+$count_sql = "SELECT COUNT(*) " . $sql_base;
+$stmt_count = db()->prepare($count_sql);
+$stmt_count->execute($params);
+$total_items = $stmt_count->fetchColumn();
+$total_pages = ceil($total_items / $limit);
+
+// Final data query
+$sql = "SELECT o.*, c.name_en as customer_name_en, c.name_ar as customer_name_ar, c.phone as customer_phone,
+ b.name_en as branch_name_en, b.name_ar as branch_name_ar " . $sql_base . " ORDER BY o.created_at DESC LIMIT $limit OFFSET $offset";
$stmt = db()->prepare($sql);
$stmt->execute($params);
$orders = $stmt->fetchAll();
+$branches = [];
+if ($current_role === 'super_admin') {
+ $branches = db()->query("SELECT id, name_en, name_ar FROM branches")->fetchAll();
+}
+
?>
-
+
+
+
+
#
@@ -101,7 +183,7 @@ $orders = $stmt->fetchAll();
-
+
@@ -110,6 +192,25 @@ $orders = $stmt->fetchAll();
+
+
+ 1): ?>
+
+
+
+
@@ -244,4 +345,4 @@ function getPaymentStatusColor($status) {
][$status] ?? 'info';
}
require_once __DIR__ . '/includes/footer.php';
-?>
\ No newline at end of file
+?>