diff --git "a/app.py" "b/app.py"
--- "a/app.py"
+++ "b/app.py"
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python3
 
 import os
@@ -7,12 +8,13 @@ import hashlib
 import json
 from urllib.parse import unquote, parse_qs, quote
 import time
-from datetime import datetime, timezone
+from datetime import datetime
 import logging
 import threading
 import random
 from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError
+import pytz
 
 BOT_TOKEN = os.getenv("BOT_TOKEN", "7835463659:AAGNePbelZIAOeaglyQi1qulOqnjs4BGQn4")
 HOST = '0.0.0.0'
@@ -24,17 +26,15 @@ HF_DATA_FILE_PATH = "data.json"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
+BISHKEK_TZ = pytz.timezone('Asia/Bishkek')
+
 app = Flask(__name__)
 logging.basicConfig(level=logging.INFO)
 app.secret_key = os.urandom(24)
 
 _data_lock = threading.Lock()
 visitor_data_cache = {}
-
-KYRGYZSTAN_TIMEZONE = timezone(timedelta(hours=6)) # UTC+6 for Bishkek
-
-def get_current_time_kyrgyzstan():
-    return datetime.now(KYRGYZSTAN_TIMEZONE)
+org_contact_info_cache = {}
 
 def generate_unique_id(all_data):
     while True:
@@ -43,7 +43,7 @@ def generate_unique_id(all_data):
             return new_id
 
 def download_data_from_hf():
-    global visitor_data_cache
+    global visitor_data_cache, org_contact_info_cache
     if not HF_TOKEN_READ:
         logging.warning("HF_TOKEN_READ not set. Skipping Hugging Face download.")
         return False
@@ -63,11 +63,14 @@ def download_data_from_hf():
         with _data_lock:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    visitor_data_cache = json.load(f)
+                    full_data = json.load(f)
+                    visitor_data_cache = full_data.get('users', {})
+                    org_contact_info_cache = full_data.get('org_contact_info', {})
                 logging.info("Successfully loaded downloaded data into cache.")
             except (FileNotFoundError, json.JSONDecodeError) as e:
                  logging.error(f"Error reading downloaded data file: {e}. Starting with empty cache.")
                  visitor_data_cache = {}
+                 org_contact_info_cache = {}
         return True
     except RepositoryNotFoundError:
         logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download data.")
@@ -75,35 +78,60 @@ def download_data_from_hf():
         logging.error(f"Error downloading data from Hugging Face: {e}")
     return False
 
-def load_visitor_data():
-    global visitor_data_cache
+def load_full_data():
+    global visitor_data_cache, org_contact_info_cache
     with _data_lock:
-        if not visitor_data_cache:
-            try:
-                with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    visitor_data_cache = json.load(f)
-                logging.info("Visitor data loaded from local JSON.")
-            except FileNotFoundError:
-                logging.warning(f"{DATA_FILE} not found locally. Starting with empty data.")
-                visitor_data_cache = {}
-            except json.JSONDecodeError:
-                logging.error(f"Error decoding {DATA_FILE}. Starting with empty data.")
-                visitor_data_cache = {}
-            except Exception as e:
-                logging.error(f"Unexpected error loading visitor data: {e}")
-                visitor_data_cache = {}
-        return visitor_data_cache
+        # Check cache first
+        if visitor_data_cache or org_contact_info_cache:
+             return {'users': visitor_data_cache, 'org_contact_info': org_contact_info_cache}
 
-def save_visitor_data(data):
+        try:
+            with open(DATA_FILE, 'r', encoding='utf-8') as f:
+                full_data = json.load(f)
+                visitor_data_cache = full_data.get('users', {})
+                org_contact_info_cache = full_data.get('org_contact_info', {})
+            logging.info("Full data loaded from local JSON.")
+        except FileNotFoundError:
+            logging.warning(f"{DATA_FILE} not found locally. Starting with empty data.")
+            visitor_data_cache = {}
+            org_contact_info_cache = {}
+        except json.JSONDecodeError:
+            logging.error(f"Error decoding {DATA_FILE}. Starting with empty data.")
+            visitor_data_cache = {}
+            org_contact_info_cache = {}
+        except Exception as e:
+            logging.error(f"Unexpected error loading full data: {e}")
+            visitor_data_cache = {}
+            org_contact_info_cache = {}
+
+        return {'users': visitor_data_cache, 'org_contact_info': org_contact_info_cache}
+
+
+def save_full_data():
     with _data_lock:
         try:
-            visitor_data_cache.update(data)
+            full_data_to_save = {
+                'users': visitor_data_cache,
+                'org_contact_info': org_contact_info_cache
+            }
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
-                json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
-            logging.info(f"Visitor data successfully saved to {DATA_FILE}.")
+                json.dump(full_data_to_save, f, ensure_ascii=False, indent=4)
+            logging.info(f"Full data successfully saved to {DATA_FILE}.")
             upload_data_to_hf_async()
         except Exception as e:
-            logging.error(f"Error saving visitor data: {e}")
+            logging.error(f"Error saving full data: {e}")
+
+
+def save_visitor_data(data):
+    with _data_lock:
+        visitor_data_cache.update(data)
+    save_full_data()
+
+def save_org_contact_info(info):
+    global org_contact_info_cache
+    with _data_lock:
+        org_contact_info_cache = info
+    save_full_data()
 
 def upload_data_to_hf():
     if not HF_TOKEN_WRITE:
@@ -128,7 +156,7 @@ def upload_data_to_hf():
                  repo_id=REPO_ID,
                  repo_type="dataset",
                  token=HF_TOKEN_WRITE,
-                 commit_message=f"Update bonus data {get_current_time_kyrgyzstan().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:
@@ -145,7 +173,7 @@ def periodic_backup():
      while True:
          time.sleep(3600)
          logging.info("Initiating periodic backup...")
-         upload_data_to_hf()
+         save_full_data() # Save locally and trigger HF upload
 
 def verify_telegram_data(init_data_str):
     try:
@@ -168,6 +196,8 @@ def verify_telegram_data(init_data_str):
             current_time = int(time.time())
             if current_time - auth_date > 86400:
                  logging.warning(f"Telegram InitData is older than 24 hours (Auth Date: {auth_date}, Current: {current_time}).")
+                 # Decide if you want to fail verification for old data
+                 # return parsed_data, False # Uncomment to fail old data
             return parsed_data, True
         else:
             logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
@@ -204,6 +234,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);
+            --section-bg: #2c2c2e;
         }
         * { box-sizing: border-box; margin: 0; padding: 0; }
         html, body {
@@ -214,7 +245,7 @@ TEMPLATE = """
             overscroll-behavior-y: none;
             -webkit-font-smoothing: antialiased;
             -moz-osx-font-smoothing: grayscale;
-            visibility: hidden;
+            visibility: hidden; /* Hide until theme applied or loaded */
             min-height: 100vh;
         }
         .container {
@@ -261,21 +292,21 @@ TEMPLATE = """
             box-shadow: var(--shadow-glow-red);
             border: 1px solid rgba(244, 67, 54, 0.2);
         }
