-
+
- 1): ?> + 1 || $current_role === 'super_admin'): ?>
-
    + +
  • + + + +
    • +
    • +
  • - +
    • @@ -297,17 +356,17 @@ if ($current_user_id && $current_page !== 'login.php' && $current_page !== 'logo
    -
    - + +
    • diff --git a/includes/lang.php b/includes/lang.php index b7ce1ee..2b83ba9 100644 --- a/includes/lang.php +++ b/includes/lang.php @@ -148,7 +148,7 @@ $translations = [ 'next' => 'Next', 'page' => 'Page', 'of' => 'of', - 'Access Denied' => 'Access Denied', + 'Access Denied' => 'تم رفض الوصول', 'active_orders' => 'Active Orders', 'add_branch' => 'Add Branch', 'add_new_branch' => 'Add New Branch', @@ -193,7 +193,8 @@ $translations = [ 'confirm_delete_user' => 'Are you sure you want to delete this user?', 'leave_blank_to_keep_current' => 'leave blank to keep current', 'permissions' => 'Permissions', - 'user_permissions' => 'User Permissions' + 'user_permissions' => 'User Permissions', + 'orders_per_month' => 'Orders per Month' ], 'ar' => [ 'dashboard' => 'لوحة القيادة', @@ -380,7 +381,8 @@ $translations = [ 'confirm_delete_user' => 'هل أنت متأكد من حذف هذا المستخدم؟', 'leave_blank_to_keep_current' => 'اتركه فارغاً للاحتفاظ بكلمة المرور الحالية', 'permissions' => 'الصلاحيات', - 'user_permissions' => 'صلاحيات المستخدم' + 'user_permissions' => 'صلاحيات المستخدم', + 'orders_per_month' => 'الطلبات شهرياً' ] ]; @@ -409,4 +411,16 @@ function decimals() { function format_amount($amount) { return number_format((float)$amount, decimals()) . ' ' . currency(); +} + +function lang_url($new_lang) { + $params = $_GET; + $params['lang'] = $new_lang; + return '?' . http_build_query($params); +} + +function branch_url($new_branch_id) { + $params = $_GET; + $params['switch_branch'] = $new_branch_id; + return '?' . http_build_query($params); } \ No newline at end of file diff --git a/index.php b/index.php index 017f431..f3fbdee 100644 --- a/index.php +++ b/index.php @@ -1,8 +1,9 @@ query("SELECT * FROM categories ORDER BY name_en ASC")->fetchAll(); -$items = db()->query("SELECT i.*, c.name_en as cat_en, c.name_ar as cat_ar - FROM items i - LEFT JOIN categories c ON i.category_id = c.id - ORDER BY i.name_en ASC")->fetchAll(); + +$query = "SELECT i.*, c.name_en as cat_en, c.name_ar as cat_ar + FROM items i + LEFT JOIN categories c ON i.category_id = c.id"; +$params = []; +$where = []; + +if ($search) { + $where[] = "(i.name_en LIKE ? OR i.name_ar LIKE ?)"; + $params[] = "%$search%"; + $params[] = "%$search%"; +} + +if ($category_filter) { + $where[] = "i.category_id = ?"; + $params[] = $category_filter; +} + +if ($where) { + $query .= " WHERE " . implode(" AND ", $where); +} + +$query .= " ORDER BY i.name_en ASC"; +$stmt = db()->prepare($query); +$stmt->execute($params); +$items = $stmt->fetchAll(); + $services = db()->query("SELECT * FROM services ORDER BY name_en ASC")->fetchAll(); $stmt = db()->prepare("SELECT * FROM prices "); @@ -235,6 +262,42 @@ foreach ($prices_raw as $p) {
+ +
+
+
+
+ +
+ + + + +
+
+
+ + +
+
+ + + + +
+
+
+
+ @@ -769,4 +841,4 @@ document.getElementById('itemImageFile').addEventListener('change', function(e) }); - \ No newline at end of file + diff --git a/login.php b/login.php index 27a61e3..657b6cd 100644 --- a/login.php +++ b/login.php @@ -49,7 +49,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { - + @@ -76,6 +76,18 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { width: auto; margin-bottom: 1.5rem; } + .btn-primary { + background-color: #3b82f6; + border-color: #3b82f6; + } + .btn-primary:hover { + background-color: #2563eb; + border-color: #2563eb; + } + .form-control:focus { + border-color: #3b82f6; + box-shadow: 0 0 0 0.25rem rgba(59, 130, 246, 0.25); + } @@ -106,9 +118,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
- English + English | - العربية + العربية
diff --git a/orders.php b/orders.php index 242f1cb..c2190fc 100644 --- a/orders.php +++ b/orders.php @@ -3,12 +3,13 @@ $title = 'orders'; require_once __DIR__ . '/includes/header.php'; $current_role = $_SESSION['role'] ?? 'cashier'; -$session_branch_id = $_SESSION['branch_id']; +$session_branch_id = $_SESSION['branch_id'] ?? 'all'; // Filters $status_filter = $_GET['status'] ?? ''; $payment_filter = $_GET['payment_status'] ?? ''; -$branch_filter = $_GET['branch_id'] ?? ''; +// Default to session branch if no explicit GET filter +$branch_filter = $_GET['branch_id'] ?? $session_branch_id; $from_date = $_GET['from_date'] ?? ''; $to_date = $_GET['to_date'] ?? ''; $search = $_GET['search'] ?? ''; @@ -26,10 +27,7 @@ $sql_base = " FROM orders o $params = []; // Branch restriction -if ($current_role !== 'super_admin') { - $sql_base .= " AND o.branch_id = ?"; - $params[] = $session_branch_id; -} elseif ($branch_filter) { +if ($branch_filter !== 'all') { $sql_base .= " AND o.branch_id = ?"; $params[] = $branch_filter; } @@ -98,7 +96,7 @@ if ($current_role === 'super_admin') {