diff --git a/api/settings.php b/api/settings.php index 9cd53bf..e3c5c9a 100644 --- a/api/settings.php +++ b/api/settings.php @@ -12,7 +12,7 @@ if (!in_array($user['role'], ['owner', 'manager'])) { if ($_SERVER['REQUEST_METHOD'] === 'POST') { $pdo = db(); $keys = [ - 'company_name_ar', 'company_name_en', 'vat_percentage', + 'timezone', 'company_name_ar', 'company_name_en', 'vat_percentage', 'company_vat_number', 'company_phone', 'company_email', 'company_address', 'smtp_host', 'smtp_port', 'smtp_user', 'smtp_pass', 'smtp_secure', 'mail_from', 'mail_from_name' ]; @@ -54,4 +54,4 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $referer = $_SERVER['HTTP_REFERER'] ?? '../index.php'; header('Location: ' . $referer); exit; -} +} \ No newline at end of file diff --git a/includes/app.php b/includes/app.php index bb69dbf..27fe2c7 100644 --- a/includes/app.php +++ b/includes/app.php @@ -7,7 +7,7 @@ if (session_status() !== PHP_SESSION_ACTIVE) { require_once __DIR__ . '/../db/config.php'; -date_default_timezone_set('UTC'); + function get_settings(): array { @@ -33,6 +33,15 @@ function get_setting(string $key, $default = '') return $settings[$key] ?? $default; } +$app_tz = get_setting('timezone', 'UTC'); +if (empty($app_tz)) { + $app_tz = 'UTC'; +} +date_default_timezone_set($app_tz); +try { + db()->exec("SET time_zone = '" . date('P') . "'"); +} catch (Throwable $e) {} + function app_name(): string diff --git a/includes/footer_settings.php b/includes/footer_settings.php index 4b25295..059ed01 100644 --- a/includes/footer_settings.php +++ b/includes/footer_settings.php @@ -10,6 +10,17 @@
+
+ + +
diff --git a/reports.php b/reports.php index d49952d..3321ae9 100644 --- a/reports.php +++ b/reports.php @@ -44,9 +44,14 @@ if ($tab === 'sales') { } $stmt->execute(); $followUpOrders = $stmt->fetchAll(); + + $onlineStmt = db()->query("SELECT * FROM online_orders WHERE status IN ('pending', 'accepted') ORDER BY created_at ASC"); + $onlineOrders = $onlineStmt->fetchAll(); + } catch(Throwable $e) { $dbError = $e->getMessage(); $followUpOrders = []; + $onlineOrders = []; } } elseif ($tab === 'daily') { $reportDate = $_GET['date'] ?? date('Y-m-d'); @@ -92,6 +97,65 @@ if ($tab === 'sales') { } catch(Throwable $e) { $dbError = $e->getMessage(); } +} elseif ($tab === 'expenses') { + $dateFrom = $_GET['date_from'] ?? date('Y-m-01'); + $dateTo = $_GET['date_to'] ?? date('Y-m-t'); + $branchFilter = $_GET['branch'] ?? ''; + $categoryFilter = $_GET['category_id'] ?? ''; + + $params = []; + $whereConditions = ["DATE(e.expense_date) >= :date_from", "DATE(e.expense_date) <= :date_to"]; + $params[':date_from'] = $dateFrom; + $params[':date_to'] = $dateTo; + + if ($user['role'] !== 'owner') { + $whereConditions[] = "(e.branch_code = :ubranch OR e.branch_code IS NULL)"; + $params[':ubranch'] = $user['branch_code']; + if ($branchFilter && $branchFilter === $user['branch_code']) { + $whereConditions[] = "e.branch_code = :branch"; + $params[':branch'] = $branchFilter; + } elseif ($branchFilter && $branchFilter === 'general') { + $whereConditions[] = "e.branch_code IS NULL"; + } + } else { + if ($branchFilter) { + if ($branchFilter === 'general') { + $whereConditions[] = "e.branch_code IS NULL"; + } else { + $whereConditions[] = "e.branch_code = :branch"; + $params[':branch'] = $branchFilter; + } + } + } + + if ($categoryFilter) { + $whereConditions[] = "e.category_id = :category_id"; + $params[':category_id'] = $categoryFilter; + } + + $where = " WHERE " . implode(" AND ", $whereConditions); + + $sql = "SELECT e.*, c.name_ar as category_name_ar, c.name_en as category_name_en, u.username as created_by_name + FROM expenses e + LEFT JOIN expense_categories c ON e.category_id = c.id + LEFT JOIN users u ON e.created_by = u.id + " . $where . " + ORDER BY e.expense_date DESC"; + try { + $stmt = db()->prepare($sql); + foreach ($params as $k => $v) { + $stmt->bindValue($k, $v); + } + $stmt->execute(); + $expensesReport = $stmt->fetchAll(); + + $catStmt = db()->query("SELECT id, name_ar, name_en FROM expense_categories ORDER BY name_ar"); + $expenseCategories = $catStmt->fetchAll(); + } catch(Throwable $e) { + $dbError = $e->getMessage(); + $expensesReport = []; + $expenseCategories = []; + } } else { $report = ['gross' => 0.0, 'branch_totals' => [], 'payment_totals' => [], 'product_totals' => [], 'sales_count' => 0]; try { @@ -123,6 +187,9 @@ require __DIR__ . '/includes/header.php';
    • +
  • + +
    • @@ -240,6 +307,176 @@ require __DIR__ . '/includes/header.php';
    + + + + + +
    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    +
    + + +
    +
    +

    +

    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +

    + +
    + + +

    +
    +

    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    +
    + + +
    +
    +
    +

    +
    +
    +
    +

    +
    +
    +
    +

    +
    +
    +
    +
    + + +
    +
    @@ -321,6 +558,53 @@ require __DIR__ . '/includes/header.php';
    + +
    +
    +

    + +
    + + +

    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    # + + + + + +
    +
    + +
    +