-        .card-label {
-            font-size: 1.1em;
+         .card-label {
+            font-size: 1em;
             font-weight: 500;
             color: var(--text-secondary-color);
             margin-bottom: 12px;
         }
         .bonus-amount {
-            font-size: 3em;
+            font-size: 2.5em;
             font-weight: 800;
             color: var(--brand-yellow);
             letter-spacing: -2px;
             line-height: 1;
         }
         .debt-amount {
-            font-size: 3em;
+            font-size: 2.5em;
             font-weight: 800;
             color: var(--brand-red);
             letter-spacing: -2px;
@@ -292,68 +323,71 @@ TEMPLATE = """
         .client-id-label {
             font-weight: 500;
             color: var(--text-secondary-color);
+            font-size: 0.9em;
         }
         .client-id-value {
-            font-size: 1.3em;
+            font-size: 1.1em;
             font-weight: 700;
             color: var(--brand-yellow);
-            letter-spacing: 2px;
+            letter-spacing: 1px;
             background-color: rgba(255,193,7,0.1);
-            padding: 4px 10px;
+            padding: 4px 8px;
             border-radius: 8px;
         }
-        .navigation-buttons {
-            display: grid;
-            grid-template-columns: repeat(3, 1fr);
-            gap: var(--padding-m);
-            margin-top: var(--padding-m);
+
+        .navigation {
+            display: flex;
+            justify-content: space-around;
+            gap: 10px;
+            margin-bottom: var(--padding-m);
         }
+
         .nav-button {
+            flex-grow: 1;
+            padding: 12px;
             background-color: var(--card-bg);
+            color: var(--text-color);
+            border: none;
             border-radius: var(--border-radius);
-            padding: var(--padding-m);
-            text-align: center;
+            font-size: 0.9em;
+            font-weight: 600;
             cursor: pointer;
-            transition: background-color 0.2s ease, transform 0.2s ease;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            height: 80px;
-            border: 1px solid rgba(255, 255, 255, 0.05);
+            transition: background-color 0.2s ease;
+            text-align: center;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.2);
         }
         .nav-button:hover {
-            background-color: #2a2a2c;
-            transform: translateY(-3px);
-        }
-        .nav-button-icon {
-            font-size: 1.8em;
-            margin-bottom: 8px;
-            color: var(--brand-yellow);
+            background-color: #3a3a3c;
         }
-        .nav-button-text {
-            font-size: 0.9em;
-            font-weight: 500;
-            color: var(--text-secondary-color);
+        .nav-button.active {
+            background-color: var(--brand-yellow);
+            color: var(--brand-black);
         }
-        .history-section {
-            background-color: var(--card-bg);
+
+        .content-section {
+            background-color: var(--section-bg);
             border-radius: var(--border-radius);
             padding: var(--padding-l);
-            margin-top: var(--padding-m);
+            display: none; /* Hidden by default */
+        }
+        .content-section.active {
+            display: block;
         }
-        .history-title {
+
+        .section-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 Styles */
         .history-list {
             list-style: none;
             padding: 0;
             margin: 0;
-            max-height: 35vh;
+            max-height: 40vh; /* Limit height for scrolling */
             overflow-y: auto;
         }
         .history-item {
@@ -364,110 +398,103 @@ TEMPLATE = """
             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-details { display: flex; flex-direction: column; flex-grow: 1; margin-right: 10px;}
+        .history-description { font-size: 1em; font-weight: 500; word-break: break-word; }
         .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 { font-size: 1.1em; font-weight: 700; flex-shrink: 0; }
         .history-amount.accrual { color: var(--brand-green); }
         .history-amount.deduction { color: var(--brand-red); }
-        .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.5);
-            backdrop-filter: blur(5px);
-            -webkit-backdrop-filter: blur(5px);
-            padding: 20px;
-            box-sizing: border-box;
+        .history-amount.payment { color: var(--brand-green); } /* For debt payments */
+        .history-amount.debt-accrual { color: var(--brand-red); } /* For adding debt */
+
+        /* Invoice Styles */
+        .invoice-list {
+            list-style: none;
+            padding: 0;
+            margin: 0;
+            max-height: 40vh; /* Limit height for scrolling */
+            overflow-y: auto;
         }
-        .modal-content {
+        .invoice-item {
             background-color: var(--card-bg);
-            margin: 20px auto;
-            padding: var(--padding-l);
-            border: 1px solid rgba(255, 255, 255, 0.05);
             border-radius: var(--border-radius);
-            width: 100%;
-            max-width: 700px;
-            box-shadow: 0 0 30px rgba(255, 193, 7, 0.1);
+            margin-bottom: var(--padding-m);
+            padding: var(--padding-m);
+            border: 1px solid rgba(255, 255, 255, 0.1);
         }
-        .modal-header {
+        .invoice-summary {
             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-header h2 {
-            font-size: 1.5em;
-            font-weight: 700;
-            color: var(--brand-yellow);
+            margin-bottom: 10px;
+            cursor: pointer; /* Make summary clickable to toggle items */
+        }
+        .invoice-summary .date { font-size: 0.9em; color: var(--text-secondary-color); }
+        .invoice-summary .total { font-size: 1.2em; font-weight: 700; color: var(--brand-yellow); }
+        .invoice-details {
+            margin-top: 10px;
+            padding-top: 10px;
+            border-top: 1px solid rgba(255, 255, 255, 0.05);
+            display: none; /* Hidden by default */
+        }
+        .invoice-details.expanded { display: block; }
+        .invoice-item-list { list-style: none; padding: 0; margin: 0; }
+        .invoice-line-item {
+            display: flex;
+            justify-content: space-between;
+            font-size: 0.9em;
+            padding: 5px 0;
+            border-bottom: 1px dashed rgba(255, 255, 255, 0.03);
         }
-        .modal-close {
-            font-size: 2em;
-            cursor: pointer;
+        .invoice-line-item:last-child { border-bottom: none; }
+        .invoice-line-item .item-name { flex-grow: 1; margin-right: 10px; }
+        .invoice-line-item .item-qty-price { flex-shrink: 0; text-align: right; color: var(--text-secondary-color); }
+        .no-items {
+            text-align: center;
             color: var(--text-secondary-color);
-            line-height: 1;
-        }
-        .modal-close:hover {
-            color: var(--text-color);
+            padding: 2rem 0;
         }
-        .invoice-section {
-            background-color: var(--card-bg);
-            border-radius: var(--border-radius);
-            padding: var(--padding-m);
-            margin-bottom: var(--padding-m);
-            border: 1px solid rgba(255, 255, 255, 0.05);
+
+        /* Contact Info Styles */
+        .contact-info-details {
+            display: flex;
+            flex-direction: column;
+            gap: 15px;
         }
-        .invoice-title {
-            font-size: 1.3em;
-            font-weight: 700;
-            margin-bottom: var(--padding-m);
-            color: var(--brand-yellow);
+        .contact-item {
             display: flex;
-            justify-content: space-between;
             align-items: center;
+            gap: 15px;
+            font-size: 1em;
         }
-        .invoice-date {
-            font-size: 0.9em;
-            color: var(--text-secondary-color);
-        }
-        .invoice-item {
+        .contact-item a {
+            color: var(--text-color);
+            text-decoration: none;
             display: flex;
-            justify-content: space-between;
-            padding: 10px 0;
-            border-bottom: 1px dashed rgba(255, 255, 255, 0.1);
-            font-size: 0.95em;
+            align-items: center;
+            gap: 10px;
+            word-break: break-word;
+        }
+        .contact-item a:hover {
+             color: var(--brand-yellow);
         }
-        .invoice-item:last-child {
-            border-bottom: none;
+        .contact-item svg {
+            width: 24px;
+            height: 24px;
+            fill: var(--brand-yellow);
+            flex-shrink: 0;
         }
-        .invoice-item .name { flex-grow: 1; margin-right: 10px; }
-        .invoice-item .quantity { min-width: 50px; text-align: right; margin-right: 10px; }
-        .invoice-item .price { min-width: 80px; text-align: right; }
-        .invoice-total {
-            text-align: right;
+         .org-name {
             font-size: 1.2em;
             font-weight: 700;
-            margin-top: var(--padding-m);
-            padding-top: var(--padding-m);
-            border-top: 1px solid rgba(255, 255, 255, 0.1);
-        }
-        .no-invoices {
-            text-align: center;
-            color: var(--text-secondary-color);
-            padding: 2rem 0;
-        }
+            margin-bottom: var(--padding-m);
+         }
+         .no-contact-info {
+             text-align: center;
+             color: var(--text-secondary-color);
+             padding: 2rem 0;
+         }
+
     </style>
 </head>
 <body>
@@ -493,26 +520,17 @@ TEMPLATE = """
             <p class="client-id-value">{{ user.id }}</p>
         </section>
 
-        <section class="navigation-buttons">
-            <div class="nav-button" onclick="openModal('businessCardModal')">
-                <div class="nav-button-icon">🏢</div>
-                <div class="nav-button-text">Визитка</div>
-            </div>
-            <div class="nav-button" onclick="openModal('invoicesModal')">
-                <div class="nav-button-icon">📄</div>
-                <div class="nav-button-text">Накладные</div>
-            </div>
-            <div class="nav-button" onclick="openModal('historyModal')">
-                <div class="nav-button-icon">⏱️</div>
-                <div class="nav-button-text">История</div>
-            </div>
-        </section>
+        <nav class="navigation">
+            <button class="nav-button" data-target="historySection">История</button>
+            <button class="nav-button" data-target="invoicesSection">Накладные</button>
+            <button class="nav-button" data-target="contactSection">Контакты</button>
+        </nav>
 
-        <section class="history-section">
-            <h2 class="history-title">Последние операции</h2>
+        <section id="historySection" class="content-section">
+            <h2 class="section-title">Истор��я операций</h2>
             {% if user.combined_history %}
                 <ul class="history-list">
-                    {% for item in user.combined_history[:5] %}
+                    {% for item in user.combined_history %}
                         <li class="history-item">
                             <div class="history-details">
                                 <span class="history-description">{{ item.description }}</span>
@@ -523,135 +541,128 @@ TEMPLATE = """
                                     {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
                                 </span>
                             {% elif item.transaction_type == 'debt' %}
-                                <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'accrual' }}">
-                                    {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
+                                <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'payment' }}"> {# 'accrual' for debt means adding debt (deduction from balance perspective), 'payment' means reducing debt (accrual from balance perspective) #}
+                                    {{ '+' if item.type == 'payment' else '-' }}{{ "%.2f"|format(item.amount|float) }}
+                                </span>
+                             {% elif item.transaction_type == 'invoice' %}
+                                <span class="history-amount">
+                                    {{ "%.2f"|format(item.total_amount|float) }}
                                 </span>
                             {% endif %}
                         </li>
                     {% endfor %}
                 </ul>
-                {% if user.combined_history|length > 5 %}
-                    <p style="text-align: center; margin-top: 16px;"><a href="#" onclick="openModal('historyModal'); return false;" style="color: var(--brand-yellow); text-decoration: none;">Посмотреть всю историю</a></p>
-                {% endif %}
             {% else %}
-                <p class="no-history">Операций пока не было.</p>
+                <p class="no-items">Операций пока не было.</p>
             {% endif %}
         </section>
-    </div>
 
-    <!-- Business Card Modal -->
-    <div id="businessCardModal" class="modal">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2>Визитная карточка</h2>
-                <span class="modal-close" onclick="closeModal('businessCardModal')">×</span>
-            </div>
-            <div class="invoice-section" style="text-align: center;">
-                <h3 style="color: var(--brand-yellow); margin-bottom: var(--padding-m);">{{ business_info.name }}</h3>
-                <p style="color: var(--text-secondary-color); margin-bottom: 8px;">{{ business_info.address }}</p>
-                <p style="color: var(--text-secondary-color); margin-bottom: 8px;">Тел: {{ business_info.phone1 }}</p>
-                {% if business_info.phone2 %}
-                <p style="color: var(--text-secondary-color); margin-bottom: 8px;">Тел: {{ business_info.phone2 }}</p>
-                {% endif %}
-                <div style="margin-top: 16px;">
-                    <a href="tel:{{ business_info.phone1 }}" style="text-decoration: none; margin: 0 8px;"><img src="https://img.icons8.com/ios-glyphs/30/FFC107/phone.png" alt="Call"></a>
-                    {% if business_info.whatsapp %}
-                    <a href="https://wa.me/{{ business_info.whatsapp.replace('+', '') }}" target="_blank" style="text-decoration: none; margin: 0 8px;"><img src="https://img.icons8.com/ios-filled/30/FFC107/whatsapp.png" alt="WhatsApp"></a>
-                    {% endif %}
-                    {% if business_info.telegram_username %}
-                    <a href="https://t.me/{{ business_info.telegram_username.lstrip('@') }}" target="_blank" style="text-decoration: none; margin: 0 8px;"><img src="https://img.icons8.com/ios-filled/30/FFC107/telegram-app.png" alt="Telegram"></a>
-                    {% endif %}
-                </div>
-            </div>
-        </div>
-    </div>
+        <section id="invoicesSection" class="content-section">
+             <h2 class="section-title">Мои накладные</h2>
+             {% if user.invoices %}
+                 <ul class="invoice-list">
+                     {% for invoice in user.invoices|sort(attribute='date', reverse=true) %}
+                         <li class="invoice-item">
+                             <div class="invoice-summary" onclick="toggleInvoiceDetails(this)">
+                                 <span class="date">{{ invoice.date_str }}</span>
+                                 <span class="total">{{ "%.2f"|format(invoice.total_amount|float) }} ₽</span> {# Assuming Rubles #}
+                             </div>
+                             <div class="invoice-details">
+                                 <ul class="invoice-item-list">
+                                     {% for item in invoice.items %}
+                                         <li class="invoice-line-item">
+                                             <span class="item-name">{{ item.name }}</span>
+                                             <span class="item-qty-price">{{ item.quantity }} x {{ "%.2f"|format(item.price_per_unit|float) }} ₽</span>
+                                         </li>
+                                     {% endfor %}
+                                 </ul>
+                             </div>
+                         </li>
+                     {% endfor %}
+                 </ul>
+             {% else %}
+                 <p class="no-items">У вас пока нет накладных.</p>
+             {% endif %}
+        </section>
+
+         <section id="contactSection" class="content-section">
+             <h2 class="section-title">Контакты организации</h2>
+             {% if contact_info %}
+                <div class="org-name">{{ contact_info.name or 'Организация' }}</div>
+                 <div class="contact-info-details">
+                     {% if contact_info.phone %}
+                     <div class="contact-item">
+                         <a href="tel:{{ contact_info.phone }}">
+                             <svg viewBox="0 0 24 24"><path d="M20 15.586c-1.93 0-3.8-.56-5.48-1.63l-1.18 1.18c2.88 2.9 7.1 4.13 10.66 2.41l-3-3.96zM12 3.9c-1.65 0-3.3.58-4.65 1.6L6.17 3.75C8.27 2.2 10.17 1.07 12 1.07s3.73 1.13 5.83 2.68l-1.18 1.18c-1.35-1.02-3-1.6-4.65-1.6zM15.586 20H12c-4.96 0-9-4.04-9-9c0-1.65.58-3.3 1.6-4.65L3.75 6.17C2.2 8.27 1.07 10.17 1.07 12s1.13 3.73 2.68 5.83l1.18-1.18c1.02 1.35 1.6 3 1.6 4.65h3.586zm-3-8c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"/></svg>
+                             {{ contact_info.phone }} (Позвонить)
+                         </a>
+                     </div>
+                     {% endif %}
+                     {% if contact_info.whatsapp %}
+                     <div class="contact-item">
+                         <a href="https://wa.me/{{ contact_info.whatsapp|replace('+', '') }}" target="_blank">
+                             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M12 2c-5.523 0-10 4.477-10 10s4.477 10 10 10 10-4.477 10-10-4.477-10-10-10zm4.797 14.23c-.346.138-.66.238-.994.367-.366.142-.737.29-.977.29-.24 0-.4-.07-.853-.244-.454-.173-1.412-.527-2.311-1.426-.898-.899-1.424-1.99-1.673-2.42-.249-.43-.027-.662.174-.863.182-.182.407-.431.546-.644.139-.213.186-.366.248-.486.062-.12.031-.224-.015-.313-.047-.09-.346-.833-.474-1.136-.129-.304-.264-.247-.36-.251-.095-.004-.206-.004-.336-.004s-.331.05-.506.221c-.173.17-.66.653-.66 1.593s.674 1.844.766 1.962c.092.117 1.37 2.037 3.332 2.855 1.96.817 2.355.634 2.78.592.426-.042.994-.404 1.132-.793.14-.39.14-1.11.095-1.243-.046-.134-.173-.213-.36-.304z"/></svg>
+                             {{ contact_info.whatsapp }} (WhatsApp)
+                         </a>
+                     </div>
+                     {% endif %}
+                     {% if contact_info.telegram %}
+                     <div class="contact-item">
+                         <a href="tg://resolve?domain={{ contact_info.telegram|replace('@', '') }}">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm3.06 8.81l-3.48 6.83c-.16.35-.5.58-.88.58-.39 0-.74-.23-.9-.59l-1.65-5.33-4.13-2.34c-.33-.18-.44-.59-.26-.92.18-.33.59-.44.92-.26l9.82 5.58c.35.2.46.61.26.96-.09.18-.27.3-.46.34z"/></svg>
+                             @{{ contact_info.telegram|replace('@', '') }} (Telegram)
+                         </a>
+                     </div>
+                     {% endif %}
+                     {% if contact_info.address %}
+                     <div class="contact-item">
+                         <svg viewBox="0 0 24 24" width="24" height="24"><path d="M12 12.7c-.82 0-1.49-.67-1.49-1.49 0-.82.67-1.49 1.49-1.49.82 0 1.49.67 1.49 1.49 0 .82-.67 1.49-1.49 1.49zm0-11.7C7.05 1 3 5.05 3 10c0 5.5 7 12 9 12s9-6.5 9-12c0-4.95-4.05-9-9-9zm0 17.55C9.2 17.55 6 13.86 6 10c0-3.31 2.69-6 6-6s6 2.69 6 6c0 3.86-3.2 7.55-6 7.55z"/></svg>
+                         {{ contact_info.address }}
+                     </div>
+                     {% endif %}
+                     {% if contact_info.website %}
+                     <div class="contact-item">
+                          <a href="{{ contact_info.website }}" target="_blank">
+                             <svg viewBox="0 0 24 24" width="24" height="24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z"/></svg>
+                              Сайт
+                         </a>
+                     </div>
+                     {% endif %}
+                 </div>
+             {% else %}
+                 <p class="no-items">Информация о компании пока не добавлена.</p>
+             {% endif %}
+         </section>
 
-    <!-- Invoices Modal -->
-    <div id="invoicesModal" class="modal">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2>Мои накладные</h2>
-                <span class="modal-close" onclick="closeModal('invoicesModal')">×</span>
-            </div>
-            {% if user.invoices %}
-                {% for invoice in user.invoices %}
-                    <div class="invoice-section">
-                        <div class="invoice-title">
-                            <span>Накладная #{{ invoice.id }}</span>
-                            <span class="invoice-date">{{ invoice.date_str }}</span>
-                        </div>
-                        {% for item in invoice.items %}
-                            <div class="invoice-item">
-                                <span class="name">{{ item.name }}</span>
-                                <span class="quantity">{{ item.quantity }} шт.</span>
-                                <span class="price">{{ "%.2f"|format(item.price|float) }}</span>
-                            </div>
-                        {% endfor %}
-                        <div class="invoice-total">
-                            Итого: {{ "%.2f"|format(invoice.total_amount|float) }} сом
-                        </div>
-                    </div>
-                {% endfor %}
-            {% else %}
-                <p class="no-invoices">У вас пока нет накладных.</p>
-            {% endif %}
-        </div>
-    </div>
 
-    <!-- History Modal -->
-    <div id="historyModal" class="modal">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2>История операций</h2>
-                <span class="modal-close" onclick="closeModal('historyModal')">×</span>
-            </div>
-            {% if user.combined_history %}
-                <ul class="history-list">
-                    {% for item in user.combined_history %}
-                        <li class="history-item">
-                            <div class="history-details">
-                                <span class="history-description">{{ item.description }}</span>
-                                <span class="history-date">{{ item.date_str }}</span>
-                            </div>
-                            {% if item.transaction_type == 'bonus' %}
-                                <span class="history-amount {{ 'accrual' if item.type == 'accrual' else 'deduction' }}">
-                                    {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
-                                </span>
-                            {% elif item.transaction_type == 'debt' %}
-                                <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'accrual' }}">
-                                    {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
-                                </span>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                </ul>
-            {% else %}
-                <p class="no-history">Операций пока не было.</p>
-            {% endif %}
-        </div>
     </div>
 
     <script>
         const tg = window.Telegram.WebApp;
+        let currentUserId = '{{ user.id }}'; // Pass the user ID from Flask
 
         function applyTheme(themeParams) {
             const root = document.documentElement;
             const isDark = themeParams.bg_color ? (parseInt(themeParams.bg_color.substring(1, 3), 16) < 128) : true;
-            
+
             root.style.setProperty('--brand-black', themeParams.bg_color || '#101010');
             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('--card-bg', themeParams.secondary_bg_color || (isDark ? '#1c1c1e' : '#f1f1f1'));
+            root.style.setProperty('--section-bg', themeParams.secondary_bg_color || (isDark ? '#2c2c2e' : '#e9e9e9'));
         }
-        
+
         function setupTelegram() {
              if (!tg || !tg.initData) {
                  console.error("Telegram WebApp script not loaded or initData is missing.");
                  document.body.style.visibility = 'visible';
+                 // Fallback greeting if TG data is missing
+                 const greetingElement = document.getElementById('greeting');
+                 if (greetingElement) greetingElement.textContent = `Привет, {{ user.first_name or 'Гость' }}! 👋`;
                  return;
              }
-             
+
             tg.ready();
             tg.expand();
 
@@ -661,9 +672,10 @@ TEMPLATE = """
             tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
 
              const urlParams = new URLSearchParams(window.location.search);
-             const userIdForTest = urlParams.get('user_id_for_test');
+             const userIdFromUrl = urlParams.get('user_id_for_test');
 
-             if (!userIdForTest) {
+             // Only attempt backend verification if we don't have a verified user ID in the URL yet
+             if (!userIdFromUrl || userIdFromUrl === 'N/A') {
                 fetch('/verify', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
@@ -672,60 +684,118 @@ TEMPLATE = """
                 .then(response => response.json())
                 .then(data => {
                     if (data.status === 'ok' && data.verified && data.user_id) {
+                         // If backend verified, reload the page with the correct user_id parameter
                         window.location.replace('/?user_id_for_test=' + data.user_id);
                     } else {
                         console.warn('Backend verification failed:', data.message);
+                        // Show the page anyway, maybe with limited functionality or a message
                         document.body.style.visibility = 'visible';
+                        // Set greeting based on potentially available user data even if verification failed
+                        const user = tg.initDataUnsafe?.user;
+                        const greetingElement = document.getElementById('greeting');
+                        if (user && greetingElement) {
+                            const name = user.first_name || user.username || 'Гость';
+                            greetingElement.textContent = `Привет, ${name}! 👋`;
+                        }
                     }
                 })
                 .catch(error => {
                     console.error('Error sending initData for verification:', error);
                     document.body.style.visibility = 'visible';
+                     const user = tg.initDataUnsafe?.user;
+                     const greetingElement = document.getElementById('greeting');
+                     if (user && greetingElement) {
+                         const name = user.first_name || user.username || 'Гость';
+                         greetingElement.textContent = `Привет, ${name}! 👋`;
+                     }
                 });
              } else {
+                 // If user_id_for_test is already in the URL, assume it's verified and show content
                  document.body.style.visibility = 'visible';
+                 // Set greeting based on Telegram data
+                 const user = tg.initDataUnsafe?.user;
+                 const greetingElement = document.getElementById('greeting');
+                 if (user && greetingElement) {
+                     const name = user.first_name || user.username || 'Гость';
+                     greetingElement.textContent = `Привет, ${name}! 👋`;
+                 } else {
+                     // Fallback if TG data is missing but ID is in URL
+                     if (greetingElement) greetingElement.textContent = `Привет, клиент {{ user.id }}! 👋`;
+                 }
              }
 
-             const user = tg.initDataUnsafe?.user;
-             const greetingElement = document.getElementById('greeting');
-             if (user) {
-                 const name = user.first_name || user.username || 'Гость';
-                 greetingElement.textContent = `Привет, ${name}! 👋`;
-             } else {
-                greetingElement.textContent = `Привет, {{ user.first_name or 'Гость' }}! 👋`;
+             // Setup navigation after the body is visible
+             const navButtons = document.querySelectorAll('.nav-button');
+             const contentSections = document.querySelectorAll('.content-section');
+
+             function showSection(targetId) {
+                 contentSections.forEach(section => {
+                     section.classList.remove('active');
+                 });
+                 navButtons.forEach(button => {
+                     button.classList.remove('active');
+                 });
+
+                 const targetSection = document.getElementById(targetId);
+                 if (targetSection) {
+                     targetSection.classList.add('active');
+                     const activeNavButton = document.querySelector(`.nav-button[data-target="${targetId}"]`);
+                     if (activeNavButton) activeNavButton.classList.add('active');
+                 }
              }
+
+             navButtons.forEach(button => {
+                 button.addEventListener('click', () => {
+                     const targetId = button.getAttribute('data-target');
+                     showSection(targetId);
+                 });
+             });
+
+             // Show the first section by default (or 'historySection')
+             showSection('historySection'); // Or get from hash/localStorage
+
          }
 
+        function toggleInvoiceDetails(summaryElement) {
+            const details = summaryElement.nextElementSibling;
+            if (details && details.classList.contains('invoice-details')) {
+                details.classList.toggle('expanded');
+            }
+        }
+
+
+        // Wait for the Telegram WebApp script to load or timeout
         if (window.Telegram && window.Telegram.WebApp) {
             setupTelegram();
         } else {
              window.addEventListener('load', setupTelegram, {once: true});
              setTimeout(() => {
                  if (document.body.style.visibility !== 'visible') {
+                      console.warn("Telegram WebApp script took too long to load or failed. Displaying content without full features.");
                       document.body.style.visibility = 'visible';
+                      const greetingElement = document.getElementById('greeting');
+                       if (greetingElement) greetingElement.textContent = `Привет, {{ user.first_name or 'Гость' }}! 👋`;
+                       const navButtons = document.querySelectorAll('.nav-button');
+                       const contentSections = document.querySelectorAll('.content-section');
+                       function showSectionFallback(targetId) {
+                            contentSections.forEach(section => section.style.display = 'none');
+                            navButtons.forEach(button => button.classList.remove('active'));
+                            const targetSection = document.getElementById(targetId);
+                            if (targetSection) targetSection.style.display = 'block';
+                            const activeNavButton = document.querySelector(`.nav-button[data-target="${targetId}"]`);
+                            if (activeNavButton) activeNavButton.classList.add('active');
+                       }
+                       navButtons.forEach(button => {
+                           button.addEventListener('click', () => {
+                               const targetId = button.getAttribute('data-target');
+                               showSectionFallback(targetId);
+                           });
+                       });
+                        showSectionFallback('historySection'); // Show first section
                   }
-             }, 3000);
-        }
-
-        function openModal(modalId) {
-            const modal = document.getElementById(modalId);
-            if (modal) {
-                modal.style.display = 'block';
-            }
+             }, 3000); // 3 second timeout
         }
 
-        function closeModal(modalId) {
-            const modal = document.getElementById(modalId);
-            if (modal) {
-                modal.style.display = 'none';
-            }
-        }
-
-        window.onclick = function(event) {
-            if (event.target.classList.contains('modal')) {
-                closeModal(event.target.id);
-            }
-        }
     </script>
 </body>
 </html>
@@ -753,12 +823,14 @@ ADMIN_TEMPLATE = """
             --admin-secondary: #6c757d;
             --admin-success: #198754;
             --admin-danger: #dc3545;
+            --admin-info: #0d6efd;
             --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; }
+        h1, h2, h3 { color: #343a40; }
         h1 { text-align: center; color: var(--admin-secondary); margin-bottom: var(--padding); font-weight: 600; }
         .summary-bar { display: grid; grid-template-columns: repeat(auto-fill, minmax(220px, 1fr)); gap: var(--padding); margin-bottom: var(--padding); }
         .summary-card { background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); text-align: center; }
@@ -766,90 +838,95 @@ ADMIN_TEMPLATE = """
         .summary-card .label { font-size: 0.9em; color: var(--admin-secondary); margin-top: 0.5rem; }
         .summary-card .value.bonus { color: var(--admin-primary-dark); }
         .summary-card .value.debt { color: var(--admin-danger); }
+         .summary-card .value.users { color: var(--admin-info); }
+
         .controls-bar { display: flex; flex-wrap: wrap; gap: 1rem; align-items: center; background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); margin-bottom: var(--padding); }
-        .controls-bar input[type="text"], .controls-bar input[type="tel"], .controls-bar input[type="number"] { flex-grow: 1; padding: 12px 15px; font-size: 1.1em; border-radius: 8px; border: 1px solid var(--admin-border); box-sizing: border-box; min-width: 200px; }
-        .btn { padding: 12px 20px; font-size: 1em; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s ease; }
+        .controls-bar input[type="text"] { flex-grow: 1; padding: 12px 15px; font-size: 1em; border-radius: 8px; border: 1px solid var(--admin-border); box-sizing: border-box; min-width: 200px; }
+        .btn { padding: 10px 18px; font-size: 1em; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s ease; }
         .btn-primary { background-color: var(--admin-primary); color: #000; }
         .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-edit { background-color: var(--admin-secondary); color: white; }
-        .btn-edit:hover { background-color: #545b62; }
-        .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(340px, 1fr)); gap: var(--padding); margin-top: var(--padding); }
+        .btn-secondary { background-color: var(--admin-secondary); color: white; }
+        .btn-secondary:hover { background-color: #5a6268; }
+
+
+        .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 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); }
         .user-info { display: flex; align-items: center; gap: 1rem; margin-bottom: 1rem; }
-        .user-info img { width: 60px; height: 60px; border-radius: 50%; object-fit: cover; border: 3px solid var(--admin-border); background-color: #eee; }
-        .user-details .name { font-weight: 600; font-size: 1.2em; }
-        .user-details .username { color: var(--admin-secondary); font-size: 0.9em; }
+        .user-info img { width: 50px; height: 50px; border-radius: 50%; object-fit: cover; border: 2px solid var(--admin-border); background-color: #eee; }
+        .user-details .name { font-weight: 600; font-size: 1.1em; }
+        .user-details .username { color: var(--admin-secondary); font-size: 0.8em; }
         .user-balances { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; text-align: center; margin-bottom: 1rem; }
-        .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-balances .label { font-size: 0.8em; color: var(--admin-secondary); }
+        .user-balances .amount.bonus { font-size: 1.6em; font-weight: 700; color: var(--admin-primary-dark); }
+        .user-balances .amount.debt { font-size: 1.6em; font-weight: 700; color: var(--admin-danger); }
         .user-actions { margin-top: auto; display: flex; flex-direction: column; gap: 0.5rem; }
         .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; }
+
+        /* Modals */
         .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: 3% auto; padding: var(--padding); border: 1px solid var(--admin-border); width: 95%; max-width: 800px; border-radius: var(--border-radius); position: relative; box-shadow: 0 8px 30px rgba(0,0,0,0.15); }
         .modal-close { color: #aaa; position: absolute; top: 15px; right: 25px; font-size: 28px; font-weight: bold; cursor: pointer; }
-        .modal-close:hover { color: #777; }
         .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; }
         .modal-header .username { font-size: 1rem; color: var(--admin-secondary); }
+
+        /* Forms */
         .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: repeat(auto-fill, minmax(250px, 1fr)); gap: 1rem; align-items: flex-end; }
+         .form-section hr { margin: 1rem 0; border: 0; border-top: 1px solid rgba(0,0,0,.1); }
+        .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; align-items: flex-start; margin-bottom: 1rem; }
+        .form-row.three-cols { grid-template-columns: 2fr 1fr 1fr; gap: 0.5rem; } /* For invoice items */
         .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[type="text"],
+        .form-group input[type="number"],
+        .form-group input[type="tel"] { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
+        .form-group input[type="number"] { -moz-appearance: textfield; } /* Hide arrows in Firefox */
+        .form-group input[type="number"]::-webkit-outer-spin-button,
+        .form-group input[type="number"]::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; } /* Hide arrows in Chrome/Safari */
+        .add-item-btn { background-color: var(--admin-secondary); color: white; padding: 10px 15px; border-radius: 8px; border: none; cursor: pointer; align-self: flex-end; }
+        .add-item-btn:hover { background-color: #5a6268; }
+        .remove-item-btn { background-color: var(--admin-danger); color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 0.8em; padding: 2px 6px;}
+
+        .calculation-summary, .invoice-summary-preview { background: #e9ecef; 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; }
+        .summary-item.total { font-size: 1.1em; font-weight: 700; }
+        .invoice-item-list-preview { list-style: none; padding: 0; max-height: 150px; overflow-y: auto; margin-bottom: 1rem; }
+        .invoice-item-list-preview li { padding: 5px 0; border-bottom: 1px dashed rgba(0,0,0,.05); display: flex; justify-content: space-between; align-items: center;}
+        .invoice-item-list-preview li:last-child { border-bottom: none; }
+
+
+        /* History & Invoices */
         .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-list { list-style: none; padding: 0; max-height: 250px; 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-item .desc { font-size: 0.9em; flex-grow: 1; margin-right: 10px; }
+        .history-item .date { font-size: 0.8em; color: var(--admin-secondary); flex-shrink: 0; text-align: right; }
+        .history-item .amount { font-weight: 600; flex-shrink: 0; text-align: right;}
+        .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-primary-dark); }
+
+        /* Modal Footer */
         .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; }
-        .btn-submit:hover { background-color: #157346; }
+         .btn-submit:hover { background-color: #157347; }
         .status-message { text-align: center; font-weight: 500; flex-grow: 1; text-align: left; }
-        .invoice-grid { display: grid; grid-template-columns: 1fr 1fr; gap: var(--padding); margin-top: var(--padding); }
-        .invoice-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; }
-        .invoice-card:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(0, 0, 0, 0.08); }
-        .invoice-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 1rem; border-bottom: 1px solid var(--admin-border); padding-bottom: 0.5rem; }
-        .invoice-header .id { font-weight: 600; font-size: 1.1em; }
-        .invoice-header .date { color: var(--admin-secondary); font-size: 0.9em; }
-        .invoice-items-list { list-style: none; padding: 0; margin: 0; border-bottom: 1px solid var(--admin-border); padding-bottom: 0.5rem; margin-bottom: 0.5rem; }
-        .invoice-item-admin { display: flex; justify-content: space-between; font-size: 0.9em; margin-bottom: 5px; }
-        .invoice-item-admin .name { flex-grow: 1; margin-right: 10px; }
-        .invoice-item-admin .quantity, .invoice-item-admin .price { min-width: 60px; text-align: right; }
-        .invoice-total-admin { text-align: right; font-weight: 600; margin-top: 0.5rem; }
-        .invoice-actions { margin-top: auto; display: flex; gap: 0.5rem; }
-        .btn-invoice-delete { background-color: var(--admin-danger); color: white; padding: 8px 15px; font-size: 0.9em; border-radius: 6px; }
-        .btn-invoice-delete:hover { background-color: #c82333; }
-        .add-item-row { display: grid; grid-template-columns: 1fr 1fr 1fr auto; gap: 0.5rem; margin-bottom: 0.5rem; align-items: center; }
-        .add-item-row input { padding: 8px; font-size: 0.9em; border: 1px solid var(--admin-border); border-radius: 6px; }
-        .add-item-row .btn-add-item { padding: 8px 15px; font-size: 0.9em; border-radius: 6px; background-color: var(--admin-primary); color: #000; border: none; cursor: pointer; }
-        .add-item-row .btn-add-item:hover { background-color: var(--admin-primary-dark); }
-        .invoice-calculation-summary { background: #f0f0f0; padding: 0.75rem; border-radius: 6px; margin-top: 1rem; }
-        .summary-item-admin { display: flex; justify-content: space-between; margin-bottom: 0.4rem; font-size: 0.9em; }
-        .summary-item-admin strong { font-weight: 600; }
-        .no-invoices-admin { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
-        .company-info-section { background: 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); margin-bottom: var(--padding); }
-        .company-info-section h3 { margin-top: 0; margin-bottom: 1.5rem; font-size: 1.3em; border-bottom: 1px solid var(--admin-border); padding-bottom: 0.5rem; }
-        .company-info-section .form-group { margin-bottom: 1rem; }
-        .company-info-section .form-group label { margin-bottom: 0.5rem; font-weight: 500; font-size: 0.9em; }
-        .company-info-section .form-group input { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
-        .company-info-section .btn-save-company { display: block; width: fit-content; margin-top: 1.5rem; margin-left: auto; }
+
+        /* Contact Info Admin */
+        #contactInfoModal .form-group { margin-bottom: 1rem;}
+        #contactInfoModal .form-group:last-of-type { margin-bottom: 0;}
+
+
     </style>
 </head>
 <body>
@@ -857,7 +934,7 @@ ADMIN_TEMPLATE = """
         <h1>Панель администратора Bonus</h1>
         <div class="summary-bar">
             <div class="summary-card">
-                <div class="value">{{ summary.total_users }}</div>
+                <div class="value users">{{ summary.total_users }}</div>
                 <div class="label">Всего клиентов</div>
             </div>
             <div class="summary-card">
@@ -869,7 +946,7 @@ ADMIN_TEMPLATE = """
                 <div class="label">Всего долгов</div>
             </div>
              <div class="summary-card">
-                <div class="value debt">{{ summary.users_with_debt }}</div>
+                <div class="value users">{{ summary.users_with_debt }}</div>
                 <div class="label">Клиенты с долгом</div>
             </div>
         </div>
@@ -877,7 +954,7 @@ ADMIN_TEMPLATE = """
         <div class="controls-bar">
             <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
             <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
-            <button class="btn btn-primary" onclick="openCompanyInfoModal()">Настроить визитку</button>
+            <button class="btn btn-secondary" onclick="openContactInfoModal({{ contact_info|tojson }})">Реквизиты компании</button>
         </div>
 
         {% if users %}
@@ -887,8 +964,13 @@ ADMIN_TEMPLATE = """
                         <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 class="name">{{ user.first_name or 'Без имени' }} {{ user.last_name or '' }}</div>
+                                <div class="username">
+                                    {% if user.telegram_id %} @{{ user.username if user.username else 'tg user' }} {% endif %}
+                                    {% if user.phone_number %} {{ user.phone_number }} {% endif %}
+                                    {% if not user.telegram_id and not user.phone_number %} Нет контактных данных {% endif %}
+                                    | ID: {{ user.id }}
+                                </div>
                             </div>
                         </div>
                         <div class="user-balances">
@@ -898,12 +980,11 @@ ADMIN_TEMPLATE = """
                             </div>
                             <div>
                                <div class="label">Долг</div>
-                               <div class="amount debt">{{ "%.2f"|format(user.debts|float if user.debts else 0) }}</div>
+                               <div class="amount debt">{{ "%.2f"|format(user.debts|float) }}</div>
                             </div>
                         </div>
                         <div class="user-actions">
-                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом</button>
-                            <button class="btn-manage" onclick='openInvoiceModal({{ user|tojson }})'>Накладные</button>
+                            <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 %}
@@ -924,60 +1005,83 @@ ADMIN_TEMPLATE = """
             <div id="modalUserUsername" class="username"></div>
         </div>
         <input type="hidden" id="modalUserId">
-        
+
         <div class="form-section">
-            <h3>Бонусы</h3>
+            <h3>Операции с бонусами и долгами</h3>
             <div class="form-row">
                 <div class="form-group">
-                    <label for="purchaseAmount">Сумма покупки (для начисления)</label>
-                    <input type="number" id="purchaseAmount" placeholder="1500" oninput="updateCalculations()">
+                    <label for="purchaseAmount">Сумма покупки (для начисления бонусов)</label>
+                    <input type="number" id="purchaseAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
                 </div>
                 <div class="form-group">
                     <label for="deductAmount">Списать бонусов</label>
-                    <input type="number" id="deductAmount" placeholder="100" oninput="updateCalculations()">
+                    <input type="number" id="deductAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
                 </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"><strong>Итоговый баланс бонусов:</strong> <strong id="summaryFinalBalance">0.00</strong></div>
-            </div>
-        </div>
-        
-        <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()">
+                    <input type="number" id="addDebtAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
                 </div>
                 <div class="form-group">
                     <label for="repayDebtAmount">Погасить долг</label>
-                    <input type="number" id="repayDebtAmount" placeholder="200" oninput="updateCalculations()">
+                    <input type="number" id="repayDebtAmount" placeholder="0.00" value="" step="0.01" min="0" oninput="updateBonusDebtCalculations()">
                 </div>
             </div>
             <div class="calculation-summary">
+                <div class="summary-item"><span>Текущие бонусы:</span> <strong id="summaryCurrentBonus">0.00</strong></div>
+                <div class="summary-item"><span>Будет начислено (2%):</span> <strong id="summaryAccrualBonus">+0.00</strong></div>
+                <div class="summary-item"><span>Будет списано бонусов:</span> <strong id="summaryDeductionBonus">-0.00</strong></div>
+                <hr>
                 <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>
+                <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"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
+                <div class="summary-item total"><strong>Итоговые бонусы:</strong> <strong id="summaryFinalBonus">0.00</strong></div>
+                <div class="summary-item total"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
+            </div>
+             <div class="modal-footer">
+                <div id="bonusDebtStatus" class="status-message"></div>
+                <button class="btn-submit" onclick="submitBonusDebtTransaction()">Провести операции с бонусами/долгом</button>
             </div>
         </div>
 
+         <div class="form-section">
+             <h3>Добавить накладную</h3>
+             <div id="invoiceItems">
+                 <!-- Invoice items will be added here -->
+             </div>
+             <div class="form-row three-cols">
+                 <div class="form-group"><label>Название товара</label><input type="text" id="newItemName"></div>
+                 <div class="form-group"><label>Кол-во</label><input type="number" id="newItemQty" value="1" step="0.01" min="0.01"></div>
+                 <div class="form-group"><label>Цена за ед.</label><input type="number" id="newItemPrice" value="0.00" step="0.01" min="0"></div>
+             </div>
+              <div class="form-row">
+                 <div class="form-group" style="grid-column: span 2;">
+                     <label for="invoiceDescription">Описание (необязательно)</label>
+                     <input type="text" id="invoiceDescription" placeholder="Например: Заказ #123">
+                 </div>
+                 <button class="btn add-item-btn" onclick="addInvoiceItem()">Добавить товар</button>
+              </div>
+             <div class="invoice-summary-preview">
+                 <div class="summary-item"><span>Всего позиций:</span> <strong id="invoiceTotalItems">0</strong></div>
+                 <div class="summary-item total"><strong>Итоговая сумма накладной:</strong> <strong id="invoiceTotalAmount">0.00 ₽</strong></div>
+             </div>
+             <div class="modal-footer">
+                <div id="invoiceStatus" class="status-message"></div>
+                 <button class="btn-submit" onclick="submitInvoice()">Сохранить накладную</button>
+             </div>
+         </div>
+
+
         <div class="history-container">
-            <h3>Общая история операций</h3>
+            <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="addClientModal" class="modal">
       <div class="modal-content">
         <span class="modal-close" onclick="closeModal('addClientModal')">×</span>
@@ -986,7 +1090,7 @@ ADMIN_TEMPLATE = """
         </div>
         <div class="form-group" style="margin-bottom: 1rem;">
             <label for="newClientFirstName">Имя</label>
-            <input type="text" id="newClientFirstName" placeholder="Иван">
+            <input type="text" id="newClientFirstName" placeholder="Иван" required>
         </div>
         <div class="form-group" style="margin-bottom: 1.5rem;">
             <label for="newClientPhone">Номер телефона (уникальный)</label>
@@ -999,95 +1103,53 @@ ADMIN_TEMPLATE = """
       </div>
     </div>
 
-    <div id="invoiceModal" class="modal">
+     <div id="contactInfoModal" class="modal">
       <div class="modal-content">
-        <span class="modal-close" onclick="closeModal('invoiceModal')">×</span>
+        <span class="modal-close" onclick="closeModal('contactInfoModal')">×</span>
         <div class="modal-header">
-            <h2 id="invoiceModalUserName"></h2>
-            <div id="invoiceModalUserUsername" class="username"></div>
+            <h2>Реквизиты компании</h2>
         </div>
-        <input type="hidden" id="invoiceModalUserId">
-        <div id="invoiceStatusMessage" class="status-message" style="margin-bottom: 1rem;"></div>
-        
-        <div class="form-section">
-            <h3>Добавить новую накладную</h3>
-            <div class="add-item-row">
-                <input type="text" id="newItemName" placeholder="Название товара">
-                <input type="number" id="newItemQuantity" placeholder="Кол-во" min="1">
-                <input type="number" id="newItemPrice" placeholder="Цена за ед." step="0.01">
-                <button class="btn-add-item" onclick="addItemToList()">Добавить товар</button>
-            </div>
-            <ul id="invoiceItemList" style="list-style: none; padding: 0; margin-top: 1rem;"></ul>
-            <div class="invoice-calculation-summary">
-                <div class="summary-item-admin"><span>Всего товаров:</span> <strong id="itemCountSummary">0</strong></div>
-                <div class="summary-item-admin"><span>Итоговая сумма:</span> <strong id="invoiceTotalSummary">0.00</strong></div>
-            </div>
+        <div class="form-group">
+            <label for="orgName">Название организации</label>
+            <input type="text" id="orgName" placeholder="Название компании">
         </div>
-
-        <div class="history-container">
-            <h3>История накладных</h3>
-            <div id="invoiceHistoryList" class="invoice-grid"></div>
+         <div class="form-group">
+            <label for="orgPhone">Номер телефона (для звонков, WhatsApp)</label>
+            <input type="tel" id="orgPhone" placeholder="+79001234567">
+        </div>
+         <div class="form-group">
+            <label for="orgTelegram">Telegram username/ID</label>
+            <input type="text" id="orgTelegram" placeholder="@username или ID">
+        </div>
+         <div class="form-group">
+            <label for="orgAddress">Адрес</label>
+            <input type="text" id="orgAddress" placeholder="Улица, дом, офис">
+        </div>
+         <div class="form-group">
+            <label for="orgWebsite">Сайт (ссылка)</label>
+            <input type="text" id="orgWebsite" placeholder="https://example.com">
         </div>
         <div class="modal-footer">
-            <button class="btn-submit" onclick="saveInvoice()">Сохранить накладную</button>
+            <div id="contactInfoStatus" class="status-message"></div>
+            <button class="btn-submit" onclick="submitContactInfo()">Сохранить реквизиты</button>
         </div>
       </div>
     </div>
 
-    <div id="companyInfoModal" class="modal">
-        <div class="modal-content">
-            <span class="modal-close" onclick="closeModal('companyInfoModal')">×</span>
-            <div class="modal-header">
-                <h2>Настройки визитной карточки</h2>
-            </div>
-            <div class="company-info-section">
-                <div class="form-group">
-                    <label for="companyName">Название организации</label>
-                    <input type="text" id="companyName" placeholder="Название">
-                </div>
-                <div class="form-group">
-                    <label for="companyAddress">Адрес</label>
-                    <input type="text" id="companyAddress" placeholder="Адрес">
-                </div>
-                <div class="form-row">
-                    <div class="form-group">
-                        <label for="companyPhone1">Телефон 1</label>
-                        <input type="tel" id="companyPhone1" placeholder="+996 XXX XXX XXX">
-                    </div>
-                    <div class="form-group">
-                        <label for="companyPhone2">Телефон 2 (опционально)</label>
-                        <input type="tel" id="companyPhone2" placeholder="+996 XXX XXX XXX">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="companyWhatsapp">WhatsApp (для кнопки, без +)</label>
-                    <input type="tel" id="companyWhatsapp" placeholder="996XXXXXXXXXX">
-                </div>
-                <div class="form-group">
-                    <label for="companyTelegram">Telegram (для кнопки, с @)</label>
-                    <input type="text" id="companyTelegram" placeholder="@username">
-                </div>
-                <button class="btn btn-primary btn-save-company" onclick="saveCompanyInfo()">Сохранить настройки</button>
-            </div>
-        </div>
-    </div>
 
     <script>
         const transactionModal = document.getElementById('transactionModal');
         const addClientModal = document.getElementById('addClientModal');
-        const invoiceModal = document.getElementById('invoiceModal');
-        const companyInfoModal = document.getElementById('companyInfoModal');
-
+        const contactInfoModal = document.getElementById('contactInfoModal');
         let currentUserData = null;
-        let currentInvoiceModalUser = null;
-        let invoiceItems = [];
+        let currentInvoiceItems = []; // Array to hold items for the new invoice being built
 
         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)) {
+                if (cardSearchTerm && cardSearchTerm.includes(searchTerm)) {
                     card.style.display = 'flex';
                 } else {
                     card.style.display = 'none';
@@ -1098,49 +1160,37 @@ ADMIN_TEMPLATE = """
         function openTransactionModal(userData) {
             currentUserData = userData;
             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('modalUserName').textContent = `${userData.first_name || 'Без имени'} ${userData.last_name || ''}`;
+            let contactInfo = '';
+            if (userData.telegram_id) contactInfo += `@${userData.username || 'tg user'}`;
+            if (userData.phone_number) {
+                if (contactInfo) contactInfo += ' | ';
+                contactInfo += userData.phone_number;
+            }
+             if (!contactInfo) contactInfo = 'Нет контактных данных';
+            document.getElementById('modalUserUsername').textContent = `${contactInfo} | ID: ${userData.id}`;
+
+            // Reset bonus/debt form
             document.getElementById('purchaseAmount').value = '';
             document.getElementById('deductAmount').value = '';
             document.getElementById('addDebtAmount').value = '';
             document.getElementById('repayDebtAmount').value = '';
-            document.getElementById('modalStatus').textContent = '';
+            document.getElementById('bonusDebtStatus').textContent = '';
+            updateBonusDebtCalculations(); // Update summaries based on current data
 
-            const historyList = document.getElementById('modalHistoryList');
-            historyList.innerHTML = '';
-            
-            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));
+            // Reset invoice form
+            currentInvoiceItems = [];
+            document.getElementById('invoiceItems').innerHTML = '';
+            document.getElementById('newItemName').value = '';
+            document.getElementById('newItemQty').value = '1';
+            document.getElementById('newItemPrice').value = '0.00';
+             document.getElementById('invoiceDescription').value = '';
+            document.getElementById('invoiceStatus').textContent = '';
+            updateInvoiceCalculations();
+
+            // Populate and display combined history
+            displayCombinedHistory(userData);
 
-            if (combinedHistory.length > 0) {
-                combinedHistory.forEach(item => {
-                    const li = document.createElement('li');
-                    li.className = 'history-item';
-                    let sign, amountClass, amountText;
-                    if (item.transaction_type === 'bonus') {
-                        sign = item.type === 'accrual' ? '+' : '-';
-                        amountClass = item.type === 'accrual' ? 'accrual' : 'deduction';
-                        amountText = `${sign}${parseFloat(item.amount).toFixed(2)} (бонус)`;
-                    } else { 
-                        sign = item.type === 'accrual' ? '+' : '-';
-                        amountClass = item.type === 'accrual' ? 'deduction' : 'accrual'; 
-                        amountText = `${sign}${parseFloat(item.amount).toFixed(2)} (долг)`;
-                    }
-                    li.innerHTML = `
-                        <div>
-                            <div class="history-description">${item.description}</div>
-                            <div class="history-date">${item.date_str}</div>
-                        </div>
-                        <div class="history-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';
         }
 
@@ -1151,236 +1201,131 @@ ADMIN_TEMPLATE = """
             addClientModal.style.display = 'block';
         }
 
-        function openInvoiceModal(userData) {
-            currentInvoiceModalUser = userData;
-            document.getElementById('invoiceModalUserId').value = userData.id;
-            document.getElementById('invoiceModalUserName').textContent = `${userData.first_name || ''} ${userData.last_name || ''}`;
-            document.getElementById('invoiceModalUserUsername').textContent = `@${userData.username || userData.phone_number} | ID: ${userData.id}`;
-            
-            invoiceItems = [];
-            refreshInvoiceItemList();
-            refreshInvoiceTotal();
-            document.getElementById('invoiceStatusMessage').textContent = '';
-            document.getElementById('invoiceHistoryList').innerHTML = '';
-
-            const invoiceHistoryList = document.getElementById('invoiceHistoryList');
-            if (userData.invoices && userData.invoices.length > 0) {
-                userData.invoices.forEach(invoice => {
-                    const invoiceCard = document.createElement('div');
-                    invoiceCard.className = 'invoice-card';
-                    
-                    let itemsHtml = '';
-                    invoice.items.forEach(item => {
-                        itemsHtml += `
-                            <div class="invoice-item-admin">
-                                <span class="name">${item.name}</span>
-                                <span class="quantity">${item.quantity} шт.</span>
-                                <span class="price">${parseFloat(item.price).toFixed(2)}</span>
-                            </div>
-                        `;
-                    });
-
-                    invoiceCard.innerHTML = `
-                        <div class="invoice-header">
-                            <span class="id">#${invoice.id}</span>
-                            <span class="date">${invoice.date_str}</span>
-                        </div>
-                        <ul class="invoice-items-list">${itemsHtml}</ul>
-                        <div class="invoice-total-admin">Итого: ${parseFloat(invoice.total_amount).toFixed(2)} сом</div>
-                        <div class="invoice-actions">
-                            <button class="btn btn-delete btn-invoice-delete" onclick="deleteInvoice('${userData.id}', '${invoice.id}')">Удалить</button>
-                        </div>
-                    `;
-                    invoiceHistoryList.appendChild(invoiceCard);
-                });
-            } else {
-                invoiceHistoryList.innerHTML = '<p class="no-invoices-admin">Нет накладных.</p>';
-            }
-            invoiceModal.style.display = 'block';
+        function openContactInfoModal(contactInfo) {
+             document.getElementById('orgName').value = contactInfo.name || '';
+             document.getElementById('orgPhone').value = contactInfo.phone || '';
+             document.getElementById('orgTelegram').value = contactInfo.telegram || '';
+             document.getElementById('orgAddress').value = contactInfo.address || '';
+             document.getElementById('orgWebsite').value = contactInfo.website || '';
+             document.getElementById('contactInfoStatus').textContent = '';
+             contactInfoModal.style.display = 'block';
         }
 
-        function openCompanyInfoModal() {
-            const companyInfo = JSON.parse(localStorage.getItem('companyInfo') || '{}');
-            document.getElementById('companyName').value = companyInfo.name || '';
-            document.getElementById('companyAddress').value = companyInfo.address || '';
-            document.getElementById('companyPhone1').value = companyInfo.phone1 || '';
-            document.getElementById('companyPhone2').value = companyInfo.phone2 || '';
-            document.getElementById('companyWhatsapp').value = companyInfo.whatsapp || '';
-            document.getElementById('companyTelegram').value = companyInfo.telegram_username || '';
-            companyInfoModal.style.display = 'block';
-        }
 
         function closeModal(modalId) {
             document.getElementById(modalId).style.display = 'none';
             if (modalId === 'transactionModal') {
                 currentUserData = null;
             }
-            if (modalId === 'invoiceModal') {
-                currentInvoiceModalUser = null;
-                invoiceItems = [];
-            }
         }
 
-        function updateCalculations() {
+        function updateBonusDebtCalculations() {
             if (!currentUserData) return;
 
-            const currentBalance = parseFloat(currentUserData.bonuses) || 0;
+            const currentBonus = parseFloat(currentUserData.bonuses) || 0;
             const purchaseAmount = parseFloat(document.getElementById('purchaseAmount').value) || 0;
-            const deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
+            let deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
             const accrualAmount = purchaseAmount * 0.02;
-            let finalDeductAmount = deductAmount;
-            if (deductAmount > currentBalance) {
-                finalDeductAmount = currentBalance;
-                document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
+
+            // Cap deduction at current bonus amount
+            if (deductAmount > currentBonus) {
+                deductAmount = currentBonus;
+                document.getElementById('deductAmount').value = deductAmount > 0 ? deductAmount.toFixed(2) : '';
             }
-            const finalBalance = currentBalance + accrualAmount - finalDeductAmount;
-            document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
-            document.getElementById('summaryAccrual').textContent = `+${accrualAmount.toFixed(2)}`;
-            document.getElementById('summaryDeduction').textContent = `-${finalDeductAmount.toFixed(2)}`;
-            document.getElementById('summaryFinalBalance').textContent = finalBalance.toFixed(2);
+            const finalBonus = currentBonus + accrualAmount - deductAmount;
+
+            document.getElementById('summaryCurrentBonus').textContent = currentBonus.toFixed(2);
+            document.getElementById('summaryAccrualBonus').textContent = `+${accrualAmount.toFixed(2)}`;
+            document.getElementById('summaryDeductionBonus').textContent = `-${deductAmount.toFixed(2)}`;
+            document.getElementById('summaryFinalBonus').textContent = finalBonus.toFixed(2);
 
             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;
+            let repayDebtAmount = parseFloat(document.getElementById('repayDebtAmount').value) || 0;
+
+             // Cap repayment at current debt amount
             if (repayDebtAmount > currentDebt) {
-                finalRepayAmount = currentDebt;
-                document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
+                repayDebtAmount = currentDebt;
+                 document.getElementById('repayDebtAmount').value = repayDebtAmount > 0 ? repayDebtAmount.toFixed(2) : '';
             }
-            const finalDebt = currentDebt + addDebtAmount - finalRepayAmount;
+            const finalDebt = currentDebt + addDebtAmount - repayDebtAmount;
+
             document.getElementById('summaryCurrentDebt').textContent = currentDebt.toFixed(2);
             document.getElementById('summaryAddDebt').textContent = `+${addDebtAmount.toFixed(2)}`;
-            document.getElementById('summaryRepayDebt').textContent = `-${finalRepayAmount.toFixed(2)}`;
+            document.getElementById('summaryRepayDebt').textContent = `-${repayDebtAmount.toFixed(2)}`;
             document.getElementById('summaryFinalDebt').textContent = finalDebt.toFixed(2);
         }
 
-        function addItemToList() {
-            const name = document.getElementById('newItemName').value.trim();
-            const quantity = parseInt(document.getElementById('newItemQuantity').value);
-            const price = parseFloat(document.getElementById('newItemPrice').value);
+        function addInvoiceItem() {
+            const nameInput = document.getElementById('newItemName');
+            const qtyInput = document.getElementById('newItemQty');
+            const priceInput = document.getElementById('newItemPrice');
+
+            const name = nameInput.value.trim();
+            const quantity = parseFloat(qtyInput.value);
+            const price_per_unit = parseFloat(priceInput.value);
 
-            if (!name || isNaN(quantity) || quantity <= 0 || isNaN(price) || price < 0) {
-                alert('Пожалуйста, введите корректные данные для товара.');
+            if (!name || isNaN(quantity) || quantity <= 0 || isNaN(price_per_unit) || price_per_unit < 0) {
+                alert('Пожалуйста, введите корректные данные товара (название, количество > 0, цена >= 0).');
                 return;
             }
 
-            invoiceItems.push({ name, quantity, price });
-            refreshInvoiceItemList();
-            refreshInvoiceTotal();
-
-            document.getElementById('newItemName').value = '';
-            document.getElementById('newItemQuantity').value = '';
-            document.getElementById('newItemPrice').value = '';
-        }
-
-        function refreshInvoiceItemList() {
-            const list = document.getElementById('invoiceItemList');
-            list.innerHTML = '';
-            invoiceItems.forEach((item, index) => {
-                const li = document.createElement('li');
-                li.className = 'invoice-item-admin';
-                li.innerHTML = `
-                    <span class="name">${item.name}</span>
-                    <span class="quantity">${item.quantity} шт.</span>
-                    <span class="price">${item.price.toFixed(2)}</span>
-                    <button class="btn-delete" style="padding: 5px 10px; font-size: 0.8em;" onclick="removeItemFromList(${index})">Удалить</button>
-                `;
-                list.appendChild(li);
+            currentInvoiceItems.push({
+                name: name,
+                quantity: quantity,
+                price_per_unit: price_per_unit
             });
-        }
 
-        function removeItemFromList(index) {
-            invoiceItems.splice(index, 1);
-            refreshInvoiceItemList();
-            refreshInvoiceTotal();
-        }
+            renderInvoiceItems();
+            updateInvoiceCalculations();
 
-        function refreshInvoiceTotal() {
-            let total = 0;
-            invoiceItems.forEach(item => {
-                total += item.quantity * item.price;
-            });
-            document.getElementById('itemCountSummary').textContent = invoiceItems.length;
-            document.getElementById('invoiceTotalSummary').textContent = total.toFixed(2);
+            // Clear item inputs
+            nameInput.value = '';
+            qtyInput.value = '1';
+            priceInput.value = '0.00';
+            nameInput.focus();
         }
 
-        async function saveInvoice() {
-            const userId = document.getElementById('invoiceModalUserId').value;
-            const statusEl = document.getElementById('invoiceStatusMessage');
-            statusEl.style.color = 'var(--admin-secondary)';
-            statusEl.textContent = 'Сохранение...';
-
-            if (invoiceItems.length === 0) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
-                return;
-            }
+        function removeInvoiceItem(index) {
+            currentInvoiceItems.splice(index, 1);
+            renderInvoiceItems();
+            updateInvoiceCalculations();
+        }
 
-            const totalAmount = parseFloat(document.getElementById('invoiceTotalSummary').textContent);
-            const invoiceData = {
-                user_id: userId,
-                items: invoiceItems,
-                total_amount: totalAmount
-            };
+        function renderInvoiceItems() {
+            const itemListEl = document.getElementById('invoiceItems');
+            itemListEl.innerHTML = ''; // Clear current list
 
-            try {
-                const response = await fetch('/admin/add_invoice', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(invoiceData)
-                });
-                const result = await response.json();
-                if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
-                    statusEl.textContent = 'Накладная успешно сохранена!';
-                    setTimeout(() => { location.reload(); }, 1500);
-                } else {
-                    throw new Error(result.message || 'Произошла ошибка при сохранении.');
-                }
-            } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = `Ошибка: ${error.message}`;
-            }
+            currentInvoiceItems.forEach((item, index) => {
+                const itemElement = document.createElement('div');
+                itemElement.className = 'form-row three-cols';
+                itemElement.innerHTML = `
+                    <div class="form-group"><input type="text" value="${item.name}" readonly></div>
+                    <div class="form-group"><input type="number" value="${item.quantity}" step="0.01" readonly></div>
+                    <div class="form-group" style="display:flex; align-items:center; gap: 5px;">
+                         <input type="number" value="${item.price_per_unit.toFixed(2)}" step="0.01" readonly style="flex-grow: 1;">
+                         <button class="remove-item-btn" onclick="removeInvoiceItem(${index})">X</button>
+                    </div>
+                `;
+                 itemListEl.appendChild(itemElement);
+            });
         }
 
-        async function deleteInvoice(userId, invoiceId) {
-            if (!confirm('Вы уверены, что хотите удалить эту накладную?')) return;
-            try {
-                const response = await fetch('/admin/delete_invoice', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ user_id: userId, invoice_id: invoiceId })
-                });
-                const result = await response.json();
-                if (response.ok) {
-                    location.reload();
-                } else {
-                    throw new Error(result.message || 'Не удалось удалить накладную.');
-                }
-            } catch (error) {
-                alert(`Ошибка: ${error.message}`);
-            }
+        function updateInvoiceCalculations() {
+            let totalAmount = 0;
+            currentInvoiceItems.forEach(item => {
+                totalAmount += item.quantity * item.price_per_unit;
+            });
+            document.getElementById('invoiceTotalItems').textContent = currentInvoiceItems.length;
+            document.getElementById('invoiceTotalAmount').textContent = `${totalAmount.toFixed(2)} ₽`;
         }
 
-        function saveCompanyInfo() {
-            const companyInfo = {
-                name: document.getElementById('companyName').value.trim(),
-                address: document.getElementById('companyAddress').value.trim(),
-                phone1: document.getElementById('companyPhone1').value.trim(),
-                phone2: document.getElementById('companyPhone2').value.trim(),
-                whatsapp: document.getElementById('companyWhatsapp').value.trim(),
-                telegram_username: document.getElementById('companyTelegram').value.trim()
-            };
-            localStorage.setItem('companyInfo', JSON.stringify(companyInfo));
-            alert('Настройки визитной карточки сохранены!');
-            closeModal('companyInfoModal');
-        }
 
-        async function submitTransaction() {
-            const statusEl = document.getElementById('modalStatus');
+        async function submitBonusDebtTransaction() {
+            const statusEl = document.getElementById('bonusDebtStatus');
             statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Обработка...';
-            
+
             const payload = {
                 user_id: document.getElementById('modalUserId').value,
                 purchase_amount: parseFloat(document.getElementById('purchaseAmount').value) || 0,
@@ -1389,11 +1334,12 @@ ADMIN_TEMPLATE = """
                 repay_debt_amount: parseFloat(document.getElementById('repayDebtAmount').value) || 0,
             };
 
-            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 = 'Введите сумму для любой из операций.';
-                return;
-            }
+             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 = 'Введите сумму для любой из операций с бонусами/долгом.';
+                 return;
+             }
+
             try {
                 const response = await fetch('/admin/add_transaction', {
                     method: 'POST',
@@ -1403,8 +1349,27 @@ ADMIN_TEMPLATE = """
                 const result = await response.json();
                 if (response.ok) {
                     statusEl.style.color = 'var(--admin-success)';
-                    statusEl.textContent = 'Операция успешно проведена!';
-                    setTimeout(() => { location.reload(); }, 1500);
+                    statusEl.textContent = 'Операции с бонусами/долгом успешно проведены!';
+                     // Update current user data and history display without full reload for responsiveness
+                    currentUserData.bonuses = result.new_balance;
+                    currentUserData.debts = result.new_debt;
+                     if (result.history_entries) {
+                          // Add new history entries to current user data
+                          if (!currentUserData.history) currentUserData.history = [];
+                          if (!currentUserData.debt_history) currentUserData.debt_history = [];
+                          result.history_entries.forEach(entry => {
+                              if (entry.transaction_type === 'bonus') currentUserData.history.push(entry);
+                              if (entry.transaction_type === 'debt') currentUserData.debt_history.push(entry);
+                          });
+                           displayCombinedHistory(currentUserData); // Refresh history display
+                     }
+                    updateBonusDebtCalculations(); // Refresh calculations with new balance/debt
+                     // Clear bonus/debt form after successful transaction
+                    document.getElementById('purchaseAmount').value = '';
+                    document.getElementById('deductAmount').value = '';
+                    document.getElementById('addDebtAmount').value = '';
+                    document.getElementById('repayDebtAmount').value = '';
+
                 } else {
                     throw new Error(result.message || 'Произошла ошибка');
                 }
@@ -1413,7 +1378,106 @@ ADMIN_TEMPLATE = """
                 statusEl.textContent = `Ошибка: ${error.message}`;
             }
         }
-        
+
+         async function submitInvoice() {
+             const statusEl = document.getElementById('invoiceStatus');
+             statusEl.style.color = 'var(--admin-secondary)';
+             statusEl.textContent = 'Сохранение накладной...';
+
+             if (currentInvoiceItems.length === 0) {
+                 statusEl.style.color = 'var(--admin-danger)';
+                 statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
+                 return;
+             }
+
+             const payload = {
+                 user_id: document.getElementById('modalUserId').value,
+                 description: document.getElementById('invoiceDescription').value.trim(),
+                 items: currentInvoiceItems,
+             };
+
+             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 = 'Накладная успешно сохранена!';
+                      // Add new invoice entry to current user data and history display
+                     if (!currentUserData.invoices) currentUserData.invoices = [];
+                     currentUserData.invoices.push(result.invoice_entry);
+                      displayCombinedHistory(currentUserData); // Refresh history display
+
+                     // Clear invoice form after successful save
+                     currentInvoiceItems = [];
+                     renderInvoiceItems();
+                     document.getElementById('newItemName').value = '';
+                     document.getElementById('newItemQty').value = '1';
+                     document.getElementById('newItemPrice').value = '0.00';
+                     document.getElementById('invoiceDescription').value = '';
+                     updateInvoiceCalculations();
+
+                 } else {
+                     throw new Error(result.message || 'Произошла ошибка');
+                 }
+             } catch (error) {
+                 statusEl.style.color = 'var(--admin-danger)';
+                 statusEl.textContent = `Ошибка: ${error.message}`;
+             }
+         }
+
+
+        function displayCombinedHistory(userData) {
+            const historyList = document.getElementById('modalHistoryList');
+            historyList.innerHTML = '';
+
+            const bonusHistory = (userData.history || []).map(h => ({...h, transaction_type: 'bonus'}));
+            const debtHistory = (userData.debt_history || []).map(h => ({...h, transaction_type: 'debt'}));
+             const invoiceHistory = (userData.invoices || []).map(inv => ({
+                 date: inv.date,
+                 date_str: inv.date_str,
+                 description: inv.description || `Накладная #${inv.invoice_id}`,
+                 total_amount: inv.total_amount,
+                 transaction_type: 'invoice'
+             }));
+
+
+            const combinedHistory = [...bonusHistory, ...debtHistory, ...invoiceHistory].sort((a, b) => new Date(b.date) - new Date(a.date));
+
+            if (combinedHistory.length > 0) {
+                combinedHistory.forEach(item => {
+                    const li = document.createElement('li');
+                    li.className = 'history-item';
+                    let amountText, amountClass;
+
+                    if (item.transaction_type === 'bonus') {
+                        amountText = `${item.type === 'accrual' ? '+' : '-'}${parseFloat(item.amount).toFixed(2)}`;
+                        amountClass = item.type === 'accrual' ? 'bonus-accrual' : 'bonus-deduction';
+                    } else if (item.transaction_type === 'debt') {
+                        amountText = `${item.type === 'payment' ? '+' : '-'}${parseFloat(item.amount).toFixed(2)}`; // Payment increases bonus view, accrual decreases
+                        amountClass = item.type === 'payment' ? 'debt-payment' : 'debt-accrual';
+                    } else if (item.transaction_type === 'invoice') {
+                         amountText = `${parseFloat(item.total_amount).toFixed(2)} ₽`;
+                         amountClass = 'invoice';
+                    }
+
+
+                    li.innerHTML = `
+                        <div class="desc">${item.description}</div>
+                        <div class="date">${item.date_str}</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>';
+            }
+        }
+
+
         async function submitNewClient() {
             const statusEl = document.getElementById('addClientStatus');
             statusEl.style.color = 'var(--admin-secondary)';
@@ -1450,6 +1514,40 @@ ADMIN_TEMPLATE = """
             }
         }
 
+         async function submitContactInfo() {
+             const statusEl = document.getElementById('contactInfoStatus');
+             statusEl.style.color = 'var(--admin-secondary)';
+             statusEl.textContent = 'Сохранение...';
+
+             const payload = {
+                 name: document.getElementById('orgName').value.trim(),
+                 phone: document.getElementById('orgPhone').value.trim(),
+                 telegram: document.getElementById('orgTelegram').value.trim(),
+                 address: document.getElementById('orgAddress').value.trim(),
+                 website: document.getElementById('orgWebsite').value.trim(),
+             };
+
+             try {
+                 const response = await fetch('/admin/save_contact_info', {
+                     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 = 'Реквизиты успешно обновлены!';
+                     // No reload needed, data is saved
+                 } else {
+                     throw new Error(result.message || 'Произошла ошибка');
+                 }
+             } catch (error) {
+                 statusEl.style.color = 'var(--admin-danger)';
+                 statusEl.textContent = `Ошибка: ${error.message}`;
+             }
+         }
+
+
         async function deleteClient(userId) {
             if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) {
                 return;
@@ -1472,8 +1570,14 @@ ADMIN_TEMPLATE = """
         }
 
         window.onclick = function(event) {
-            if (event.target.classList.contains('modal')) {
-                closeModal(event.target.id);
+            if (event.target == transactionModal) {
+                //closeModal('transactionModal'); // Keep open for now to avoid losing context
+            }
+            if (event.target == addClientModal) {
+                closeModal('addClientModal');
+            }
+             if (event.target == contactInfoModal) {
+                closeModal('contactInfoModal');
             }
         }
     </script>
@@ -1481,44 +1585,72 @@ ADMIN_TEMPLATE = """
 </html>
 """
 
+
 @app.route('/')
 def index():
     user_id_str = request.args.get('user_id_for_test')
-    
-    current_data = load_visitor_data()
+
+    full_data = load_full_data()
+    visitor_data = full_data.get('users', {})
+    contact_info = full_data.get('org_contact_info', {})
+
     user_data = {}
 
-    if user_id_str and user_id_str in current_data:
-        user_data = current_data[user_id_str]
+    if user_id_str and user_id_str in visitor_data:
+        user_data = visitor_data[user_id_str]
         user_data['id'] = user_id_str
 
+        # Prepare bonus history
         bonus_history = user_data.get('history', [])
+        # Ensure type is correctly set for older data
         for item in bonus_history:
+            if 'type' not in item: item['type'] = 'accrual' if item.get('description', '').startswith('Начисление') else 'deduction'
             item['transaction_type'] = 'bonus'
 
+        # Prepare debt history
         debt_history = user_data.get('debt_history', [])
+        # Ensure type is correctly set for older data
         for item in debt_history:
-            item['transaction_type'] = 'debt'
+             if 'type' not in item: item['type'] = 'accrual' if item.get('description', '') == 'Добавление долга' else 'payment'
+             item['transaction_type'] = 'debt'
+
+        # Prepare invoice history (simplified for combined display)
+        invoice_history = user_data.get('invoices', [])
+        invoice_history_for_display = []
+        for invoice in invoice_history:
+            invoice_history_for_display.append({
+                "date": invoice.get('date', datetime.now(BISHKEK_TZ).isoformat()), # Use creation date or fallback
+                "date_str": invoice.get('date_str', datetime.now(BISHKEK_TZ).strftime('%Y-%m-%d %H:%M:%S')),
+                "description": invoice.get('description', f"Накладная #{invoice.get('invoice_id', 'N/A')}"),
+                "total_amount": invoice.get('total_amount', 0),
+                "transaction_type": 'invoice',
+                # Optional: Add invoice ID or link if needed
+                "invoice_id": invoice.get('invoice_id')
+            })
+
 
         combined_history = sorted(
-            bonus_history + debt_history,
-            key=lambda x: x['date'],
+            bonus_history + debt_history + invoice_history_for_display,
+            key=lambda x: x.get('date', ''), # Sort by date
             reverse=True
         )
         user_data['combined_history'] = combined_history
+        user_data['invoices'] = user_data.get('invoices', []) # Ensure invoices list exists
+
     else:
+        # Default data for unverified/new users or if ID not found
         user_data = {
-            "id": "N/A",
+            "id": "N/A", # Or some placeholder
+            "first_name": "Гость",
             "bonuses": 0,
             "debts": 0,
             "history": [],
             "debt_history": [],
-            "combined_history": [],
             "invoices": [],
-            "first_name": "Гость"
+            "combined_history": []
         }
 
-    return render_template_string(TEMPLATE, user=user_data)
+    return render_template_string(TEMPLATE, user=user_data, contact_info=contact_info)
 
 @app.route('/verify', methods=['POST'])
 def verify_data():
@@ -1542,56 +1674,94 @@ def verify_data():
         if is_valid:
             tg_user_id = user_info_dict.get('id')
             if tg_user_id:
-                now = get_current_time_kyrgyzstan()
-                all_data = load_visitor_data()
-                
+                now_bishkek = datetime.now(BISHKEK_TZ)
+                all_data = load_full_data().get('users', {}) # Load only user data for lookup
+
                 existing_user_key = None
                 for key, user_data_item in all_data.items():
                     if str(user_data_item.get('telegram_id')) == str(tg_user_id):
                         existing_user_key = key
                         break
-                
+
+                user_id_to_return = None
+                user_entry = None
+
                 if existing_user_key:
                     user_entry = all_data[existing_user_key]
-                    user_entry.update({
-                        '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'),
-                        'visited_at': now.timestamp(),
-                        'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S')
-                    })
-                    user_id_to_save = existing_user_key
+                    # Update Telegram info if it exists and is different
+                    if user_entry.get('telegram_id') is not None:
+                         user_entry.update({
+                            'first_name': user_info_dict.get('first_name', user_entry.get('first_name')),
+                            'last_name': user_info_dict.get('last_name', user_entry.get('last_name')),
+                            'username': user_info_dict.get('username', user_entry.get('username')),
+                            'photo_url': user_info_dict.get('photo_url', user_entry.get('photo_url')),
+                            'language_code': user_info_dict.get('language_code', user_entry.get('language_code')),
+                            'is_premium': user_info_dict.get('is_premium', user_entry.get('is_premium', False)),
+                            'visited_at': now_bishkek.timestamp(),
+                            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
+                         })
+                    user_id_to_return = existing_user_key
                 else:
-                    new_user_id = generate_unique_id(all_data)
-                    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': [],
-                        '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})
+                    # Check if a user with this phone number already exists (added manually)
+                    phone_number = user_info_dict.get('phone_number')
+                    if phone_number:
+                        for key, user_data_item in all_data.items():
+                             if user_data_item.get('phone_number') == phone_number:
+                                  existing_user_key = key
+                                  break
+
+                    if existing_user_key:
+                        # Link existing phone user to Telegram
+                        user_entry = all_data[existing_user_key]
+                        user_entry.update({
+                            'telegram_id': tg_user_id,
+                            'first_name': user_info_dict.get('first_name', user_entry.get('first_name')),
+                            'last_name': user_info_dict.get('last_name', user_entry.get('last_name')),
+                            'username': user_info_dict.get('username', user_entry.get('username')),
+                            'photo_url': user_info_dict.get('photo_url', user_entry.get('photo_url')),
+                            'language_code': user_info_dict.get('language_code', user_entry.get('language_code')),
+                             'is_premium': user_info_dict.get('is_premium', user_entry.get('is_premium', False)),
+                            'visited_at': now_bishkek.timestamp(),
+                            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
+                        })
+                        user_id_to_return = existing_user_key
+
+                    else:
+                        # Create a brand new user
+                        new_user_id = generate_unique_id(all_data)
+                        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', 'ru'),
+                            'is_premium': user_info_dict.get('is_premium', False),
+                            'phone_number': user_info_dict.get('phone_number'), # Save phone if available from TG
+                            'visited_at': now_bishkek.timestamp(),
+                            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S'),
+                            'bonuses': 0,
+                            'history': [],
+                            'debts': 0,
+                            'debt_history': [],
+                            'invoices': [] # Initialize invoices list
+                        }
+                        user_id_to_return = new_user_id
+
+                if user_id_to_return and user_entry:
+                     save_visitor_data({user_id_to_return: user_entry}) # Use save_visitor_data to trigger full save
+                     return jsonify({"status": "ok", "verified": True, "user_id": user_id_to_return})
+                else:
+                     # Should not happen if tg_user_id is present, but safety check
+                    return jsonify({"status": "error", "verified": True, "message": "Could not create or find user entry"}), 500
+
             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')}")
+            logging.warning(f"Verification failed for initData: {init_data_str}")
+            # Optionally return a specific ID for "unverified" view or an error
+            # For now, return invalid response
             return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
 
     except Exception as e:
@@ -1600,64 +1770,100 @@ def verify_data():
 
 @app.route('/admin')
 def admin_panel():
-    current_data = load_visitor_data()
+    full_data = load_full_data()
+    visitor_data = full_data.get('users', {})
+    contact_info = full_data.get('org_contact_info', {})
+
     users_list = []
-    for user_id, user_data in current_data.items():
-        user_data['id'] = user_id
-        users_list.append(user_data)
-    
+    for user_id, user_data in visitor_data.items():
+        user_data_copy = user_data.copy() # Avoid modifying cache directly
+        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)
     total_debts = sum(u.get('debts', 0) for u in users_list)
-    users_with_debt = sum(1 for u in users_list if u.get('debts', 0) > 0)
-    
+    users_with_debt = sum(1 for u in users_list if u.get('debts', 0) > 0.01) # Account for float errors
+
     summary_stats = {
         "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)
+
+    # Need a Jinja filter to_json to pass complex objects to JS
+    def to_json(obj):
+        return json.dumps(obj)
+    app.jinja_env.filters['tojson'] = to_json
+
+    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats, contact_info=contact_info)
+
+@app.route('/admin/save_contact_info', methods=['POST'])
+def save_contact_info_route():
+    try:
+        data = request.get_json()
+        # Basic validation/cleaning
+        contact_info = {
+            'name': data.get('name', '').strip(),
+            'phone': data.get('phone', '').strip(),
+            'whatsapp': data.get('phone', '').strip(), # Use phone for whatsapp link
+            'telegram': data.get('telegram', '').strip(),
+            'address': data.get('address', '').strip(),
+            'website': data.get('website', '').strip(),
+        }
+        save_org_contact_info(contact_info)
+        return jsonify({"status": "ok", "message": "Contact info updated successfully"}), 200
+    except Exception as e:
+        logging.exception("Error in /admin/save_contact_info endpoint")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
 
 @app.route('/admin/add_client', methods=['POST'])
 def add_client():
     try:
         data = request.get_json()
-        phone_number = data.get('phone_number')
-        first_name = data.get('first_name')
+        phone_number = data.get('phone_number', '').strip()
+        first_name = data.get('first_name', '').strip()
 
         if not phone_number or not first_name:
             return jsonify({"status": "error", "message": "Имя и номер телефона обязательны."}), 400
-        
-        all_data = load_visitor_data()
 
+        all_data = load_full_data().get('users', {})
+
+        # Check for existing client with this phone number
         for user in all_data.values():
             if user.get('phone_number') == phone_number:
                 return jsonify({"status": "error", "message": "Клиент с таким номером телефона уже существует."}), 409
+            # Also check if this phone number is already linked to a Telegram user
+            if user.get('telegram_id') is not None and user.get('phone_number') == phone_number:
+                 return jsonify({"status": "error", "message": "Этот номер телефона уже привязан к клиенту Telegram."}), 409
+
 
-        now = get_current_time_kyrgyzstan()
+        now_bishkek = datetime.now(BISHKEK_TZ)
         new_id = generate_unique_id(all_data)
-        
+
         new_client = {
             'id': new_id,
-            'telegram_id': None,
+            'telegram_id': None, # Manually added clients have no TG ID initially
             'first_name': first_name,
             'last_name': None,
             'username': None,
             'photo_url': None,
-            'language_code': 'ru',
+            'language_code': 'ru', # Default language
             'is_premium': False,
             'phone_number': phone_number,
-            'visited_at': now.timestamp(),
-            'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S'),
+            'created_at': now_bishkek.timestamp(), # Track creation date
+            'created_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S'),
+            'visited_at': now_bishkek.timestamp(), # Same as created initially
+            'visited_at_str': now_bishkek.strftime('%Y-%m-%d %H:%M:%S'),
             'bonuses': 0,
             'history': [],
             'debts': 0,
             'debt_history': [],
-            'invoices': []
+            'invoices': [] # Initialize invoices list
         }
-        
+
         save_visitor_data({new_id: new_client})
 
         return jsonify({"status": "ok", "message": "Client added successfully"}), 201
@@ -1666,6 +1872,7 @@ def add_client():
         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:
@@ -1678,64 +1885,93 @@ def add_transaction():
 
         if not user_id:
             return jsonify({"status": "error", "message": "User ID is required"}), 400
-        
+
         user_id_str = str(user_id)
-        all_data = load_visitor_data()
+        all_data = load_full_data().get('users', {})
 
         if user_id_str not in all_data:
             return jsonify({"status": "error", "message": "User not found"}), 404
 
         user = all_data[user_id_str]
-        now = get_current_time_kyrgyzstan()
-        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
-        
-        if repay_debt_amount > user.get('debts', 0):
-            return jsonify({"status": "error", "message": "Сумма погашения превышает текущий долг"}), 400
+        now_bishkek = datetime.now(BISHKEK_TZ)
+        now_iso = now_bishkek.isoformat()
+        now_str = now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
+
+        current_bonuses = user.get('bonuses', 0)
+        current_debts = user.get('debts', 0)
+
+        if deduct_amount > (current_bonuses + 0.001): # Allow for minor float inaccuracies
+             return jsonify({"status": "error", "message": f"Недостаточно бонусов для списания. Доступно: {current_bonuses:.2f}"}), 400
+
+        if repay_debt_amount > (current_debts + 0.001): # Allow for minor float inaccuracies
+            return jsonify({"status": "error", "message": f"Сумма погашения ({repay_debt_amount:.2f}) превышает текущий долг ({current_debts:.2f})."}), 400
 
+        # Bonus operations
         accrual_amount = purchase_amount * 0.02
-        user['bonuses'] = user.get('bonuses', 0) + accrual_amount - deduct_amount
+        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:.2f}",
-                "date": now_iso, "date_str": now_str
-            })
-        if deduct_amount > 0:
-            user['history'].append({
-                "type": "deduction", "amount": deduct_amount,
-                "description": f"Списание бонусов ({deduct_amount:.2f})",
-                "date": now_iso, "date_str": now_str
-            })
+        new_bonus_debt_history = []
+
+        if accrual_amount > 0.001: # Only add if significant amount
+            entry = {
+                "type": "accrual", "amount": round(accrual_amount, 2),
+                "description": f"Начисление с покупки {round(purchase_amount, 2)} ₽",
+                "date": now_iso, "date_str": now_str,
+                "transaction_type": "bonus"
+            }
+            user['history'].append(entry)
+            new_bonus_debt_history.append(entry)
+
+        if deduct_amount > 0.001: # Only add if significant amount
+            entry = {
+                "type": "deduction", "amount": round(deduct_amount, 2),
+                "description": "Списание бонусов",
+                "date": now_iso, "date_str": now_str,
+                "transaction_type": "bonus"
+            }
+            user['history'].append(entry)
+            new_bonus_debt_history.append(entry)
+
+        # Debt operations
+        user['debts'] = current_debts + add_debt_amount - repay_debt_amount
 
-        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 add_debt_amount > 0:
-            user['debt_history'].append({
-                "type": "accrual", "amount": add_debt_amount,
-                "description": f"Добавление долга {add_debt_amount:.2f}",
-                "date": now_iso, "date_str": now_str
-            })
-        if repay_debt_amount > 0:
-            user['debt_history'].append({
-                "type": "payment", "amount": repay_debt_amount,
-                "description": f"Погашение долга {repay_debt_amount:.2f}",
-                "date": now_iso, "date_str": now_str
-            })
-        
-        save_visitor_data({user_id_str: user})
+        if add_debt_amount > 0.001: # Only add if significant amount
+            entry = {
+                "type": "accrual", "amount": round(add_debt_amount, 2),
+                "description": "Добавление долга",
+                "date": now_iso, "date_str": now_str,
+                "transaction_type": "debt"
+            }
+            user['debt_history'].append(entry)
+            new_bonus_debt_history.append(entry)
+
+        if repay_debt_amount > 0.001: # Only add if significant amount
+            entry = {
+                "type": "payment", "amount": round(repay_debt_amount, 2),
+                "description": "Погашение долга",
+                "date": now_iso, "date_str": now_str,
+                 "transaction_type": "debt"
+            }
+            user['debt_history'].append(entry)
+            new_bonus_debt_history.append(entry)
+
+        # Ensure bonuses and debts are rounded for storage
+        user['bonuses'] = round(user.get('bonuses', 0), 2)
+        user['debts'] = round(user.get('debts', 0), 2)
+
+
+        save_visitor_data({user_id_str: user}) # Use save_visitor_data to trigger full save
 
         return jsonify({
-            "status": "ok", "message": "Transaction successful", 
-            "new_balance": user['bonuses'], "new_debt": user['debts']
+            "status": "ok", "message": "Transaction successful",
+            "new_balance": user['bonuses'], "new_debt": user['debts'],
+            "history_entries": new_bonus_debt_history # Return new entries to update UI
         }), 200
 
     except Exception as e:
@@ -1747,75 +1983,82 @@ 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))
+        description = data.get('description', '').strip()
+        items = data.get('items', [])
 
-        if not user_id or not items:
-            return jsonify({"status": "error", "message": "User ID and items are required."}), 400
+        if not user_id:
+            return jsonify({"status": "error", "message": "User ID is required"}), 400
+        if not items:
+             return jsonify({"status": "error", "message": "Invoice must contain at least one item."}), 400
 
         user_id_str = str(user_id)
-        all_data = load_visitor_data()
+        all_data = load_full_data().get('users', {})
 
         if user_id_str not in all_data:
-            return jsonify({"status": "error", "message": "User not found."}), 404
+            return jsonify({"status": "error", "message": "User not found"}), 404
 
         user = all_data[user_id_str]
-        now = get_current_time_kyrgyzstan()
-        now_iso = now.isoformat()
-        now_str = now.strftime('%Y-%m-%d %H:%M:%S')
+        now_bishkek = datetime.now(BISHKEK_TZ)
+        now_iso = now_bishkek.isoformat()
+        now_str = now_bishkek.strftime('%Y-%m-%d %H:%M:%S')
+
+        total_amount = 0
+        processed_items = []
+        for item in items:
+            name = item.get('name', '').strip()
+            quantity = float(item.get('quantity', 0))
+            price_per_unit = float(item.get('price_per_unit', 0))
+
+            if not name or quantity <= 0 or price_per_unit < 0:
+                 # Log invalid item but maybe continue or return error? Let's return error for data integrity.
+                 logging.warning(f"Invalid item data for user {user_id}: {item}")
+                 return jsonify({"status": "error", "message": "Invalid item data detected."}), 400
+
+            item_total = quantity * price_per_unit
+            total_amount += item_total
+            processed_items.append({
+                "name": name,
+                "quantity": round(quantity, 2),
+                "price_per_unit": round(price_per_unit, 2)
+            })
+
+        if 'invoices' not in user or not isinstance(user['invoices'], list):
+             user['invoices'] = []
+
+        invoice_id = len(user['invoices']) + 1 # Simple sequential ID per user
 
-        next_invoice_id = 1
-        if user.get('invoices'):
-            next_invoice_id = max(inv['id'] for inv in user['invoices']) + 1
-        
         new_invoice = {
-            'id': next_invoice_id,
-            'items': items,
-            'total_amount': total_amount,
-            'date': now_iso,
-            'date_str': now_str
+            "invoice_id": invoice_id,
+            "date": now_iso,
+            "date_str": now_str,
+            "description": description,
+            "items": processed_items,
+            "total_amount": round(total_amount, 2)
         }
 
-        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 added successfully."}), 201
-
-    except Exception as e:
-        logging.exception("Error in /admin/add_invoice endpoint")
-        return jsonify({"status": "error", "message": str(e)}), 500
-
-@app.route('/admin/delete_invoice', methods=['POST'])
-def delete_invoice():
-    try:
-        data = request.get_json()
-        user_id = data.get('user_id')
-        invoice_id = int(data.get('invoice_id'))
 
-        if not user_id or invoice_id is None:
-            return jsonify({"status": "error", "message": "User ID and Invoice ID are required."}), 400
+        save_visitor_data({user_id_str: user}) # Use save_visitor_data to trigger full save
 
-        user_id_str = str(user_id)
-        all_data = load_visitor_data()
+        # Return the new invoice entry formatted for history display
+        invoice_entry_for_history = {
+            "date": new_invoice["date"],
+            "date_str": new_invoice["date_str"],
+            "description": new_invoice["description"] or f"Накладная #{new_invoice['invoice_id']}",
+            "total_amount": new_invoice["total_amount"],
+            "transaction_type": 'invoice'
+        }
 
-        if user_id_str not in all_data:
-            return jsonify({"status": "error", "message": "User not found."}), 404
 
-        user = all_data[user_id_str]
-        
-        initial_invoice_count = len(user.get('invoices', []))
-        user['invoices'] = [inv for inv in user.get('invoices', []) if inv['id'] != invoice_id]
-        
-        if len(user['invoices']) == initial_invoice_count:
-            return jsonify({"status": "error", "message": "Invoice not found for this user."}), 404
-        
-        save_visitor_data({user_id_str: user})
-        return jsonify({"status": "ok", "message": "Invoice deleted successfully."}), 200
+        return jsonify({
+            "status": "ok",
+            "message": "Invoice added successfully",
+            "invoice_entry": new_invoice, # Return full invoice data
+             "history_entry": invoice_entry_for_history # Return entry formatted for history list
+            }), 201
 
     except Exception as e:
-        logging.exception("Error in /admin/delete_invoice endpoint")
+        logging.exception("Error in /admin/add_invoice endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 
@@ -1829,26 +2072,20 @@ def delete_client():
             return jsonify({"status": "error", "message": "User ID is required"}), 400
 
         user_id_str = str(user_id)
-        load_visitor_data()
+        load_full_data() # Ensure cache is loaded
 
         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]
+            # Prevent deletion of users linked to Telegram accounts
             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)
-                logging.info(f"User {user_id_str} deleted. Data saved to {DATA_FILE}.")
-                upload_data_to_hf_async()
-            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
+        save_full_data() # Save locally and trigger HF upload
 
         return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
 
@@ -1865,14 +2102,14 @@ if __name__ == '__main__':
          print("Attempting initial data download from Hugging Face...")
          download_data_from_hf()
 
-    load_visitor_data()
+    load_full_data() # Initial load into cache
 
     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)
\ No newline at end of file
+    app.run(host=HOST, port=PORT, debug=False)