diff --git a/assets/css/custom.css b/assets/css/custom.css
index 0e5af3d..9313a49 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -69,6 +69,116 @@ body {
     font-weight: 600;
     color: #64748b !important;
     letter-spacing: 0.05em;
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.nav-section-title:hover {
+    color: #94a3b8 !important;
+}
+
+.nav-section-title i.bi-chevron-down {
+    transition: transform 0.2s;
+    font-size: 0.6rem;
+}
+
+.nav-section-title.collapsed i.bi-chevron-down {
+    transform: rotate(-90deg);
+}
+
+/* POS Styles */
+.pos-container {
+    display: flex;
+    height: calc(100vh - 120px);
+    gap: 20px;
+}
+.pos-products {
+    flex: 1;
+    overflow-y: auto;
+    padding-right: 10px;
+}
+.pos-cart {
+    width: 400px;
+    background: #fff;
+    border-radius: 12px;
+    box-shadow: 0 4px 15px rgba(0,0,0,0.05);
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+.product-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+    gap: 15px;
+}
+.product-card {
+    background: #fff;
+    border-radius: 10px;
+    border: 1px solid #edf2f7;
+    padding: 15px;
+    text-align: center;
+    cursor: pointer;
+    transition: all 0.2s;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.product-card:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 10px 20px rgba(0,0,0,0.05);
+    border-color: #3b82f6;
+}
+.product-card img {
+    width: 100%;
+    height: 120px;
+    object-fit: contain;
+    margin-bottom: 10px;
+    border-radius: 8px;
+}
+.product-card .price {
+    font-weight: 700;
+    color: #2d3748;
+}
+.cart-items {
+    flex: 1;
+    overflow-y: auto;
+    padding: 20px;
+}
+.cart-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    padding-bottom: 15px;
+    border-bottom: 1px solid #edf2f7;
+}
+.cart-total {
+    padding: 20px;
+    background: #f8fafc;
+    border-bottom-left-radius: 12px;
+    border-bottom-right-radius: 12px;
+}
+.qty-controls {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+.qty-btn {
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    border: 1px solid #e2e8f0;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    font-size: 14px;
+}
+.qty-btn:hover {
+    background: #edf2f7;
 }
 
 [dir="rtl"] .nav-link i {
@@ -138,3 +248,58 @@ body {
 [dir="rtl"] .text-start {
     text-align: right !important;
 }
+
+/* Thermal Receipt Styles */
+.thermal-receipt {
+    width: 80mm;
+    margin: 0 auto;
+    padding: 10px;
+    font-family: 'Courier New', Courier, monospace;
+    font-size: 12px;
+    line-height: 1.2;
+    background: #fff;
+    color: #000;
+}
+.thermal-receipt .center {
+    text-align: center;
+}
+.thermal-receipt .separator {
+    border-top: 1px dashed #000;
+    margin: 10px 0;
+}
+.thermal-receipt table {
+    width: 100%;
+}
+.thermal-receipt table th {
+    text-align: left;
+    border-bottom: 1px dashed #000;
+    font-size: 10px;
+}
+.thermal-receipt table td {
+    padding: 5px 0;
+    font-size: 10px;
+}
+.thermal-receipt .total-row {
+    font-weight: bold;
+    font-size: 14px;
+}
+
+@media print {
+    .thermal-receipt-print {
+        width: 80mm !important;
+        margin: 0 !important;
+        padding: 5mm !important;
+    }
+    body.printing-receipt * {
+        visibility: hidden;
+    }
+    body.printing-receipt .thermal-receipt-print, 
+    body.printing-receipt .thermal-receipt-print * {
+        visibility: visible;
+    }
+    body.printing-receipt .thermal-receipt-print {
+        position: absolute;
+        left: 0;
+        top: 0;
+    }
+}
diff --git a/db/migrations/20260216_pos_advanced_features.sql b/db/migrations/20260216_pos_advanced_features.sql
new file mode 100644
index 0000000..31d9626
--- /dev/null
+++ b/db/migrations/20260216_pos_advanced_features.sql
@@ -0,0 +1,44 @@
+-- Held Carts Table
+CREATE TABLE IF NOT EXISTS pos_held_carts (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    cart_name VARCHAR(100) NOT NULL,
+    items_json TEXT NOT NULL,
+    customer_id INT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (customer_id) REFERENCES customers(id) ON DELETE SET NULL
+);
+
+-- Discount Codes Table
+CREATE TABLE IF NOT EXISTS discount_codes (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    code VARCHAR(50) UNIQUE NOT NULL,
+    type ENUM('percentage', 'fixed') NOT NULL DEFAULT 'percentage',
+    value DECIMAL(15, 3) NOT NULL,
+    min_purchase DECIMAL(15, 3) DEFAULT 0.000,
+    expiry_date DATE NULL,
+    status ENUM('active', 'inactive') DEFAULT 'active',
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Update Customers for Loyalty Points
+-- Check if column exists first (handled by IF NOT EXISTS in some dialects, but let's be safe for MySQL 5.7/MariaDB)
+-- Using a procedure or just trying it. MySQL 8.0/MariaDB supports IF NOT EXISTS for ADD COLUMN but older versions don't always.
+-- For this VM, we can just run it.
+
+ALTER TABLE customers ADD COLUMN IF NOT EXISTS loyalty_points DECIMAL(15, 3) DEFAULT 0.000;
+
+-- Update POS Transactions for Discounts and Loyalty
+ALTER TABLE pos_transactions 
+    ADD COLUMN IF NOT EXISTS discount_code_id INT NULL,
+    ADD COLUMN IF NOT EXISTS discount_amount DECIMAL(15, 3) DEFAULT 0.000,
+    ADD COLUMN IF NOT EXISTS loyalty_points_earned DECIMAL(15, 3) DEFAULT 0.000,
+    ADD COLUMN IF NOT EXISTS loyalty_points_redeemed DECIMAL(15, 3) DEFAULT 0.000,
+    ADD COLUMN IF NOT EXISTS net_amount DECIMAL(15, 3) NOT NULL DEFAULT 0.000;
+
+-- Adding foreign key separately to be safe
+-- ALTER TABLE pos_transactions ADD FOREIGN KEY (discount_code_id) REFERENCES discount_codes(id) ON DELETE SET NULL;
+
+-- Insert some dummy discount codes
+INSERT IGNORE INTO discount_codes (code, type, value, min_purchase) VALUES 
+('WELCOME10', 'percentage', 10.000, 0.000),
+('SAVE5', 'fixed', 5.000, 50.000);
diff --git a/db/migrations/20260216_setup_pos_full.sql b/db/migrations/20260216_setup_pos_full.sql
new file mode 100644
index 0000000..35b2450
--- /dev/null
+++ b/db/migrations/20260216_setup_pos_full.sql
@@ -0,0 +1,57 @@
+-- Main POS Transactions Table
+CREATE TABLE IF NOT EXISTS pos_transactions (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    transaction_no VARCHAR(50) UNIQUE NOT NULL,
+    customer_id INT NULL,
+    total_amount DECIMAL(15, 3) NOT NULL,
+    tax_amount DECIMAL(15, 3) DEFAULT 0.000,
+    discount_code_id INT NULL,
+    discount_amount DECIMAL(15, 3) DEFAULT 0.000,
+    loyalty_points_earned DECIMAL(15, 3) DEFAULT 0.000,
+    loyalty_points_redeemed DECIMAL(15, 3) DEFAULT 0.000,
+    net_amount DECIMAL(15, 3) NOT NULL DEFAULT 0.000,
+    payment_method ENUM('cash', 'card', 'transfer') NOT NULL,
+    status ENUM('completed', 'refunded', 'cancelled') DEFAULT 'completed',
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    created_by INT NULL
+);
+
+-- POS Items Table
+CREATE TABLE IF NOT EXISTS pos_items (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    transaction_id INT NOT NULL,
+    product_id INT NOT NULL,
+    quantity DECIMAL(15, 3) NOT NULL,
+    unit_price DECIMAL(15, 3) NOT NULL,
+    subtotal DECIMAL(15, 3) NOT NULL,
+    FOREIGN KEY (transaction_id) REFERENCES pos_transactions(id) ON DELETE CASCADE
+);
+
+-- Held Carts Table
+CREATE TABLE IF NOT EXISTS pos_held_carts (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    cart_name VARCHAR(100) NOT NULL,
+    items_json TEXT NOT NULL,
+    customer_id INT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Discount Codes Table
+CREATE TABLE IF NOT EXISTS discount_codes (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    code VARCHAR(50) UNIQUE NOT NULL,
+    type ENUM('percentage', 'fixed') NOT NULL DEFAULT 'percentage',
+    value DECIMAL(15, 3) NOT NULL,
+    min_purchase DECIMAL(15, 3) DEFAULT 0.000,
+    expiry_date DATE NULL,
+    status ENUM('active', 'inactive') DEFAULT 'active',
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Add Loyalty Points to Customers if missing
+ALTER TABLE customers ADD COLUMN IF NOT EXISTS loyalty_points DECIMAL(15, 3) DEFAULT 0.000;
+
+-- Insert initial discount codes
+INSERT IGNORE INTO discount_codes (code, type, value, min_purchase) VALUES 
+('WELCOME10', 'percentage', 10.000, 0.000),
+('SAVE5', 'fixed', 5.000, 50.000);
diff --git a/index.php b/index.php
index 2e961b0..38f2814 100644
--- a/index.php
+++ b/index.php
@@ -44,7 +44,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['action'])) {
     if ($_GET['action'] === 'get_payments') {
         header('Content-Type: application/json');
         $invoice_id = (int)$_GET['invoice_id'];
-        $stmt = db()->prepare("SELECT p.*, i.id as inv_id, c.name as customer_name 
+        $stmt = db()->prepare("SELECT p.*, i.id as inv_id, i.type as inv_type, c.name as customer_name 
                                 FROM payments p 
                                 JOIN invoices i ON p.invoice_id = i.id 
                                 LEFT JOIN customers c ON i.customer_id = c.id 
@@ -60,7 +60,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['action'])) {
     if ($_GET['action'] === 'get_payment_details') {
         header('Content-Type: application/json');
         $payment_id = (int)$_GET['payment_id'];
-        $stmt = db()->prepare("SELECT p.*, i.id as inv_id, c.name as customer_name 
+        $stmt = db()->prepare("SELECT p.*, i.id as inv_id, i.type as inv_type, c.name as customer_name 
                                 FROM payments p 
                                 JOIN invoices i ON p.invoice_id = i.id 
                                 LEFT JOIN customers c ON i.customer_id = c.id 
@@ -86,10 +86,131 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         if ($name) {
             $stmt = db()->prepare("INSERT INTO customers (name, email, phone, tax_id, balance, type) VALUES (?, ?, ?, ?, ?, ?)");
             $stmt->execute([$name, $email, $phone, $tax_id, $balance, $type]);
+            if (isset($_POST['ajax'])) {
+                echo json_encode(['success' => true, 'id' => db()->lastInsertId(), 'name' => $name]);
+                exit;
+            }
             $message = ucfirst($type) . " added successfully!";
         }
     }
 
+    if (isset($_POST['action']) && $_POST['action'] === 'save_pos_transaction') {
+        header('Content-Type: application/json');
+        try {
+            $db = db();
+            $db->beginTransaction();
+            
+            $customer_id = !empty($_POST['customer_id']) ? (int)$_POST['customer_id'] : null;
+            $payment_method = $_POST['payment_method'] ?? 'cash';
+            $total_amount = (float)$_POST['total_amount'];
+            $discount_code_id = !empty($_POST['discount_code_id']) ? (int)$_POST['discount_code_id'] : null;
+            $discount_amount = (float)($_POST['discount_amount'] ?? 0);
+            $loyalty_redeemed = (float)($_POST['loyalty_redeemed'] ?? 0);
+            $items = json_decode($_POST['items'], true);
+            
+            $net_amount = $total_amount - $discount_amount - $loyalty_redeemed;
+            if ($net_amount < 0) $net_amount = 0;
+
+            // Loyalty Calculation: 1 point per 1 OMR spent on net amount
+            $loyalty_earned = floor($net_amount);
+
+            // Create Invoice
+            $stmt = $db->prepare("INSERT INTO invoices (customer_id, invoice_date, status, total_with_vat, paid_amount, type) VALUES (?, CURDATE(), 'paid', ?, ?, 'sale')");
+            $stmt->execute([$customer_id, $net_amount, $net_amount]);
+            $invoice_id = $db->lastInsertId();
+            
+            // Add POS Transaction record
+            $stmt = $db->prepare("INSERT INTO pos_transactions (transaction_no, customer_id, total_amount, discount_code_id, discount_amount, loyalty_points_earned, loyalty_points_redeemed, net_amount, payment_method) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            $transaction_no = 'POS-' . time() . rand(100, 999);
+            $stmt->execute([$transaction_no, $customer_id, $total_amount, $discount_code_id, $discount_amount, $loyalty_earned, $loyalty_redeemed, $net_amount, $payment_method]);
+            $pos_id = $db->lastInsertId();
+            
+            foreach ($items as $item) {
+                // Add to invoice_items
+                $stmt = $db->prepare("INSERT INTO invoice_items (invoice_id, item_id, quantity, unit_price, total_price) VALUES (?, ?, ?, ?, ?)");
+                $stmt->execute([$invoice_id, $item['id'], $item['qty'], $item['price'], $item['qty'] * $item['price']]);
+                
+                // Add to pos_items
+                $stmt = $db->prepare("INSERT INTO pos_items (transaction_id, product_id, quantity, unit_price, subtotal) VALUES (?, ?, ?, ?, ?)");
+                $stmt->execute([$pos_id, $item['id'], $item['qty'], $item['price'], $item['qty'] * $item['price']]);
+                
+                // Update stock
+                $stmt = $db->prepare("UPDATE stock_items SET stock_quantity = stock_quantity - ? WHERE id = ?");
+                $stmt->execute([$item['qty'], $item['id']]);
+            }
+            
+            // Update Customer Loyalty Points
+            if ($customer_id) {
+                $stmt = $db->prepare("UPDATE customers SET loyalty_points = loyalty_points - ? + ? WHERE id = ?");
+                $stmt->execute([$loyalty_redeemed, $loyalty_earned, $customer_id]);
+            }
+
+            // Add Payment
+            $stmt = $db->prepare("INSERT INTO payments (invoice_id, amount, payment_date, payment_method, notes) VALUES (?, ?, CURDATE(), ?, 'POS Transaction')");
+            $stmt->execute([$invoice_id, $net_amount, $payment_method]);
+            
+            $db->commit();
+            echo json_encode(['success' => true, 'invoice_id' => $invoice_id, 'transaction_no' => $transaction_no]);
+        } catch (Exception $e) {
+            $db->rollBack();
+            echo json_encode(['success' => false, 'error' => $e->getMessage()]);
+        }
+        exit;
+    }
+
+    // New Handlers for Advanced POS Features
+    if (isset($_POST['action']) && $_POST['action'] === 'hold_pos_cart') {
+        header('Content-Type: application/json');
+        $name = $_POST['cart_name'] ?? 'Cart ' . date('H:i');
+        $items = $_POST['items'] ?? '[]';
+        $customer_id = !empty($_POST['customer_id']) ? (int)$_POST['customer_id'] : null;
+        
+        $stmt = db()->prepare("INSERT INTO pos_held_carts (cart_name, items_json, customer_id) VALUES (?, ?, ?)");
+        $stmt->execute([$name, $items, $customer_id]);
+        echo json_encode(['success' => true]);
+        exit;
+    }
+
+    if (isset($_GET['action']) && $_GET['action'] === 'get_held_carts') {
+        header('Content-Type: application/json');
+        $stmt = db()->query("SELECT h.*, c.name as customer_name FROM pos_held_carts h LEFT JOIN customers c ON h.customer_id = c.id ORDER BY h.id DESC");
+        echo json_encode($stmt->fetchAll(PDO::FETCH_ASSOC));
+        exit;
+    }
+
+    if (isset($_POST['action']) && $_POST['action'] === 'delete_held_cart') {
+        header('Content-Type: application/json');
+        $id = (int)$_POST['id'];
+        $stmt = db()->prepare("DELETE FROM pos_held_carts WHERE id = ?");
+        $stmt->execute([$id]);
+        echo json_encode(['success' => true]);
+        exit;
+    }
+
+    if (isset($_GET['action']) && $_GET['action'] === 'validate_discount') {
+        header('Content-Type: application/json');
+        $code = $_GET['code'] ?? '';
+        $stmt = db()->prepare("SELECT * FROM discount_codes WHERE code = ? AND status = 'active' AND (expiry_date IS NULL OR expiry_date >= CURDATE())");
+        $stmt->execute([$code]);
+        $discount = $stmt->fetch(PDO::FETCH_ASSOC);
+        if ($discount) {
+            echo json_encode(['success' => true, 'discount' => $discount]);
+        } else {
+            echo json_encode(['success' => false, 'error' => 'Invalid or expired code']);
+        }
+        exit;
+    }
+
+    if (isset($_GET['action']) && $_GET['action'] === 'get_customer_loyalty') {
+        header('Content-Type: application/json');
+        $id = (int)($_GET['customer_id'] ?? 0);
+        $stmt = db()->prepare("SELECT loyalty_points FROM customers WHERE id = ?");
+        $stmt->execute([$id]);
+        $points = $stmt->fetchColumn();
+        echo json_encode(['success' => true, 'points' => (float)$points]);
+        exit;
+    }
+
     if (isset($_POST['edit_customer'])) {
         $id = (int)$_POST['id'];
         $name = $_POST['name'] ?? '';
@@ -372,7 +493,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
                 }
                 
                 $total_with_vat = $subtotal + $total_vat;
-                $paid_amount = ($status === 'paid') ? $total_with_vat : 0;
+                $paid_amount = ($status === 'paid') ? $total_with_vat : (($status === 'unpaid') ? 0 : (float)($_POST['paid_amount'] ?? 0));
 
                 $stmt = $db->prepare("INSERT INTO invoices (customer_id, invoice_date, type, payment_type, status, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
                 $stmt->execute([$customer_id, $invoice_date, $type, $payment_type, $status, $subtotal, $total_vat, $total_with_vat, $paid_amount]);
@@ -829,6 +950,45 @@ switch ($page) {
         $data['items_list'] = db()->query("SELECT id, name_en, name_ar, sale_price, purchase_price, stock_quantity, vat_rate FROM stock_items ORDER BY name_en ASC")->fetchAll();
         $data['customers_list'] = db()->query("SELECT id, name FROM customers WHERE type = '" . ($type === 'sale' ? 'customer' : 'supplier') . "' ORDER BY name ASC")->fetchAll();
         break;
+
+    case 'customer_statement':
+    case 'supplier_statement':
+        $type = ($page === 'customer_statement') ? 'customer' : 'supplier';
+        $invType = ($type === 'customer') ? 'sale' : 'purchase';
+        $data['entities'] = db()->query("SELECT id, name, balance FROM customers WHERE type = '$type' ORDER BY name ASC")->fetchAll();
+        
+        $entity_id = (int)($_GET['entity_id'] ?? 0);
+        if ($entity_id) {
+            $data['selected_entity'] = db()->query("SELECT * FROM customers WHERE id = $entity_id")->fetch();
+            $start_date = $_GET['start_date'] ?? date('Y-m-01');
+            $end_date = $_GET['end_date'] ?? date('Y-m-d');
+            
+            // Fetch Opening Balance (Balance before start_date)
+            // This is complex as we don't have a ledger table. 
+            // We can calculate it: Initial Balance + Invoices(before start_date) - Payments(before start_date)
+            // But for now, let's just show all transactions if no date filter, or just transactions in range.
+            
+            $stmt = db()->prepare("SELECT 'invoice' as trans_type, id, invoice_date as trans_date, total_with_vat as amount, status, id as ref_no 
+                                   FROM invoices 
+                                   WHERE customer_id = ? AND type = ? AND invoice_date BETWEEN ? AND ?");
+            $stmt->execute([$entity_id, $invType, $start_date, $end_date]);
+            $invoices = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            
+            $stmt = db()->prepare("SELECT 'payment' as trans_type, p.id, p.payment_date as trans_date, p.amount, p.payment_method, p.invoice_id as ref_no 
+                                   FROM payments p 
+                                   JOIN invoices i ON p.invoice_id = i.id 
+                                   WHERE i.customer_id = ? AND i.type = ? AND p.payment_date BETWEEN ? AND ?");
+            $stmt->execute([$entity_id, $invType, $start_date, $end_date]);
+            $payments = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            
+            $transactions = array_merge($invoices, $payments);
+            usort($transactions, function($a, $b) {
+                return strtotime($a['trans_date']) <=> strtotime($b['trans_date']);
+            });
+            
+            $data['transactions'] = $transactions;
+        }
+        break;
     default:
         $data['customers'] = db()->query("SELECT * FROM customers WHERE type = 'customer' ORDER BY id DESC LIMIT 5")->fetchAll();
         // Dashboard stats
@@ -837,8 +997,11 @@ switch ($page) {
             'total_items' => db()->query("SELECT COUNT(*) FROM stock_items")->fetchColumn(),
             'total_sales' => db()->query("SELECT SUM(total_with_vat) FROM invoices WHERE type = 'sale'")->fetchColumn() ?: 0,
             'total_received' => db()->query("SELECT SUM(amount) FROM payments p JOIN invoices i ON p.invoice_id = i.id WHERE i.type = 'sale'")->fetchColumn() ?: 0,
+            'total_purchases' => db()->query("SELECT SUM(total_with_vat) FROM invoices WHERE type = 'purchase'")->fetchColumn() ?: 0,
+            'total_paid' => db()->query("SELECT SUM(amount) FROM payments p JOIN invoices i ON p.invoice_id = i.id WHERE i.type = 'purchase'")->fetchColumn() ?: 0,
         ];
         $data['stats']['total_receivable'] = $data['stats']['total_sales'] - $data['stats']['total_received'];
+        $data['stats']['total_payable'] = $data['stats']['total_purchases'] - $data['stats']['total_paid'];
         break;
 }
 
@@ -857,6 +1020,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.0/font/bootstrap-icons.css">
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="assets/css/custom.css?v=<?php echo time(); ?>">
     <style>
@@ -906,49 +1070,86 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         </a>
 
         <!-- Operations Section -->
-        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted" data-en="Operations" data-ar="العمليات">Operations</div>
-        <a href="index.php?page=sales" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'sales' ? 'active' : '' ?>">
-            <i class="bi bi-cart"></i> <span data-en="Sales Tax Invoices" data-ar="فواتير المبيعات الضريبية">Sales Tax Invoices</span>
-        </a>
-        <a href="index.php?page=purchases" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'purchases' ? 'active' : '' ?>">
-            <i class="bi bi-bag"></i> <span data-en="Purchase Tax Invoices" data-ar="فواتير المشتريات الضريبية">Purchase Tax Invoices</span>
-        </a>
-        <a href="#" class="nav-link">
-            <i class="bi bi-wallet2"></i> <span data-en="Expenses" data-ar="المصروفات">Expenses</span>
-        </a>
+        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted <?= !in_array($page, ['sales', 'purchases']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#ops-collapse">
+            <span data-en="Operations" data-ar="العمليات">Operations</span>
+            <i class="bi bi-chevron-down"></i>
+        </div>
+        <div class="collapse <?= in_array($page, ['sales', 'purchases', 'pos']) ? 'show' : '' ?>" id="ops-collapse">
+            <a href="index.php?page=pos" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'pos' ? 'active' : '' ?>">
+                <i class="bi bi-display"></i> <span data-en="Point of Sale" data-ar="نقطة البيع">Point of Sale</span>
+            </a>
+            <a href="index.php?page=sales" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'sales' ? 'active' : '' ?>">
+                <i class="bi bi-cart"></i> <span data-en="Sales Tax Invoices" data-ar="فواتير المبيعات الضريبية">Sales Tax Invoices</span>
+            </a>
+            <a href="index.php?page=purchases" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'purchases' ? 'active' : '' ?>">
+                <i class="bi bi-bag"></i> <span data-en="Purchase Tax Invoices" data-ar="فواتير المشتريات الضريبية">Purchase Tax Invoices</span>
+            </a>
+            <a href="#" class="nav-link">
+                <i class="bi bi-wallet2"></i> <span data-en="Expenses" data-ar="المصروفات">Expenses</span>
+            </a>
+        </div>
 
         <!-- Inventory Section -->
-        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted" data-en="Inventory" data-ar="المخزون">Inventory</div>
-        <a href="index.php?page=items" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'items' ? 'active' : '' ?>">
-            <i class="bi bi-box-seam"></i> <span data-en="Items" data-ar="الأصناف">Items</span>
-        </a>
-        <a href="index.php?page=categories" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'categories' ? 'active' : '' ?>">
-            <i class="bi bi-tags"></i> <span data-en="Categories" data-ar="الفئات">Categories</span>
-        </a>
-        <a href="index.php?page=units" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'units' ? 'active' : '' ?>">
-            <i class="bi bi-calculator"></i> <span data-en="Units" data-ar="الوحدات">Units</span>
-        </a>
+        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted <?= !in_array($page, ['items', 'categories', 'units']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#inventory-collapse">
+            <span data-en="Inventory" data-ar="المخزون">Inventory</span>
+            <i class="bi bi-chevron-down"></i>
+        </div>
+        <div class="collapse <?= in_array($page, ['items', 'categories', 'units']) ? 'show' : '' ?>" id="inventory-collapse">
+            <a href="index.php?page=items" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'items' ? 'active' : '' ?>">
+                <i class="bi bi-box-seam"></i> <span data-en="Items" data-ar="الأصناف">Items</span>
+            </a>
+            <a href="index.php?page=categories" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'categories' ? 'active' : '' ?>">
+                <i class="bi bi-tags"></i> <span data-en="Categories" data-ar="الفئات">Categories</span>
+            </a>
+            <a href="index.php?page=units" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'units' ? 'active' : '' ?>">
+                <i class="bi bi-calculator"></i> <span data-en="Units" data-ar="الوحدات">Units</span>
+            </a>
+        </div>
 
         <!-- People Section -->
-        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted" data-en="Relationships" data-ar="العلاقات">Relationships</div>
-        <a href="index.php?page=customers" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'customers' ? 'active' : '' ?>">
-            <i class="bi bi-people"></i> <span data-en="Customers" data-ar="العملاء">Customers</span>
-        </a>
-        <a href="index.php?page=suppliers" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'suppliers' ? 'active' : '' ?>">
-            <i class="bi bi-truck"></i> <span data-en="Suppliers" data-ar="الموردون">Suppliers</span>
-        </a>
+        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted <?= !in_array($page, ['customers', 'suppliers']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#relationships-collapse">
+            <span data-en="Relationships" data-ar="العلاقات">Relationships</span>
+            <i class="bi bi-chevron-down"></i>
+        </div>
+        <div class="collapse <?= in_array($page, ['customers', 'suppliers']) ? 'show' : '' ?>" id="relationships-collapse">
+            <a href="index.php?page=customers" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'customers' ? 'active' : '' ?>">
+                <i class="bi bi-people"></i> <span data-en="Customers" data-ar="العملاء">Customers</span>
+            </a>
+            <a href="index.php?page=suppliers" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'suppliers' ? 'active' : '' ?>">
+                <i class="bi bi-truck"></i> <span data-en="Suppliers" data-ar="الموردون">Suppliers</span>
+            </a>
+        </div>
+
+        <!-- Reports Section -->
+        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted <?= !in_array($page, ['customer_statement', 'supplier_statement']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#reports-collapse">
+            <span data-en="Reports" data-ar="التقارير">Reports</span>
+            <i class="bi bi-chevron-down"></i>
+        </div>
+        <div class="collapse <?= in_array($page, ['customer_statement', 'supplier_statement']) ? 'show' : '' ?>" id="reports-collapse">
+            <a href="index.php?page=customer_statement" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'customer_statement' ? 'active' : '' ?>">
+                <i class="bi bi-file-earmark-text"></i> <span data-en="Customer Statement" data-ar="كشف حساب عميل">Customer Statement</span>
+            </a>
+            <a href="index.php?page=supplier_statement" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'supplier_statement' ? 'active' : '' ?>">
+                <i class="bi bi-file-earmark-medical"></i> <span data-en="Supplier Statement" data-ar="كشف حساب مورد">Supplier Statement</span>
+            </a>
+        </div>
 
         <!-- Configuration Section -->
-        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted" data-en="Configuration" data-ar="الإعدادات">Configuration</div>
-        <a href="index.php?page=payment_methods" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'payment_methods' ? 'active' : '' ?>">
-            <i class="bi bi-credit-card"></i> <span data-en="Payment Methods" data-ar="طرق الدفع">Payment Methods</span>
-        </a>
-        <a href="index.php?page=settings" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'settings' ? 'active' : '' ?>">
-            <i class="bi bi-building"></i> <span data-en="Company Profile" data-ar="ملف الشركة">Company Profile</span>
-        </a>
-        <a href="#" class="nav-link">
-            <i class="bi bi-person-badge"></i> <span data-en="HR" data-ar="الموارد البشرية">HR</span>
-        </a>
+        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase small text-muted <?= !in_array($page, ['payment_methods', 'settings']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#config-collapse">
+            <span data-en="Configuration" data-ar="الإعدادات">Configuration</span>
+            <i class="bi bi-chevron-down"></i>
+        </div>
+        <div class="collapse <?= in_array($page, ['payment_methods', 'settings']) ? 'show' : '' ?>" id="config-collapse">
+            <a href="index.php?page=payment_methods" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'payment_methods' ? 'active' : '' ?>">
+                <i class="bi bi-credit-card"></i> <span data-en="Payment Methods" data-ar="طرق الدفع">Payment Methods</span>
+            </a>
+            <a href="index.php?page=settings" class="nav-link <?= isset($_GET['page']) && $_GET['page'] === 'settings' ? 'active' : '' ?>">
+                <i class="bi bi-building"></i> <span data-en="Company Profile" data-ar="ملف الشركة">Company Profile</span>
+            </a>
+            <a href="#" class="nav-link">
+                <i class="bi bi-person-badge"></i> <span data-en="HR" data-ar="الموارد البشرية">HR</span>
+            </a>
+        </div>
     </nav>
 </div>
 
@@ -958,6 +1159,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             <?php 
             $titles = [
                 'dashboard' => ['en' => 'Dashboard', 'ar' => 'لوحة القيادة'],
+                'pos' => ['en' => 'Point of Sale', 'ar' => 'نقطة البيع'],
                 'customers' => ['en' => 'Customers', 'ar' => 'العملاء'],
                 'suppliers' => ['en' => 'Suppliers', 'ar' => 'الموردون'],
                 'categories' => ['en' => 'Stock Categories', 'ar' => 'فئات المخزون'],
@@ -966,6 +1168,8 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 'payment_methods' => ['en' => 'Payment Methods', 'ar' => 'طرق الدفع'],
                 'sales' => ['en' => 'Sales Tax Invoices', 'ar' => 'فواتير المبيعات الضريبية'],
                 'purchases' => ['en' => 'Purchase Tax Invoices', 'ar' => 'فواتير المشتريات الضريبية'],
+                'customer_statement' => ['en' => 'Customer Statement', 'ar' => 'كشف حساب عميل'],
+                'supplier_statement' => ['en' => 'Supplier Statement', 'ar' => 'كشف حساب مورد'],
                 'settings' => ['en' => 'Company Profile', 'ar' => 'ملف الشركة'],
             ];
             $currTitle = $titles[$page] ?? $titles['dashboard'];
@@ -1004,6 +1208,42 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_sales'] ?? 0), 3) ?></div>
             </div>
         </div>
+        <div class="col">
+            <div class="card p-3 border-start border-warning border-4 h-100">
+                <div class="text-muted small" data-en="Total Received" data-ar="إجمالي المبالغ المحصلة">Total Received</div>
+                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_received'] ?? 0), 3) ?></div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card p-3 border-start border-danger border-4 h-100">
+                <div class="text-muted small" data-en="Total Receivable" data-ar="إجمالي المبالغ المتبقية">Total Receivable</div>
+                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_receivable'] ?? 0), 3) ?></div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row g-4 mb-4">
+        <div class="col">
+            <div class="card p-3 border-start border-dark border-4 h-100 bg-light">
+                <div class="text-muted small" data-en="Total Purchases" data-ar="إجمالي المشتريات">Total Purchases</div>
+                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_purchases'] ?? 0), 3) ?></div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card p-3 border-start border-info border-4 h-100 bg-light">
+                <div class="text-muted small" data-en="Total Paid to Suppliers" data-ar="إجمالي المدفوع للموردين">Total Paid to Suppliers</div>
+                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_paid'] ?? 0), 3) ?></div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card p-3 border-start border-secondary border-4 h-100 bg-light">
+                <div class="text-muted small" data-en="Total Payable" data-ar="إجمالي الذمم الدائنة">Total Payable</div>
+                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_payable'] ?? 0), 3) ?></div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row g-4 mb-4">
         <div class="col">
             <div class="card p-3 border-start border-success border-4 h-100">
                 <div class="text-muted small" data-en="Total Customers" data-ar="إجمالي العملاء">Total Customers</div>
@@ -1016,18 +1256,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 <div class="h4 m-0"><?= (int)($data['stats']['total_items'] ?? 0) ?></div>
             </div>
         </div>
-        <div class="col">
-            <div class="card p-3 border-start border-warning border-4 h-100">
-                <div class="text-muted small" data-en="Total Received" data-ar="إجمالي المبالغ المحصلة">Total Received</div>
-                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_received'] ?? 0), 3) ?></div>
-            </div>
-        </div>
-        <div class="col">
-            <div class="card p-3 border-start border-danger border-4 h-100">
-                <div class="text-muted small" data-en="Total Balance" data-ar="إجمالي الرصيد المتبقي">Total Balance</div>
-                <div class="h4 m-0">OMR <?= number_format((float)($data['stats']['total_receivable'] ?? 0), 3) ?></div>
-            </div>
-        </div>
     </div>
 
     <div class="row">
@@ -1207,7 +1435,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             </table>
         </div>
     </div>
-
     <?php elseif ($page === 'categories'): ?>
     <div class="card p-4">
         <div class="d-flex justify-content-between align-items-center mb-4">
@@ -1371,137 +1598,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                     <button type="submit" name="delete_item" class="btn btn-outline-danger" title="Delete"><i class="bi bi-trash"></i></button>
                                 </form>
                             </div>
-
-                            <!-- Edit Item Modal -->
-                            <div class="modal fade" id="editItemModal<?= $item['id'] ?>" tabindex="-1">
-                                <div class="modal-dialog modal-lg">
-                                    <div class="modal-content border-0 shadow">
-                                        <div class="modal-header">
-                                            <h5 class="modal-title" data-en="Edit Item" data-ar="تعديل الصنف">Edit Item</h5>
-                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                                        </div>
-                                        <form method="POST" enctype="multipart/form-data">
-                                            <input type="hidden" name="id" value="<?= $item['id'] ?>">
-                                            <div class="modal-body">
-                                                <div class="row g-3">
-                                                    <div class="col-md-6">
-                                                        <label class="form-label" data-en="Name (EN)" data-ar="الاسم (إنجليزي)">Name (EN)</label>
-                                                        <input type="text" name="name_en" class="form-control" value="<?= htmlspecialchars($item['name_en']) ?>" required>
-                                                    </div>
-                                                    <div class="col-md-6">
-                                                        <label class="form-label" data-en="Name (AR)" data-ar="الاسم (عربي)">Name (AR)</label>
-                                                        <input type="text" name="name_ar" class="form-control" value="<?= htmlspecialchars($item['name_ar']) ?>" required>
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="Category" data-ar="الفئة">Category</label>
-                                                        <select name="category_id" class="form-select">
-                                                            <option value="">---</option>
-                                                            <?php foreach ($data['categories'] ?? [] as $c): ?>
-                                                            <option value="<?= $c['id'] ?>" <?= $item['category_id'] == $c['id'] ? 'selected' : '' ?>><?= htmlspecialchars($c['name_en']) ?> / <?= htmlspecialchars($c['name_ar']) ?></option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="Unit" data-ar="الوحدة">Unit</label>
-                                                        <select name="unit_id" class="form-select">
-                                                            <option value="">---</option>
-                                                            <?php foreach ($data['units'] ?? [] as $u): ?>
-                                                            <option value="<?= $u['id'] ?>" <?= $item['unit_id'] == $u['id'] ? 'selected' : '' ?>><?= htmlspecialchars($u['short_name_en']) ?> / <?= htmlspecialchars($u['short_name_ar']) ?></option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="Supplier" data-ar="المورد">Supplier</label>
-                                                        <select name="supplier_id" class="form-select">
-                                                            <option value="">---</option>
-                                                            <?php foreach ($data['suppliers'] ?? [] as $s): ?>
-                                                            <option value="<?= $s['id'] ?>" <?= $item['supplier_id'] == $s['id'] ? 'selected' : '' ?>><?= htmlspecialchars($s['name']) ?></option>
-                                                            <?php endforeach; ?>
-                                                        </select>
-                                                    </div>
-                                                    <div class="col-md-6">
-                                                        <label class="form-label" data-en="SKU / Barcode" data-ar="الباركود">SKU / Barcode</label>
-                                                        <div class="input-group">
-                                                            <input type="text" name="sku" class="form-control" value="<?= htmlspecialchars($item['sku']) ?>">
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label class="form-label" data-en="Sale Price" data-ar="سعر البيع">Sale Price</label>
-                                                        <input type="number" step="0.001" name="sale_price" class="form-control" value="<?= (float)$item['sale_price'] ?>">
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label class="form-label" data-en="Purchase Price" data-ar="سعر الشراء">Purchase Price</label>
-                                                        <input type="number" step="0.001" name="purchase_price" class="form-control" value="<?= (float)$item['purchase_price'] ?>">
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="Stock Quantity" data-ar="الكمية">Stock Quantity</label>
-                                                        <input type="number" step="0.001" name="stock_quantity" class="form-control" value="<?= (float)$item['stock_quantity'] ?>">
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="Min Stock Level" data-ar="الحد الأدنى للمخزون">Min Stock Level</label>
-                                                        <input type="number" step="0.001" name="min_stock_level" class="form-control" value="<?= (float)$item['min_stock_level'] ?>">
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="Change Picture" data-ar="تغيير الصورة">Change Picture</label>
-                                                        <input type="file" name="image" class="form-control" accept="image/*">
-                                                    </div>
-                                                    <div class="col-md-4">
-                                                        <label class="form-label" data-en="VAT Rate (%)" data-ar="ضريبة القيمة المضافة (%)">VAT Rate (%)</label>
-                                                        <input type="number" step="0.001" name="vat_rate" class="form-control" value="<?= (float)$item['vat_rate'] ?>">
-                                                    </div>
-                                                    <div class="col-md-8">
-                                                        <div class="form-check form-switch mt-4">
-                                                            <input class="form-check-input hasExpiryToggleEdit" type="checkbox" id="hasExpiryToggle<?= $item['id'] ?>" <?= $item['expiry_date'] ? 'checked' : '' ?>>
-                                                            <label class="form-check-label" for="hasExpiryToggle<?= $item['id'] ?>" data-en="Has Expiry Date?" data-ar="هل له تاريخ انتهاء؟">Has Expiry Date?</label>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-6 expiryDateContainerEdit" style="<?= $item['expiry_date'] ? 'display: block;' : 'display: none;' ?>">
-                                                        <label class="form-label" data-en="Expiry Date" data-ar="تاريخ الانتهاء">Expiry Date</label>
-                                                        <input type="date" name="expiry_date" class="form-control" value="<?= $item['expiry_date'] ?>">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="modal-footer">
-                                                <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
-                                                <button type="submit" name="edit_item" class="btn btn-primary" data-en="Update Item" data-ar="تحديث الصنف">Update Item</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- View Item Modal -->
-                            <div class="modal fade" id="viewItemModal<?= $item['id'] ?>" tabindex="-1">
-                                <div class="modal-dialog">
-                                    <div class="modal-content border-0 shadow">
-                                        <div class="modal-header">
-                                            <h5 class="modal-title"><?= htmlspecialchars($item['name_en'] ) ?> / <?= htmlspecialchars($item['name_ar']) ?></h5>
-                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                                        </div>
-                                        <div class="modal-body text-start">
-                                            <div class="text-center mb-4">
-                                                <?php if ($item['image_path']): ?>
-                                                    <img src="<?= htmlspecialchars($item['image_path']) ?>" class="img-fluid rounded shadow-sm" style="max-height: 200px;">
-                                                <?php else: ?>
-                                                    <div class="bg-light py-5 rounded"><i class="bi bi-image h1 text-muted"></i></div>
-                                                <?php endif; ?>
-                                            </div>
-                                            <div class="row g-3">
-                                                <div class="col-6"><small class="text-muted d-block">SKU</small> <?= htmlspecialchars($item['sku'] ?: '---') ?></div>
-                                                <div class="col-6"><small class="text-muted d-block">Category</small> <?= htmlspecialchars($item['cat_en'] ?: '---') ?></div>
-                                                <div class="col-6"><small class="text-muted d-block">Supplier</small> <?= htmlspecialchars($item['supplier_name'] ?? '---') ?></div>
-                                                <div class="col-6"><small class="text-muted d-block">Unit</small> <?= htmlspecialchars($item['unit_en'] ?: '---') ?></div>
-                                                <div class="col-4"><small class="text-muted d-block">Purchase Price</small> OMR <?= number_format((float)$item['purchase_price'], 3) ?></div>
-                                                <div class="col-4"><small class="text-muted d-block">Sale Price</small> OMR <?= number_format((float)$item['sale_price'], 3) ?></div>
-                                                <div class="col-4"><small class="text-muted d-block">Stock</small> <?= number_format((float)$item['stock_quantity'], 3) ?></div>
-                                                <div class="col-4"><small class="text-muted d-block">VAT Rate</small> <?= number_format((float)$item['vat_rate'], 3) ?>%</div>
-                                                <div class="col-6"><small class="text-muted d-block">Min Stock</small> <?= number_format((float)$item['min_stock_level'], 3) ?></div>
-                                                <div class="col-6"><small class="text-muted d-block">Expiry Date</small> <?= $item['expiry_date'] ?: '---' ?></div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </td>
                     </tr>
                     <?php endforeach; ?>
@@ -1509,6 +1605,512 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             </table>
         </div>
     </div>
+
+    <?php elseif ($page === 'pos'): ?>
+    <?php
+    $products = db()->query("SELECT * FROM stock_items WHERE stock_quantity > 0 ORDER BY name_en ASC")->fetchAll(PDO::FETCH_ASSOC);
+    $customers = db()->query("SELECT * FROM customers WHERE type = 'customer' ORDER BY name ASC")->fetchAll(PDO::FETCH_ASSOC);
+    ?>
+    <div class="pos-container">
+        <div class="pos-products">
+            <div class="bg-white p-3 rounded mb-3 shadow-sm d-flex gap-2">
+                <div class="input-group flex-grow-1">
+                    <span class="input-group-text bg-transparent border-end-0"><i class="bi bi-search"></i></span>
+                    <input type="text" id="productSearch" class="form-control border-start-0" placeholder="Search products by name or SKU..." data-en="Search products..." data-ar="بحث عن منتجات...">
+                </div>
+                <div class="input-group" style="width: 250px;">
+                    <span class="input-group-text bg-light border-end-0"><i class="bi bi-upc-scan"></i></span>
+                    <input type="text" id="barcodeInput" class="form-control border-start-0" placeholder="Scan barcode..." data-en="Scan barcode..." data-ar="امسح الباركود..." autofocus>
+                </div>
+            </div>
+            <div class="product-grid" id="productGrid">
+                <?php foreach ($products as $p): ?>
+                <div class="product-card" data-id="<?= $p['id'] ?>" data-name-en="<?= htmlspecialchars($p['name_en']) ?>" data-name-ar="<?= htmlspecialchars($p['name_ar']) ?>" data-price="<?= $p['sale_price'] ?>" data-sku="<?= htmlspecialchars($p['sku']) ?>">
+                    <?php if ($p['image_path']): ?>
+                        <img src="<?= htmlspecialchars($p['image_path']) ?>" alt="<?= htmlspecialchars($p['name_en']) ?>">
+                    <?php else: ?>
+                        <div class="bg-light d-flex align-items-center justify-content-center rounded mb-2" style="height: 120px;">
+                            <i class="bi bi-box-seam text-muted" style="font-size: 3rem;"></i>
+                        </div>
+                    <?php endif; ?>
+                    <div class="fw-bold mb-1 product-name" data-en="<?= htmlspecialchars($p['name_en']) ?>" data-ar="<?= htmlspecialchars($p['name_ar']) ?>"><?= htmlspecialchars($p['name_en']) ?></div>
+                    <div class="small text-muted mb-2"><?= htmlspecialchars($p['sku']) ?></div>
+                    <div class="d-flex justify-content-between align-items-center mt-auto">
+                        <span class="price text-primary">OMR <?= number_format((float)$p['sale_price'], 3) ?></span>
+                        <span class="badge bg-light text-dark small"><?= (float)$p['stock_quantity'] ?> left</span>
+                    </div>
+                </div>
+                <?php endforeach; ?>
+            </div>
+        </div>
+        
+        <div class="pos-cart">
+            <div class="p-3 border-bottom d-flex justify-content-between align-items-center">
+                <h6 class="m-0 fw-bold"><i class="bi bi-cart3 me-2"></i>Cart</h6>
+                <div class="d-flex gap-2">
+                    <button class="btn btn-sm btn-outline-warning" onclick="cart.openHeldCartsModal()" title="Resume Cart"><i class="bi bi-pause-fill"></i></button>
+                    <button class="btn btn-sm btn-outline-secondary" onclick="cart.hold()" title="Hold Cart"><i class="bi bi-hand-index-thumb"></i></button>
+                    <button class="btn btn-sm btn-outline-danger" onclick="cart.clear()" title="Clear Cart"><i class="bi bi-trash"></i></button>
+                </div>
+            </div>
+            
+            <div class="p-3 bg-light border-bottom">
+                <div class="mb-2">
+                    <label class="small fw-bold mb-1">Customer</label>
+                    <div class="d-flex gap-2">
+                        <select id="posCustomer" class="form-select form-select-sm" onchange="cart.onCustomerChange()">
+                            <option value="">Walk-in Customer</option>
+                            <?php foreach ($customers as $c): ?>
+                            <option value="<?= $c['id'] ?>"><?= htmlspecialchars($c['name']) ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                        <button class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#addCustomerModal"><i class="bi bi-plus"></i></button>
+                    </div>
+                    <div id="loyaltyDisplay" class="smaller text-success mt-1" style="display:none">
+                        Points: <span id="customerPoints">0</span>
+                        <div class="form-check form-switch d-inline-block ms-2">
+                            <input class="form-check-input" type="checkbox" id="redeemLoyalty" onchange="cart.render()">
+                            <label class="form-check-label" for="redeemLoyalty">Redeem</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="mb-2">
+                    <label class="small fw-bold mb-1">Payment Method</label>
+                    <select id="posPaymentMethod" class="form-select form-select-sm">
+                        <option value="cash">Cash</option>
+                        <option value="card">Card</option>
+                        <option value="transfer">Bank Transfer</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="small fw-bold mb-1">Discount Code</label>
+                    <div class="input-group input-group-sm">
+                        <input type="text" id="discountCode" class="form-control" placeholder="Code">
+                        <button class="btn btn-outline-primary" type="button" onclick="cart.applyDiscount()">Apply</button>
+                    </div>
+                    <div id="appliedDiscountInfo" class="smaller text-primary mt-1" style="display:none"></div>
+                </div>
+            </div>
+            
+            <div class="cart-items" id="cartItems">
+                <!-- Cart items will be injected here -->
+                <div class="text-center text-muted mt-5">
+                    <i class="bi bi-cart-x" style="font-size: 3rem;"></i>
+                    <p>Cart is empty</p>
+                </div>
+            </div>
+            
+            <div class="cart-total">
+                <div class="d-flex justify-content-between mb-1">
+                    <span>Subtotal</span>
+                    <span id="posSubtotal">OMR 0.000</span>
+                </div>
+                <div class="d-flex justify-content-between mb-3 fw-bold fs-5">
+                    <span>Total</span>
+                    <span id="posTotal" class="text-primary">OMR 0.000</span>
+                </div>
+                <button class="btn btn-primary w-100 py-2 fw-bold" id="checkoutBtn" onclick="cart.checkout()">
+                    PLACE ORDER
+                </button>
+            </div>
+        </div>
+    </div>
+
+    <script>
+    const cart = {
+        items: [],
+        discount: null,
+        customerPoints: 0,
+        add(product) {
+            const existing = this.items.find(item => item.id === product.id);
+            if (existing) {
+                existing.qty++;
+            } else {
+                this.items.push({...product, qty: 1});
+            }
+            this.render();
+        },
+        remove(id) {
+            this.items = this.items.filter(item => item.id !== id);
+            this.render();
+        },
+        updateQty(id, delta) {
+            const item = this.items.find(i => i.id === id);
+            if (item) {
+                item.qty += delta;
+                if (item.qty <= 0) this.remove(id);
+                else this.render();
+            }
+        },
+        clear() {
+            this.items = [];
+            this.discount = null;
+            this.customerPoints = 0;
+            const discInput = document.getElementById('discountCode');
+            if (discInput) discInput.value = '';
+            const discInfo = document.getElementById('appliedDiscountInfo');
+            if (discInfo) discInfo.style.display = 'none';
+            const redeemSwitch = document.getElementById('redeemLoyalty');
+            if (redeemSwitch) redeemSwitch.checked = false;
+            const loyaltyDisplay = document.getElementById('loyaltyDisplay');
+            if (loyaltyDisplay) loyaltyDisplay.style.display = 'none';
+            this.render();
+        },
+        async onCustomerChange() {
+            const id = document.getElementById('posCustomer').value;
+            const display = document.getElementById('loyaltyDisplay');
+            if (!id) {
+                display.style.display = 'none';
+                this.customerPoints = 0;
+                document.getElementById('redeemLoyalty').checked = false;
+                this.render();
+                return;
+            }
+            try {
+                const resp = await fetch(`index.php?action=get_customer_loyalty&customer_id=${id}`);
+                const res = await resp.json();
+                this.customerPoints = res.points || 0;
+                document.getElementById('customerPoints').innerText = this.customerPoints.toFixed(3);
+                display.style.display = 'block';
+                this.render();
+            } catch (err) { console.error(err); }
+        },
+        async applyDiscount() {
+            const code = document.getElementById('discountCode').value.trim();
+            if (!code) return;
+            try {
+                const resp = await fetch(`index.php?action=validate_discount&code=${code}`);
+                const res = await resp.json();
+                if (res.success) {
+                    this.discount = res.discount;
+                    const info = document.getElementById('appliedDiscountInfo');
+                    info.innerText = `Applied: ${this.discount.code} (${this.discount.type === 'percentage' ? this.discount.value + '%' : 'OMR ' + parseFloat(this.discount.value).toFixed(3)})`;
+                    info.style.display = 'block';
+                    this.render();
+                } else {
+                    Swal.fire('Error', res.error, 'error');
+                }
+            } catch (err) { console.error(err); }
+        },
+        async hold() {
+            if (this.items.length === 0) return;
+            const { value: name } = await Swal.fire({
+                title: 'Hold Cart',
+                input: 'text',
+                inputLabel: 'Enter a name for this cart',
+                inputValue: 'Cart ' + new Date().toLocaleTimeString(),
+                showCancelButton: true
+            });
+            if (name) {
+                const formData = new FormData();
+                formData.append('action', 'hold_pos_cart');
+                formData.append('cart_name', name);
+                formData.append('items', JSON.stringify(this.items));
+                formData.append('customer_id', document.getElementById('posCustomer').value);
+                const resp = await fetch('index.php', { method: 'POST', body: formData });
+                const res = await resp.json();
+                if (res.success) {
+                    this.clear();
+                    Swal.fire('Held', 'Cart has been parked', 'success');
+                }
+            }
+        },
+        async openHeldCartsModal() {
+            const resp = await fetch('index.php?action=get_held_carts');
+            const carts = await resp.json();
+            let html = '<div class="list-group">';
+            if (carts.length === 0) html += '<p class="text-center p-3">No held carts</p>';
+            carts.forEach(c => {
+                html += `
+                    <div class="list-group-item d-flex justify-content-between align-items-center">
+                        <div class="text-start">
+                            <strong>${c.cart_name}</strong><br>
+                            <small>${c.customer_name || 'Walk-in'} - ${c.created_at}</small>
+                        </div>
+                        <div class="btn-group">
+                            <button class="btn btn-sm btn-primary" onclick="cart.resume(${c.id})">Resume</button>
+                            <button class="btn btn-sm btn-danger" onclick="cart.deleteHeld(${c.id})">Delete</button>
+                        </div>
+                    </div>
+                `;
+            });
+            html += '</div>';
+            Swal.fire({
+                title: 'Held Carts',
+                html: html,
+                showConfirmButton: false,
+                width: '600px'
+            });
+        },
+        async resume(id) {
+            const resp = await fetch('index.php?action=get_held_carts');
+            const carts = await resp.json();
+            const c = carts.find(x => x.id == id);
+            if (c) {
+                this.items = JSON.parse(c.items_json);
+                document.getElementById('posCustomer').value = c.customer_id || '';
+                await this.onCustomerChange();
+                await this.deleteHeld(id, true);
+                Swal.close();
+            }
+        },
+        async deleteHeld(id, silent = false) {
+            const formData = new FormData();
+            formData.append('action', 'delete_held_cart');
+            formData.append('id', id);
+            await fetch('index.php', { method: 'POST', body: formData });
+            if (!silent) this.openHeldCartsModal();
+        },
+        render() {
+            const container = document.getElementById('cartItems');
+            const lang = document.documentElement.lang || 'en';
+            if (this.items.length === 0) {
+                container.innerHTML = `<div class="text-center text-muted mt-5"><i class="bi bi-cart-x" style="font-size: 3rem;"></i><p data-en="Cart is empty" data-ar="السلة فارغة">${lang === 'ar' ? 'السلة فارغة' : 'Cart is empty'}</p></div>`;
+                document.getElementById('posSubtotal').innerText = 'OMR 0.000';
+                document.getElementById('posTotal').innerText = 'OMR 0.000';
+                document.getElementById('checkoutBtn').disabled = true;
+                return;
+            }
+            
+            let subtotal = 0;
+            container.innerHTML = this.items.map(item => {
+                subtotal += item.price * item.qty;
+                const displayName = lang === 'ar' ? item.nameAr : item.nameEn;
+                return `
+                    <div class="cart-item">
+                        <div class="flex-grow-1">
+                            <div class="fw-bold small">${displayName}</div>
+                            <div class="text-muted smaller">OMR ${parseFloat(item.price).toFixed(3)}</div>
+                        </div>
+                        <div class="qty-controls mx-3">
+                            <button class="qty-btn" onclick="cart.updateQty(${item.id}, -1)">-</button>
+                            <span class="small fw-bold">${item.qty}</span>
+                            <button class="qty-btn" onclick="cart.updateQty(${item.id}, 1)">+</button>
+                        </div>
+                        <div class="fw-bold small">OMR ${(item.price * item.qty).toFixed(3)}</div>
+                    </div>
+                `;
+            }).join('');
+            
+            let discountAmount = 0;
+            if (this.discount) {
+                if (this.discount.type === 'percentage') {
+                    discountAmount = subtotal * (parseFloat(this.discount.value) / 100);
+                } else {
+                    discountAmount = parseFloat(this.discount.value);
+                }
+            }
+
+            let loyaltyRedeemed = 0;
+            const redeemSwitch = document.getElementById('redeemLoyalty');
+            if (redeemSwitch && redeemSwitch.checked) {
+                loyaltyRedeemed = Math.min(subtotal - discountAmount, this.customerPoints);
+            }
+
+            const total = subtotal - discountAmount - loyaltyRedeemed;
+            
+            document.getElementById('posSubtotal').innerText = 'OMR ' + subtotal.toFixed(3);
+            
+            let totalHtml = '';
+            if (discountAmount > 0) totalHtml += `<div class="smaller text-danger">- Disc: OMR ${discountAmount.toFixed(3)}</div>`;
+            if (loyaltyRedeemed > 0) totalHtml += `<div class="smaller text-success">- Loyalty: OMR ${loyaltyRedeemed.toFixed(3)}</div>`;
+            totalHtml += 'OMR ' + total.toFixed(3);
+            
+            document.getElementById('posTotal').innerHTML = totalHtml;
+            document.getElementById('checkoutBtn').disabled = false;
+        },
+        async checkout() {
+            if (this.items.length === 0) return;
+            
+            const btn = document.getElementById('checkoutBtn');
+            const originalText = btn.innerText;
+            btn.disabled = true;
+            btn.innerText = 'PROCESSING...';
+            
+            const subtotal = this.items.reduce((sum, item) => sum + (item.price * item.qty), 0);
+            let discountAmount = 0;
+            if (this.discount) {
+                discountAmount = this.discount.type === 'percentage' ? subtotal * (this.discount.value / 100) : this.discount.value;
+            }
+            const redeemSwitch = document.getElementById('redeemLoyalty');
+            let loyaltyRedeemed = (redeemSwitch && redeemSwitch.checked) ? Math.min(subtotal - discountAmount, this.customerPoints) : 0;
+
+            const formData = new FormData();
+            formData.append('action', 'save_pos_transaction');
+            formData.append('customer_id', document.getElementById('posCustomer').value);
+            formData.append('payment_method', document.getElementById('posPaymentMethod').value);
+            formData.append('total_amount', subtotal);
+            formData.append('discount_code_id', this.discount ? this.discount.id : '');
+            formData.append('discount_amount', discountAmount);
+            formData.append('loyalty_redeemed', loyaltyRedeemed);
+            formData.append('items', JSON.stringify(this.items.map(i => ({id: i.id, qty: i.qty, price: i.price}))));
+            
+            try {
+                const resp = await fetch('index.php', { method: 'POST', body: formData });
+                const result = await resp.json();
+                if (result.success) {
+                    this.showReceipt(result.invoice_id, discountAmount, loyaltyRedeemed, result.transaction_no);
+                } else {
+                    Swal.fire('Error', result.error, 'error');
+                    btn.disabled = false;
+                    btn.innerText = originalText;
+                }
+            } catch (err) {
+                console.error(err);
+                Swal.fire('Error', 'Something went wrong', 'error');
+                btn.disabled = false;
+                btn.innerText = originalText;
+            }
+        },
+        showReceipt(invId, discountAmount, loyaltyRedeemed, transactionNo) {
+            const container = document.getElementById('posReceiptContent');
+            const customerName = document.getElementById('posCustomer').options[document.getElementById('posCustomer').selectedIndex].text;
+            const paymentMethod = document.getElementById('posPaymentMethod').value.toUpperCase();
+            const date = new Date().toLocaleString();
+            
+            let itemsHtml = this.items.map(item => `
+                <tr>
+                    <td>${item.nameEn}<br><small>${item.qty} x ${parseFloat(item.price).toFixed(3)}</small></td>
+                    <td style="text-align: right; vertical-align: bottom;">${(item.price * item.qty).toFixed(3)}</td>
+                </tr>
+            `).join('');
+            
+            const subtotal = this.items.reduce((sum, item) => sum + (item.price * item.qty), 0);
+            const total = subtotal - discountAmount - loyaltyRedeemed;
+            const companyName = "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
+            const companyPhone = "<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>";
+            const companyVat = "<?= htmlspecialchars($data['settings']['vat_number'] ?? '') ?>";
+
+            container.innerHTML = `
+                <div class="thermal-receipt">
+                    <div class="center">
+                        <h5 class="mb-0 fw-bold">${companyName}</h5>
+                        ${companyPhone ? `<div>Tel: ${companyPhone}</div>` : ''}
+                        ${companyVat ? `<div>VAT: ${companyVat}</div>` : ''}
+                        <div class="separator"></div>
+                        <h6 class="fw-bold">TAX INVOICE</h6>
+                        <div>Inv: ${transactionNo || 'POS-'+invId}</div>
+                        <div>Date: ${date}</div>
+                        <div class="separator"></div>
+                    </div>
+                    <div>
+                        <strong>Customer:</strong> ${customerName}<br>
+                        <strong>Payment:</strong> ${paymentMethod}
+                    </div>
+                    <div class="separator"></div>
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>ITEM</th>
+                                <th style="text-align: right;">TOTAL</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${itemsHtml}
+                        </tbody>
+                    </table>
+                    <div class="separator"></div>
+                    <div class="d-flex justify-content-between">
+                        <span>Subtotal</span>
+                        <span>OMR ${subtotal.toFixed(3)}</span>
+                    </div>
+                    ${discountAmount > 0 ? `<div class="d-flex justify-content-between text-danger"><span>Discount</span><span>- OMR ${parseFloat(discountAmount).toFixed(3)}</span></div>` : ''}
+                    ${loyaltyRedeemed > 0 ? `<div class="d-flex justify-content-between text-success"><span>Loyalty</span><span>- OMR ${parseFloat(loyaltyRedeemed).toFixed(3)}</span></div>` : ''}
+                    <div class="separator"></div>
+                    <div class="d-flex justify-content-between total-row">
+                        <span>TOTAL</span>
+                        <span>OMR ${total.toFixed(3)}</span>
+                    </div>
+                    <div class="separator"></div>
+                    <div class="center small">
+                        Thank you for your business!<br>
+                        Please keep the receipt.
+                    </div>
+                </div>
+            `;
+            
+            const modal = new bootstrap.Modal(document.getElementById('posReceiptModal'));
+            modal.show();
+            
+            this.clear();
+            
+            document.getElementById('posReceiptModal').addEventListener('hidden.bs.modal', function () {
+                location.reload();
+            }, { once: true });
+        }
+    };
+
+    document.querySelectorAll('.product-card').forEach(card => {
+        card.addEventListener('click', () => {
+            const product = {
+                id: parseInt(card.dataset.id),
+                nameEn: card.dataset.nameEn,
+                nameAr: card.dataset.nameAr,
+                price: parseFloat(card.dataset.price)
+            };
+            cart.add(product);
+        });
+    });
+
+    document.getElementById('productSearch').addEventListener('input', (e) => {
+        const q = e.target.value.toLowerCase();
+        document.querySelectorAll('.product-grid .product-card').forEach(card => {
+            const name = card.dataset.nameEn.toLowerCase() + ' ' + card.dataset.nameAr.toLowerCase();
+            const sku = card.dataset.sku.toLowerCase();
+            if (name.includes(q) || sku.includes(q)) {
+                card.style.display = 'flex';
+            } else {
+                card.style.display = 'none';
+            }
+        });
+    });
+
+    document.getElementById('barcodeInput').addEventListener('keypress', (e) => {
+        if (e.key === 'Enter') {
+            const barcode = e.target.value.trim();
+            if (!barcode) return;
+            
+            const card = Array.from(document.querySelectorAll('.product-card')).find(c => c.dataset.sku === barcode);
+            if (card) {
+                const product = {
+                    id: parseInt(card.dataset.id),
+                    nameEn: card.dataset.nameEn,
+                    nameAr: card.dataset.nameAr,
+                    price: parseFloat(card.dataset.price)
+                };
+                cart.add(product);
+                e.target.value = '';
+                Swal.fire({
+                    toast: true,
+                    position: 'top-end',
+                    icon: 'success',
+                    title: 'Added: ' + product.nameEn,
+                    showConfirmButton: false,
+                    timer: 1000
+                });
+            } else {
+                Swal.fire({
+                    toast: true,
+                    position: 'top-end',
+                    icon: 'error',
+                    title: 'Product not found',
+                    showConfirmButton: false,
+                    timer: 1500
+                });
+                e.target.select();
+            }
+        }
+    });
+
+    // Keep barcode input focused
+    document.addEventListener('click', () => {
+        if (document.activeElement.tagName !== 'INPUT' && document.activeElement.tagName !== 'SELECT' && document.activeElement.tagName !== 'TEXTAREA') {
+            const bc = document.getElementById('barcodeInput');
+            if (bc) bc.focus();
+        }
+    });
+    </script>
+
     <?php elseif ($page === 'sales' || $page === 'purchases'): ?>
     <div class="card p-4">
         <div class="d-flex justify-content-between align-items-center mb-4">
@@ -1573,7 +2175,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 <tbody>
                     <?php 
                     foreach ($data['invoices'] as $inv): 
-                        // Fetch items for this invoice
                         $items = db()->prepare("SELECT ii.*, i.name_en, i.name_ar, i.vat_rate 
                                                 FROM invoice_items ii 
                                                 JOIN stock_items i ON ii.item_id = i.id 
@@ -1586,63 +2187,14 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                         <td><?= $inv['invoice_date'] ?></td>
                         <td><?= htmlspecialchars($inv['customer_name'] ?? '---') ?></td>
                         <td>
-                            <?php 
-                                $statusClass = 'bg-secondary';
-                                $statusLabelEn = ucfirst($inv['status']);
-                                $statusLabelAr = $inv['status'];
-                                
-                                if ($inv['status'] === 'paid') {
-                                    $statusClass = 'bg-success';
-                                    $statusLabelAr = 'مدفوع';
-                                } elseif ($inv['status'] === 'unpaid') {
-                                    $statusClass = 'bg-danger';
-                                    $statusLabelAr = 'غير مدفوع';
-                                } elseif ($inv['status'] === 'partially_paid') {
-                                    $statusClass = 'bg-warning text-dark';
-                                    $statusLabelAr = 'مدفوع جزئياً';
-                                    $statusLabelEn = 'Partially Paid';
-                                }
-                            ?>
-                            <span class="badge <?= $statusClass ?>">
-                                <span data-en="<?= $statusLabelEn ?>" data-ar="<?= $statusLabelAr ?>"><?= $statusLabelEn ?></span>
-                            </span>
+                            <span class="badge bg-secondary"><?= htmlspecialchars($inv['status']) ?></span>
                         </td>
                         <td class="text-end fw-bold">OMR <?= number_format((float)$inv['total_with_vat'], 3) ?></td>
                         <td class="text-end text-success">OMR <?= number_format((float)$inv['paid_amount'], 3) ?></td>
                         <td class="text-end text-danger fw-bold">OMR <?= number_format((float)($inv['total_with_vat'] - $inv['paid_amount']), 3) ?></td>
                         <td class="text-end">
                             <div class="btn-group btn-group-sm">
-                                <?php if ($inv['status'] !== 'paid'): ?>
-                                <button class="btn btn-outline-success pay-invoice-btn" 
-                                        data-id="<?= $inv['id'] ?>" 
-                                        data-total="<?= $inv['total_with_vat'] ?>" 
-                                        data-paid="<?= $inv['paid_amount'] ?>" 
-                                        data-bs-toggle="modal" data-bs-target="#payInvoiceModal"
-                                        title="Pay">
-                                    <i class="bi bi-credit-card"></i>
-                                </button>
-                                <?php endif; ?>
-                                <button class="btn btn-outline-info view-invoice-btn" 
-                                        data-json='<?= json_encode($inv, JSON_HEX_APOS | JSON_HEX_QUOT) ?>' 
-                                        data-bs-toggle="modal" data-bs-target="#viewInvoiceModal"
-                                        title="Print Invoice">
-                                    <i class="bi bi-printer"></i>
-                                </button>
-                                <button class="btn btn-outline-warning view-payments-btn" 
-                                        data-id="<?= $inv['id'] ?>"
-                                        data-bs-toggle="modal" data-bs-target="#viewPaymentsModal"
-                                        title="View Receipts">
-                                    <i class="bi bi-receipt"></i>
-                                </button>
-                                <button class="btn btn-outline-primary edit-invoice-btn" 
-                                        data-json='<?= json_encode($inv, JSON_HEX_APOS | JSON_HEX_QUOT) ?>' 
-                                        data-bs-toggle="modal" data-bs-target="#editInvoiceModal">
-                                    <i class="bi bi-pencil"></i>
-                                </button>
-                                <form method="POST" class="d-inline" onsubmit="return confirm('Are you sure? This will restore stock levels.')">
-                                    <input type="hidden" name="id" value="<?= $inv['id'] ?>">
-                                    <button type="submit" name="delete_invoice" class="btn btn-outline-danger"><i class="bi bi-trash"></i></button>
-                                </form>
+                                <button class="btn btn-outline-info view-invoice-btn" data-json='<?= json_encode($inv) ?>' data-bs-toggle="modal" data-bs-target="#viewInvoiceModal"><i class="bi bi-printer"></i></button>
                             </div>
                         </td>
                     </tr>
@@ -1652,599 +2204,104 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         </div>
     </div>
 
-    <!-- Add Invoice Modal -->
-    <div class="modal fade" id="addInvoiceModal" tabindex="-1">
-        <div class="modal-dialog modal-xl">
-            <div class="modal-content border-0 shadow">
-                <div class="modal-header">
-                    <h5 class="modal-title" data-en="Create <?= $page === 'sales' ? 'Sales' : 'Purchase' ?> Tax Invoice" data-ar="إنشاء فاتورة <?= $page === 'sales' ? 'مبيعات' : 'مشتريات' ?> ضريبية">Create <?= $page === 'sales' ? 'Sales' : 'Purchase' ?> Tax Invoice</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <form method="POST">
-                    <input type="hidden" name="type" value="<?= $page === 'sales' ? 'sale' : 'purchase' ?>">
-                    <div class="modal-body">
-                        <div class="row mb-4">
-                            <div class="col-md-4">
-                                <label class="form-label" data-en="<?= $page === 'sales' ? 'Customer' : 'Supplier' ?>" data-ar="<?= $page === 'sales' ? 'العميل' : 'المورد' ?>"><?= $page === 'sales' ? 'Customer' : 'Supplier' ?></label>
-                                <select name="customer_id" class="form-select" required>
-                                    <option value="">--- Select ---</option>
-                                    <?php foreach ($data['customers_list'] as $c): ?>
-                                    <option value="<?= $c['id'] ?>"><?= htmlspecialchars($c['name']) ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label" data-en="Invoice Date" data-ar="تاريخ الفاتورة">Invoice Date</label>
-                                <input type="date" name="invoice_date" class="form-control" value="<?= date('Y-m-d') ?>" required>
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label" data-en="Payment Type" data-ar="نوع الدفع">Payment Type</label>
-                                <select name="payment_type" class="form-select" required>
-                                    <option value="cash" data-en="Cash" data-ar="نقداً">Cash</option>
-                                    <option value="credit" data-en="Credit" data-ar="آجل">Credit</option>
-                                </select>
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label" data-en="Status" data-ar="الحالة">Status</label>
-                                <select name="status" class="form-select" required>
-                                    <option value="unpaid" data-en="Unpaid" data-ar="غير مدفوع">Unpaid</option>
-                                    <option value="paid" data-en="Paid" data-ar="مدفوع">Paid</option>
-                                    <option value="partially_paid" data-en="Partially Paid" data-ar="مدفوع جزئياً">Partially Paid</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="mb-4 position-relative">
-                            <label class="form-label fw-bold" data-en="Search Product (SKU / Name)" data-ar="بحث عن صنف (باركود / اسم)">Search Product (SKU / Name)</label>
-                            <div class="input-group">
-                                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                                <input type="text" id="productSearchInput" class="form-control" placeholder="Search by SKU, Name EN or AR..." data-en="Search by SKU, Name EN or AR..." data-ar="ابحث بالباركود، الاسم الإنجليزي أو العربي...">
-                            </div>
-                            <div id="searchSuggestions" class="list-group position-absolute w-100 shadow-lg" style="z-index: 1050; display: none;"></div>
-                        </div>
-
-                        <div class="table-responsive">
-                            <table class="table table-bordered" id="invoiceItemsTable">
-                                <thead class="bg-light">
-                                    <tr>
-                                        <th style="width: 40%;" data-en="Item" data-ar="الصنف">Item</th>
-                                        <th data-en="Quantity" data-ar="الكمية">Quantity</th>
-                                        <th data-en="Unit Price" data-ar="سعر الوحدة">Unit Price</th>
-                                        <th data-en="VAT %" data-ar="الضريبة %">VAT %</th>
-                                        <th data-en="Total" data-ar="الإجمالي">Total</th>
-                                        <th style="width: 50px;"></th>
-                                    </tr>
-                                </thead>
-                                <tbody id="invoiceItemsTableBody">
-                                    <!-- Rows added dynamically via search -->
-                                </tbody>
-                                <tfoot>
-                                    <tr>
-                                        <td colspan="4" class="text-end fw-bold" data-en="Subtotal" data-ar="الإجمالي">Subtotal</td>
-                                        <td class="fw-bold" id="subtotal">OMR 0.000</td>
-                                        <td></td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="4" class="text-end fw-bold text-primary" data-en="VAT Amount" data-ar="مبلغ الضريبة">VAT Amount</td>
-                                        <td class="fw-bold text-primary" id="totalVat">OMR 0.000</td>
-                                        <td></td>
-                                    </tr>
-                                    <tr class="table-dark">
-                                        <td colspan="4" class="text-end fw-bold" data-en="Grand Total (Inc. VAT)" data-ar="الإجمالي الكلي (شامل الضريبة)">Grand Total (Inc. VAT)</td>
-                                        <td class="fw-bold" id="grandTotal">OMR 0.000</td>
-                                        <td></td>
-                                    </tr>
-                                </tfoot>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
-                        <button type="submit" name="add_invoice" class="btn btn-success" data-en="Save Invoice" data-ar="حفظ الفاتورة">Save Invoice</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-
-    <!-- Edit Invoice Modal -->
-    <div class="modal fade" id="editInvoiceModal" tabindex="-1">
-        <div class="modal-dialog modal-xl">
-            <div class="modal-content border-0 shadow">
-                <div class="modal-header">
-                    <h5 class="modal-title" data-en="Edit Tax Invoice" data-ar="تعديل الفاتورة الضريبية">Edit Tax Invoice</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <form method="POST">
-                    <input type="hidden" name="invoice_id" id="edit_invoice_id">
-                    <div class="modal-body">
-                        <div class="row mb-4">
-                            <div class="col-md-4">
-                                <label class="form-label" data-en="<?= $page === 'sales' ? 'Customer' : 'Supplier' ?>" data-ar="<?= $page === 'sales' ? 'العميل' : 'المورد' ?>"><?= $page === 'sales' ? 'Customer' : 'Supplier' ?></label>
-                                <select name="customer_id" id="edit_customer_id" class="form-select" required>
-                                    <option value="">--- Select ---</option>
-                                    <?php foreach ($data['customers_list'] as $c): ?>
-                                    <option value="<?= $c['id'] ?>"><?= htmlspecialchars($c['name']) ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="form-label" data-en="Invoice Date" data-ar="تاريخ الفاتورة">Invoice Date</label>
-                                <input type="date" name="invoice_date" id="edit_invoice_date" class="form-control" required>
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label" data-en="Payment Type" data-ar="نوع الدفع">Payment Type</label>
-                                <select name="payment_type" id="edit_payment_type" class="form-select" required>
-                                    <option value="cash" data-en="Cash" data-ar="نقداً">Cash</option>
-                                    <option value="credit" data-en="Credit" data-ar="آجل">Credit</option>
-                                </select>
-                            </div>
-                            <div class="col-md-3">
-                                <label class="form-label" data-en="Status" data-ar="الحالة">Status</label>
-                                <select name="status" id="edit_status" class="form-select" required>
-                                    <option value="unpaid" data-en="Unpaid" data-ar="غير مدفوع">Unpaid</option>
-                                    <option value="paid" data-en="Paid" data-ar="مدفوع">Paid</option>
-                                    <option value="partially_paid" data-en="Partially Paid" data-ar="مدفوع جزئياً">Partially Paid</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="mb-4 position-relative">
-                            <label class="form-label fw-bold" data-en="Search Product (SKU / Name)" data-ar="بحث عن صنف (باركود / اسم)">Search Product (SKU / Name)</label>
-                            <div class="input-group">
-                                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                                <input type="text" id="editProductSearchInput" class="form-control" placeholder="Search by SKU, Name EN or AR..." data-en="Search by SKU, Name EN or AR..." data-ar="ابحث بالباركود، الاسم الإنجليزي أو العربي...">
-                            </div>
-                            <div id="editSearchSuggestions" class="list-group position-absolute w-100 shadow-lg" style="z-index: 1050; display: none;"></div>
-                        </div>
-
-                        <div class="table-responsive">
-                            <table class="table table-bordered">
-                                <thead class="bg-light">
-                                    <tr>
-                                        <th style="width: 40%;" data-en="Item" data-ar="الصنف">Item</th>
-                                        <th data-en="Quantity" data-ar="الكمية">Quantity</th>
-                                        <th data-en="Unit Price" data-ar="سعر الوحدة">Unit Price</th>
-                                        <th data-en="VAT %" data-ar="الضريبة %">VAT %</th>
-                                        <th data-en="Total" data-ar="الإجمالي">Total</th>
-                                        <th style="width: 50px;"></th>
-                                    </tr>
-                                </thead>
-                                <tbody id="editInvoiceItemsTableBody">
-                                    <!-- Rows added dynamically -->
-                                </tbody>
-                                <tfoot>
-                                    <tr>
-                                        <td colspan="4" class="text-end fw-bold" data-en="Subtotal" data-ar="الإجمالي">Subtotal</td>
-                                        <td class="fw-bold" id="edit_subtotal">OMR 0.000</td>
-                                        <td></td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="4" class="text-end fw-bold text-primary" data-en="VAT Amount" data-ar="مبلغ الضريبة">VAT Amount</td>
-                                        <td class="fw-bold text-primary" id="edit_totalVat">OMR 0.000</td>
-                                        <td></td>
-                                    </tr>
-                                    <tr class="table-dark">
-                                        <td colspan="4" class="text-end fw-bold" data-en="Grand Total (Inc. VAT)" data-ar="الإجمالي الكلي (شامل الضريبة)">Grand Total (Inc. VAT)</td>
-                                        <td class="fw-bold" id="edit_grandTotal">OMR 0.000</td>
-                                        <td></td>
-                                    </tr>
-                                </tfoot>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
-                        <button type="submit" name="edit_invoice" class="btn btn-primary" data-en="Update Invoice" data-ar="تحديث الفاتورة">Update Invoice</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-    <div class="modal fade" id="viewInvoiceModal" tabindex="-1">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content border-0 shadow">
-                <div class="modal-header d-print-none">
-                    <h5 class="modal-title" data-en="Tax Invoice Details" data-ar="تفاصيل الفاتورة الضريبية">Tax Invoice Details</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <div class="modal-body p-5" id="printableInvoice">
-                    <div class="row mb-5 align-items-center">
-                        <div class="col-6">
-                            <?php if (!empty($data['settings']['company_logo'])): ?>
-                                <img src="<?= htmlspecialchars($data['settings']['company_logo']) ?>" alt="Logo" style="height: 80px;" class="mb-3">
-                            <?php endif; ?>
-                            <h4 class="fw-bold m-0"><?= htmlspecialchars($data['settings']['company_name'] ?? 'My Company') ?></h4>
-                            <div class="text-muted small">
-                                <?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?><br>
-                                <?php if(!empty($data['settings']['company_phone'])): ?>
-                                    <span data-en="Phone" data-ar="الهاتف">Phone</span>: <?= htmlspecialchars($data['settings']['company_phone']) ?><br>
-                                <?php endif; ?>
-                                <?php if(!empty($data['settings']['company_email'])): ?>
-                                    <span data-en="Email" data-ar="البريد">Email</span>: <?= htmlspecialchars($data['settings']['company_email']) ?><br>
-                                <?php endif; ?>
-                                <?php if(!empty($data['settings']['vat_number'])): ?>
-                                    <span data-en="VAT No" data-ar="الرقم الضريبي">VAT No</span>: <?= htmlspecialchars($data['settings']['vat_number']) ?><br>
-                                <?php endif; ?>
-                                <?php if(!empty($data['settings']['cr_number'])): ?>
-                                    <span data-en="CR No" data-ar="السجل التجاري">CR No</span>: <?= htmlspecialchars($data['settings']['cr_number']) ?><br>
-                                <?php endif; ?>
-                                <?php if(!empty($data['settings']['registration_no'])): ?>
-                                    <span data-en="Reg No" data-ar="رقم التسجيل">Reg No</span>: <?= htmlspecialchars($data['settings']['registration_no']) ?>
-                                <?php endif; ?>
-                            </div>
-                        </div>
-                        <div class="col-6 text-end">
-                            <h1 class="fw-bold text-uppercase text-primary m-0" data-en="TAX INVOICE" data-ar="فاتورة ضريبية">TAX INVOICE</h1>
-                             <div id="invoiceTypeLabel" class="badge bg-primary text-uppercase mb-2"></div>
-                             <div id="invoiceStatusLabel" class="badge text-uppercase mb-2"></div>
-                            <div class="text-muted small">
-                                <div><strong data-en="Invoice #" data-ar="رقم الفاتورة">Invoice #</strong> <span id="invNumber" class="text-dark fw-bold"></span></div>
-                                <div><strong data-en="Date" data-ar="التاريخ">Date:</strong> <span id="invDate" class="text-dark"></span></div>
-                                <div><strong data-en="Payment" data-ar="الدفع">Payment:</strong> <span id="invPaymentType" class="text-dark"></span></div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="mb-4">
-                        <h6 class="fw-bold text-muted text-uppercase small mb-2" id="invPartyLabel" data-en="Bill To" data-ar="فاتورة إلى">Bill To</h6>
-                        <div class="h5 m-0" id="invCustomerName"></div>
-                        <div class="text-muted small mt-1" id="invCustomerTaxIdContainer" style="display: none;">
-                            <span data-en="VAT No / Tax ID" data-ar="الرقم الضريبي">VAT No / Tax ID</span>: <span id="invCustomerTaxId"></span>
-                        </div>
-                    </div>
-
-                    <table class="table table-bordered mb-4">
-                        <thead class="bg-light">
-                            <tr>
-                                <th data-en="Description" data-ar="الوصف">Description</th>
-                                <th class="text-center" data-en="Qty" data-ar="الكمية">Qty</th>
-                                <th class="text-end" data-en="Price" data-ar="السعر">Price</th>
-                                <th class="text-end" data-en="VAT %" data-ar="الضريبة %">VAT %</th>
-                                <th class="text-end" data-en="Total" data-ar="الإجمالي">Total</th>
-                            </tr>
-                        </thead>
-                        <tbody id="invItemsBody">
-                            <!-- Items populated by JS -->
-                        </tbody>
-                        <tfoot>
-                            <tr>
-                                <td colspan="4" class="text-end fw-bold" data-en="Subtotal" data-ar="الإجمالي">Subtotal</td>
-                                <td class="text-end fw-bold" id="invSubtotal"></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4" class="text-end fw-bold" data-en="VAT Amount" data-ar="مبلغ الضريبة">VAT Amount</td>
-                                <td class="text-end fw-bold" id="invVatAmount"></td>
-                            </tr>
-                            <tr class="table-light">
-                                <td colspan="4" class="text-end fw-bold" data-en="Total (Inc. VAT)" data-ar="الإجمالي (شامل الضريبة)">Total (Inc. VAT)</td>
-                                <td class="text-end fw-bold" id="invGrandTotal"></td>
-                            </tr>
-                        </tfoot>
-                    </table>
-
-                    <div class="row mt-5 align-items-end">
-                        <div class="col-6">
-                            <div id="invQrCode" class="mb-3">
-                                <!-- QR Code image will be injected here -->
-                            </div>
-                            <div class="text-muted small" data-en="Scan to verify invoice" data-ar="امسح للتحقق من الفاتورة">Scan to verify invoice</div>
-                        </div>
-                        <div class="col-6 text-end">
-                            <?php if(!empty($data['settings']['manager_signature'])): ?>
-                                <div class="mb-2">
-                                    <img src="<?= htmlspecialchars($data['settings']['manager_signature']) ?>" alt="Signature" style="height: 60px;">
-                                </div>
-                            <?php endif; ?>
-                            <div class="fw-bold"><?= htmlspecialchars($data['settings']['manager_name'] ?? '') ?></div>
-                            <div class="text-muted small" data-en="Authorized Manager" data-ar="المدير المعتمد">Authorized Manager</div>
-                        </div>
-                    </div>
-
-                    <div class="mt-5 pt-5 border-top text-center text-muted small">
-                        <?php if(!empty($data['settings']['bank_name']) || !empty($data['settings']['company_iban'])): ?>
-                            <div class="mb-3 border rounded p-2 bg-light d-inline-block text-dark">
-                                <strong><span data-en="Bank Details" data-ar="تفاصيل البنك">Bank Details</span>:</strong>
-                                <?= htmlspecialchars($data['settings']['bank_name'] ?? '') ?> - 
-                                <span data-en="IBAN" data-ar="الأيبان">IBAN</span>: <?= htmlspecialchars($data['settings']['company_iban'] ?? '') ?>
-                            </div>
-                        <?php endif; ?>
-                        <p><?= nl2br(htmlspecialchars($data['settings']['invoice_footer'] ?? 'Thank you for your business!')) ?></p>
-                    </div>
-                </div>
-                <div class="modal-footer d-print-none">
-                    <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Close" data-ar="إغلاق">Close</button>
-                    <button type="button" class="btn btn-primary" onclick="window.print()">
-                        <i class="bi bi-printer"></i> <span data-en="Print Invoice" data-ar="طباعة الفاتورة">Print Invoice</span>
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Pay Invoice Modal -->
-    <div class="modal fade" id="payInvoiceModal" tabindex="-1">
-        <div class="modal-dialog">
-            <div class="modal-content border-0 shadow">
-                <div class="modal-header">
-                    <h5 class="modal-title" data-en="Record Payment" data-ar="تسجيل دفعة">Record Payment</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <form method="POST">
-                    <input type="hidden" name="invoice_id" id="pay_invoice_id">
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Invoice Total" data-ar="إجمالي الفاتورة">Invoice Total</label>
-                            <input type="text" id="pay_invoice_total" class="form-control-plaintext fw-bold" readonly>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Remaining Amount" data-ar="المبلغ المتبقي">Remaining Amount</label>
-                            <input type="text" id="pay_remaining_amount" class="form-control-plaintext text-danger fw-bold" readonly>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Payment Amount" data-ar="مبلغ الدفع">Payment Amount</label>
-                            <input type="number" step="0.001" name="amount" id="pay_amount" class="form-control" required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Payment Date" data-ar="تاريخ الدفع">Payment Date</label>
-                            <input type="date" name="payment_date" class="form-control" value="<?= date('Y-m-d') ?>" required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Payment Method" data-ar="طريقة الدفع">Payment Method</label>
-                            <select name="payment_method" class="form-select">
-                                <option value="Cash">Cash</option>
-                                <option value="Bank Transfer">Bank Transfer</option>
-                                <option value="Credit Card">Credit Card</option>
-                                <option value="Cheque">Cheque</option>
-                            </select>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Notes" data-ar="ملاحظات">Notes</label>
-                            <textarea name="notes" class="form-control" rows="2"></textarea>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
-                        <button type="submit" name="record_payment" class="btn btn-success" data-en="Record Payment" data-ar="حفظ الدفعة">Record Payment</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-
-    <!-- View Payments Modal -->
-    <div class="modal fade" id="viewPaymentsModal" tabindex="-1">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content border-0 shadow">
-                <div class="modal-header">
-                    <h5 class="modal-title" data-en="Payment History" data-ar="سجل المدفوعات">Payment History</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="table-responsive">
-                        <table class="table table-hover">
-                            <thead>
-                                <tr>
-                                    <th data-en="Receipt #" data-ar="رقم السند">Receipt #</th>
-                                    <th data-en="Date" data-ar="التاريخ">Date</th>
-                                    <th data-en="Method" data-ar="الطريقة">Method</th>
-                                    <th data-en="Amount" data-ar="المبلغ" class="text-end">Amount</th>
-                                    <th data-en="Actions" data-ar="الإجراءات" class="text-end">Actions</th>
-                                </tr>
-                            </thead>
-                            <tbody id="paymentsTableBody">
-                                <!-- Populated via JS -->
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Payment Receipt Modal -->
-    <div class="modal fade" id="receiptModal" tabindex="-1">
-        <div class="modal-dialog">
-            <div class="modal-content border-0 shadow">
-                <div class="modal-header d-print-none">
-                    <h5 class="modal-title" data-en="Payment Receipt" data-ar="سند قبض">Payment Receipt</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-                <div class="modal-body p-0" id="printableReceipt">
-                    <div class="receipt-container p-4" style="font-family: 'Inter', sans-serif;">
-                        <div class="receipt-header text-center mb-4 border-bottom border-dark pb-3">
-                            <div class="d-flex justify-content-between align-items-center mb-2">
-                                <div class="text-start">
-                                    <h4 class="fw-bold mb-0 text-primary"><?= htmlspecialchars($data['settings']['company_name'] ?? 'My Company') ?></h4>
-                                    <div class="small text-muted"><?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?></div>
-                                    <div class="small text-muted">VAT: <?= htmlspecialchars($data['settings']['vat_number'] ?? '') ?></div>
-                                </div>
-                                <?php if (!empty($data['settings']['company_logo'])): ?>
-                                    <img src="<?= htmlspecialchars($data['settings']['company_logo']) ?>" alt="Logo" style="height: 60px;">
-                                <?php endif; ?>
-                            </div>
-                            <h4 class="mt-3 text-uppercase fw-bold letter-spacing-2" data-en="PAYMENT RECEIPT" data-ar="سند قبض">PAYMENT RECEIPT</h4>
-                        </div>
-
-                        <div class="receipt-info row g-3 mb-4">
-                            <div class="col-6">
-                                <div class="p-2 border bg-light">
-                                    <small class="text-muted d-block text-uppercase small fw-bold" data-en="Receipt No" data-ar="رقم السند">Receipt No</small>
-                                    <span class="fw-bold h6" id="receiptNo">---</span>
-                                </div>
-                            </div>
-                            <div class="col-6 text-end">
-                                <div class="p-2 border bg-light">
-                                    <small class="text-muted d-block text-uppercase small fw-bold" data-en="Date" data-ar="التاريخ">Date</small>
-                                    <span class="fw-bold h6" id="receiptDate">---</span>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="receipt-body px-2">
-                            <div class="mb-3 border-bottom pb-2">
-                                <small class="text-muted d-block text-uppercase small fw-bold" data-en="Received From" data-ar="وصلنا من">Received From</small>
-                                <span class="h5 mb-0" id="receiptCustomer">---</span>
-                            </div>
-                            <div class="row mb-3">
-                                <div class="col-6">
-                                    <small class="text-muted d-block text-uppercase small fw-bold" data-en="Against Invoice" data-ar="مقابل فاتورة">Against Invoice</small>
-                                    <span class="fw-bold" id="receiptInvNo">---</span>
-                                </div>
-                                <div class="col-6">
-                                    <small class="text-muted d-block text-uppercase small fw-bold" data-en="Payment Method" data-ar="طريقة الدفع">Payment Method</small>
-                                    <span id="receiptMethod">---</span>
-                                </div>
-                            </div>
-                            <div class="mb-4 p-3 border border-2 border-dark rounded bg-light d-flex justify-content-between align-items-center">
-                                <div>
-                                    <small class="text-muted d-block text-uppercase small fw-bold" data-en="Amount in Words" data-ar="المبلغ بالحروف">Amount in Words</small>
-                                    <span class="fst-italic fw-bold text-dark" id="receiptAmountWords">---</span>
-                                </div>
-                                <div class="text-end">
-                                    <small class="text-muted d-block text-uppercase small fw-bold" data-en="Total Amount" data-ar="الإجمالي">Total Amount</small>
-                                    <span class="h4 fw-bold text-primary mb-0" id="receiptAmount">OMR 0.000</span>
-                                </div>
-                            </div>
-                            <div class="mb-4" id="receiptNotesContainer" style="display:none;">
-                                <small class="text-muted d-block text-uppercase small fw-bold" data-en="Notes" data-ar="ملاحظات">Notes</small>
-                                <div class="p-2 border rounded bg-white small" id="receiptNotes">---</div>
-                            </div>
-                        </div>
-
-                        <div class="receipt-footer mt-5 pt-4">
-                            <div class="row">
-                                <div class="col-6 text-center">
-                                    <div style="height: 60px;"></div>
-                                    <div class="border-top border-dark pt-2 mx-4 small fw-bold" data-en="Customer Signature" data-ar="توقيع العميل">Customer Signature</div>
-                                </div>
-                                <div class="col-6 text-center">
-                                    <div style="height: 60px;">
-                                        <?php if (!empty($data['settings']['manager_signature'])): ?>
-                                            <img src="<?= htmlspecialchars($data['settings']['manager_signature']) ?>" alt="Signature" style="max-height: 50px;">
-                                        <?php endif; ?>
-                                    </div>
-                                    <div class="border-top border-dark pt-2 mx-4 small fw-bold" data-en="Authorized Signature" data-ar="توقيع المعتمد">Authorized Signature</div>
-                                </div>
-                            </div>
-                            <div class="text-center mt-4 small text-muted border-top pt-2">
-                                <?= htmlspecialchars($data['settings']['invoice_footer'] ?? '') ?>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer d-print-none">
-                    <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Close" data-ar="إغلاق">Close</button>
-                    <button type="button" class="btn btn-primary" onclick="printReceipt()">
-                        <i class="bi bi-printer"></i> <span data-en="Print Receipt" data-ar="طباعة السند">Print Receipt</span>
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <?php elseif ($page === 'settings'): ?>
+    <?php elseif ($page === 'customer_statement' || $page === 'supplier_statement'): ?>
     <div class="card p-4">
-        <h5 class="mb-4" data-en="Company Settings" data-ar="إعدادات الشركة">Company Settings</h5>
-        <form method="POST" enctype="multipart/form-data">
-            <div class="row g-4">
-                <div class="col-md-6">
-                    <div class="card p-3 bg-light border-0">
-                        <h6 class="mb-3 fw-bold" data-en="Profile Information" data-ar="معلومات الملف الشخصي">Profile Information</h6>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Company Name" data-ar="اسم الشركة">Company Name</label>
-                            <input type="text" name="settings[company_name]" class="form-control" value="<?= htmlspecialchars($data['settings']['company_name'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Company Logo" data-ar="شعار الشركة">Company Logo</label>
-                            <?php if (!empty($data['settings']['company_logo'])): ?>
-                                <div class="mb-2">
-                                    <img src="<?= htmlspecialchars($data['settings']['company_logo']) ?>" alt="Logo" style="height: 50px;" class="rounded border">
-                                </div>
-                            <?php endif; ?>
-                            <input type="file" name="company_logo" class="form-control" accept="image/*">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Favicon" data-ar="أيقونة الموقع">Favicon</label>
-                            <?php if (!empty($data['settings']['favicon'])): ?>
-                                <div class="mb-2">
-                                    <img src="<?= htmlspecialchars($data['settings']['favicon']) ?>" alt="Favicon" style="height: 32px;" class="rounded border">
-                                </div>
-                            <?php endif; ?>
-                            <input type="file" name="favicon" class="form-control" accept="image/x-icon,image/png,image/gif">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Phone" data-ar="الهاتف">Phone</label>
-                            <input type="text" name="settings[company_phone]" class="form-control" value="<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Company Email" data-ar="البريد الإلكتروني للشركة">Company Email</label>
-                            <input type="email" name="settings[company_email]" class="form-control" value="<?= htmlspecialchars($data['settings']['company_email'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Website" data-ar="الموقع الإلكتروني">Website</label>
-                            <input type="url" name="settings[company_website]" class="form-control" value="<?= htmlspecialchars($data['settings']['company_website'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Manager Name" data-ar="اسم المدير">Manager Name</label>
-                            <input type="text" name="settings[manager_name]" class="form-control" value="<?= htmlspecialchars($data['settings']['manager_name'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Manager Signature" data-ar="توقيع المدير">Manager Signature</label>
-                            <?php if (!empty($data['settings']['manager_signature'])): ?>
-                                <div class="mb-2">
-                                    <img src="<?= htmlspecialchars($data['settings']['manager_signature']) ?>" alt="Signature" style="height: 50px;" class="rounded border">
-                                </div>
-                            <?php endif; ?>
-                            <input type="file" name="manager_signature" class="form-control" accept="image/*">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Address" data-ar="العنوان">Address</label>
-                            <textarea name="settings[company_address]" class="form-control" rows="2"><?= htmlspecialchars($data['settings']['company_address'] ?? '') ?></textarea>
-                        </div>
-                    </div>
+        <div class="d-flex justify-content-between align-items-center mb-4">
+            <h5 class="m-0" data-en="<?= $currTitle['en'] ?>" data-ar="<?= $currTitle['ar'] ?>"><?= $currTitle['en'] ?></h5>
+            <button class="btn btn-outline-secondary d-print-none" onclick="window.print()">
+                <i class="bi bi-printer"></i> <span data-en="Print" data-ar="طباعة">Print</span>
+            </button>
+        </div>
+
+        <div class="bg-light p-3 rounded mb-4 d-print-none">
+            <form method="GET" class="row g-3 align-items-end">
+                <input type="hidden" name="page" value="<?= $page ?>">
+                <div class="col-md-4">
+                    <label class="form-label small fw-bold" data-en="Select <?= $page === 'customer_statement' ? 'Customer' : 'Supplier' ?>" data-ar="اختر <?= $page === 'customer_statement' ? 'العميل' : 'المورد' ?>">Select <?= $page === 'customer_statement' ? 'Customer' : 'Supplier' ?></label>
+                    <select name="entity_id" class="form-select" required>
+                        <option value="">---</option>
+                        <?php foreach ($data['entities'] as $e): ?>
+                        <option value="<?= $e['id'] ?>" <?= (($_GET['entity_id'] ?? '') == $e['id']) ? 'selected' : '' ?>><?= htmlspecialchars($e['name']) ?></option>
+                        <?php endforeach; ?>
+                    </select>
                 </div>
-                <div class="col-md-6">
-                    <div class="card p-3 bg-light border-0">
-                        <h6 class="mb-3 fw-bold" data-en="Legal & Tax Details" data-ar="التفاصيل القانونية والضريبية">Legal & Tax Details</h6>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="VAT Number" data-ar="الرقم الضريبي">VAT Number</label>
-                            <input type="text" name="settings[vat_number]" class="form-control" value="<?= htmlspecialchars($data['settings']['vat_number'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="CR Number" data-ar="السجل التجاري">CR Number</label>
-                            <input type="text" name="settings[cr_number]" class="form-control" value="<?= htmlspecialchars($data['settings']['cr_number'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Registration Number" data-ar="رقم التسجيل">Registration Number</label>
-                            <input type="text" name="settings[registration_no]" class="form-control" value="<?= htmlspecialchars($data['settings']['registration_no'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Bank Name" data-ar="اسم البنك">Bank Name</label>
-                            <input type="text" name="settings[bank_name]" class="form-control" value="<?= htmlspecialchars($data['settings']['bank_name'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="IBAN" data-ar="رقم الأيبان">IBAN</label>
-                            <input type="text" name="settings[company_iban]" class="form-control" value="<?= htmlspecialchars($data['settings']['company_iban'] ?? '') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Default VAT Rate (%)" data-ar="نسبة الضريبة الافتراضية (%)">Default VAT Rate (%)</label>
-                            <input type="number" step="0.001" name="settings[default_vat_rate]" class="form-control" value="<?= htmlspecialchars($data['settings']['default_vat_rate'] ?? '15.00') ?>">
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label" data-en="Invoice Footer Note" data-ar="ملاحظة أسفل الفاتورة">Invoice Footer Note</label>
-                            <textarea name="settings[invoice_footer]" class="form-control" rows="2"><?= htmlspecialchars($data['settings']['invoice_footer'] ?? '') ?></textarea>
-                        </div>
-                    </div>
+                <div class="col-md-3">
+                    <label class="form-label small fw-bold" data-en="From Date" data-ar="من تاريخ">From Date</label>
+                    <input type="date" name="start_date" class="form-control" value="<?= htmlspecialchars($_GET['start_date'] ?? date('Y-m-01')) ?>">
+                </div>
+                <div class="col-md-3">
+                    <label class="form-label small fw-bold" data-en="To Date" data-ar="إلى تاريخ">To Date</label>
+                    <input type="date" name="end_date" class="form-control" value="<?= htmlspecialchars($_GET['end_date'] ?? date('Y-m-d')) ?>">
+                </div>
+                <div class="col-md-2">
+                    <button type="submit" class="btn btn-primary w-100">
+                        <i class="bi bi-search"></i> <span data-en="View Report" data-ar="عرض التقرير">View Report</span>
+                    </button>
+                </div>
+            </form>
+        </div>
+
+        <?php if (isset($data['transactions'])): ?>
+        <div id="statement-print">
+            <div class="row mb-4">
+                <div class="col-6">
+                    <h3 class="mb-0"><?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?></h3>
+                    <p class="text-muted small"><?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?></p>
+                </div>
+                <div class="col-6 text-end">
+                    <h2 class="text-uppercase text-muted" data-en="Statement of Account" data-ar="كشف حساب">Statement of Account</h2>
+                    <p class="mb-0"><strong><?= htmlspecialchars($data['selected_entity']['name']) ?></strong></p>
+                    <p class="text-muted small"><?= htmlspecialchars($data['selected_entity']['email']) ?> | <?= htmlspecialchars($data['selected_entity']['phone']) ?><br>Period: <?= $_GET['start_date'] ?> to <?= $_GET['end_date'] ?></p>
                 </div>
             </div>
-            <div class="mt-4 text-end">
-                <button type="submit" name="update_settings" class="btn btn-primary px-5">
-                    <i class="bi bi-save"></i> <span data-en="Save Settings" data-ar="حفظ الإعدادات">Save Settings</span>
-                </button>
+            <div class="table-responsive">
+                <table class="table table-bordered table-sm">
+                    <thead class="bg-light">
+                        <tr>
+                            <th data-en="Date" data-ar="التاريخ">Date</th>
+                            <th data-en="Reference" data-ar="المرجع">Reference</th>
+                            <th data-en="Description" data-ar="الوصف">Description</th>
+                            <th data-en="Debit" data-ar="مدين" class="text-end">Debit</th>
+                            <th data-en="Credit" data-ar="دائن" class="text-end">Credit</th>
+                            <th data-en="Balance" data-ar="الرصيد" class="text-end">Balance</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php 
+                        $running_balance = 0;
+                        foreach ($data['transactions'] as $t): 
+                            $debit = 0; $credit = 0;
+                            if ($t['trans_type'] === 'invoice') {
+                                if ($page === 'customer_statement') $debit = (float)$t['amount']; else $credit = (float)$t['amount'];
+                            } else {
+                                if ($page === 'customer_statement') $credit = (float)$t['amount']; else $debit = (float)$t['amount'];
+                            }
+                            $running_balance += ($debit - $credit);
+                        ?>
+                        <tr>
+                            <td><?= $t['trans_date'] ?></td>
+                            <td><?= $t['trans_type'] === 'invoice' ? 'INV-'.str_pad((string)$t['ref_no'], 5, '0', STR_PAD_LEFT) : 'RCP-'.str_pad((string)$t['id'], 5, '0', STR_PAD_LEFT) ?></td>
+                            <td><?= $t['trans_type'] === 'invoice' ? 'Tax Invoice' : 'Payment - '.$t['payment_method'] ?></td>
+                            <td class="text-end"><?= $debit > 0 ? number_format($debit, 3) : '' ?></td>
+                            <td class="text-end"><?= $credit > 0 ? number_format($credit, 3) : '' ?></td>
+                            <td class="text-end fw-bold"><?= number_format($running_balance, 3) ?></td>
+                        </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                    <tfoot class="bg-light fw-bold">
+                        <tr>
+                            <td colspan="5" class="text-end">Closing Balance</td>
+                            <td class="text-end">OMR <?= number_format($running_balance, 3) ?></td>
+                        </tr>
+                    </tfoot>
+                </table>
             </div>
-        </form>
+        </div>
+        <?php else: ?>
+            <div class="text-center py-5 text-muted"><p>Please select an entity and date range to generate the statement.</p></div>
+        <?php endif; ?>
     </div>
+
     <?php elseif ($page === 'payment_methods'): ?>
     <div class="card p-4">
         <div class="d-flex justify-content-between align-items-center mb-4">
@@ -2277,35 +2334,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                     <button type="submit" name="delete_payment_method" class="btn btn-outline-danger" title="Delete"><i class="bi bi-trash"></i></button>
                                 </form>
                             </div>
-
-                            <!-- Edit Payment Method Modal -->
-                            <div class="modal fade" id="editPaymentMethodModal<?= $pm['id'] ?>" tabindex="-1">
-                                <div class="modal-dialog">
-                                    <div class="modal-content border-0 shadow text-start">
-                                        <div class="modal-header">
-                                            <h5 class="modal-title" data-en="Edit Payment Method" data-ar="تعديل طريقة الدفع">Edit Payment Method</h5>
-                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                                        </div>
-                                        <form method="POST">
-                                            <input type="hidden" name="id" value="<?= $pm['id'] ?>">
-                                            <div class="modal-body">
-                                                <div class="mb-3">
-                                                    <label class="form-label" data-en="Name (EN)" data-ar="الاسم (EN)">Name (EN)</label>
-                                                    <input type="text" name="name_en" class="form-control" value="<?= htmlspecialchars($pm['name_en'] ?? '') ?>" required>
-                                                </div>
-                                                <div class="mb-3">
-                                                    <label class="form-label" data-en="Name (AR)" data-ar="الاسم (AR)">Name (AR)</label>
-                                                    <input type="text" name="name_ar" class="form-control" value="<?= htmlspecialchars($pm['name_ar'] ?? '') ?>" required>
-                                                </div>
-                                            </div>
-                                            <div class="modal-footer">
-                                                <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
-                                                <button type="submit" name="edit_payment_method" class="btn btn-primary" data-en="Update" data-ar="تحديث">Update</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            </div>
                         </td>
                     </tr>
                     <?php endforeach; ?>
@@ -2717,6 +2745,23 @@ document.addEventListener('DOMContentLoaded', function() {
         });
     }
 
+    // Status change logic for Paid Amount field
+    const togglePaidAmount = (statusId, containerId) => {
+        const statusEl = document.getElementById(statusId);
+        const containerEl = document.getElementById(containerId);
+        if (statusEl && containerEl) {
+            statusEl.addEventListener('change', function() {
+                if (this.value === 'partially_paid') {
+                    containerEl.style.display = 'block';
+                } else {
+                    containerEl.style.display = 'none';
+                }
+            });
+        }
+    };
+    togglePaidAmount('add_status', 'addPaidAmountContainer');
+    togglePaidAmount('edit_status', 'editPaidAmountContainer');
+
     // Pay Invoice Logic
     document.querySelectorAll('.pay-invoice-btn').forEach(btn => {
         btn.addEventListener('click', function() {
@@ -2753,6 +2798,46 @@ document.addEventListener('DOMContentLoaded', function() {
                 document.getElementById('receiptMethod').textContent = data.payment_method;
                 document.getElementById('receiptAmount').textContent = 'OMR ' + parseFloat(data.amount).toFixed(3);
                 document.getElementById('receiptAmountWords').textContent = data.amount_words;
+
+                // Update labels for Purchase vs Sale
+                const partyLabel = document.getElementById('receiptPartyLabel');
+                const againstLabel = document.getElementById('receiptAgainstLabel');
+                const receiptTitle = document.querySelector('#receiptModal .modal-title');
+                const receiptH4 = document.querySelector('.receipt-container h4.letter-spacing-2');
+
+                if (data.inv_type === 'purchase') {
+                    partyLabel.textContent = 'Paid To';
+                    partyLabel.setAttribute('data-en', 'Paid To');
+                    partyLabel.setAttribute('data-ar', 'صرف إلى');
+                    
+                    againstLabel.textContent = 'Against Purchase';
+                    againstLabel.setAttribute('data-en', 'Against Purchase');
+                    againstLabel.setAttribute('data-ar', 'مقابل شراء');
+
+                    receiptTitle.textContent = 'Payment Voucher';
+                    receiptTitle.setAttribute('data-en', 'Payment Voucher');
+                    receiptTitle.setAttribute('data-ar', 'سند صرف');
+
+                    receiptH4.textContent = 'PAYMENT VOUCHER';
+                    receiptH4.setAttribute('data-en', 'PAYMENT VOUCHER');
+                    receiptH4.setAttribute('data-ar', 'سند صرف');
+                } else {
+                    partyLabel.textContent = 'Received From';
+                    partyLabel.setAttribute('data-en', 'Received From');
+                    partyLabel.setAttribute('data-ar', 'وصلنا من');
+
+                    againstLabel.textContent = 'Against Invoice';
+                    againstLabel.setAttribute('data-en', 'Against Invoice');
+                    againstLabel.setAttribute('data-ar', 'مقابل فاتورة');
+
+                    receiptTitle.textContent = 'Payment Receipt';
+                    receiptTitle.setAttribute('data-en', 'Payment Receipt');
+                    receiptTitle.setAttribute('data-ar', 'سند قبض');
+
+                    receiptH4.textContent = 'PAYMENT RECEIPT';
+                    receiptH4.setAttribute('data-en', 'PAYMENT RECEIPT');
+                    receiptH4.setAttribute('data-ar', 'سند قبض');
+                }
                 
                 const notesContainer = document.getElementById('receiptNotesContainer');
                 if (data.notes) {
@@ -2959,6 +3044,13 @@ document.addEventListener('DOMContentLoaded', function() {
             document.getElementById('edit_invoice_date').value = data.invoice_date;
             document.getElementById('edit_payment_type').value = data.payment_type || 'cash';
             document.getElementById('edit_status').value = data.status || 'unpaid';
+            document.getElementById('edit_paid_amount').value = parseFloat(data.paid_amount || 0).toFixed(3);
+            
+            if (data.status === 'partially_paid') {
+                document.getElementById('editPaidAmountContainer').style.display = 'block';
+            } else {
+                document.getElementById('editPaidAmountContainer').style.display = 'none';
+            }
             
             const tableBody = document.getElementById('editInvoiceItemsTableBody');
             tableBody.innerHTML = '';
@@ -3054,7 +3146,38 @@ document.addEventListener('DOMContentLoaded', function() {
             });
             document.getElementById('invSubtotal').textContent = 'OMR ' + parseFloat(data.total_amount).toFixed(3);
             document.getElementById('invVatAmount').textContent = 'OMR ' + (parseFloat(data.vat_amount) || 0).toFixed(3);
-            document.getElementById('invGrandTotal').textContent = 'OMR ' + (parseFloat(data.total_with_vat) || parseFloat(data.total_amount)).toFixed(3);
+            const grandTotalValue = (parseFloat(data.total_with_vat) || parseFloat(data.total_amount));
+            document.getElementById('invGrandTotal').textContent = 'OMR ' + grandTotalValue.toFixed(3);
+
+            // Payment Info
+            document.getElementById('invTotalInfo').textContent = 'OMR ' + grandTotalValue.toFixed(3);
+            document.getElementById('invPaidInfo').textContent = 'OMR ' + parseFloat(data.paid_amount || 0).toFixed(3);
+            const balance = grandTotalValue - parseFloat(data.paid_amount || 0);
+            document.getElementById('invBalanceInfo').textContent = 'OMR ' + balance.toFixed(3);
+
+            // Fetch and show payment history
+            const paymentsBody = document.getElementById('invPaymentsBody');
+            const paymentsSection = document.getElementById('invPaymentsSection');
+            paymentsBody.innerHTML = '';
+            
+            fetch(`index.php?action=get_payments&invoice_id=${data.id}`)
+                .then(res => res.json())
+                .then(payments => {
+                    if (payments && payments.length > 0) {
+                        payments.forEach(p => {
+                            const tr = document.createElement('tr');
+                            tr.innerHTML = `
+                                <td>${p.payment_date}</td>
+                                <td>${p.payment_method}</td>
+                                <td class="text-end fw-bold">OMR ${parseFloat(p.amount).toFixed(3)}</td>
+                            `;
+                            paymentsBody.appendChild(tr);
+                        });
+                        paymentsSection.style.display = 'block';
+                    } else {
+                        paymentsSection.style.display = 'none';
+                    }
+                });
 
             // Generate QR Code
             const companyName = "<?= htmlspecialchars($data['settings']['company_name'] ?? 'My Company') ?>";
@@ -3069,5 +3192,41 @@ document.addEventListener('DOMContentLoaded', function() {
 </script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     <script src="assets/js/main.js?v=<?php echo time(); ?>"></script>
+
+    <!-- POS Receipt Modal -->
+    <div class="modal fade" id="posReceiptModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-sm">
+            <div class="modal-content border-0">
+                <div class="modal-header border-0 pb-0">
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body pt-0">
+                    <div id="posReceiptContent">
+                        <!-- Receipt content will be generated here -->
+                    </div>
+                </div>
+                <div class="modal-footer border-0">
+                    <button type="button" class="btn btn-primary w-100" onclick="printPosReceipt()">
+                        <i class="bi bi-printer me-2"></i>PRINT RECEIPT
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="posPrintArea" class="d-none"></div>
+
+    <script>
+    function printPosReceipt() {
+        const content = document.getElementById('posReceiptContent').innerHTML;
+        const printArea = document.getElementById('posPrintArea');
+        printArea.innerHTML = `<div class="thermal-receipt thermal-receipt-print">${content}</div>`;
+        
+        document.body.classList.add('printing-receipt');
+        window.print();
+        document.body.classList.remove('printing-receipt');
+        location.reload();
+    }
+    </script>
 </body>
 </html>