Update app.py

app.py

@@ -7,7 +7,7 @@ import hashlib
 import json
 from urllib.parse import unquote, parse_qs, quote
 import time
-from datetime import datetime
+from datetime import datetime, timezone, timedelta
 import logging
 import threading
 import random
@@ -31,12 +31,17 @@ app.secret_key = os.urandom(24)
 _data_lock = threading.Lock()
 visitor_data_cache = {}
 
+BISHKEK_TZ = timezone(timedelta(hours=6))
+
 def generate_unique_id(all_data):
     while True:
         new_id = str(random.randint(10000, 99999))
         if new_id not in all_data:
             return new_id
 
+def generate_invoice_id():
+    return f"inv_{int(time.time() * 1000)}_{random.randint(100,999)}"
+
 def download_data_from_hf():
     global visitor_data_cache
     if not HF_TOKEN_READ:
@@ -123,7 +128,7 @@ def upload_data_to_hf():
                  repo_id=REPO_ID,
                  repo_type="dataset",
                  token=HF_TOKEN_WRITE,
-                 commit_message=f"Update bonus data {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
+                 commit_message=f"Update bonus data {datetime.now(BISHKEK_TZ).strftime('%Y-%m-%d %H:%M:%S')}"
              )
         logging.info("Bonus data successfully uploaded to Hugging Face.")
     except Exception as e:
@@ -198,6 +203,7 @@ TEMPLATE = """
             --shadow-glow: 0 0 35px var(--shadow-color);
             --shadow-color-red: rgba(244, 67, 54, 0.15);
             --shadow-glow-red: 0 0 35px var(--shadow-color-red);
+            --link-color: var(--brand-yellow);
         }
         * { box-sizing: border-box; margin: 0; padding: 0; }
         html, body {
@@ -218,27 +224,11 @@ TEMPLATE = """
             flex-direction: column;
             gap: var(--padding-m);
         }
-        .header {
-            text-align: left;
-            padding: var(--padding-m) 0;
-        }
-        .logo {
-            font-size: 2.5em;
-            font-weight: 800;
-            color: var(--text-color);
-            letter-spacing: -1px;
-        }
+        .header { text-align: left; padding: var(--padding-m) 0; }
+        .logo { font-size: 2.5em; font-weight: 800; color: var(--text-color); letter-spacing: -1px; }
         .logo span { color: var(--brand-yellow); }
-        .welcome-text {
-            font-size: 1em;
-            color: var(--text-secondary-color);
-            margin-top: 4px;
-        }
-        .card-grid {
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            gap: var(--padding-m);
-        }
+        .welcome-text { font-size: 1em; color: var(--text-secondary-color); margin-top: 4px; }
+        .card-grid { display: grid; grid-template-columns: 1fr 1fr; gap: var(--padding-m); }
         .bonus-card, .debt-card {
             background: linear-gradient(145deg, #2a2a2a, #1c1c1c);
             border-radius: calc(var(--border-radius) + 8px);
@@ -247,93 +237,51 @@ TEMPLATE = """
             position: relative;
             overflow: hidden;
         }
-        .bonus-card {
-            box-shadow: var(--shadow-glow);
-            border: 1px solid rgba(255, 193, 7, 0.2);
-        }
-        .debt-card {
-            box-shadow: var(--shadow-glow-red);
-            border: 1px solid rgba(244, 67, 54, 0.2);
-        }
-        .card-label {
-            font-size: 1.1em;
-            font-weight: 500;
-            color: var(--text-secondary-color);
-            margin-bottom: 12px;
-        }
-        .bonus-amount {
-            font-size: 3em;
-            font-weight: 800;
-            color: var(--brand-yellow);
-            letter-spacing: -2px;
-            line-height: 1;
-        }
-        .debt-amount {
-            font-size: 3em;
-            font-weight: 800;
-            color: var(--brand-red);
-            letter-spacing: -2px;
-            line-height: 1;
-        }
-        .client-id-card {
-            background-color: var(--card-bg);
-            border-radius: var(--border-radius);
-            padding: var(--padding-m);
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        .client-id-label {
-            font-weight: 500;
-            color: var(--text-secondary-color);
-        }
-        .client-id-value {
-            font-size: 1.3em;
-            font-weight: 700;
-            color: var(--brand-yellow);
-            letter-spacing: 2px;
-            background-color: rgba(255,193,7,0.1);
-            padding: 4px 10px;
-            border-radius: 8px;
-        }
-        .history-section {
-            background-color: var(--card-bg);
-            border-radius: var(--border-radius);
-            padding: var(--padding-l);
-        }
-        .history-title {
-            font-size: 1.4em;
-            font-weight: 700;
-            margin-bottom: var(--padding-m);
-            padding-bottom: var(--padding-m);
-            border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-        }
-        .history-list {
-            list-style: none;
-            padding: 0;
-            margin: 0;
-            max-height: 35vh;
-            overflow-y: auto;
-        }
-        .history-item {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            padding: 14px 4px;
-            border-bottom: 1px solid rgba(255, 255, 255, 0.05);
-        }
+        .bonus-card { box-shadow: var(--shadow-glow); border: 1px solid rgba(255, 193, 7, 0.2); }
+        .debt-card { box-shadow: var(--shadow-glow-red); border: 1px solid rgba(244, 67, 54, 0.2); }
+        .card-label { font-size: 1.1em; font-weight: 500; color: var(--text-secondary-color); margin-bottom: 12px; }
+        .bonus-amount, .debt-amount { font-size: 3em; font-weight: 800; letter-spacing: -2px; line-height: 1; }
+        .bonus-amount { color: var(--brand-yellow); }
+        .debt-amount { color: var(--brand-red); }
+        .client-id-card { background-color: var(--card-bg); border-radius: var(--border-radius); padding: var(--padding-m); display: flex; justify-content: space-between; align-items: center; }
+        .client-id-label { font-weight: 500; color: var(--text-secondary-color); }
+        .client-id-value { font-size: 1.3em; font-weight: 700; color: var(--brand-yellow); letter-spacing: 2px; background-color: rgba(255,193,7,0.1); padding: 4px 10px; border-radius: 8px; }
+        .history-section { background-color: var(--card-bg); border-radius: var(--border-radius); padding: var(--padding-l); }
+        .history-title { font-size: 1.4em; font-weight: 700; margin-bottom: var(--padding-m); padding-bottom: var(--padding-m); border-bottom: 1px solid rgba(255, 255, 255, 0.1); }
+        .history-list { list-style: none; padding: 0; margin: 0; max-height: 35vh; overflow-y: auto; }
+        .history-item { display: flex; justify-content: space-between; align-items: center; padding: 14px 4px; border-bottom: 1px solid rgba(255, 255, 255, 0.05); }
         .history-item:last-child { border-bottom: none; }
         .history-details { display: flex; flex-direction: column; }
         .history-description { font-size: 1em; font-weight: 500; }
+        .history-invoice-details-link { font-size: 0.8em; color: var(--link-color); cursor: pointer; text-decoration: underline; margin-top: 4px; }
         .history-date { font-size: 0.8em; color: var(--text-secondary-color); margin-top: 4px; }
         .history-amount { font-size: 1.1em; font-weight: 700; }
         .history-amount.accrual { color: #4CAF50; }
         .history-amount.deduction { color: #F44336; }
-        .no-history {
-            text-align: center;
-            color: var(--text-secondary-color);
-            padding: 2rem 0;
+        .history-amount.invoice { color: var(--brand-yellow); }
+        .no-history { text-align: center; color: var(--text-secondary-color); padding: 2rem 0; }
+        
+        .modal {
+            display: none; position: fixed; z-index: 1000; left: 0; top: 0; width: 100%; height: 100%;
+            overflow: auto; background-color: rgba(0,0,0,0.7); backdrop-filter: blur(3px);
+            align-items: center; justify-content: center; padding: var(--padding-m);
         }
+        .modal-content {
+            background-color: var(--card-bg); color: var(--text-color);
+            padding: var(--padding-l); border-radius: var(--border-radius);
+            width: 100%; max-width: 500px;
+            box-shadow: 0 5px 25px rgba(0,0,0,0.3);
+            position: relative;
+        }
+        .modal-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: var(--padding-m); padding-bottom: var(--padding-m); border-bottom: 1px solid rgba(255,255,255,0.1); }
+        .modal-title { font-size: 1.3em; font-weight: 700; }
+        .modal-close { font-size: 1.8em; font-weight: bold; color: var(--text-secondary-color); cursor: pointer; line-height: 1; }
+        .modal-body table { width: 100%; border-collapse: collapse; margin-top: 10px; }
+        .modal-body th, .modal-body td { text-align: left; padding: 8px; border-bottom: 1px solid rgba(255,255,255,0.1); font-size: 0.9em; }
+        .modal-body th { font-weight: 600; }
+        .modal-body td.item-total, .modal-body td.grand-total { text-align: right; }
+        .modal-body .grand-total-row td { font-weight: bold; font-size: 1em; padding-top: 10px; border-top: 2px solid rgba(255,255,255,0.2); }
+
     </style>
 </head>
 <body>
@@ -367,6 +315,9 @@ TEMPLATE = """
                         <li class="history-item">
                             <div class="history-details">
                                 <span class="history-description">{{ item.description }}</span>
+                                {% if item.transaction_type == 'invoice' %}
+                                    <span class="history-invoice-details-link" onclick="showClientInvoiceDetails('{{ item.items | tojson | e }}', '{{ item.id }}')">Посмотреть детали</span>
+                                {% endif %}
                                 <span class="history-date">{{ item.date_str }}</span>
                             </div>
                             {% if item.transaction_type == 'bonus' %}
@@ -377,6 +328,10 @@ TEMPLATE = """
                                 <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'accrual' }}">
                                     {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
                                 </span>
+                            {% elif item.transaction_type == 'invoice' %}
+                                 <span class="history-amount invoice">
+                                    {{ "%.2f"|format(item.total_amount|float) }}
+                                </span>
                             {% endif %}
                         </li>
                     {% endfor %}
@@ -387,6 +342,26 @@ TEMPLATE = """
         </section>
     </div>
 
+    <div id="clientInvoiceDetailModal" class="modal">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 id="clientInvoiceModalTitle" class="modal-title">Детали накладной</h3>
+                <span class="modal-close" onclick="closeClientInvoiceModal()">×</span>
+            </div>
+            <div class="modal-body">
+                <table id="clientInvoiceItemsTable">
+                    <thead>
+                        <tr><th>Товар</th><th>Кол-во</th><th>Цена</th><th>Сумма</th></tr>
+                    </thead>
+                    <tbody></tbody>
+                    <tfoot>
+                        <tr class="grand-total-row"><td colspan="3">Итого:</td><td id="clientInvoiceGrandTotal" class="grand-total"></td></tr>
+                    </tfoot>
+                </table>
+            </div>
+        </div>
+    </div>
+
     <script>
         const tg = window.Telegram.WebApp;
 
@@ -398,6 +373,7 @@ TEMPLATE = """
             root.style.setProperty('--text-color', themeParams.text_color || '#ffffff');
             root.style.setProperty('--text-secondary-color', themeParams.hint_color || '#a0a0a0');
             root.style.setProperty('--brand-yellow', themeParams.button_color || '#FFC107');
+            root.style.setProperty('--link-color', themeParams.link_color || themeParams.button_color || '#FFC107');
             root.style.setProperty('--card-bg', themeParams.secondary_bg_color || (isDark ? '#1c1c1e' : '#f1f1f1'));
         }
         
@@ -462,6 +438,36 @@ TEMPLATE = """
                   }
              }, 3000);
         }
+
+        function showClientInvoiceDetails(invoiceItemsJson, invoiceId) {
+            const items = JSON.parse(invoiceItemsJson);
+            const modal = document.getElementById('clientInvoiceDetailModal');
+            document.getElementById('clientInvoiceModalTitle').textContent = `Детали накладной #${invoiceId.substring(0,8)}...`;
+            const tableBody = modal.querySelector('#clientInvoiceItemsTable tbody');
+            tableBody.innerHTML = '';
+            let grandTotal = 0;
+            items.forEach(item => {
+                const row = tableBody.insertRow();
+                row.insertCell().textContent = item.name;
+                row.insertCell().textContent = item.quantity;
+                row.insertCell().textContent = parseFloat(item.price_per_unit).toFixed(2);
+                row.insertCell().textContent = parseFloat(item.item_total).toFixed(2);
+                row.cells[3].classList.add('item-total');
+                grandTotal += parseFloat(item.item_total);
+            });
+            document.getElementById('clientInvoiceGrandTotal').textContent = grandTotal.toFixed(2);
+            modal.style.display = 'flex';
+        }
+
+        function closeClientInvoiceModal() {
+            document.getElementById('clientInvoiceDetailModal').style.display = 'none';
+        }
+        window.onclick = function(event) {
+            if (event.target == document.getElementById('clientInvoiceDetailModal')) {
+                closeClientInvoiceModal();
+            }
+        }
+
     </script>
 </body>
 </html>
@@ -479,19 +485,10 @@ ADMIN_TEMPLATE = """
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <style>
         :root {
-            --admin-bg: #f8f9fa;
-            --admin-text: #212529;
-            --admin-card-bg: #ffffff;
-            --admin-border: #dee2e6;
-            --admin-shadow: rgba(0, 0, 0, 0.05);
-            --admin-primary: #FFC107;
-            --admin-primary-dark: #e0a800;
-            --admin-secondary: #6c757d;
-            --admin-success: #198754;
-            --admin-danger: #dc3545;
-            --border-radius: 12px;
-            --padding: 1.5rem;
-            --font-family: 'Inter', sans-serif;
+            --admin-bg: #f8f9fa; --admin-text: #212529; --admin-card-bg: #ffffff; --admin-border: #dee2e6;
+            --admin-shadow: rgba(0, 0, 0, 0.05); --admin-primary: #FFC107; --admin-primary-dark: #e0a800;
+            --admin-secondary: #6c757d; --admin-success: #198754; --admin-danger: #dc3545;
+            --admin-info: #0dcaf0; --border-radius: 12px; --padding: 1.5rem; --font-family: 'Inter', sans-serif;
         }
         body { font-family: var(--font-family); background-color: var(--admin-bg); color: var(--admin-text); margin: 0; padding: var(--padding); line-height: 1.6; }
         .container { max-width: 1200px; margin: 0 auto; }
@@ -509,6 +506,8 @@ ADMIN_TEMPLATE = """
         .btn-primary:hover { background-color: var(--admin-primary-dark); }
         .btn-delete { background-color: var(--admin-danger); color: white; }
         .btn-delete:hover { background-color: #c82333; }
+        .btn-info { background-color: var(--admin-info); color: white; }
+        .btn-info:hover { background-color: #0baccc; }
         .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(340px, 1fr)); gap: var(--padding); margin-top: var(--padding); }
         .user-card { background-color: var(--admin-card-bg); border-radius: var(--border-radius); padding: var(--padding); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); display: flex; flex-direction: column; transition: transform 0.2s ease, box-shadow 0.2s ease; }
         .user-card:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(0, 0, 0, 0.08); }
@@ -520,12 +519,14 @@ ADMIN_TEMPLATE = """
         .user-balances .label { font-size: 0.9em; color: var(--admin-secondary); }
         .user-balances .amount.bonus { font-size: 1.8em; font-weight: 700; color: var(--admin-primary-dark); }
         .user-balances .amount.debt { font-size: 1.8em; font-weight: 700; color: var(--admin-danger); }
-        .user-actions { margin-top: auto; display: flex; flex-direction: column; gap: 0.5rem; }
+        .user-actions { margin-top: auto; display: grid; grid-template-columns: 1fr; gap: 0.5rem; }
+         .user-actions.two-buttons { grid-template-columns: 1fr 1fr; }
         .btn-manage { display: block; width: 100%; padding: 10px; background-color: var(--admin-primary); color: #000; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s; }
         .btn-manage:hover { background-color: var(--admin-primary-dark); }
         .no-users { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
         .modal { display: none; position: fixed; z-index: 1001; left: 0; top: 0; width: 100%; height: 100%; overflow: auto; background-color: rgba(0,0,0,0.5); backdrop-filter: blur(5px); }
-        .modal-content { background-color: var(--admin-bg); margin: 5% auto; padding: var(--padding); border: 1px solid var(--admin-border); width: 90%; max-width: 700px; border-radius: var(--border-radius); position: relative; box-shadow: 0 8px 30px rgba(0,0,0,0.15); }
+        .modal-content { background-color: var(--admin-bg); margin: 5% auto; padding: var(--padding); border: 1px solid var(--admin-border); width: 90%; max-width: 800px; border-radius: var(--border-radius); position: relative; box-shadow: 0 8px 30px rgba(0,0,0,0.15); }
+        .modal-content.large { max-width: 950px; }
         .modal-close { color: #aaa; position: absolute; top: 15px; right: 25px; font-size: 28px; font-weight: bold; cursor: pointer; }
         .modal-header { padding-bottom: 1rem; margin-bottom: 1.5rem; border-bottom: 1px solid var(--admin-border); }
         .modal-header h2 { margin: 0; font-size: 1.5rem; }
@@ -533,93 +534,80 @@ ADMIN_TEMPLATE = """
         .form-section { border: 1px solid var(--admin-border); border-radius: 8px; padding: 1rem; margin-bottom: 1.5rem; }
         .form-section h3 { margin-top: 0; margin-bottom: 1rem; font-size: 1.1em; }
         .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; align-items: flex-end; }
+        .form-row.three-col { grid-template-columns: 2fr 1fr 1fr; }
+        .form-row.four-col { grid-template-columns: 2fr 1fr 1fr auto; }
         .form-group { display: flex; flex-direction: column; }
         .form-group label { margin-bottom: 0.5rem; font-weight: 500; font-size: 0.9em; }
-        .form-group input { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
-        .calculation-summary { background: #f0f0f0; padding: 1rem; border-radius: 8px; margin-top: 1rem; }
+        .form-group input, .form-group button { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
+        .form-group button { background-color: var(--admin-info); color: white; cursor: pointer; }
+        .form-group button:hover { background-color: #0baccc; }
+        .calculation-summary, .invoice-summary { background: #f0f0f0; padding: 1rem; border-radius: 8px; margin-top: 1rem; }
         .summary-item { display: flex; justify-content: space-between; margin-bottom: 0.5rem; font-size: 0.95em; }
         .summary-item strong { font-weight: 600; }
-        .history-container { margin-top: 1.5rem; }
-        .history-container h3 { font-size: 1.2rem; margin-bottom: 1rem; }
-        .history-list { list-style: none; padding: 0; max-height: 200px; overflow-y: auto; border: 1px solid var(--admin-border); border-radius: 8px; }
-        .history-item { display: flex; justify-content: space-between; padding: 8px 12px; border-bottom: 1px solid var(--admin-border); }
-        .history-item:last-child { border-bottom: none; }
-        .history-item .desc { font-size: 0.9em; }
-        .history-item .date { font-size: 0.8em; color: var(--admin-secondary); }
-        .history-item .amount.bonus-accrual { color: var(--admin-success); font-weight: 600; }
-        .history-item .amount.bonus-deduction { color: var(--admin-danger); font-weight: 600; }
-        .history-item .amount.debt-accrual { color: var(--admin-danger); font-weight: 600; }
-        .history-item .amount.debt-payment { color: var(--admin-success); font-weight: 600; }
+        .history-container, .invoice-items-container, .existing-invoices-container { margin-top: 1.5rem; }
+        .history-container h3, .invoice-items-container h3, .existing-invoices-container h3 { font-size: 1.2rem; margin-bottom: 1rem; }
+        .history-list, .invoice-items-list, .existing-invoices-list { list-style: none; padding: 0; max-height: 200px; overflow-y: auto; border: 1px solid var(--admin-border); border-radius: 8px; }
+        .history-item, .invoice-item-row, .existing-invoice-item { display: flex; justify-content: space-between; align-items: center; padding: 8px 12px; border-bottom: 1px solid var(--admin-border); }
+        .history-item:last-child, .invoice-item-row:last-child, .existing-invoice-item:last-child { border-bottom: none; }
+        .history-item .desc, .invoice-item-row .name, .existing-invoice-item .desc { font-size: 0.9em; flex-grow: 1; }
+        .invoice-item-row .qty, .invoice-item-row .price, .invoice-item-row .total { font-size: 0.9em; width: 60px; text-align: right;}
+        .invoice-item-row .actions { width: 40px; text-align: right; }
+        .existing-invoice-item .actions button { font-size: 0.8em; padding: 4px 8px; }
+        .history-item .date, .existing-invoice-item .date { font-size: 0.8em; color: var(--admin-secondary); }
+        .history-item .amount, .existing-invoice-item .amount { font-weight: 600; }
+        .history-item .amount.bonus-accrual, .history-item .amount.debt-payment { color: var(--admin-success); }
+        .history-item .amount.bonus-deduction, .history-item .amount.debt-accrual { color: var(--admin-danger); }
+        .history-item .amount.invoice { color: var(--admin-info); }
         .modal-footer { margin-top: 1.5rem; display: flex; justify-content: flex-end; align-items: center; gap: 1rem;}
         .modal-footer button { padding: 12px 25px; font-size: 1.1em; border-radius: 8px; border: none; font-weight: 600; cursor: pointer; }
         .btn-submit { background-color: var(--admin-success); color: white; }
-        .status-message { text-align: center; font-weight: 500; flex-grow: 1; text-align: left; }
+        .status-message { font-weight: 500; flex-grow: 1; text-align: left; }
+        table.invoice-items-table { width: 100%; border-collapse: collapse; margin-top: 10px; }
+        table.invoice-items-table th, table.invoice-items-table td { text-align: left; padding: 8px; border-bottom: 1px solid var(--admin-border); font-size: 0.9em; }
+        table.invoice-items-table th { font-weight: 600; background-color: #f0f0f0; }
+        table.invoice-items-table td.number { text-align: right; }
     </style>
 </head>
 <body>
     <div class="container">
         <h1>Панель администратора Bonus</h1>
         <div class="summary-bar">
-            <div class="summary-card">
-                <div class="value">{{ summary.total_users }}</div>
-                <div class="label">Всего клиентов</div>
-            </div>
-            <div class="summary-card">
-                <div class="value bonus">{{ "%.2f"|format(summary.total_bonuses|float) }}</div>
-                <div class="label">Всего бонусов</div>
-            </div>
-            <div class="summary-card">
-                <div class="value debt">{{ "%.2f"|format(summary.total_debts|float) }}</div>
-                <div class="label">Всего долгов</div>
-            </div>
-             <div class="summary-card">
-                <div class="value debt">{{ summary.users_with_debt }}</div>
-                <div class="label">Клиенты с долгом</div>
-            </div>
+            <div class="summary-card"><div class="value">{{ summary.total_users }}</div><div class="label">Всего клиентов</div></div>
+            <div class="summary-card"><div class="value bonus">{{ "%.2f"|format(summary.total_bonuses|float) }}</div><div class="label">Всего бонусов</div></div>
+            <div class="summary-card"><div class="value debt">{{ "%.2f"|format(summary.total_debts|float) }}</div><div class="label">Всего долгов</div></div>
+            <div class="summary-card"><div class="value debt">{{ summary.users_with_debt }}</div><div class="label">Клиенты с долгом</div></div>
         </div>
-
         <div class="controls-bar">
             <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
             <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
         </div>
-
-        {% if users %}
-            <div class="user-grid" id="userGrid">
-                {% for user in users|sort(attribute='visited_at', reverse=true) %}
-                    <div class="user-card" data-user-id="{{ user.id }}" data-search-term="{{ user.first_name|lower }} {{ user.last_name|lower }} {{ user.username|lower }} {{ user.id }} {{ user.phone_number|lower if user.phone_number }}">
-                        <div class="user-info">
-                            <img src="{{ user.photo_url if user.photo_url else 'data:image/svg+xml;charset=UTF-8,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 100 100%27%3e%3crect width=%27100%27 height=%27100%27 fill=%27%23e9ecef%27/%3e%3ctext x=%2750%25%27 y=%2755%25%27 dominant-baseline=%27middle%27 text-anchor=%27middle%27 font-size=%2745%27 font-family=%27sans-serif%27 fill=%27%23adb5bd%27%3e?%3c/text%3e%3c/svg%3e' }}" alt="User Avatar">
-                            <div class="user-details">
-                                <div class="name">{{ user.first_name or '' }} {{ user.last_name or '' }}</div>
-                                <div class="username">@{{ user.username if user.username else user.phone_number }} | ID: {{ user.id }}</div>
-                            </div>
-                        </div>
-                        <div class="user-balances">
-                            <div>
-                               <div class="label">Бонусы</div>
-                               <div class="amount bonus">{{ "%.2f"|format(user.bonuses|float) }}</div>
-                            </div>
-                            <div>
-                               <div class="label">Долг</div>
-                               <div class="amount debt">{{ "%.2f"|format(user.debts|float if user.debts else 0) }}</div>
-                            </div>
-                        </div>
-                        <div class="user-actions">
-                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом</button>
-                            {% if user.telegram_id == None %}
-                            <button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>
-                            {% endif %}
+        <div class="user-grid" id="userGrid">
+            {% for user in users|sort(attribute='visited_at', reverse=true) %}
+                <div class="user-card" data-user-id="{{ user.id }}" data-search-term="{{ user.first_name|lower }} {{ user.last_name|lower if user.last_name }} {{ user.username|lower if user.username }} {{ user.id }} {{ user.phone_number|lower if user.phone_number }}">
+                    <div class="user-info">
+                        <img src="{{ user.photo_url if user.photo_url else 'data:image/svg+xml;charset=UTF-8,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 100 100%27%3e%3crect width=%27100%27 height=%27100%27 fill=%27%23e9ecef%27/%3e%3ctext x=%2750%25%27 y=%2755%25%27 dominant-baseline=%27middle%27 text-anchor=%27middle%27 font-size=%2745%27 font-family=%27sans-serif%27 fill=%27%23adb5bd%27%3e?%3c/text%3e%3c/svg%3e' }}" alt="User Avatar">
+                        <div class="user-details">
+                            <div class="name">{{ user.first_name or '' }} {{ user.last_name or '' }}</div>
+                            <div class="username">@{{ user.username if user.username else user.phone_number }} | ID: {{ user.id }}</div>
                         </div>
                     </div>
-                {% endfor %}
-            </div>
-        {% else %}
-            <p class="no-users">Пользователей пока нет.</p>
-        {% endif %}
+                    <div class="user-balances">
+                        <div><div class="label">Бонусы</div><div class="amount bonus">{{ "%.2f"|format(user.bonuses|float) }}</div></div>
+                        <div><div class="label">Долг</div><div class="amount debt">{{ "%.2f"|format(user.debts|float if user.debts else 0) }}</div></div>
+                    </div>
+                    <div class="user-actions {% if user.telegram_id == None %}two-buttons{% endif %}">
+                        <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом</button>
+                        {% if user.telegram_id == None %}<button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить</button>{% endif %}
+                    </div>
+                </div>
+            {% else %}
+                <p class="no-users">Пользователей пока нет.</p>
+            {% endfor %}
+        </div>
     </div>
 
     <div id="transactionModal" class="modal">
-      <div class="modal-content">
+      <div class="modal-content large">
         <span class="modal-close" onclick="closeModal('transactionModal')">×</span>
         <div class="modal-header">
             <h2 id="modalUserName"></h2>
@@ -630,20 +618,13 @@ ADMIN_TEMPLATE = """
         <div class="form-section">
             <h3>Бонусы</h3>
             <div class="form-row">
-                <div class="form-group">
-                    <label for="purchaseAmount">Сумма покупки (для начисления)</label>
-                    <input type="number" id="purchaseAmount" placeholder="1500" oninput="updateCalculations()">
-                </div>
-                <div class="form-group">
-                    <label for="deductAmount">Списать бонусов</label>
-                    <input type="number" id="deductAmount" placeholder="100" oninput="updateCalculations()">
-                </div>
+                <div class="form-group"><label for="purchaseAmount">Сумма покупки (для начисления)</label><input type="number" id="purchaseAmount" placeholder="1500" oninput="updateCalculations()"></div>
+                <div class="form-group"><label for="deductAmount">Списать бонусов</label><input type="number" id="deductAmount" placeholder="100" oninput="updateCalculations()"></div>
             </div>
             <div class="calculation-summary">
                 <div class="summary-item"><span>Текущий баланс:</span> <strong id="summaryCurrentBalance">0.00</strong></div>
                 <div class="summary-item"><span>Будет начислено (2%):</span> <strong id="summaryAccrual">+0.00</strong></div>
-                <div class="summary-item"><span>Будет списано:</span> <strong id="summaryDeduction">-0.00</strong></div>
-                <hr>
+                <div class="summary-item"><span>Будет списано:</span> <strong id="summaryDeduction">-0.00</strong></div><hr>
                 <div class="summary-item"><strong>Итоговый баланс бонусов:</strong> <strong id="summaryFinalBalance">0.00</strong></div>
             </div>
         </div>
@@ -651,71 +632,104 @@ ADMIN_TEMPLATE = """
         <div class="form-section">
             <h3>Долги</h3>
             <div class="form-row">
-                 <div class="form-group">
-                    <label for="addDebtAmount">Добавить долг</label>
-                    <input type="number" id="addDebtAmount" placeholder="500" oninput="updateCalculations()">
-                </div>
-                <div class="form-group">
-                    <label for="repayDebtAmount">Погасить долг</label>
-                    <input type="number" id="repayDebtAmount" placeholder="200" oninput="updateCalculations()">
-                </div>
+                 <div class="form-group"><label for="addDebtAmount">Добавить долг</label><input type="number" id="addDebtAmount" placeholder="500" oninput="updateCalculations()"></div>
+                 <div class="form-group"><label for="repayDebtAmount">Погасить долг</label><input type="number" id="repayDebtAmount" placeholder="200" oninput="updateCalculations()"></div>
             </div>
             <div class="calculation-summary">
                 <div class="summary-item"><span>Текущий долг:</span> <strong id="summaryCurrentDebt">0.00</strong></div>
                 <div class="summary-item"><span>Будет добавлено:</span> <strong id="summaryAddDebt">+0.00</strong></div>
-                <div class="summary-item"><span>Будет погашено:</span> <strong id="summaryRepayDebt">-0.00</strong></div>
-                <hr>
+                <div class="summary-item"><span>Будет погашено:</span> <strong id="summaryRepayDebt">-0.00</strong></div><hr>
                 <div class="summary-item"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
             </div>
         </div>
-
+        <div class="modal-footer">
+            <div id="modalStatus" class="status-message"></div>
+            <button class="btn-submit" onclick="submitTransaction()">Провести операции с бонусами/долгами</button>
+        </div>
+        <hr style="margin: 2rem 0;">
+        <div class="form-section">
+             <h3>Накладные клиента</h3>
+             <div style="margin-bottom: 1rem;"><button class="btn btn-info" onclick="openNewInvoiceModal()">Создать новую накладную</button></div>
+             <div class="existing-invoices-container">
+                <h4>Существующие накладные (<span id="existingInvoicesCount">0</span>)</h4>
+                <ul id="existingInvoicesList" class="existing-invoices-list"></ul>
+             </div>
+        </div>
         <div class="history-container">
             <h3>Общая история операций</h3>
             <ul id="modalHistoryList" class="history-list"></ul>
         </div>
-        <div class="modal-footer">
-            <div id="modalStatus" class="status-message"></div>
-            <button class="btn-submit" onclick="submitTransaction()">Провести операцию</button>
-        </div>
       </div>
     </div>
     
+    <div id="newInvoiceModal" class="modal">
+        <div class="modal-content large">
+            <span class="modal-close" onclick="closeModal('newInvoiceModal')">×</span>
+            <div class="modal-header"><h2>Новая накладная для <span id="newInvoiceModalUserName"></span></h2></div>
+            <div class="form-section">
+                <h3>Добавить товары</h3>
+                <div class="form-row four-col">
+                    <div class="form-group"><label for="invoiceItemName">Название товара</label><input type="text" id="invoiceItemName"></div>
+                    <div class="form-group"><label for="invoiceItemQty">Кол-во</label><input type="number" id="invoiceItemQty" value="1" min="1"></div>
+                    <div class="form-group"><label for="invoiceItemPrice">Цена за ед.</label><input type="number" id="invoiceItemPrice" min="0" step="0.01"></div>
+                    <div class="form-group" style="justify-content: flex-end;"><button onclick="addItemToInvoiceTable()">Добавить</button></div>
+                </div>
+            </div>
+            <div class="invoice-items-container">
+                <h3>Товары в накладной</h3>
+                <table id="currentInvoiceItemsTable" class="invoice-items-table">
+                    <thead><tr><th>Название</th><th class="number">Кол-во</th><th class="number">Цена</th><th class="number">Сумма</th><th></th></tr></thead>
+                    <tbody></tbody>
+                </table>
+                <div class="invoice-summary" style="text-align: right; margin-top:1rem;"><strong>Итого по накладной: <span id="currentInvoiceTotalAmount">0.00</span></strong></div>
+            </div>
+            <div class="modal-footer">
+                <div id="newInvoiceStatus" class="status-message"></div>
+                <button class="btn-submit" onclick="submitNewInvoice()">Сохранить накладную</button>
+            </div>
+        </div>
+    </div>
+
+    <div id="viewAdminInvoiceDetailModal" class="modal">
+        <div class="modal-content">
+            <span class="modal-close" onclick="closeModal('viewAdminInvoiceDetailModal')">×</span>
+            <div class="modal-header"><h2 id="viewAdminInvoiceModalTitle">Детали накладной</h2></div>
+            <div class="modal-body">
+                <table id="viewAdminInvoiceItemsTable" class="invoice-items-table">
+                    <thead><tr><th>Товар</th><th class="number">Кол-во</th><th class="number">Цена</th><th class="number">Сумма</th></tr></thead>
+                    <tbody></tbody>
+                    <tfoot><tr class="grand-total-row"><td colspan="3"><strong>Итого:</strong></td><td id="viewAdminInvoiceGrandTotal" class="number"><strong></strong></td></tr></tfoot>
+                </table>
+            </div>
+        </div>
+    </div>
+    
     <div id="addClientModal" class="modal">
       <div class="modal-content">
         <span class="modal-close" onclick="closeModal('addClientModal')">×</span>
-        <div class="modal-header">
-            <h2>Добавить нового клиента</h2>
-        </div>
-        <div class="form-group" style="margin-bottom: 1rem;">
-            <label for="newClientFirstName">Имя</label>
-            <input type="text" id="newClientFirstName" placeholder="Иван">
-        </div>
-        <div class="form-group" style="margin-bottom: 1.5rem;">
-            <label for="newClientPhone">Номер телефона (уникальный)</label>
-            <input type="tel" id="newClientPhone" placeholder="+79001234567">
-        </div>
-        <div class="modal-footer">
-            <div id="addClientStatus" class="status-message"></div>
-            <button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button>
-        </div>
+        <div class="modal-header"><h2>Добавить нового клиента</h2></div>
+        <div class="form-group" style="margin-bottom: 1rem;"><label for="newClientFirstName">Имя</label><input type="text" id="newClientFirstName" placeholder="Иван"></div>
+        <div class="form-group" style="margin-bottom: 1.5rem;"><label for="newClientPhone">Номер телефона (уникальный)</label><input type="tel" id="newClientPhone" placeholder="+79001234567"></div>
+        <div class="modal-footer"><div id="addClientStatus" class="status-message"></div><button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button></div>
       </div>
     </div>
 
     <script>
         const transactionModal = document.getElementById('transactionModal');
         const addClientModal = document.getElementById('addClientModal');
+        const newInvoiceModal = document.getElementById('newInvoiceModal');
+        const viewAdminInvoiceDetailModal = document.getElementById('viewAdminInvoiceDetailModal');
+
         let currentUserData = null;
+        let currentInvoiceItems = [];
 
         function searchUsers() {
             const searchTerm = document.getElementById('searchInput').value.toLowerCase();
             const userCards = document.querySelectorAll('.user-card');
             userCards.forEach(card => {
                 const cardSearchTerm = card.getAttribute('data-search-term');
-                if (cardSearchTerm.includes(searchTerm)) {
-                    card.style.display = 'flex';
-                } else {
-                    card.style.display = 'none';
-                }
+                if (cardSearchTerm.includes(searchTerm)) card.style.display = 'flex';
+                else card.style.display = 'none';
             });
         }
 
@@ -724,48 +738,182 @@ ADMIN_TEMPLATE = """
             document.getElementById('modalUserId').value = userData.id;
             document.getElementById('modalUserName').textContent = `${userData.first_name || ''} ${userData.last_name || ''}`;
             document.getElementById('modalUserUsername').textContent = `@${userData.username || userData.phone_number} | ID: ${userData.id}`;
-            document.getElementById('purchaseAmount').value = '';
-            document.getElementById('deductAmount').value = '';
-            document.getElementById('addDebtAmount').value = '';
-            document.getElementById('repayDebtAmount').value = '';
+            ['purchaseAmount', 'deductAmount', 'addDebtAmount', 'repayDebtAmount'].forEach(id => document.getElementById(id).value = '');
             document.getElementById('modalStatus').textContent = '';
-
+            
+            populateModalHistoryAndInvoices(userData);
+            updateCalculations();
+            transactionModal.style.display = 'block';
+        }
+        
+        function populateModalHistoryAndInvoices(userData) {
             const historyList = document.getElementById('modalHistoryList');
             historyList.innerHTML = '';
+            const existingInvoicesList = document.getElementById('existingInvoicesList');
+            existingInvoicesList.innerHTML = '';
+
+            const bonusHistory = (userData.history || []).map(h => ({...h, transaction_type: 'bonus', date_obj: new Date(h.date)}));
+            const debtHistory = (userData.debt_history || []).map(h => ({...h, transaction_type: 'debt', date_obj: new Date(h.date)}));
+            const invoices = (userData.invoices || []).map(inv => ({...inv, transaction_type: 'invoice', date_obj: new Date(inv.date)}));
             
-            const bonusHistory = (userData.history || []).map(h => ({...h, transaction_type: 'bonus'}));
-            const debtHistory = (userData.debt_history || []).map(h => ({...h, transaction_type: 'debt'}));
-            const combinedHistory = [...bonusHistory, ...debtHistory].sort((a, b) => new Date(b.date) - new Date(a.date));
+            const combinedHistory = [...bonusHistory, ...debtHistory, ...invoices].sort((a, b) => b.date_obj - a.date_obj);
 
             if (combinedHistory.length > 0) {
                 combinedHistory.forEach(item => {
                     const li = document.createElement('li');
                     li.className = 'history-item';
-                    let sign, amountClass, amountText;
+                    let amountClass, amountText, descText = item.description;
                     if (item.transaction_type === 'bonus') {
-                        sign = item.type === 'accrual' ? '+' : '-';
                         amountClass = item.type === 'accrual' ? 'bonus-accrual' : 'bonus-deduction';
-                        amountText = `${sign}${parseFloat(item.amount).toFixed(2)} (бонус)`;
-                    } else { // debt
-                        sign = item.type === 'accrual' ? '+' : '-';
+                        amountText = `${item.type === 'accrual' ? '+' : '-'}${parseFloat(item.amount).toFixed(2)}`;
+                    } else if (item.transaction_type === 'debt') {
                         amountClass = item.type === 'accrual' ? 'debt-accrual' : 'debt-payment';
-                        amountText = `${sign}${parseFloat(item.amount).toFixed(2)} (долг)`;
+                        amountText = `${item.type === 'accrual' ? '+' : '-'}${parseFloat(item.amount).toFixed(2)}`;
+                    } else if (item.transaction_type === 'invoice') {
+                        amountClass = 'invoice';
+                        descText = `Накладная #${item.id.substring(0,8)}...`;
+                        amountText = `${parseFloat(item.total_amount).toFixed(2)}`;
+                        li.style.cursor = "pointer";
+                        li.onclick = () => showAdminInvoiceDetails(item);
                     }
-                    li.innerHTML = `
-                        <div>
-                            <div class="desc">${item.description}</div>
-                            <div class="date">${item.date_str}</div>
-                        </div>
-                        <div class="amount ${amountClass}">${amountText}</div>
-                    `;
+                    li.innerHTML = `<div><div class="desc">${descText}</div><div class="date">${item.date_str}</div></div><div class="amount ${amountClass}">${amountText}</div>`;
                     historyList.appendChild(li);
                 });
             } else {
                 historyList.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет истории</li>';
             }
             
-            updateCalculations();
-            transactionModal.style.display = 'block';
+            document.getElementById('existingInvoicesCount').textContent = invoices.length;
+            if (invoices.length > 0) {
+                invoices.sort((a,b) => b.date_obj - a.date_obj).forEach(inv => {
+                    const invLi = document.createElement('li');
+                    invLi.className = 'existing-invoice-item';
+                    invLi.innerHTML = `
+                        <div class="desc">Накладная #${inv.id.substring(0,8)}... (${inv.items.length} поз.)</div>
+                        <div class="date">${inv.date_str}</div>
+                        <div class="amount">${parseFloat(inv.total_amount).toFixed(2)}</div>
+                        <div class="actions"><button class="btn btn-info btn-sm" onclick='showAdminInvoiceDetails(${JSON.stringify(inv)})'>Смотреть</button></div>
+                    `;
+                    existingInvoicesList.appendChild(invLi);
+                });
+            } else {
+                 existingInvoicesList.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет накладных</li>';
+            }
+        }
+
+        function openNewInvoiceModal() {
+            if (!currentUserData) return;
+            document.getElementById('newInvoiceModalUserName').textContent = `${currentUserData.first_name || ''} ${currentUserData.last_name || ''}`;
+            currentInvoiceItems = [];
+            renderCurrentInvoiceItems();
+            updateCurrentInvoiceTotal();
+            ['invoiceItemName', 'invoiceItemQty', 'invoiceItemPrice'].forEach(id => document.getElementById(id).value = (id === 'invoiceItemQty' ? '1' : ''));
+            document.getElementById('newInvoiceStatus').textContent = '';
+            newInvoiceModal.style.display = 'block';
+        }
+
+        function addItemToInvoiceTable() {
+            const name = document.getElementById('invoiceItemName').value.trim();
+            const quantity = parseInt(document.getElementById('invoiceItemQty').value);
+            const price_per_unit = parseFloat(document.getElementById('invoiceItemPrice').value);
+
+            if (!name || isNaN(quantity) || quantity <= 0 || isNaN(price_per_unit) || price_per_unit < 0) {
+                alert('Пожалуйста, введите корректные данные для товара.');
+                return;
+            }
+            currentInvoiceItems.push({ name, quantity, price_per_unit, item_total: quantity * price_per_unit });
+            renderCurrentInvoiceItems();
+            updateCurrentInvoiceTotal();
+            document.getElementById('invoiceItemName').value = '';
+            document.getElementById('invoiceItemQty').value = '1';
+            document.getElementById('invoiceItemPrice').value = '';
+            document.getElementById('invoiceItemName').focus();
+        }
+
+        function renderCurrentInvoiceItems() {
+            const tableBody = document.getElementById('currentInvoiceItemsTable').querySelector('tbody');
+            tableBody.innerHTML = '';
+            currentInvoiceItems.forEach((item, index) => {
+                const row = tableBody.insertRow();
+                row.insertCell().textContent = item.name;
+                row.insertCell().textContent = item.quantity;
+                row.insertCell().textContent = item.price_per_unit.toFixed(2);
+                row.insertCell().textContent = item.item_total.toFixed(2);
+                const actionCell = row.insertCell();
+                const removeBtn = document.createElement('button');
+                removeBtn.textContent = '×';
+                removeBtn.className = 'btn-delete btn-sm';
+                removeBtn.style.padding = '2px 6px';
+                removeBtn.onclick = () => removeInvoiceItem(index);
+                actionCell.appendChild(removeBtn);
+                ['.number', '.number', '.number'].forEach((sel, i) => row.cells[i+1].classList.add(sel.substring(1)));
+            });
+        }
+        
+        function removeInvoiceItem(index) {
+            currentInvoiceItems.splice(index, 1);
+            renderCurrentInvoiceItems();
+            updateCurrentInvoiceTotal();
+        }
+
+        function updateCurrentInvoiceTotal() {
+            const total = currentInvoiceItems.reduce((sum, item) => sum + item.item_total, 0);
+            document.getElementById('currentInvoiceTotalAmount').textContent = total.toFixed(2);
+        }
+        
+        async function submitNewInvoice() {
+            const statusEl = document.getElementById('newInvoiceStatus');
+            if (currentInvoiceItems.length === 0) {
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
+                return;
+            }
+            statusEl.style.color = 'var(--admin-secondary)';
+            statusEl.textContent = 'Сохранение накладной...';
+
+            const payload = {
+                user_id: currentUserData.id,
+                items: currentInvoiceItems,
+                total_amount: currentInvoiceItems.reduce((sum, item) => sum + item.item_total, 0)
+            };
+
+            try {
+                const response = await fetch('/admin/add_invoice', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                });
+                const result = await response.json();
+                if (response.ok) {
+                    statusEl.style.color = 'var(--admin-success)';
+                    statusEl.textContent = 'Накладная успешно сохранена!';
+                    setTimeout(() => { 
+                        closeModal('newInvoiceModal');
+                        refreshUserDataAndModal();
+                    }, 1500);
+                } else { throw new Error(result.message || 'Ошибка сохранения'); }
+            } catch (error) {
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = `Ошибка: ${error.message}`;
+            }
+        }
+        
+        function showAdminInvoiceDetails(invoiceData) {
+            document.getElementById('viewAdminInvoiceModalTitle').textContent = `Детали накладной #${invoiceData.id.substring(0,8)}...`;
+            const tableBody = viewAdminInvoiceDetailModal.querySelector('#viewAdminInvoiceItemsTable tbody');
+            tableBody.innerHTML = '';
+            let grandTotal = 0;
+            invoiceData.items.forEach(item => {
+                const row = tableBody.insertRow();
+                row.insertCell().textContent = item.name;
+                row.insertCell().textContent = item.quantity;
+                row.insertCell().textContent = parseFloat(item.price_per_unit).toFixed(2);
+                row.insertCell().textContent = parseFloat(item.item_total).toFixed(2);
+                grandTotal += parseFloat(item.item_total);
+                ['.number', '.number', '.number'].forEach((sel, i) => row.cells[i+1].classList.add(sel.substring(1)));
+            });
+            document.getElementById('viewAdminInvoiceGrandTotal').textContent = grandTotal.toFixed(2);
+            viewAdminInvoiceDetailModal.style.display = 'block';
         }
 
         function openAddClientModal() {
@@ -777,23 +925,25 @@ ADMIN_TEMPLATE = """
 
         function closeModal(modalId) {
             document.getElementById(modalId).style.display = 'none';
-            if (modalId === 'transactionModal') {
-                currentUserData = null;
-            }
+            if (modalId === 'transactionModal') currentUserData = null;
+            if (modalId === 'newInvoiceModal') currentInvoiceItems = [];
         }
 
         function updateCalculations() {
             if (!currentUserData) return;
-
             const currentBalance = parseFloat(currentUserData.bonuses) || 0;
             const purchaseAmount = parseFloat(document.getElementById('purchaseAmount').value) || 0;
             const deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
             const accrualAmount = purchaseAmount * 0.02;
-            let finalDeductAmount = deductAmount;
-            if (deductAmount > currentBalance) {
+            let finalDeductAmount = Math.max(0, deductAmount);
+            if (finalDeductAmount > currentBalance + accrualAmount) { // Allow deduction from newly accrued as well
+                 finalDeductAmount = currentBalance + accrualAmount; // Cap at total available after accrual
+                 document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
+            } else if (finalDeductAmount > currentBalance && purchaseAmount === 0){ // Cap at current if no accrual
                 finalDeductAmount = currentBalance;
                 document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
             }
+            
             const finalBalance = currentBalance + accrualAmount - finalDeductAmount;
             document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
             document.getElementById('summaryAccrual').textContent = `+${accrualAmount.toFixed(2)}`;
@@ -803,11 +953,17 @@ ADMIN_TEMPLATE = """
             const currentDebt = parseFloat(currentUserData.debts) || 0;
             const addDebtAmount = parseFloat(document.getElementById('addDebtAmount').value) || 0;
             const repayDebtAmount = parseFloat(document.getElementById('repayDebtAmount').value) || 0;
-            let finalRepayAmount = repayDebtAmount;
-            if (repayDebtAmount > currentDebt) {
+            let finalRepayAmount = Math.max(0, repayDebtAmount);
+
+            if (finalRepayAmount > currentDebt + addDebtAmount) { // If repaying more than current debt + new debt (e.g. error or covering future)
+                finalRepayAmount = currentDebt + addDebtAmount; // Cap at total debt after adding new
+                document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
+            } else if (finalRepayAmount > currentDebt && addDebtAmount === 0) { // If only repaying and more than current debt
                 finalRepayAmount = currentDebt;
                 document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
             }
+
+
             const finalDebt = currentDebt + addDebtAmount - finalRepayAmount;
             document.getElementById('summaryCurrentDebt').textContent = currentDebt.toFixed(2);
             document.getElementById('summaryAddDebt').textContent = `+${addDebtAmount.toFixed(2)}`;
@@ -830,7 +986,7 @@ ADMIN_TEMPLATE = """
 
             if (payload.purchase_amount <= 0 && payload.deduct_amount <= 0 && payload.add_debt_amount <= 0 && payload.repay_debt_amount <= 0) {
                 statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = 'Введите сумму для любой из операций.';
+                statusEl.textContent = 'Введите сумму для одной из операций с бонусами/долгами.';
                 return;
             }
             try {
@@ -843,10 +999,8 @@ ADMIN_TEMPLATE = """
                 if (response.ok) {
                     statusEl.style.color = 'var(--admin-success)';
                     statusEl.textContent = 'Операция успешно проведена!';
-                    setTimeout(() => { location.reload(); }, 1500);
-                } else {
-                    throw new Error(result.message || 'Произошла ошибка');
-                }
+                    setTimeout(() => { refreshUserDataAndModal(); statusEl.textContent = '';}, 1500);
+                } else { throw new Error(result.message || 'Произошла ошибка'); }
             } catch (error) {
                 statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = `Ошибка: ${error.message}`;
@@ -857,18 +1011,15 @@ ADMIN_TEMPLATE = """
             const statusEl = document.getElementById('addClientStatus');
             statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Сохранение...';
-
             const payload = {
                 first_name: document.getElementById('newClientFirstName').value.trim(),
                 phone_number: document.getElementById('newClientPhone').value.trim(),
             };
-
             if (!payload.first_name || !payload.phone_number) {
                 statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = 'Имя и номер телефона обязательны.';
                 return;
             }
-
             try {
                 const response = await fetch('/admin/add_client', {
                     method: 'POST',
@@ -880,9 +1031,7 @@ ADMIN_TEMPLATE = """
                     statusEl.style.color = 'var(--admin-success)';
                     statusEl.textContent = 'Клиент успешно добавлен!';
                     setTimeout(() => { location.reload(); }, 1500);
-                } else {
-                    throw new Error(result.message || 'Произошла ошибка');
-                }
+                } else { throw new Error(result.message || 'Произошла ошибка'); }
             } catch (error) {
                 statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = `Ошибка: ${error.message}`;
@@ -890,9 +1039,7 @@ ADMIN_TEMPLATE = """
         }
 
         async function deleteClient(userId) {
-            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) {
-                return;
-            }
+            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) return;
             try {
                 const response = await fetch('/admin/delete_client', {
                     method: 'POST',
@@ -900,23 +1047,41 @@ ADMIN_TEMPLATE = """
                     body: JSON.stringify({ user_id: userId })
                 });
                 const result = await response.json();
-                if (response.ok) {
-                    location.reload();
-                } else {
-                    throw new Error(result.message || 'Не удалось удалить клиента.');
+                if (response.ok) location.reload();
+                else throw new Error(result.message || 'Не удалось удалить клиента.');
+            } catch (error) { alert(`Ошибка: ${error.message}`); }
+        }
+
+        async function refreshUserDataAndModal() {
+            if (!currentUserData || !currentUserData.id) return;
+            try {
+                const response = await fetch(`/admin/get_user_data/${currentUserData.id}`);
+                if (!response.ok) throw new Error('Failed to fetch updated user data');
+                const updatedUserData = await response.json();
+                
+                const userCard = document.querySelector(`.user-card[data-user-id="${currentUserData.id}"]`);
+                if(userCard) {
+                    userCard.querySelector('.user-balances .amount.bonus').textContent = parseFloat(updatedUserData.bonuses).toFixed(2);
+                    userCard.querySelector('.user-balances .amount.debt').textContent = parseFloat(updatedUserData.debts).toFixed(2);
+                     userCard.setAttribute('data-search-term', `${updatedUserData.first_name||''} ${updatedUserData.last_name||''} ${updatedUserData.username||''} ${updatedUserData.id} ${updatedUserData.phone_number||''}`.toLowerCase());
                 }
+                
+                currentUserData = updatedUserData;
+                populateModalHistoryAndInvoices(updatedUserData);
+                updateCalculations();
+
             } catch (error) {
-                alert(`Ошибка: ${error.message}`);
+                console.error("Error refreshing user data:", error);
+                document.getElementById('modalStatus').textContent = 'Ошибка обновления данных. Перезагрузите.';
             }
         }
 
+
         window.onclick = function(event) {
-            if (event.target == transactionModal) {
-                closeModal('transactionModal');
-            }
-            if (event.target == addClientModal) {
-                closeModal('addClientModal');
-            }
+            if (event.target == transactionModal) closeModal('transactionModal');
+            if (event.target == addClientModal) closeModal('addClientModal');
+            if (event.target == newInvoiceModal) closeModal('newInvoiceModal');
+            if (event.target == viewAdminInvoiceDetailModal) closeModal('viewAdminInvoiceDetailModal');
         }
     </script>
 </body>
@@ -926,38 +1091,41 @@ ADMIN_TEMPLATE = """
 @app.route('/')
 def index():
     user_id_str = request.args.get('user_id_for_test')
-    
     current_data = load_visitor_data()
     user_data = {}
 
     if user_id_str and user_id_str in current_data:
-        user_data = current_data[user_id_str]
+        user_data = current_data[user_id_str].copy()
         user_data['id'] = user_id_str
 
+        combined_history = []
         bonus_history = user_data.get('history', [])
         for item in bonus_history:
-            item['transaction_type'] = 'bonus'
+            item_copy = item.copy()
+            item_copy['transaction_type'] = 'bonus'
+            combined_history.append(item_copy)
 
         debt_history = user_data.get('debt_history', [])
         for item in debt_history:
-            item['transaction_type'] = 'debt'
-
-        combined_history = sorted(
-            bonus_history + debt_history,
-            key=lambda x: x['date'],
-            reverse=True
-        )
+            item_copy = item.copy()
+            item_copy['transaction_type'] = 'debt'
+            combined_history.append(item_copy)
+        
+        invoices = user_data.get('invoices', [])
+        for inv in invoices:
+            inv_copy = inv.copy()
+            inv_copy['transaction_type'] = 'invoice'
+            inv_copy['description'] = f"Покупка по накладной #{inv_copy['id'][:8]}..."
+            combined_history.append(inv_copy)
+
+        combined_history.sort(key=lambda x: x['date'], reverse=True)
         user_data['combined_history'] = combined_history
     else:
         user_data = {
-            "id": "N/A",
-            "bonuses": 0,
-            "debts": 0,
-            "history": [],
-            "debt_history": [],
+            "id": "N/A", "bonuses": 0, "debts": 0,
+            "history": [], "debt_history": [], "invoices": [],
             "combined_history": []
         }
-
     return render_template_string(TEMPLATE, user=user_data)
 
 @app.route('/verify', methods=['POST'])
@@ -969,7 +1137,6 @@ def verify_data():
             return jsonify({"status": "error", "message": "Missing initData"}), 400
 
         user_data_parsed, is_valid = verify_telegram_data(init_data_str)
-
         user_info_dict = {}
         if user_data_parsed and 'user' in user_data_parsed:
             try:
@@ -982,7 +1149,7 @@ def verify_data():
         if is_valid:
             tg_user_id = user_info_dict.get('id')
             if tg_user_id:
-                now = datetime.now()
+                now_dt = datetime.now(BISHKEK_TZ)
                 all_data = load_visitor_data()
                 
                 existing_user_key = None
@@ -991,6 +1158,7 @@ def verify_data():
                         existing_user_key = key
                         break
                 
+                user_id_to_save = existing_user_key
                 if existing_user_key:
                     user_entry = all_data[existing_user_key]
                     user_entry.update({
@@ -999,40 +1167,27 @@ def verify_data():
                         'username': user_info_dict.get('username'),
                         'photo_url': user_info_dict.get('photo_url'),
                         'language_code': user_info_dict.get('language_code'),
-                        'visited_at': now.timestamp(),
-                        'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S')
+                        'visited_at': now_dt.timestamp(),
+                        'visited_at_str': now_dt.strftime('%Y-%m-%d %H:%M:%S')
                     })
-                    user_id_to_save = existing_user_key
                 else:
                     new_user_id = generate_unique_id(all_data)
+                    user_id_to_save = new_user_id
                     user_entry = {
-                        'id': new_user_id,
-                        'telegram_id': tg_user_id,
-                        'first_name': user_info_dict.get('first_name'),
-                        'last_name': user_info_dict.get('last_name'),
-                        'username': user_info_dict.get('username'),
-                        'photo_url': user_info_dict.get('photo_url'),
-                        'language_code': user_info_dict.get('language_code'),
-                        'is_premium': user_info_dict.get('is_premium', False),
-                        'phone_number': None,
-                        'visited_at': now.timestamp(),
-                        'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S'),
-                        'bonuses': 0,
-                        'history': [],
-                        'debts': 0,
-                        'debt_history': []
+                        'id': new_user_id, 'telegram_id': tg_user_id,
+                        'first_name': user_info_dict.get('first_name'), 'last_name': user_info_dict.get('last_name'),
+                        'username': user_info_dict.get('username'), 'photo_url': user_info_dict.get('photo_url'),
+                        'language_code': user_info_dict.get('language_code'), 'is_premium': user_info_dict.get('is_premium', False),
+                        'phone_number': None, 'visited_at': now_dt.timestamp(), 'visited_at_str': now_dt.strftime('%Y-%m-%d %H:%M:%S'),
+                        'bonuses': 0, 'history': [], 'debts': 0, 'debt_history': [], 'invoices': []
                     }
-                    user_id_to_save = new_user_id
-                
                 save_visitor_data({user_id_to_save: user_entry})
-                
                 return jsonify({"status": "ok", "verified": True, "user_id": user_id_to_save})
             else:
                  return jsonify({"status": "error", "verified": True, "message": "User ID not found in parsed data"}), 400
         else:
             logging.warning(f"Verification failed for user: {user_info_dict.get('id')}")
             return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
-
     except Exception as e:
         logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
@@ -1042,8 +1197,9 @@ def admin_panel():
     current_data = load_visitor_data()
     users_list = []
     for user_id, user_data in current_data.items():
-        user_data['id'] = user_id
-        users_list.append(user_data)
+        user_data_copy = user_data.copy()
+        user_data_copy['id'] = user_id
+        users_list.append(user_data_copy)
     
     total_users = len(users_list)
     total_bonuses = sum(u.get('bonuses', 0) for u in users_list)
@@ -1051,14 +1207,21 @@ def admin_panel():
     users_with_debt = sum(1 for u in users_list if u.get('debts', 0) > 0)
     
     summary_stats = {
-        "total_users": total_users,
-        "total_bonuses": total_bonuses,
-        "total_debts": total_debts,
-        "users_with_debt": users_with_debt
+        "total_users": total_users, "total_bonuses": total_bonuses,
+        "total_debts": total_debts, "users_with_debt": users_with_debt
     }
-    
     return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats)
 
+@app.route('/admin/get_user_data/<user_id>', methods=['GET'])
+def get_user_data(user_id):
+    all_data = load_visitor_data()
+    if user_id in all_data:
+        user_data = all_data[user_id].copy()
+        user_data['id'] = user_id # Ensure id is part of the returned data
+        return jsonify(user_data), 200
+    return jsonify({"status": "error", "message": "User not found"}), 404
+
+
 @app.route('/admin/add_client', methods=['POST'])
 def add_client():
     try:
@@ -1070,41 +1233,25 @@ def add_client():
             return jsonify({"status": "error", "message": "Имя и номер телефона обязательны."}), 400
         
         all_data = load_visitor_data()
-
         for user in all_data.values():
             if user.get('phone_number') == phone_number:
                 return jsonify({"status": "error", "message": "Клиент с таким номером телефона уже существует."}), 409
 
-        now = datetime.now()
+        now_dt = datetime.now(BISHKEK_TZ)
         new_id = generate_unique_id(all_data)
         
         new_client = {
-            'id': new_id,
-            'telegram_id': None,
-            'first_name': first_name,
-            'last_name': None,
-            'username': None,
-            'photo_url': None,
-            'language_code': 'ru',
-            'is_premium': False,
-            'phone_number': phone_number,
-            'visited_at': now.timestamp(),
-            'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S'),
-            'bonuses': 0,
-            'history': [],
-            'debts': 0,
-            'debt_history': []
+            'id': new_id, 'telegram_id': None, 'first_name': first_name, 'last_name': None, 'username': None,
+            'photo_url': None, 'language_code': 'ru', 'is_premium': False, 'phone_number': phone_number,
+            'visited_at': now_dt.timestamp(), 'visited_at_str': now_dt.strftime('%Y-%m-%d %H:%M:%S'),
+            'bonuses': 0, 'history': [], 'debts': 0, 'debt_history': [], 'invoices': []
         }
-        
         save_visitor_data({new_id: new_client})
-
         return jsonify({"status": "ok", "message": "Client added successfully"}), 201
-
     except Exception as e:
         logging.exception("Error in /admin/add_client endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-
 @app.route('/admin/add_transaction', methods=['POST'])
 def add_transaction():
     try:
@@ -1125,62 +1272,76 @@ def add_transaction():
             return jsonify({"status": "error", "message": "User not found"}), 404
 
         user = all_data[user_id_str]
-        now = datetime.now()
-        now_iso = now.isoformat()
-        now_str = now.strftime('%Y-%m-%d %H:%M:%S')
-        
-        if deduct_amount > user.get('bonuses', 0):
-             return jsonify({"status": "error", "message": "Недостаточно бонусов для списания"}), 400
+        now_dt = datetime.now(BISHKEK_TZ)
+        now_iso = now_dt.isoformat()
+        now_str = now_dt.strftime('%Y-%m-%d %H:%M:%S')
         
-        if repay_debt_amount > user.get('debts', 0):
-            return jsonify({"status": "error", "message": "Сумма погашения превышает текущий долг"}), 400
-
-        # Bonus operations
+        current_bonuses = user.get('bonuses', 0)
         accrual_amount = purchase_amount * 0.02
-        user['bonuses'] = user.get('bonuses', 0) + accrual_amount - deduct_amount
-        if 'history' not in user or not isinstance(user['history'], list):
-            user['history'] = []
+        
+        # Ensure deduct_amount is not more than available after potential accrual
+        if deduct_amount > current_bonuses + accrual_amount:
+             return jsonify({"status": "error", "message": f"Недостаточно бонусов для списания. Доступно: {(current_bonuses + accrual_amount):.2f}"}), 400
+        
+        if repay_debt_amount > user.get('debts', 0) + add_debt_amount:
+            return jsonify({"status": "error", "message": f"Сумма погашения превышает текущий долг. Доступно к погашению: {(user.get('debts', 0) + add_debt_amount):.2f}"}), 400
 
+        user['bonuses'] = current_bonuses + accrual_amount - deduct_amount
+        if 'history' not in user or not isinstance(user['history'], list): user['history'] = []
         if accrual_amount > 0:
-            user['history'].append({
-                "type": "accrual", "amount": accrual_amount,
-                "description": f"Начисление с покупки {purchase_amount}",
-                "date": now_iso, "date_str": now_str
-            })
+            user['history'].append({"type": "accrual", "amount": accrual_amount, "description": f"Начисление с покупки {purchase_amount}", "date": now_iso, "date_str": now_str})
         if deduct_amount > 0:
-            user['history'].append({
-                "type": "deduction", "amount": deduct_amount,
-                "description": "Списание бонусов",
-                "date": now_iso, "date_str": now_str
-            })
+            user['history'].append({"type": "deduction", "amount": deduct_amount, "description": "Списание бонусов", "date": now_iso, "date_str": now_str})
 
-        # Debt operations
         user['debts'] = user.get('debts', 0) + add_debt_amount - repay_debt_amount
-        if 'debt_history' not in user or not isinstance(user['debt_history'], list):
-            user['debt_history'] = []
-
+        if 'debt_history' not in user or not isinstance(user['debt_history'], list): user['debt_history'] = []
         if add_debt_amount > 0:
-            user['debt_history'].append({
-                "type": "accrual", "amount": add_debt_amount,
-                "description": "Добавление долга",
-                "date": now_iso, "date_str": now_str
-            })
+            user['debt_history'].append({"type": "accrual", "amount": add_debt_amount, "description": "Добавление долга", "date": now_iso, "date_str": now_str})
         if repay_debt_amount > 0:
-            user['debt_history'].append({
-                "type": "payment", "amount": repay_debt_amount,
-                "description": "Погашение долга",
-                "date": now_iso, "date_str": now_str
-            })
+            user['debt_history'].append({"type": "payment", "amount": repay_debt_amount, "description": "Погашение долга", "date": now_iso, "date_str": now_str})
         
         save_visitor_data({user_id_str: user})
+        return jsonify({"status": "ok", "message": "Transaction successful", "new_balance": user['bonuses'], "new_debt": user['debts']}), 200
+    except Exception as e:
+        logging.exception("Error in /admin/add_transaction endpoint")
+        return jsonify({"status": "error", "message": str(e)}), 500
 
-        return jsonify({
-            "status": "ok", "message": "Transaction successful", 
-            "new_balance": user['bonuses'], "new_debt": user['debts']
-        }), 200
+@app.route('/admin/add_invoice', methods=['POST'])
+def add_invoice():
+    try:
+        data = request.get_json()
+        user_id = data.get('user_id')
+        items = data.get('items')
+        total_amount = float(data.get('total_amount', 0))
+
+        if not user_id or not items or not isinstance(items, list) or len(items) == 0:
+            return jsonify({"status": "error", "message": "Некорректные данные для накладной."}), 400
 
+        user_id_str = str(user_id)
+        all_data = load_visitor_data()
+        if user_id_str not in all_data:
+            return jsonify({"status": "error", "message": "Клиент не найден."}), 404
+        
+        user = all_data[user_id_str]
+        now_dt = datetime.now(BISHKEK_TZ)
+        
+        invoice_id = generate_invoice_id()
+        new_invoice = {
+            "id": invoice_id,
+            "date": now_dt.isoformat(),
+            "date_str": now_dt.strftime('%Y-%m-%d %H:%M:%S'),
+            "items": items,
+            "total_amount": total_amount
+        }
+
+        if 'invoices' not in user or not isinstance(user['invoices'], list):
+            user['invoices'] = []
+        user['invoices'].append(new_invoice)
+        
+        save_visitor_data({user_id_str: user})
+        return jsonify({"status": "ok", "message": "Накладная успешно добавлена.", "invoice_id": invoice_id}), 201
     except Exception as e:
-        logging.exception("Error in /admin/add_transaction endpoint")
+        logging.exception("Error in /admin/add_invoice endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/admin/delete_client', methods=['POST'])
@@ -1188,23 +1349,16 @@ def delete_client():
     try:
         data = request.get_json()
         user_id = data.get('user_id')
-
-        if not user_id:
-            return jsonify({"status": "error", "message": "User ID is required"}), 400
-
+        if not user_id: return jsonify({"status": "error", "message": "User ID is required"}), 400
         user_id_str = str(user_id)
         load_visitor_data()
-
         with _data_lock:
             if user_id_str not in visitor_data_cache:
                 return jsonify({"status": "error", "message": "User not found"}), 404
-
             user_to_delete = visitor_data_cache[user_id_str]
             if user_to_delete.get('telegram_id') is not None:
                 return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
-
             del visitor_data_cache[user_id_str]
-
             try:
                 with open(DATA_FILE, 'w', encoding='utf-8') as f:
                     json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
@@ -1213,9 +1367,7 @@ def delete_client():
             except Exception as e:
                 logging.error(f"Error saving data after deletion: {e}")
                 return jsonify({"status": "error", "message": "Failed to save data after deletion"}), 500
-
         return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
-
     except Exception as e:
         logging.exception("Error in /admin/delete_client endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
@@ -1228,15 +1380,11 @@ if __name__ == '__main__':
     else:
          print("Attempting initial data download from Hugging Face...")
          download_data_from_hf()
-
     load_visitor_data()
-
     print("WARNING: The /admin route is NOT protected. Implement proper authentication for production.")
-    
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
         print("Periodic backup thread started (every hour).")
-
     print("--- Server Ready ---")
     app.run(host=HOST, port=PORT, debug=False)