diff --git "a/app.py" "b/app.py"
--- "a/app.py"
+++ "b/app.py"
@@ -8,12 +8,13 @@ import json
 from urllib.parse import unquote, parse_qs, quote
 import time
 from datetime import datetime
+from zoneinfo import ZoneInfo
 import logging
 import threading
 import random
 from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError
-import pytz
+import uuid
 
 BOT_TOKEN = os.getenv("BOT_TOKEN", "7835463659:AAGNePbelZIAOeaglyQi1qulOqnjs4BGQn4")
 HOST = '0.0.0.0'
@@ -25,41 +26,30 @@ 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 = {}
+_organization_info_cache = {}
+
+BISHKEK_TZ = ZoneInfo("Asia/Bishkek")
 
-DEFAULT_ORGANIZATION_INFO = {
-    "name": "Название вашей организации",
-    "phones": ["+996000123456"],
-    "address": "г. Бишкек, ул. Примерная, д.1",
-    "links": [{"label": "Наш сайт", "url": "https://example.com"}]
-}
+def get_now_bishkek():
+    return datetime.now(BISHKEK_TZ)
 
-def generate_unique_id(all_data_keys):
+def generate_unique_id(all_data):
     while True:
         new_id = str(random.randint(10000, 99999))
-        if new_id not in all_data_keys:
+        if new_id not in all_data and new_id != '__ORG_INFO__':
             return new_id
 
-def generate_invoice_id():
-    return f"INV-{int(time.time() * 1000)}-{random.randint(100, 999)}"
-
-def get_current_time_bishkek():
-    return datetime.now(BISHKEK_TZ)
-
 def download_data_from_hf():
-    global visitor_data_cache
+    global visitor_data_cache, _organization_info_cache
     if not HF_TOKEN_READ:
-        logging.warning("HF_TOKEN_READ not set. Skipping Hugging Face download.")
         return False
     try:
-        logging.info(f"Attempting to download {HF_DATA_FILE_PATH} from {REPO_ID}...")
         hf_hub_download(
             repo_id=REPO_ID,
             filename=HF_DATA_FILE_PATH,
@@ -70,61 +60,83 @@ def download_data_from_hf():
             force_download=True,
             etag_timeout=10
         )
-        logging.info("Data file successfully downloaded from Hugging Face.")
         with _data_lock:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    visitor_data_cache = json.load(f)
-                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.")
+                    full_data = json.load(f)
+                    _organization_info_cache = full_data.pop('__ORG_INFO__', {})
+                    visitor_data_cache = full_data
+            except (FileNotFoundError, json.JSONDecodeError):
                  visitor_data_cache = {}
+                 _organization_info_cache = {}
         return True
     except RepositoryNotFoundError:
-        logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download data.")
-    except Exception as e:
-        logging.error(f"Error downloading data from Hugging Face: {e}")
+        pass
+    except Exception:
+        pass
     return False
 
-def load_data():
-    global visitor_data_cache
+def load_visitor_data():
+    global visitor_data_cache, _organization_info_cache
     with _data_lock:
-        if not visitor_data_cache:
+        if not visitor_data_cache and not _organization_info_cache:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    visitor_data_cache = json.load(f)
-                logging.info("Data loaded from local JSON.")
+                    full_data = json.load(f)
+                    _organization_info_cache = full_data.pop('__ORG_INFO__', {})
+                    visitor_data_cache = full_data
             except FileNotFoundError:
-                logging.warning(f"{DATA_FILE} not found locally. Initializing with default structure.")
-                visitor_data_cache = {"organization_info": DEFAULT_ORGANIZATION_INFO}
+                visitor_data_cache = {}
+                _organization_info_cache = {}
             except json.JSONDecodeError:
-                logging.error(f"Error decoding {DATA_FILE}. Initializing with default structure.")
-                visitor_data_cache = {"organization_info": DEFAULT_ORGANIZATION_INFO}
-            except Exception as e:
-                logging.error(f"Unexpected error loading data: {e}")
-                visitor_data_cache = {"organization_info": DEFAULT_ORGANIZATION_INFO}
-        
-        if 'organization_info' not in visitor_data_cache:
-            visitor_data_cache['organization_info'] = DEFAULT_ORGANIZATION_INFO
-        
+                visitor_data_cache = {}
+                _organization_info_cache = {}
+            except Exception:
+                visitor_data_cache = {}
+                _organization_info_cache = {}
         return visitor_data_cache
 
-def save_data_sync():
+def get_organization_info():
+    if not _organization_info_cache:
+        return {
+            "organization_name": "Название организации",
+            "phone_numbers": [],
+            "address": "Адрес организации",
+            "whatsapp_link": "",
+            "telegram_link": ""
+        }
+    return _organization_info_cache
+
+def save_visitor_data(data):
     with _data_lock:
         try:
+            visitor_data_cache.update(data)
+            data_to_save = visitor_data_cache.copy()
+            if _organization_info_cache:
+                data_to_save['__ORG_INFO__'] = _organization_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"Data successfully saved to {DATA_FILE}.")
+                json.dump(data_to_save, f, ensure_ascii=False, indent=4)
             upload_data_to_hf_async()
-        except Exception as e:
-            logging.error(f"Error saving data: {e}")
+        except Exception:
+            pass
+
+def save_organization_info(org_info):
+    global _organization_info_cache
+    with _data_lock:
+        try:
+            _organization_info_cache.update(org_info)
+            data_to_save = visitor_data_cache.copy()
+            data_to_save['__ORG_INFO__'] = _organization_info_cache
+            with open(DATA_FILE, 'w', encoding='utf-8') as f:
+                json.dump(data_to_save, f, ensure_ascii=False, indent=4)
+            upload_data_to_hf_async()
+        except Exception:
+            pass
 
 def upload_data_to_hf():
     if not HF_TOKEN_WRITE:
-        logging.warning("HF_TOKEN_WRITE not set. Skipping Hugging Face upload.")
         return
     if not os.path.exists(DATA_FILE):
-        logging.warning(f"{DATA_FILE} does not exist. Skipping upload.")
         return
 
     try:
@@ -132,21 +144,18 @@ def upload_data_to_hf():
         with _data_lock:
              file_content_exists = os.path.getsize(DATA_FILE) > 0
              if not file_content_exists:
-                 logging.warning(f"{DATA_FILE} is empty. Skipping upload.")
                  return
 
-             logging.info(f"Attempting to upload {DATA_FILE} to {REPO_ID}/{HF_DATA_FILE_PATH}...")
              api.upload_file(
                  path_or_fileobj=DATA_FILE,
                  path_in_repo=HF_DATA_FILE_PATH,
                  repo_id=REPO_ID,
                  repo_type="dataset",
                  token=HF_TOKEN_WRITE,
-                 commit_message=f"Update data {get_current_time_bishkek().strftime('%Y-%m-%d %H:%M:%S')}"
+                 commit_message=f"Update bonus data {get_now_bishkek().strftime('%Y-%m-%d %H:%M:%S')}"
              )
-        logging.info("Data successfully uploaded to Hugging Face.")
-    except Exception as e:
-        logging.error(f"Error uploading data to Hugging Face: {e}")
+    except Exception:
+        pass
 
 def upload_data_to_hf_async():
      upload_thread = threading.Thread(target=upload_data_to_hf, daemon=True)
@@ -154,11 +163,9 @@ def upload_data_to_hf_async():
 
 def periodic_backup():
      if not HF_TOKEN_WRITE:
-         logging.info("Periodic backup disabled: HF_TOKEN_WRITE not set.")
          return
      while True:
          time.sleep(3600)
-         logging.info("Initiating periodic backup...")
          upload_data_to_hf()
 
 def verify_telegram_data(init_data_str):
@@ -180,14 +187,12 @@ def verify_telegram_data(init_data_str):
         if calculated_hash == received_hash:
             auth_date = int(parsed_data.get('auth_date', [0])[0])
             current_time = int(time.time())
-            if current_time - auth_date > 86400: # 24 hours
-                 logging.warning(f"Telegram InitData is older than 24 hours (Auth Date: {auth_date}, Current: {current_time}).")
+            if current_time - auth_date > 86400:
+                 pass
             return parsed_data, True
         else:
-            logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
             return parsed_data, False
-    except Exception as e:
-        logging.error(f"Error verifying Telegram data: {e}")
+    except Exception:
         return None, False
 
 TEMPLATE = """
@@ -217,6 +222,9 @@ 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);
+            --btn-bg: #333;
+            --btn-text: #fff;
+            --btn-hover: #555;
         }
         * { box-sizing: border-box; margin: 0; padding: 0; }
         html, body {
@@ -230,60 +238,231 @@ TEMPLATE = """
             visibility: hidden;
             min-height: 100vh;
         }
-        .container { max-width: 600px; margin: 0 auto; display: flex; flex-direction: column; gap: var(--padding-m); }
-        .header { text-align: left; padding: var(--padding-m) 0; }
-        .logo { font-size: 2.5em; font-weight: 800; color: var(--text-color); letter-spacing: -1px; }
+        .container {
+            max-width: 600px;
+            margin: 0 auto;
+            display: flex;
+            flex-direction: column;
+            gap: var(--padding-m);
+        }
+        .header {
+            text-align: left;
+            padding: var(--padding-m) 0;
+        }
+        .logo {
+            font-size: 2.5em;
+            font-weight: 800;
+            color: var(--text-color);
+            letter-spacing: -1px;
+        }
         .logo span { color: var(--brand-yellow); }
-        .welcome-text { font-size: 1em; color: var(--text-secondary-color); margin-top: 4px; }
-        .card-grid { display: grid; grid-template-columns: 1fr 1fr; gap: var(--padding-m); }
-        .bonus-card, .debt-card { background: linear-gradient(145deg, #2a2a2a, #1c1c1c); border-radius: calc(var(--border-radius) + 8px); padding: var(--padding-l); text-align: center; position: relative; overflow: hidden; }
-        .bonus-card { box-shadow: var(--shadow-glow); border: 1px solid rgba(255, 193, 7, 0.2); }
-        .debt-card { box-shadow: var(--shadow-glow-red); border: 1px solid rgba(244, 67, 54, 0.2); }
-        .card-label { font-size: 1.1em; font-weight: 500; color: var(--text-secondary-color); margin-bottom: 12px; }
-        .bonus-amount, .debt-amount { font-size: 3em; font-weight: 800; letter-spacing: -2px; line-height: 1; }
-        .bonus-amount { color: var(--brand-yellow); }
-        .debt-amount { color: var(--brand-red); }
-        .client-id-card { background-color: var(--card-bg); border-radius: var(--border-radius); padding: var(--padding-m); display: flex; justify-content: space-between; align-items: center; }
-        .client-id-label { font-weight: 500; color: var(--text-secondary-color); }
-        .client-id-value { font-size: 1.3em; font-weight: 700; color: var(--brand-yellow); letter-spacing: 2px; background-color: rgba(255,193,7,0.1); padding: 4px 10px; border-radius: 8px; }
-        
-        .navigation-tabs { display: flex; gap: 8px; margin-bottom: var(--padding-m); }
-        .navigation-tabs button {
-            flex-grow: 1; padding: 12px 10px; font-size: 0.9em; font-weight: 600; color: var(--text-secondary-color);
-            background-color: var(--card-bg); border: 1px solid rgba(255,255,255,0.1); border-radius: 10px; cursor: pointer; transition: all 0.2s ease;
-        }
-        .navigation-tabs button.active { color: var(--brand-black); background-color: var(--brand-yellow); border-color: var(--brand-yellow); }
-        .content-pane { background-color: var(--card-bg); border-radius: var(--border-radius); padding: var(--padding-l); display: none; }
-        .content-pane.active { display: block; }
-        .pane-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); }
-        .list { list-style: none; padding: 0; margin: 0; max-height: 40vh; overflow-y: auto; }
-        .list-item { display: flex; justify-content: space-between; align-items: center; padding: 14px 4px; border-bottom: 1px solid rgba(255, 255, 255, 0.05); }
-        .list-item:last-child { border-bottom: none; }
-        .list-item-details { display: flex; flex-direction: column; }
-        .list-item-description { font-size: 1em; font-weight: 500; }
-        .list-item-subtext { font-size: 0.8em; color: var(--text-secondary-color); margin-top: 4px; }
-        .list-item-amount { font-size: 1.1em; font-weight: 700; }
-        .amount-accrual { color: #4CAF50; }
-        .amount-deduction { color: #F44336; }
-        .no-items { text-align: center; color: var(--text-secondary-color); padding: 2rem 0; }
-
-        .biz-card-item { margin-bottom: 12px; }
-        .biz-card-label { font-size: 0.9em; color: var(--text-secondary-color); margin-bottom: 4px; }
-        .biz-card-value { font-size: 1.1em; font-weight: 500; }
-        .biz-card-phone-actions a { margin-right: 10px; color: var(--brand-yellow); text-decoration: none; font-size: 0.9em;}
-        .biz-card-link a { color: var(--brand-yellow); text-decoration: none; }
-
-        .invoice-item-details { cursor: pointer; }
-        .invoice-details-modal { display: none; position: fixed; z-index: 1000; left: 0; top: 0; width: 100%; height: 100%; overflow: auto; background-color: rgba(0,0,0,0.7); backdrop-filter: blur(5px); }
-        .invoice-modal-content { background-color: var(--card-bg); margin: 15% auto; padding: var(--padding-l); border-radius: var(--border-radius); width: 90%; max-width: 500px; box-shadow: 0 5px 25px rgba(0,0,0,0.3); }
-        .invoice-modal-header { display: flex; justify-content: space-between; align-items: center; border-bottom: 1px solid rgba(255,255,255,0.1); padding-bottom: var(--padding-m); margin-bottom: var(--padding-m); }
-        .invoice-modal-title { font-size: 1.3em; font-weight: 700; }
-        .invoice-modal-close { font-size: 1.8em; font-weight: bold; cursor: pointer; color: var(--text-secondary-color); }
-        .invoice-modal-body table { width: 100%; border-collapse: collapse; }
-        .invoice-modal-body th, .invoice-modal-body td { text-align: left; padding: 8px 4px; border-bottom: 1px solid rgba(255,255,255,0.05); font-size: 0.95em; }
-        .invoice-modal-body th { font-weight: 600; color: var(--text-secondary-color); }
-        .invoice-modal-body .item-qty, .invoice-modal-body .item-price, .invoice-modal-body .item-total { text-align: right; }
-        .invoice-grand-total { text-align: right; font-size: 1.1em; font-weight: 700; margin-top: var(--padding-m); padding-top: var(--padding-m); border-top: 1px solid rgba(255,255,255,0.1); }
+        .welcome-text {
+            font-size: 1em;
+            color: var(--text-secondary-color);
+            margin-top: 4px;
+        }
+        .card-grid {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            gap: var(--padding-m);
+        }
+        .bonus-card, .debt-card {
+            background: linear-gradient(145deg, #2a2a2a, #1c1c1c);
+            border-radius: calc(var(--border-radius) + 8px);
+            padding: var(--padding-l);
+            text-align: center;
+            position: relative;
+            overflow: hidden;
+        }
+        .bonus-card {
+            box-shadow: var(--shadow-glow);
+            border: 1px solid rgba(255, 193, 7, 0.2);
+        }
+        .debt-card {
+            box-shadow: var(--shadow-glow-red);
+            border: 1px solid rgba(244, 67, 54, 0.2);
+        }
+        .card-label {
+            font-size: 1.1em;
+            font-weight: 500;
+            color: var(--text-secondary-color);
+            margin-bottom: 12px;
+        }
+        .bonus-amount {
+            font-size: 3em;
+            font-weight: 800;
+            color: var(--brand-yellow);
+            letter-spacing: -2px;
+            line-height: 1;
+        }
+        .debt-amount {
+            font-size: 3em;
+            font-weight: 800;
+            color: var(--brand-red);
+            letter-spacing: -2px;
+            line-height: 1;
+        }
+        .client-id-card {
+            background-color: var(--card-bg);
+            border-radius: var(--border-radius);
+            padding: var(--padding-m);
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        .client-id-label {
+            font-weight: 500;
+            color: var(--text-secondary-color);
+        }
+        .client-id-value {
+            font-size: 1.3em;
+            font-weight: 700;
+            color: var(--brand-yellow);
+            letter-spacing: 2px;
+            background-color: rgba(255,193,7,0.1);
+            padding: 4px 10px;
+            border-radius: 8px;
+        }
+        .content-section {
+            background-color: var(--card-bg);
+            border-radius: var(--border-radius);
+            padding: var(--padding-l);
+            display: none;
+        }
+        .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-list, .invoice-list {
+            list-style: none;
+            padding: 0;
+            margin: 0;
+            max-height: 35vh;
+            overflow-y: auto;
+        }
+        .history-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 14px 4px;
+            border-bottom: 1px solid rgba(255, 255, 255, 0.05);
+        }
+        .history-item:last-child { border-bottom: none; }
+        .history-details { display: flex; flex-direction: column; }
+        .history-description { font-size: 1em; font-weight: 500; }
+        .history-date { font-size: 0.8em; color: var(--text-secondary-color); margin-top: 4px; }
+        .history-amount { font-size: 1.1em; font-weight: 700; }
+        .history-amount.accrual { color: #4CAF50; }
+        .history-amount.deduction { color: #F44336; }
+        .no-history {
+            text-align: center;
+            color: var(--text-secondary-color);
+            padding: 2rem 0;
+        }
+        .nav-buttons {
+            display: flex;
+            gap: 10px;
+            margin-bottom: var(--padding-m);
+        }
+        .nav-buttons .btn {
+            flex: 1;
+            padding: 12px 15px;
+            background-color: var(--btn-bg);
+            color: var(--btn-text);
+            border: none;
+            border-radius: 8px;
+            font-size: 1em;
+            font-weight: 600;
+            cursor: pointer;
+            transition: background-color 0.2s ease;
+        }
+        .nav-buttons .btn:hover {
+            background-color: var(--btn-hover);
+        }
+        .nav-buttons .btn.active {
+            background-color: var(--brand-yellow);
+            color: var(--brand-black);
+        }
+        .biz-card-section .org-info-card {
+            background-color: var(--card-bg);
+            border-radius: var(--border-radius);
+            padding: var(--padding-m);
+        }
+        .org-info-card p {
+            margin-bottom: 10px;
+            line-height: 1.4;
+        }
+        .org-info-card strong {
+            color: var(--brand-yellow);
+        }
+        .org-info-card ul {
+            list-style: none;
+            padding-left: 20px;
+            margin-bottom: 10px;
+        }
+        .org-info-card ul li {
+            margin-bottom: 5px;
+        }
+        .org-info-card a {
+            color: var(--brand-yellow);
+            text-decoration: none;
+            word-break: break-all;
+        }
+        .org-info-card a:hover {
+            text-decoration: underline;
+        }
+        .social-link {
+            display: inline-block;
+            margin-top: 5px;
+            padding: 8px 12px;
+            border-radius: 8px;
+            font-weight: 500;
+        }
+        .social-link.whatsapp {
+            background-color: #25D366;
+            color: white;
+        }
+        .social-link.telegram {
+            background-color: #0088CC;
+            color: white;
+        }
+        .invoice-item {
+            display: flex;
+            flex-direction: column;
+            padding: 14px 4px;
+            border-bottom: 1px solid rgba(255, 255, 255, 0.05);
+            cursor: pointer;
+        }
+        .invoice-item:last-child { border-bottom: none; }
+        .invoice-summary {
+            display: flex;
+            justify-content: space-between;
+            font-weight: 600;
+        }
+        .invoice-date {
+            font-size: 1em;
+            color: var(--text-secondary-color);
+        }
+        .invoice-total {
+            font-size: 1.1em;
+            color: var(--brand-yellow);
+        }
+        .invoice-details {
+            margin-top: 10px;
+            padding-left: 10px;
+            font-size: 0.9em;
+            color: var(--text-secondary-color);
+        }
+        .invoice-details ul {
+            list-style: disc;
+            padding-left: 20px;
+        }
+        .invoice-details li {
+            margin-bottom: 5px;
+        }
     </style>
 </head>
 <body>
@@ -309,28 +488,28 @@ TEMPLATE = """
             <p class="client-id-value">{{ user.id }}</p>
         </section>
 
-        <div class="navigation-tabs">
-            <button id="showHistoryBtn" class="nav-tab-button active">История Операций</button>
-            <button id="showInvoicesBtn" class="nav-tab-button">Мои Накладные</button>
-            <button id="showBizCardBtn" class="nav-tab-button">Визитка</button>
+        <div class="nav-buttons">
+            <button id="historyBtn" onclick="navigate('history')" class="btn">История операций</button>
+            <button id="invoicesBtn" onclick="navigate('invoices')" class="btn">Мои накладные</button>
+            <button id="cardBtn" onclick="navigate('card')" class="btn">Визитка</button>
         </div>
 
-        <section id="historyPane" class="content-pane active">
-            <h2 class="pane-title">История операций</h2>
+        <section class="content-section" id="historySection">
+            <h2 class="section-title">История операций</h2>
             {% if user.combined_history %}
-                <ul class="list">
+                <ul class="history-list">
                     {% for item in user.combined_history %}
-                        <li class="list-item">
-                            <div class="list-item-details">
-                                <span class="list-item-description">{{ item.description }}</span>
-                                <span class="list-item-subtext">{{ item.date_str }}</span>
+                        <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="list-item-amount {{ 'amount-accrual' if item.type == 'accrual' else 'amount-deduction' }}">
+                                <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="list-item-amount {{ 'amount-deduction' if item.type == 'accrual' else 'amount-accrual' }}">
+                                <span class="history-amount {{ 'deduction' if item.type == 'accrual' else 'accrual' }}">
                                     {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
                                 </span>
                             {% endif %}
@@ -338,75 +517,58 @@ TEMPLATE = """
                     {% endfor %}
                 </ul>
             {% else %}
-                <p class="no-items">Операций пока не было.</p>
+                <p class="no-history">Операций пока не было.</p>
             {% endif %}
         </section>
 
-        <section id="invoicesPane" class="content-pane">
-            <h2 class="pane-title">Мои накладные</h2>
+        <section class="content-section" id="invoicesSection">
+            <h2 class="section-title">Мои накладные</h2>
             {% if user.invoices %}
-                <ul class="list">
+                <ul class="invoice-list">
                     {% for invoice in user.invoices|sort(attribute='date', reverse=true) %}
-                        <li class="list-item invoice-item-details" onclick="showInvoiceDetails('{{ invoice.id }}')">
-                            <div class="list-item-details">
-                                <span class="list-item-description">Накладная #{{ invoice.id.split('-')[-1] }}</span>
-                                <span class="list-item-subtext">{{ invoice.date_str }}</span>
+                        <li class="invoice-item" onclick="toggleInvoiceDetails('{{ invoice.id }}')">
+                            <div class="invoice-summary">
+                                <span class="invoice-date">{{ invoice.date_str }}</span>
+                                <span class="invoice-total">{{ "%.2f"|format(invoice.total_amount|float) }}</span>
+                            </div>
+                            <div class="invoice-details" id="invoiceDetails-{{ invoice.id }}" style="display: none;">
+                                <ul>
+                                    {% for item in invoice.items %}
+                                        <li>{{ item.name }} x {{ item.quantity }} @ {{ "%.2f"|format(item.price_per_unit|float) }} = {{ "%.2f"|format(item.quantity * item.price_per_unit|float) }}</li>
+                                    {% endfor %}
+                                </ul>
                             </div>
-                            <span class="list-item-amount">{{ "%.2f"|format(invoice.grand_total|float) }}</span>
                         </li>
                     {% endfor %}
                 </ul>
             {% else %}
-                <p class="no-items">У вас пока нет накладных.</p>
+                <p class="no-history">Накладных пока нет.</p>
             {% endif %}
         </section>
 
-        <section id="bizCardPane" class="content-pane">
-            <h2 class="pane-title">Визитка организации</h2>
-            <div class="biz-card-item">
-                <p class="biz-card-label">Название:</p>
-                <p class="biz-card-value">{{ organization.name }}</p>
-            </div>
-            <div class="biz-card-item">
-                <p class="biz-card-label">Адрес:</p>
-                <p class="biz-card-value">{{ organization.address }}</p>
-            </div>
-            <div class="biz-card-item">
-                <p class="biz-card-label">Телефоны:</p>
-                {% for phone in organization.phones %}
-                <p class="biz-card-value">{{ phone }}</p>
-                <p class="biz-card-phone-actions">
-                    <a href="tel:{{ phone }}">Позвонить</a>
-                    <a href="https://wa.me/{{ phone|replace('+', '')|replace(' ', '')|replace('-', '') }}" target="_blank">WhatsApp</a>
-                    <a href="https://t.me/{{ phone|replace(' ', '')|replace('-', '') }}" target="_blank">Telegram</a>
-                </p>
-                {% endfor %}
-            </div>
-             {% if organization.links %}
-            <div class="biz-card-item">
-                <p class="biz-card-label">Ссылки:</p>
-                {% for link in organization.links %}
-                <p class="biz-card-link"><a href="{{ link.url }}" target="_blank">{{ link.label }}</a></p>
-                {% endfor %}
+        <section class="content-section" id="cardSection">
+            <h2 class="section-title">Визитка организации</h2>
+            <div class="org-info-card">
+                <p><strong>Организация:</strong> {{ org_info.organization_name }}</p>
+                <p><strong>Адрес:</strong> {{ org_info.address }}</p>
+                <p><strong>Телефоны:</strong></p>
+                <ul>
+                    {% for phone in org_info.phone_numbers %}
+                    <li><a href="tel:{{ phone }}">{{ phone }}</a></li>
+                    {% endfor %}
+                </ul>
+                {% if org_info.whatsapp_link %}
+                <p><a href="{{ org_info.whatsapp_link }}" target="_blank" class="social-link whatsapp">Написать в WhatsApp</a></p>
+                {% endif %}
+                {% if org_info.telegram_link %}
+                <p><a href="{{ org_info.telegram_link }}" target="_blank" class="social-link telegram">Написать в Telegram</a></p>
+                {% endif %}
             </div>
-            {% endif %}
         </section>
     </div>
 
-    <div id="invoiceDetailsModal" class="invoice-details-modal">
-        <div class="invoice-modal-content">
-            <div class="invoice-modal-header">
-                <h3 id="invoiceModalTitle" class="invoice-modal-title">Детали накладной</h3>
-                <span class="invoice-modal-close" onclick="closeInvoiceDetailsModal()">×</span>
-            </div>
-            <div id="invoiceModalBody" class="invoice-modal-body">
-            </div>
-        </div>
-    </div>
-    
     <script>
         const tg = window.Telegram.WebApp;
-        let userInvoices = {{ user.invoices|tojson|safe }};
 
         function applyTheme(themeParams) {
             const root = document.documentElement;
@@ -417,12 +579,47 @@ TEMPLATE = """
             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('--btn-bg', themeParams.secondary_bg_color || (isDark ? '#333' : '#e0e0e0'));
+            root.style.setProperty('--btn-text', themeParams.text_color || '#fff');
+            root.style.setProperty('--btn-hover', isDark ? '#555' : '#c0c0c0');
         }
         
+        function navigate(view) {
+            const url = new URL(window.location.href);
+            url.searchParams.set('view', view);
+            window.location.href = url.toString();
+        }
+
+        function showSection(view) {
+            document.querySelectorAll('.content-section').forEach(section => {
+                section.style.display = 'none';
+            });
+            const targetSection = document.getElementById(view + 'Section');
+            if (targetSection) {
+                targetSection.style.display = 'block';
+            } else {
+                document.getElementById('historySection').style.display = 'block';
+            }
+
+            document.querySelectorAll('.nav-buttons .btn').forEach(btn => {
+                btn.classList.remove('active');
+            });
+            document.getElementById(view + 'Btn').classList.add('active');
+            
+            document.body.style.visibility = 'visible';
+        }
+
+        function toggleInvoiceDetails(invoiceId) {
+            const details = document.getElementById(`invoiceDetails-${invoiceId}`);
+            if (details) {
+                details.style.display = details.style.display === 'none' ? 'block' : 'none';
+            }
+        }
+
         function setupTelegram() {
              if (!tg || !tg.initData) {
-                 console.error("Telegram WebApp script not loaded or initData is missing.");
                  document.body.style.visibility = 'visible';
+                 showSection('history');
                  return;
              }
              
@@ -436,6 +633,7 @@ TEMPLATE = """
 
              const urlParams = new URLSearchParams(window.location.search);
              const userIdForTest = urlParams.get('user_id_for_test');
+             const currentView = urlParams.get('view') || 'history';
 
              if (!userIdForTest) {
                 fetch('/verify', {
@@ -446,18 +644,16 @@ TEMPLATE = """
                 .then(response => response.json())
                 .then(data => {
                     if (data.status === 'ok' && data.verified && data.user_id) {
-                        window.location.replace('/?user_id_for_test=' + data.user_id);
+                        window.location.replace('/?user_id_for_test=' + data.user_id + '&view=' + currentView);
                     } else {
-                        console.warn('Backend verification failed:', data.message);
-                        document.body.style.visibility = 'visible';
+                        showSection(currentView);
                     }
                 })
                 .catch(error => {
-                    console.error('Error sending initData for verification:', error);
-                    document.body.style.visibility = 'visible';
+                    showSection(currentView);
                 });
              } else {
-                 document.body.style.visibility = 'visible';
+                 showSection(currentView);
              }
 
              const user = tg.initDataUnsafe?.user;
@@ -470,48 +666,6 @@ TEMPLATE = """
              }
          }
 
-        function setupNavigation() {
-            const buttons = document.querySelectorAll('.nav-tab-button');
-            const panes = document.querySelectorAll('.content-pane');
-
-            buttons.forEach(button => {
-                button.addEventListener('click', () => {
-                    buttons.forEach(btn => btn.classList.remove('active'));
-                    panes.forEach(pane => pane.classList.remove('active'));
-
-                    button.classList.add('active');
-                    const targetPaneId = button.id.replace('Btn', 'Pane');
-                    document.getElementById(targetPaneId).classList.add('active');
-                });
-            });
-        }
-        
-        function showInvoiceDetails(invoiceId) {
-            const invoice = userInvoices.find(inv => inv.id === invoiceId);
-            if (!invoice) return;
-
-            document.getElementById('invoiceModalTitle').textContent = `Накладная #${invoice.id.split('-').pop()} от ${invoice.date_str}`;
-            const modalBody = document.getElementById('invoiceModalBody');
-            let tableHTML = '<table><thead><tr><th>Товар</th><th class="item-qty">Кол-во</th><th class="item-price">Цена</th><th class="item-total">Сумма</th></tr></thead><tbody>';
-            invoice.items.forEach(item => {
-                tableHTML += `<tr>
-                                <td>${item.name}</td>
-                                <td class="item-qty">${item.quantity}</td>
-                                <td class="item-price">${parseFloat(item.price_per_unit).toFixed(2)}</td>
-                                <td class="item-total">${parseFloat(item.total_price).toFixed(2)}</td>
-                              </tr>`;
-            });
-            tableHTML += '</tbody></table>';
-            tableHTML += `<div class="invoice-grand-total">Итого: ${parseFloat(invoice.grand_total).toFixed(2)}</div>`;
-            modalBody.innerHTML = tableHTML;
-            document.getElementById('invoiceDetailsModal').style.display = 'block';
-        }
-
-        function closeInvoiceDetailsModal() {
-            document.getElementById('invoiceDetailsModal').style.display = 'none';
-        }
-
-
         if (window.Telegram && window.Telegram.WebApp) {
             setupTelegram();
         } else {
@@ -519,17 +673,10 @@ TEMPLATE = """
              setTimeout(() => {
                  if (document.body.style.visibility !== 'visible') {
                       document.body.style.visibility = 'visible';
+                      showSection(new URLSearchParams(window.location.search).get('view') || 'history');
                   }
              }, 3000);
         }
-        document.addEventListener('DOMContentLoaded', () => {
-            setupNavigation();
-             window.onclick = function(event) {
-                if (event.target == document.getElementById('invoiceDetailsModal')) {
-                    closeInvoiceDetailsModal();
-                }
-            }
-        });
     </script>
 </body>
 </html>
@@ -547,20 +694,23 @@ ADMIN_TEMPLATE = """
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <style>
         :root {
-            --admin-bg: #f8f9fa; --admin-text: #212529; --admin-card-bg: #ffffff; --admin-border: #dee2e6;
-            --admin-shadow: rgba(0, 0, 0, 0.05); --admin-primary: #FFC107; --admin-primary-dark: #e0a800;
-            --admin-secondary: #6c757d; --admin-success: #198754; --admin-danger: #dc3545;
-            --border-radius: 12px; --padding: 1.5rem; --font-family: 'Inter', sans-serif;
+            --admin-bg: #f8f9fa;
+            --admin-text: #212529;
+            --admin-card-bg: #ffffff;
+            --admin-border: #dee2e6;
+            --admin-shadow: rgba(0, 0, 0, 0.05);
+            --admin-primary: #FFC107;
+            --admin-primary-dark: #e0a800;
+            --admin-secondary: #6c757d;
+            --admin-success: #198754;
+            --admin-danger: #dc3545;
+            --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: var(--admin-text); }
         h1 { text-align: center; color: var(--admin-secondary); margin-bottom: var(--padding); font-weight: 600; }
-        .tabs { display: flex; margin-bottom: var(--padding); border-bottom: 1px solid var(--admin-border); }
-        .tab-button { padding: 10px 20px; cursor: pointer; background: none; border: none; font-size: 1.1em; font-weight: 500; color: var(--admin-secondary); border-bottom: 3px solid transparent; }
-        .tab-button.active { color: var(--admin-primary-dark); border-bottom-color: var(--admin-primary-dark); }
-        .tab-content { display: none; }
-        .tab-content.active { display: block; }
         .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; }
         .summary-card .value { font-size: 2em; font-weight: 700; }
@@ -574,8 +724,6 @@ ADMIN_TEMPLATE = """
         .btn-primary:hover { background-color: var(--admin-primary-dark); }
         .btn-delete { background-color: var(--admin-danger); color: white; }
         .btn-delete:hover { background-color: #c82333; }
-        .btn-success { background-color: var(--admin-success); color: white; }
-        .btn-success:hover { background-color: #146c43; }
         .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(340px, 1fr)); gap: var(--padding); margin-top: var(--padding); }
         .user-card { background-color: var(--admin-card-bg); border-radius: var(--border-radius); padding: var(--padding); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); display: flex; flex-direction: column; transition: transform 0.2s ease, box-shadow 0.2s ease; }
         .user-card:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(0, 0, 0, 0.08); }
@@ -587,7 +735,7 @@ ADMIN_TEMPLATE = """
         .user-balances .label { font-size: 0.9em; color: var(--admin-secondary); }
         .user-balances .amount.bonus { font-size: 1.8em; font-weight: 700; color: var(--admin-primary-dark); }
         .user-balances .amount.debt { font-size: 1.8em; font-weight: 700; color: var(--admin-danger); }
-        .user-actions { margin-top: auto; display: grid; grid-template-columns: 1fr; gap: 0.5rem; }
+        .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; }
@@ -600,57 +748,79 @@ ADMIN_TEMPLATE = """
         .form-section { border: 1px solid var(--admin-border); border-radius: 8px; padding: 1rem; margin-bottom: 1.5rem; }
         .form-section h3 { margin-top: 0; margin-bottom: 1rem; font-size: 1.1em; }
         .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; align-items: flex-end; }
-        .form-group { display: flex; flex-direction: column; margin-bottom: 1rem; }
+        .form-group { display: flex; flex-direction: column; }
         .form-group label { margin-bottom: 0.5rem; font-weight: 500; font-size: 0.9em; }
         .form-group input, .form-group textarea { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
-        .calculation-summary, .invoice-summary { background: #f0f0f0; padding: 1rem; border-radius: 8px; margin-top: 1rem; }
+        .calculation-summary { background: #f0f0f0; padding: 1rem; border-radius: 8px; margin-top: 1rem; }
         .summary-item { display: flex; justify-content: space-between; margin-bottom: 0.5rem; font-size: 0.95em; }
         .summary-item strong { font-weight: 600; }
-        .history-container, .invoice-list-container { margin-top: 1.5rem; }
-        .history-container h3, .invoice-list-container h3 { font-size: 1.2rem; margin-bottom: 1rem; }
-        .history-list, .invoice-list { list-style: none; padding: 0; max-height: 200px; overflow-y: auto; border: 1px solid var(--admin-border); border-radius: 8px; }
-        .history-item, .invoice-list-item { display: flex; justify-content: space-between; padding: 8px 12px; border-bottom: 1px solid var(--admin-border); }
-        .history-item:last-child, .invoice-list-item:last-child { border-bottom: none; }
-        .desc, .invoice-id { font-size: 0.9em; }
-        .date, .invoice-date { font-size: 0.8em; color: var(--admin-secondary); }
-        .amount.bonus-accrual, .amount.debt-payment { color: var(--admin-success); font-weight: 600; }
-        .amount.bonus-deduction, .amount.debt-accrual, .invoice-total { color: var(--admin-danger); font-weight: 600; }
+        .history-container { margin-top: 1.5rem; }
+        .history-container h3 { font-size: 1.2rem; margin-bottom: 1rem; }
+        .history-list { list-style: none; padding: 0; max-height: 200px; overflow-y: auto; border: 1px solid var(--admin-border); border-radius: 8px; }
+        .history-item { display: flex; justify-content: space-between; padding: 8px 12px; border-bottom: 1px solid var(--admin-border); }
+        .history-item:last-child { border-bottom: none; }
+        .history-item .desc { font-size: 0.9em; }
+        .history-item .date { font-size: 0.8em; color: var(--admin-secondary); }
+        .history-item .amount.bonus-accrual { color: var(--admin-success); font-weight: 600; }
+        .history-item .amount.bonus-deduction { color: var(--admin-danger); font-weight: 600; }
+        .history-item .amount.debt-accrual { color: var(--admin-danger); font-weight: 600; }
+        .history-item .amount.debt-payment { color: var(--admin-success); font-weight: 600; }
         .modal-footer { margin-top: 1.5rem; display: flex; justify-content: flex-end; align-items: center; gap: 1rem;}
         .modal-footer button { padding: 12px 25px; font-size: 1.1em; border-radius: 8px; border: none; font-weight: 600; cursor: pointer; }
         .btn-submit { background-color: var(--admin-success); color: white; }
-        .status-message { font-weight: 500; flex-grow: 1; text-align: left; }
-        .dynamic-list .item { display: flex; gap: 0.5rem; align-items: center; margin-bottom: 0.5rem; }
-        .dynamic-list .item input { flex-grow: 1; }
-        .dynamic-list .item button { padding: 8px 12px; font-size: 0.9em; }
-        .invoice-item-row { display: grid; grid-template-columns: 3fr 1fr 1.5fr 0.5fr; gap: 8px; margin-bottom: 8px; align-items: center;}
-        .invoice-item-row input {padding: 8px; font-size: 0.9em;}
-        #invoiceItemsContainer .remove-item-btn { background-color: var(--admin-danger); color:white; border:none; border-radius:4px; padding: 5px 8px; cursor:pointer;}
+        .status-message { text-align: center; font-weight: 500; flex-grow: 1; text-align: left; }
+
+        .invoice-items-preview {
+            border: 1px dashed var(--admin-border);
+            border-radius: 8px;
+            padding: 1rem;
+            margin-top: 1rem;
+        }
+        .invoice-items-preview ul {
+            list-style: none;
+            padding: 0;
+        }
+        .invoice-items-preview li {
+            padding: 5px 0;
+            border-bottom: 1px dotted rgba(0,0,0,0.1);
+        }
+        .invoice-items-preview li:last-child {
+            border-bottom: none;
+        }
     </style>
 </head>
 <body>
     <div class="container">
-        <h1>Панель администратора</h1>
-        <div class="tabs">
-            <button class="tab-button active" onclick="openTab(event, 'clientsTab')">Клиенты</button>
-            <button class="tab-button" onclick="openTab(event, 'orgTab')">Настройки организации</button>
-        </div>
-
-        <div id="clientsTab" class="tab-content active">
-            <h2>Управление клиентами</h2>
-            <div class="summary-bar">
-                <div class="summary-card"><div class="value">{{ summary.total_users }}</div><div class="label">Всего клиентов</div></div>
-                <div class="summary-card"><div class="value bonus">{{ "%.2f"|format(summary.total_bonuses|float) }}</div><div class="label">Всего бонусов</div></div>
-                <div class="summary-card"><div class="value debt">{{ "%.2f"|format(summary.total_debts|float) }}</div><div class="label">Всего долгов</div></div>
-                <div class="summary-card"><div class="value debt">{{ summary.users_with_debt }}</div><div class="label">Клиенты с долгом</div></div>
+        <h1>Панель администратора Bonus</h1>
+        <div class="summary-bar">
+            <div class="summary-card">
+                <div class="value">{{ summary.total_users }}</div>
+                <div class="label">Всего клиентов</div>
+            </div>
+            <div class="summary-card">
+                <div class="value bonus">{{ "%.2f"|format(summary.total_bonuses|float) }}</div>
+                <div class="label">Всего бонусов</div>
             </div>
-            <div class="controls-bar">
-                <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
-                <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
+            <div class="summary-card">
+                <div class="value debt">{{ "%.2f"|format(summary.total_debts|float) }}</div>
+                <div class="label">Всего долгов</div>
+             </div>
+             <div class="summary-card">
+                <div class="value debt">{{ summary.users_with_debt }}</div>
+                <div class="label">Клиенты с долгом</div>
             </div>
-            {% if users %}
-                <div class="user-grid" id="userGrid">
-                    {% for user in users|sort(attribute='visited_at', reverse=true) %}
-                    <div class="user-card" data-user-id="{{ user.id }}" data-search-term="{{ user.first_name|lower }} {{ user.last_name|lower if user.last_name }} {{ user.username|lower if user.username }} {{ user.id }} {{ user.phone_number|lower if user.phone_number }}">
+        </div>
+
+        <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="openOrgSettingsModal()">Настройки организации</button>
+        </div>
+
+        {% if users %}
+            <div class="user-grid" id="userGrid">
+                {% for user in users|sort(attribute='visited_at', reverse=true) %}
+                    <div class="user-card" data-user-id="{{ user.id }}" data-search-term="{{ user.first_name|lower }} {{ user.last_name|lower }} {{ user.username|lower }} {{ user.id }} {{ user.phone_number|lower if user.phone_number }}">
                         <div class="user-info">
                             <img src="{{ user.photo_url if user.photo_url else 'data:image/svg+xml;charset=UTF-8,%3csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 100 100%27%3e%3crect width=%27100%27 height=%27100%27 fill=%27%23e9ecef%27/%3e%3ctext x=%2750%25%27 y=%2755%25%27 dominant-baseline=%27middle%27 text-anchor=%27middle%27 font-size=%2745%27 font-family=%27sans-serif%27 fill=%27%23adb5bd%27%3e?%3c/text%3e%3c/svg%3e' }}" alt="User Avatar">
                             <div class="user-details">
@@ -659,147 +829,213 @@ ADMIN_TEMPLATE = """
                             </div>
                         </div>
                         <div class="user-balances">
-                            <div><div class="label">Бонусы</div><div class="amount bonus">{{ "%.2f"|format(user.bonuses|float) }}</div></div>
-                            <div><div class="label">Долг</div><div class="amount debt">{{ "%.2f"|format(user.debts|float if user.debts else 0) }}</div></div>
+                            <div>
+                               <div class="label">Бонусы</div>
+                               <div class="amount bonus">{{ "%.2f"|format(user.bonuses|float) }}</div>
+                            </div>
+                            <div>
+                               <div class="label">Долг</div>
+                               <div class="amount debt">{{ "%.2f"|format(user.debts|float if user.debts else 0) }}</div>
+                            </div>
                         </div>
                         <div class="user-actions">
                             <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом</button>
-                            <button class="btn-manage" style="background-color: #6c757d; color:white;" onclick='openInvoiceModal({{ user|tojson }})'>Накладные</button>
-                            {% if user.telegram_id == None %}<button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>{% endif %}
-                        </div>
-                    </div>
-                    {% endfor %}
-                </div>
-            {% else %}<p class="no-users">Пользователей пока нет.</p>{% endif %}
-        </div>
-
-        <div id="orgTab" class="tab-content">
-            <h2>Настройки организации</h2>
-            <div style="background:var(--admin-card-bg); padding:var(--padding); border-radius:var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow);">
-                <div class="form-group">
-                    <label for="orgName">Название организации</label>
-                    <input type="text" id="orgName" value="{{ organization.name }}">
-                </div>
-                <div class="form-group">
-                    <label for="orgAddress">Адрес</label>
-                    <input type="text" id="orgAddress" value="{{ organization.address }}">
-                </div>
-                <div class="form-group">
-                    <label>Телефоны</label>
-                    <div id="orgPhonesContainer" class="dynamic-list">
-                        {% for phone in organization.phones %}
-                        <div class="item"><input type="text" value="{{ phone }}"><button class="btn-delete" onclick="this.parentElement.remove()">X</button></div>
-                        {% endfor %}
-                    </div>
-                    <button class="btn btn-primary" style="margin-top:0.5rem; padding: 8px 12px; font-size:0.9em;" onclick="addOrgPhone()">+ Телефон</button>
-                </div>
-                <div class="form-group">
-                    <label>Ссылки</label>
-                    <div id="orgLinksContainer" class="dynamic-list">
-                        {% for link in organization.links %}
-                        <div class="item">
-                            <input type="text" placeholder="Название" value="{{ link.label }}" style="flex-basis: 30%;">
-                            <input type="text" placeholder="URL" value="{{ link.url }}" style="flex-basis: 60%;">
-                            <button class="btn-delete" onclick="this.parentElement.remove()">X</button>
+                            <button class="btn-manage" onclick='openInvoiceManagementModal({{ user|tojson }})'>Управление накладными</button>
+                            {% if user.telegram_id == None %}
+                            <button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>
+                            {% endif %}
                         </div>
-                        {% endfor %}
                     </div>
-                    <button class="btn btn-primary" style="margin-top:0.5rem; padding: 8px 12px; font-size:0.9em;" onclick="addOrgLink()">+ Ссылка</button>
-                </div>
-                <button class="btn btn-success" onclick="saveOrganizationInfo()">Сохранить информацию</button>
-                <div id="orgStatus" class="status-message" style="margin-top:1rem;"></div>
+                {% endfor %}
             </div>
-        </div>
+        {% else %}
+            <p class="no-users">Пользователей пока нет.</p>
+        {% endif %}
     </div>
 
-    <div id="transactionModal" class="modal"><div class="modal-content">
+    <div id="transactionModal" class="modal">
+      <div class="modal-content">
         <span class="modal-close" onclick="closeModal('transactionModal')">×</span>
-        <div class="modal-header"><h2 id="modalUserName"></h2><div id="modalUserUsername" class="username"></div></div>
+        <div class="modal-header">
+            <h2 id="modalUserName"></h2>
+            <div id="modalUserUsername" class="username"></div>
+        </div>
         <input type="hidden" id="modalUserId">
-        <div class="form-section"><h3>Бонусы</h3>
+        
+        <div class="form-section">
+            <h3>Бонусы</h3>
             <div class="form-row">
-                <div class="form-group"><label for="purchaseAmount">Сумма покупки (для начисления)</label><input type="number" id="purchaseAmount" placeholder="1500" oninput="updateCalculations()"></div>
-                <div class="form-group"><label for="deductAmount">Списать бонусов</label><input type="number" id="deductAmount" placeholder="100" oninput="updateCalculations()"></div>
+                <div class="form-group">
+                    <label for="purchaseAmount">Сумма покупки (для начисления)</label>
+                    <input type="number" id="purchaseAmount" placeholder="1500" oninput="updateCalculations()">
+                </div>
+                <div class="form-group">
+                    <label for="deductAmount">Списать бонусов</label>
+                    <input type="number" id="deductAmount" placeholder="100" oninput="updateCalculations()">
+                </div>
             </div>
             <div class="calculation-summary">
                 <div class="summary-item"><span>Текущий баланс:</span> <strong id="summaryCurrentBalance">0.00</strong></div>
                 <div class="summary-item"><span>Будет начислено (2%):</span> <strong id="summaryAccrual">+0.00</strong></div>
-                <div class="summary-item"><span>Будет списано:</span> <strong id="summaryDeduction">-0.00</strong></div><hr>
+                <div class="summary-item"><span>Будет списано:</span> <strong id="summaryDeduction">-0.00</strong></div>
+                <hr>
                 <div class="summary-item"><strong>Итоговый баланс бонусов:</strong> <strong id="summaryFinalBalance">0.00</strong></div>
             </div>
         </div>
-        <div class="form-section"><h3>Долги</h3>
+        
+        <div class="form-section">
+            <h3>Долги</h3>
             <div class="form-row">
-                 <div class="form-group"><label for="addDebtAmount">Добавить долг</label><input type="number" id="addDebtAmount" placeholder="500" oninput="updateCalculations()"></div>
-                <div class="form-group"><label for="repayDebtAmount">Погасить долг</label><input type="number" id="repayDebtAmount" placeholder="200" oninput="updateCalculations()"></div>
+                 <div class="form-group">
+                    <label for="addDebtAmount">Добавить долг</label>
+                    <input type="number" id="addDebtAmount" placeholder="500" oninput="updateCalculations()">
+                </div>
+                <div class="form-group">
+                    <label for="repayDebtAmount">Погасить долг</label>
+                    <input type="number" id="repayDebtAmount" placeholder="200" oninput="updateCalculations()">
+                </div>
             </div>
             <div class="calculation-summary">
                 <div class="summary-item"><span>Текущий долг:</span> <strong id="summaryCurrentDebt">0.00</strong></div>
                 <div class="summary-item"><span>Будет добавлено:</span> <strong id="summaryAddDebt">+0.00</strong></div>
-                <div class="summary-item"><span>Будет погашено:</span> <strong id="summaryRepayDebt">-0.00</strong></div><hr>
+                <div class="summary-item"><span>Будет погашено:</span> <strong id="summaryRepayDebt">-0.00</strong></div>
+                <hr>
                 <div class="summary-item"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
             </div>
         </div>
-        <div class="history-container"><h3>Общая история операций</h3><ul id="modalHistoryList" class="history-list"></ul></div>
-        <div class="modal-footer"><div id="modalStatus" class="status-message"></div><button class="btn-submit" onclick="submitTransaction()">Провести операцию</button></div>
-    </div></div>
+
+        <div class="history-container">
+            <h3>Общая история операций</h3>
+            <ul id="modalHistoryList" class="history-list"></ul>
+        </div>
+        <div class="modal-footer">
+            <div id="modalStatus" class="status-message"></div>
+            <button class="btn-submit" onclick="submitTransaction()">Провести операцию</button>
+        </div>
+      </div>
+    </div>
     
-    <div id="addClientModal" class="modal"><div class="modal-content">
+    <div id="addClientModal" class="modal">
+      <div class="modal-content">
         <span class="modal-close" onclick="closeModal('addClientModal')">×</span>
-        <div class="modal-header"><h2>Добавить нового клиента</h2></div>
-        <div class="form-group" style="margin-bottom: 1rem;"><label for="newClientFirstName">Имя</label><input type="text" id="newClientFirstName" placeholder="Иван"></div>
-        <div class="form-group" style="margin-bottom: 1.5rem;"><label for="newClientPhone">Номер телефона (уникальный)</label><input type="tel" id="newClientPhone" placeholder="+79001234567"></div>
-        <div class="modal-footer"><div id="addClientStatus" class="status-message"></div><button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button></div>
-    </div></div>
-
-    <div id="invoiceModal" class="modal"><div class="modal-content" style="max-width: 800px;">
-        <span class="modal-close" onclick="closeModal('invoiceModal')">×</span>
-        <div class="modal-header"><h2 id="invoiceModalUserName">Накладные для </h2></div>
-        <input type="hidden" id="invoiceModalUserId">
-        <div class="invoice-list-container">
-            <h3>Существующие накладные</h3>
-            <ul id="existingInvoicesList" class="invoice-list" style="max-height:150px;"></ul>
+        <div class="modal-header">
+            <h2>Добавить нового клиента</h2>
+        </div>
+        <div class="form-group" style="margin-bottom: 1rem;">
+            <label for="newClientFirstName">Имя</label>
+            <input type="text" id="newClientFirstName" placeholder="Иван">
         </div>
+        <div class="form-group" style="margin-bottom: 1.5rem;">
+            <label for="newClientPhone">Номер телефона (уникальный)</label>
+            <input type="tel" id="newClientPhone" placeholder="+79001234567">
+        </div>
+        <div class="modal-footer">
+            <div id="addClientStatus" class="status-message"></div>
+            <button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button>
+        </div>
+      </div>
+    </div>
+
+    <div id="orgSettingsModal" class="modal">
+        <div class="modal-content">
+            <span class="modal-close" onclick="closeModal('orgSettingsModal')">×</span>
+            <div class="modal-header">
+                <h2>Настройки организации</h2>
+            </div>
+            <div class="form-section">
+                <div class="form-group">
+                    <label for="orgName">Название организации</label>
+                    <input type="text" id="orgName" value="{{ org_info.organization_name }}">
+                </div>
+                <div class="form-group">
+                    <label for="orgAddress">Адрес</label>
+                    <textarea id="orgAddress">{{ org_info.address }}</textarea>
+                </div>
+                <div class="form-group">
+                    <label for="orgPhones">Номера телефонов (через запятую)</label>
+                    <input type="text" id="orgPhones" value="{{ ','.join(org_info.phone_numbers) }}">
+                </div>
+                <div class="form-group">
+                    <label for="orgWhatsApp">Ссылка на WhatsApp (e.g., https://wa.me/79001234567)</label>
+                    <input type="text" id="orgWhatsApp" value="{{ org_info.whatsapp_link }}">
+                </div>
+                <div class="form-group">
+                    <label for="orgTelegram">Ссылка на Telegram (e.g., https://t.me/username)</label>
+                    <input type="text" id="orgTelegram" value="{{ org_info.telegram_link }}">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <div id="orgSettingsStatus" class="status-message"></div>
+                <button class="btn-submit" onclick="submitOrgSettings()">Сохранить настройки</button>
+            </div>
+        </div>
+    </div>
+
+    <div id="invoiceManagementModal" class="modal">
+      <div class="modal-content">
+        <span class="modal-close" onclick="closeModal('invoiceManagementModal')">×</span>
+        <div class="modal-header">
+            <h2 id="invoiceModalUserName"></h2>
+            <div id="invoiceModalUserUsername" class="username"></div>
+        </div>
+        <input type="hidden" id="invoiceModalUserId">
+        
         <div class="form-section">
             <h3>Создать новую накладную</h3>
-            <div id="invoiceItemsContainer">
-                <div class="invoice-item-row" style="font-weight:bold;">
-                    <span>Наименование товара</span><span>Кол-во</span><span>Цена за ед.</span><span></span>
+            <div class="form-row">
+                <div class="form-group">
+                    <label for="invoiceItemName">Название товара</label>
+                    <input type="text" id="invoiceItemName" placeholder="Название товара">
+                </div>
+                <div class="form-group">
+                    <label for="invoiceItemQuantity">Количество</label>
+                    <input type="number" id="invoiceItemQuantity" value="1" min="1">
+                </div>
+                <div class="form-group">
+                    <label for="invoiceItemPrice">Стоимость за единицу</label>
+                    <input type="number" id="invoiceItemPrice" placeholder="0.00" step="0.01">
                 </div>
             </div>
-            <button class="btn btn-primary" style="font-size:0.9em; padding:8px 12px; margin-top:10px;" onclick="addInvoiceItemField()">+ Добавить товар</button>
-            <div class="invoice-summary" style="margin-top:20px;">
-                <div class="summary-item"><strong>Итоговая сумма накладной:</strong> <strong id="invoiceGrandTotal">0.00</strong></div>
+            <button class="btn btn-primary" style="margin-top: 1rem;" onclick="addItemToNewInvoice()">Добавить товар</button>
+
+            <div class="invoice-items-preview" style="margin-top: 1.5rem;">
+                <h4>Добавляемые товары:</h4>
+                <ul id="newInvoiceItemsList" style="list-style: none; padding: 0;">
+                </ul>
+                <p style="text-align: right; margin-top: 1rem;">Итого по новой накладной: <strong id="newInvoiceTotal">0.00</strong></p>
             </div>
         </div>
+
+        <div class="history-container">
+            <h3>Существующие накладные клиента</h3>
+            <ul id="existingInvoicesList" class="history-list"></ul>
+        </div>
+
         <div class="modal-footer">
             <div id="invoiceStatus" class="status-message"></div>
             <button class="btn-submit" onclick="submitNewInvoice()">Сохранить накладную</button>
         </div>
-    </div></div>
+      </div>
+    </div>
 
     <script>
         const transactionModal = document.getElementById('transactionModal');
         const addClientModal = document.getElementById('addClientModal');
-        const invoiceModal = document.getElementById('invoiceModal');
+        const orgSettingsModal = document.getElementById('orgSettingsModal');
+        const invoiceManagementModal = document.getElementById('invoiceManagementModal');
         let currentUserData = null;
-        let usersDataForInvoiceModal = {{ users|tojson|safe }};
-
-        function openTab(evt, tabName) {
-            var i, tabcontent, tablinks;
-            tabcontent = document.getElementsByClassName("tab-content");
-            for (i = 0; i < tabcontent.length; i++) { tabcontent[i].style.display = "none"; }
-            tablinks = document.getElementsByClassName("tab-button");
-            for (i = 0; i < tablinks.length; i++) { tablinks[i].className = tablinks[i].className.replace(" active", "");}
-            document.getElementById(tabName).style.display = "block";
-            evt.currentTarget.className += " active";
-        }
-        document.addEventListener('DOMContentLoaded', () => { document.querySelector('.tab-button.active').click(); });
+        let currentNewInvoiceItems = [];
 
         function searchUsers() {
             const searchTerm = document.getElementById('searchInput').value.toLowerCase();
-            document.querySelectorAll('.user-card').forEach(card => {
-                card.style.display = card.getAttribute('data-search-term').includes(searchTerm) ? 'flex' : 'none';
+            const userCards = document.querySelectorAll('.user-card');
+            userCards.forEach(card => {
+                const cardSearchTerm = card.getAttribute('data-search-term');
+                if (cardSearchTerm.includes(searchTerm)) {
+                    card.style.display = 'flex';
+                } else {
+                    card.style.display = 'none';
+                }
             });
         }
 
@@ -808,64 +1044,121 @@ ADMIN_TEMPLATE = """
             document.getElementById('modalUserId').value = userData.id;
             document.getElementById('modalUserName').textContent = `${userData.first_name || ''} ${userData.last_name || ''}`;
             document.getElementById('modalUserUsername').textContent = `@${userData.username || userData.phone_number} | ID: ${userData.id}`;
-            ['purchaseAmount', 'deductAmount', 'addDebtAmount', 'repayDebtAmount'].forEach(id => document.getElementById(id).value = '');
+            document.getElementById('purchaseAmount').value = '';
+            document.getElementById('deductAmount').value = '';
+            document.getElementById('addDebtAmount').value = '';
+            document.getElementById('repayDebtAmount').value = '';
             document.getElementById('modalStatus').textContent = '';
+
             const historyList = document.getElementById('modalHistoryList');
             historyList.innerHTML = '';
-            const combinedHistory = [...(userData.history || []).map(h => ({...h, transaction_type: 'bonus'})), 
-                                     ...(userData.debt_history || []).map(h => ({...h, transaction_type: 'debt'}))]
-                                    .sort((a, b) => new Date(b.date) - new Date(a.date));
+            
+            const bonusHistory = (userData.history || []).map(h => ({...h, transaction_type: 'bonus'}));
+            const debtHistory = (userData.debt_history || []).map(h => ({...h, transaction_type: 'debt'}));
+            const combinedHistory = [...bonusHistory, ...debtHistory].sort((a, b) => new Date(b.date) - new Date(a.date));
+
             if (combinedHistory.length > 0) {
                 combinedHistory.forEach(item => {
-                    const li = document.createElement('li'); li.className = 'history-item';
-                    let sign = item.type === 'accrual' ? '+' : '-';
-                    let amountClass = item.transaction_type === 'bonus' ? (item.type === 'accrual' ? 'bonus-accrual' : 'bonus-deduction') : (item.type === 'accrual' ? 'debt-accrual' : 'debt-payment');
-                    let typeText = item.transaction_type === 'bonus' ? 'бонус' : 'долг';
-                    li.innerHTML = `<div><div class="desc">${item.description}</div><div class="date">${item.date_str}</div></div>
-                                    <div class="amount ${amountClass}">${sign}${parseFloat(item.amount).toFixed(2)} (${typeText})</div>`;
+                    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' ? 'bonus-accrual' : 'bonus-deduction';
+                        amountText = `${sign}${parseFloat(item.amount).toFixed(2)}`;
+                    } else {
+                        sign = item.type === 'accrual' ? '+' : '-';
+                        amountClass = item.type === 'accrual' ? 'debt-accrual' : 'debt-payment';
+                        amountText = `${sign}${parseFloat(item.amount).toFixed(2)}`;
+                    }
+                    li.innerHTML = `
+                        <div>
+                            <div class="desc">${item.description}</div>
+                            <div class="date">${item.date_str}</div>
+                        </div>
+                        <div class="amount ${amountClass}">${amountText}</div>
+                    `;
                     historyList.appendChild(li);
                 });
-            } else { historyList.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет истории</li>'; }
+            } else {
+                historyList.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет истории</li>';
+            }
+            
             updateCalculations();
             transactionModal.style.display = 'block';
         }
+
         function openAddClientModal() {
-            ['newClientFirstName', 'newClientPhone'].forEach(id => document.getElementById(id).value = '');
+            document.getElementById('newClientFirstName').value = '';
+            document.getElementById('newClientPhone').value = '';
             document.getElementById('addClientStatus').textContent = '';
             addClientModal.style.display = 'block';
         }
+
+        function openOrgSettingsModal() {
+            orgSettingsModal.style.display = 'block';
+            document.getElementById('orgSettingsStatus').textContent = '';
+        }
+
+        function openInvoiceManagementModal(userData) {
+            currentUserData = 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}`;
+            document.getElementById('invoiceStatus').textContent = '';
+
+            currentNewInvoiceItems = [];
+            renderNewInvoiceItems();
+            renderExistingInvoices(userData.invoices || []);
+
+            invoiceManagementModal.style.display = 'block';
+        }
+
         function closeModal(modalId) {
             document.getElementById(modalId).style.display = 'none';
-            if (modalId === 'transactionModal') currentUserData = null;
-            if (modalId === 'invoiceModal') {
-                 document.getElementById('invoiceItemsContainer').innerHTML = '<div class="invoice-item-row" style="font-weight:bold;"><span>Наименование товара</span><span>Кол-во</span><span>Цена за ед.</span><span></span></div>';
-                 updateInvoiceGrandTotal();
+            if (modalId === 'transactionModal' || modalId === 'invoiceManagementModal') {
+                currentUserData = null;
             }
         }
+
         function updateCalculations() {
             if (!currentUserData) return;
+
             const currentBalance = parseFloat(currentUserData.bonuses) || 0;
             const purchaseAmount = parseFloat(document.getElementById('purchaseAmount').value) || 0;
             const deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
             const accrualAmount = purchaseAmount * 0.02;
-            let finalDeductAmount = Math.min(deductAmount, currentBalance);
-            if (deductAmount > currentBalance) document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
+            let finalDeductAmount = deductAmount;
+            if (deductAmount > currentBalance) {
+                finalDeductAmount = currentBalance;
+                document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
+            }
+            const finalBalance = currentBalance + accrualAmount - finalDeductAmount;
             document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
             document.getElementById('summaryAccrual').textContent = `+${accrualAmount.toFixed(2)}`;
             document.getElementById('summaryDeduction').textContent = `-${finalDeductAmount.toFixed(2)}`;
-            document.getElementById('summaryFinalBalance').textContent = (currentBalance + accrualAmount - finalDeductAmount).toFixed(2);
+            document.getElementById('summaryFinalBalance').textContent = finalBalance.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 = Math.min(repayDebtAmount, currentDebt);
-            if (repayDebtAmount > currentDebt) document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
+            let finalRepayAmount = repayDebtAmount;
+            if (repayDebtAmount > currentDebt) {
+                finalRepayAmount = currentDebt;
+                document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
+            }
+            const finalDebt = currentDebt + addDebtAmount - finalRepayAmount;
             document.getElementById('summaryCurrentDebt').textContent = currentDebt.toFixed(2);
             document.getElementById('summaryAddDebt').textContent = `+${addDebtAmount.toFixed(2)}`;
             document.getElementById('summaryRepayDebt').textContent = `-${finalRepayAmount.toFixed(2)}`;
-            document.getElementById('summaryFinalDebt').textContent = (currentDebt + addDebtAmount - finalRepayAmount).toFixed(2);
+            document.getElementById('summaryFinalDebt').textContent = finalDebt.toFixed(2);
         }
+
         async function submitTransaction() {
-            const statusEl = document.getElementById('modalStatus'); statusEl.textContent = 'Обработка...';
+            const statusEl = document.getElementById('modalStatus');
+            statusEl.style.color = 'var(--admin-secondary)';
+            statusEl.textContent = 'Обработка...';
+            
             const payload = {
                 user_id: document.getElementById('modalUserId').value,
                 purchase_amount: parseFloat(document.getElementById('purchaseAmount').value) || 0,
@@ -873,122 +1166,154 @@ ADMIN_TEMPLATE = """
                 add_debt_amount: parseFloat(document.getElementById('addDebtAmount').value) || 0,
                 repay_debt_amount: parseFloat(document.getElementById('repayDebtAmount').value) || 0,
             };
-            if (Object.values(payload).slice(1).every(v => v <=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', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)});
+                const response = await fetch('/admin/add_transaction', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                });
                 const result = await response.json();
-                if (!response.ok) throw new Error(result.message || 'Ошибка');
-                statusEl.style.color = 'var(--admin-success)'; statusEl.textContent = 'Операция успешна!';
-                setTimeout(() => location.reload(), 1500);
-            } catch (error) { statusEl.style.color = 'var(--admin-danger)'; statusEl.textContent = `Ошибка: ${error.message}`; }
+                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}`;
+            }
         }
+        
         async function submitNewClient() {
-            const statusEl = document.getElementById('addClientStatus'); statusEl.textContent = 'Сохранение...';
-            const payload = { first_name: document.getElementById('newClientFirstName').value.trim(), phone_number: document.getElementById('newClientPhone').value.trim() };
-            if (!payload.first_name || !payload.phone_number) { statusEl.style.color = 'var(--admin-danger)'; statusEl.textContent = 'Имя и номер телефона обязательны.'; return; }
+            const statusEl = document.getElementById('addClientStatus');
+            statusEl.style.color = 'var(--admin-secondary)';
+            statusEl.textContent = 'Сохранение...';
+
+            const payload = {
+                first_name: document.getElementById('newClientFirstName').value.trim(),
+                phone_number: document.getElementById('newClientPhone').value.trim(),
+            };
+
+            if (!payload.first_name || !payload.phone_number) {
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = 'Имя и номер телефона обязательны.';
+                return;
+            }
+
             try {
-                const response = await fetch('/admin/add_client', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)});
+                const response = await fetch('/admin/add_client', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                });
                 const result = await response.json();
-                if (!response.ok) throw new Error(result.message || 'Ошибка');
-                statusEl.style.color = 'var(--admin-success)'; statusEl.textContent = 'Клиент добавлен!';
-                setTimeout(() => location.reload(), 1500);
-            } catch (error) { statusEl.style.color = 'var(--admin-danger)'; statusEl.textContent = `Ошибка: ${error.message}`; }
+                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}`;
+            }
         }
-        async function deleteClient(userId) {
-            if (!confirm(`Удалить клиента ID ${userId}?`)) return;
-            try {
-                const response = await fetch('/admin/delete_client', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({user_id: userId})});
-                const result = await response.json();
-                if (!response.ok) throw new Error(result.message || 'Ошибка удаления');
-                location.reload();
-            } catch (error) { alert(`Ошибка: ${error.message}`); }
-        }
-        function addOrgPhone() { document.getElementById('orgPhonesContainer').insertAdjacentHTML('beforeend', '<div class="item"><input type="text"><button class="btn-delete" onclick="this.parentElement.remove()">X</button></div>'); }
-        function addOrgLink() { document.getElementById('orgLinksContainer').insertAdjacentHTML('beforeend', '<div class="item"><input type="text" placeholder="Название" style="flex-basis: 30%;"><input type="text" placeholder="URL" style="flex-basis: 60%;"><button class="btn-delete" onclick="this.parentElement.remove()">X</button></div>');}
-        async function saveOrganizationInfo() {
-            const statusEl = document.getElementById('orgStatus'); statusEl.textContent = 'Сохранение...';
-            const phones = Array.from(document.querySelectorAll('#orgPhonesContainer input')).map(inp => inp.value.trim()).filter(Boolean);
-            const links = Array.from(document.querySelectorAll('#orgLinksContainer .item')).map(item => ({label: item.children[0].value.trim(), url: item.children[1].value.trim()})).filter(l => l.label && l.url);
-            const payload = {name: document.getElementById('orgName').value.trim(), address: document.getElementById('orgAddress').value.trim(), phones, links};
+
+        async function submitOrgSettings() {
+            const statusEl = document.getElementById('orgSettingsStatus');
+            statusEl.style.color = 'var(--admin-secondary)';
+            statusEl.textContent = 'Сохранение...';
+
+            const payload = {
+                organization_name: document.getElementById('orgName').value.trim(),
+                address: document.getElementById('orgAddress').value.trim(),
+                phone_numbers: document.getElementById('orgPhones').value.split(',').map(p => p.trim()).filter(p => p),
+                whatsapp_link: document.getElementById('orgWhatsApp').value.trim(),
+                telegram_link: document.getElementById('orgTelegram').value.trim(),
+            };
+            
             try {
-                const response = await fetch('/admin/save_organization_info', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)});
+                const response = await fetch('/admin/update_org_info', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                });
                 const result = await response.json();
-                if (!response.ok) throw new Error(result.message || 'Ошибка');
-                statusEl.style.color = 'var(--admin-success)'; statusEl.textContent = 'Информация сохранена!';
-            } catch (error) { statusEl.style.color = 'var(--admin-danger)'; statusEl.textContent = `Ошибка: ${error.message}`; }
+                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}`;
+            }
         }
 
-        function openInvoiceModal(userData) {
-            currentUserData = userData; // For context if needed later, though invoice user ID is prime
-            document.getElementById('invoiceModalUserId').value = userData.id;
-            document.getElementById('invoiceModalUserName').textContent = `Накладные для ${userData.first_name || ''} ${userData.last_name || ''} (ID: ${userData.id})`;
-            document.getElementById('invoiceStatus').textContent = '';
-            
-            const existingInvoicesList = document.getElementById('existingInvoicesList');
-            existingInvoicesList.innerHTML = '';
-            const userForInvoices = usersDataForInvoiceModal.find(u => u.id === userData.id);
+        function addItemToNewInvoice() {
+            const name = document.getElementById('invoiceItemName').value.trim();
+            const quantity = parseInt(document.getElementById('invoiceItemQuantity').value);
+            const price = parseFloat(document.getElementById('invoiceItemPrice').value);
 
-            if (userForInvoices && userForInvoices.invoices && userForInvoices.invoices.length > 0) {
-                userForInvoices.invoices.sort((a,b) => new Date(b.date) - new Date(a.date)).forEach(inv => {
-                    const li = document.createElement('li');
-                    li.className = 'invoice-list-item';
-                    li.innerHTML = `<div><div class="invoice-id">#${inv.id.split('-').pop()}</div><div class="invoice-date">${inv.date_str}</div></div><div class="invoice-total">${parseFloat(inv.grand_total).toFixed(2)}</div>`;
-                    existingInvoicesList.appendChild(li);
-                });
-            } else {
-                existingInvoicesList.innerHTML = '<li style="text-align:center; padding:1rem; color:var(--admin-secondary);">Нет накладных</li>';
+            if (!name || isNaN(quantity) || quantity <= 0 || isNaN(price) || price < 0) {
+                alert('Пожалуйста, введите корректные данные для товара (название, количество > 0, цена >= 0).');
+                return;
             }
-            
-            document.getElementById('invoiceItemsContainer').innerHTML = '<div class="invoice-item-row" style="font-weight:bold;"><span>Наименование товара</span><span>Кол-во</span><span>Цена за ед.</span><span></span></div>';
-            addInvoiceItemField();
-            updateInvoiceGrandTotal();
-            invoiceModal.style.display = 'block';
-        }
-
-        function addInvoiceItemField() {
-            const container = document.getElementById('invoiceItemsContainer');
-            const itemRow = document.createElement('div');
-            itemRow.className = 'invoice-item-row';
-            itemRow.innerHTML = `
-                <input type="text" class="invoice-item-name" placeholder="Товар XYZ">
-                <input type="number" class="invoice-item-qty" placeholder="1" value="1" min="1" oninput="updateInvoiceGrandTotal()">
-                <input type="number" class="invoice-item-price" placeholder="100.00" step="0.01" oninput="updateInvoiceGrandTotal()">
-                <button type="button" class="remove-item-btn" onclick="this.parentElement.remove(); updateInvoiceGrandTotal();">X</button>
-            `;
-            container.appendChild(itemRow);
-        }
-
-        function updateInvoiceGrandTotal() {
-            let grandTotal = 0;
-            document.querySelectorAll('#invoiceItemsContainer .invoice-item-row:not(:first-child)').forEach(row => {
-                const qty = parseFloat(row.querySelector('.invoice-item-qty').value) || 0;
-                const price = parseFloat(row.querySelector('.invoice-item-price').value) || 0;
-                grandTotal += qty * price;
+
+            currentNewInvoiceItems.push({ name, quantity, price_per_unit: price });
+            renderNewInvoiceItems();
+
+            document.getElementById('invoiceItemName').value = '';
+            document.getElementById('invoiceItemQuantity').value = '1';
+            document.getElementById('invoiceItemPrice').value = '';
+        }
+
+        function renderNewInvoiceItems() {
+            const listEl = document.getElementById('newInvoiceItemsList');
+            listEl.innerHTML = '';
+            let total = 0;
+            currentNewInvoiceItems.forEach((item, index) => {
+                const li = document.createElement('li');
+                const itemTotal = item.quantity * item.price_per_unit;
+                total += itemTotal;
+                li.innerHTML = `${item.name} x ${item.quantity} @ ${item.price_per_unit.toFixed(2)} = ${(itemTotal).toFixed(2)} 
+                                <button style="margin-left:10px; background: none; border: none; color: var(--admin-danger); cursor: pointer;" onclick="removeItemFromNewInvoice(${index})">x</button>`;
+                listEl.appendChild(li);
             });
-            document.getElementById('invoiceGrandTotal').textContent = grandTotal.toFixed(2);
+            document.getElementById('newInvoiceTotal').textContent = total.toFixed(2);
+        }
+
+        function removeItemFromNewInvoice(index) {
+            currentNewInvoiceItems.splice(index, 1);
+            renderNewInvoiceItems();
         }
 
         async function submitNewInvoice() {
             const statusEl = document.getElementById('invoiceStatus');
+            statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Сохранение накладной...';
-            const userId = document.getElementById('invoiceModalUserId').value;
-            const items = [];
-            document.querySelectorAll('#invoiceItemsContainer .invoice-item-row:not(:first-child)').forEach(row => {
-                const name = row.querySelector('.invoice-item-name').value.trim();
-                const quantity = parseFloat(row.querySelector('.invoice-item-qty').value) || 0;
-                const price_per_unit = parseFloat(row.querySelector('.invoice-item-price').value) || 0;
-                if (name && quantity > 0 && price_per_unit > 0) {
-                    items.push({ name, quantity, price_per_unit, total_price: quantity * price_per_unit });
-                }
-            });
 
-            if (items.length === 0) {
+            if (currentNewInvoiceItems.length === 0) {
                 statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
                 return;
             }
-            const grand_total = items.reduce((sum, item) => sum + item.total_price, 0);
-            const payload = { user_id: userId, items, grand_total };
+
+            const payload = {
+                user_id: document.getElementById('invoiceModalUserId').value,
+                items: currentNewInvoiceItems
+            };
 
             try {
                 const response = await fetch('/admin/add_invoice', {
@@ -997,19 +1322,77 @@ ADMIN_TEMPLATE = """
                     body: JSON.stringify(payload)
                 });
                 const result = await response.json();
-                if (!response.ok) throw new Error(result.message || 'Ошибка сохранения накладной');
-                statusEl.style.color = 'var(--admin-success)';
-                statusEl.textContent = 'Накладная успешно сохранена!';
-                setTimeout(() => { closeModal('invoiceModal'); location.reload(); }, 1500);
+                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}`;
             }
         }
+
+        function renderExistingInvoices(invoices) {
+            const listEl = document.getElementById('existingInvoicesList');
+            listEl.innerHTML = '';
+            if (invoices.length === 0) {
+                listEl.innerHTML = '<li style="text-align:center; padding: 1rem; color: var(--admin-secondary);">Нет накладных</li>';
+                return;
+            }
+            invoices.sort((a, b) => new Date(b.date) - new Date(a.date));
+            invoices.forEach(invoice => {
+                const li = document.createElement('li');
+                li.className = 'history-item';
+                li.innerHTML = `
+                    <div>
+                        <div class="desc">Накладная от ${invoice.date_str}</div>
+                        <div class="date">${invoice.items.length} товар(ов)</div>
+                    </div>
+                    <div class="amount bonus-accrual">${parseFloat(invoice.total_amount).toFixed(2)}</div>
+                `;
+                li.onclick = () => { alert('Детали накладной:\n' + invoice.items.map(item => `${item.name} x ${item.quantity} @ ${item.price_per_unit.toFixed(2)}`).join('\n') + `\nИтого: ${parseFloat(invoice.total_amount).toFixed(2)}`); };
+                listEl.appendChild(li);
+            });
+        }
+
+
+        async function deleteClient(userId) {
+            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) {
+                return;
+            }
+            try {
+                const response = await fetch('/admin/delete_client', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ user_id: userId })
+                });
+                const result = await response.json();
+                if (response.ok) {
+                    location.reload();
+                } else {
+                    throw new Error(result.message || 'Не удалось удалить клиента.');
+                }
+            } catch (error) {
+                alert(`Ошибка: ${error.message}`);
+            }
+        }
+
         window.onclick = function(event) {
-            if (event.target == transactionModal) closeModal('transactionModal');
-            if (event.target == addClientModal) closeModal('addClientModal');
-            if (event.target == invoiceModal) closeModal('invoiceModal');
+            if (event.target == transactionModal) {
+                closeModal('transactionModal');
+            }
+            if (event.target == addClientModal) {
+                closeModal('addClientModal');
+            }
+            if (event.target == orgSettingsModal) {
+                closeModal('orgSettingsModal');
+            }
+            if (event.target == invoiceManagementModal) {
+                closeModal('invoiceManagementModal');
+            }
         }
     </script>
 </body>
@@ -1019,29 +1402,45 @@ ADMIN_TEMPLATE = """
 @app.route('/')
 def index():
     user_id_str = request.args.get('user_id_for_test')
-    all_data = load_data()
+    
+    current_data = load_visitor_data()
     user_data = {}
-    organization_info = all_data.get('organization_info', DEFAULT_ORGANIZATION_INFO)
 
-    if user_id_str and user_id_str in all_data:
-        user_data = all_data[user_id_str]
+    if user_id_str and user_id_str in current_data:
+        user_data = current_data[user_id_str]
         user_data['id'] = user_id_str
 
         bonus_history = user_data.get('history', [])
-        for item in bonus_history: item['transaction_type'] = 'bonus'
+        for item in bonus_history:
+            item['transaction_type'] = 'bonus'
+
         debt_history = user_data.get('debt_history', [])
-        for item in debt_history: item['transaction_type'] = 'debt'
-        
-        combined_history = sorted(bonus_history + debt_history, key=lambda x: x['date'], reverse=True)
+        for item in debt_history:
+            item['transaction_type'] = 'debt'
+
+        combined_history = sorted(
+            bonus_history + debt_history,
+            key=lambda x: datetime.fromisoformat(x['date']),
+            reverse=True
+        )
         user_data['combined_history'] = combined_history
         user_data['invoices'] = user_data.get('invoices', [])
     else:
-        user_data = { "id": "N/A", "bonuses": 0, "debts": 0, "history": [], "debt_history": [], "combined_history": [], "invoices": [] }
+        user_data = {
+            "id": "N/A",
+            "bonuses": 0,
+            "debts": 0,
+            "history": [],
+            "debt_history": [],
+            "combined_history": [],
+            "invoices": []
+        }
 
-    return render_template_string(TEMPLATE, user=user_data, organization=organization_info)
+    org_info = get_organization_info()
+    return render_template_string(TEMPLATE, user=user_data, org_info=org_info)
 
 @app.route('/verify', methods=['POST'])
-def verify_data_endpoint():
+def verify_data():
     try:
         req_data = request.get_json()
         init_data_str = req_data.get('initData')
@@ -1049,78 +1448,94 @@ def verify_data_endpoint():
             return jsonify({"status": "error", "message": "Missing initData"}), 400
 
         user_data_parsed, is_valid = verify_telegram_data(init_data_str)
+
         user_info_dict = {}
         if user_data_parsed and 'user' in user_data_parsed:
             try:
                 user_json_str = unquote(user_data_parsed['user'][0])
                 user_info_dict = json.loads(user_json_str)
-            except Exception as e:
-                logging.error(f"Could not parse user JSON: {e}")
-        
+            except Exception:
+                user_info_dict = {}
+
         if is_valid:
             tg_user_id = user_info_dict.get('id')
             if tg_user_id:
-                now_dt = get_current_time_bishkek()
-                now_ts = now_dt.timestamp()
-                now_str = now_dt.strftime('%Y-%m-%d %H:%M:%S')
+                now = get_now_bishkek()
+                all_data = load_visitor_data()
+                
+                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
                 
-                with _data_lock:
-                    all_users_data = {k: v for k, v in visitor_data_cache.items() if k != 'organization_info'}
-                    existing_user_key = None
-                    for key, user_data_item in all_users_data.items():
-                        if str(user_data_item.get('telegram_id')) == str(tg_user_id):
-                            existing_user_key = key
-                            break
-                    
+                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
-                    if existing_user_key:
-                        user_entry = visitor_data_cache[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_ts, 'visited_at_str': now_str
-                        })
-                    else:
-                        new_user_id = generate_unique_id(all_users_data.keys())
-                        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_ts, 'visited_at_str': now_str,
-                            'bonuses': 0, 'history': [], 'debts': 0, 'debt_history': [], 'invoices': []
-                        }
-                        visitor_data_cache[new_user_id] = user_entry
-                        user_id_to_save = new_user_id
-                save_data_sync()
+                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})
             else:
-                 return jsonify({"status": "error", "verified": True, "message": "User ID not found"}), 400
+                 return jsonify({"status": "error", "verified": True, "message": "User ID not found in parsed data"}), 400
         else:
-            logging.warning(f"Verification failed for user: {user_info_dict.get('id')}")
             return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
-    except Exception as e:
-        logging.exception("Error in /verify endpoint")
+
+    except Exception:
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
 @app.route('/admin')
 def admin_panel():
-    all_data = load_data()
+    current_data = load_visitor_data()
     users_list = []
-    for user_id, user_data_item in all_data.items():
-        if user_id == 'organization_info': continue
-        user_data_item['id'] = user_id
-        users_list.append(user_data_item)
+    for user_id, user_data in current_data.items():
+        user_data['id'] = user_id
+        users_list.append(user_data)
+    
+    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)
     
     summary_stats = {
-        "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)
+        "total_users": total_users,
+        "total_bonuses": total_bonuses,
+        "total_debts": total_debts,
+        "users_with_debt": users_with_debt
     }
-    organization_info = all_data.get('organization_info', DEFAULT_ORGANIZATION_INFO)
-    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats, organization=organization_info)
+    
+    org_info = get_organization_info()
+    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats, org_info=org_info)
 
 @app.route('/admin/add_client', methods=['POST'])
 def add_client():
@@ -1128,164 +1543,230 @@ def add_client():
         data = request.get_json()
         phone_number = data.get('phone_number')
         first_name = data.get('first_name')
+
         if not phone_number or not first_name:
             return jsonify({"status": "error", "message": "Имя и номер телефона обязательны."}), 400
         
-        with _data_lock:
-            all_users_data = {k: v for k, v in visitor_data_cache.items() if k != 'organization_info'}
-            for user in all_users_data.values():
-                if user.get('phone_number') == phone_number:
-                    return jsonify({"status": "error", "message": "Клиент с таким номером уже существует."}), 409
-
-            now_dt = get_current_time_bishkek()
-            new_id = generate_unique_id(all_users_data.keys())
-            new_client = {
-                'id': new_id, 'telegram_id': None, 'first_name': first_name, 'last_name': None, 'username': None,
-                'photo_url': None, 'language_code': 'ru', 'is_premium': False, 'phone_number': phone_number,
-                'visited_at': now_dt.timestamp(), 'visited_at_str': now_dt.strftime('%Y-%m-%d %H:%M:%S'),
-                'bonuses': 0, 'history': [], 'debts': 0, 'debt_history': [], 'invoices': []
-            }
-            visitor_data_cache[new_id] = new_client
-        save_data_sync()
+        all_data = load_visitor_data()
+
+        for user in all_data.values():
+            if user.get('phone_number') == phone_number:
+                return jsonify({"status": "error", "message": "Клиент с таким номером телефона уже существует."}), 409
+
+        now = get_now_bishkek()
+        new_id = generate_unique_id(all_data)
+        
+        new_client = {
+            'id': new_id,
+            'telegram_id': None,
+            'first_name': first_name,
+            'last_name': None,
+            'username': None,
+            'photo_url': None,
+            'language_code': 'ru',
+            'is_premium': False,
+            'phone_number': phone_number,
+            'visited_at': now.timestamp(),
+            'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S'),
+            'bonuses': 0,
+            'history': [],
+            'debts': 0,
+            'debt_history': [],
+            'invoices': []
+        }
+        
+        save_visitor_data({new_id: new_client})
+
         return jsonify({"status": "ok", "message": "Client added successfully"}), 201
+
     except Exception as e:
-        logging.exception("Error in /admin/add_client")
         return jsonify({"status": "error", "message": str(e)}), 500
 
+
 @app.route('/admin/add_transaction', methods=['POST'])
 def add_transaction():
     try:
         data = request.get_json()
-        user_id = str(data.get('user_id'))
+        user_id = data.get('user_id')
         purchase_amount = float(data.get('purchase_amount', 0))
         deduct_amount = float(data.get('deduct_amount', 0))
         add_debt_amount = float(data.get('add_debt_amount', 0))
         repay_debt_amount = float(data.get('repay_debt_amount', 0))
 
-        if not user_id: return jsonify({"status": "error", "message": "User ID is required"}), 400
+        if not user_id:
+            return jsonify({"status": "error", "message": "User ID is required"}), 400
         
-        with _data_lock:
-            if user_id not in visitor_data_cache:
-                return jsonify({"status": "error", "message": "User not found"}), 404
-            user = visitor_data_cache[user_id]
-            now_dt = get_current_time_bishkek()
-            now_iso = now_dt.isoformat()
-            now_str = now_dt.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
-
-            accrual_amount = purchase_amount * 0.02
-            user['bonuses'] = user.get('bonuses', 0) + accrual_amount - deduct_amount
-            user['history'] = user.get('history', [])
-            if accrual_amount > 0:
-                user['history'].append({"type": "accrual", "amount": accrual_amount, "description": f"Начисление с покупки {purchase_amount}", "date": now_iso, "date_str": now_str})
-            if deduct_amount > 0:
-                user['history'].append({"type": "deduction", "amount": deduct_amount, "description": "Списание бонусов", "date": now_iso, "date_str": now_str})
-
-            user['debts'] = user.get('debts', 0) + add_debt_amount - repay_debt_amount
-            user['debt_history'] = user.get('debt_history', [])
-            if add_debt_amount > 0:
-                user['debt_history'].append({"type": "accrual", "amount": add_debt_amount, "description": "Добавление долга", "date": now_iso, "date_str": now_str})
-            if repay_debt_amount > 0:
-                user['debt_history'].append({"type": "payment", "amount": repay_debt_amount, "description": "Погашение долга", "date": now_iso, "date_str": now_str})
+        user_id_str = str(user_id)
+        all_data = load_visitor_data()
+
+        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_now_bishkek()
+        now_iso = now.isoformat()
+        now_str = now.strftime('%Y-%m-%d %H:%M:%S')
         
-        save_data_sync()
-        return jsonify({"status": "ok", "message": "Transaction successful", "new_balance": user['bonuses'], "new_debt": user['debts']}), 200
+        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
+
+        accrual_amount = purchase_amount * 0.02
+        user['bonuses'] = user.get('bonuses', 0) + accrual_amount - deduct_amount
+        if 'history' not in user or not isinstance(user['history'], list):
+            user['history'] = []
+
+        if accrual_amount > 0:
+            user['history'].append({
+                "type": "accrual", "amount": accrual_amount,
+                "description": f"Начисление с покупки {purchase_amount}",
+                "date": now_iso, "date_str": now_str
+            })
+        if deduct_amount > 0:
+            user['history'].append({
+                "type": "deduction", "amount": deduct_amount,
+                "description": "Списание бонусов",
+                "date": now_iso, "date_str": now_str
+            })
+
+        user['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": "Добавление долга",
+                "date": now_iso, "date_str": now_str
+            })
+        if repay_debt_amount > 0:
+            user['debt_history'].append({
+                "type": "payment", "amount": repay_debt_amount,
+                "description": "Погашение долга",
+                "date": now_iso, "date_str": now_str
+            })
+        
+        save_visitor_data({user_id_str: user})
+
+        return jsonify({
+            "status": "ok", "message": "Transaction successful", 
+            "new_balance": user['bonuses'], "new_debt": user['debts']
+        }), 200
+
     except Exception as e:
-        logging.exception("Error in /admin/add_transaction")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-@app.route('/admin/delete_client', methods=['POST'])
-def delete_client_endpoint():
+@app.route('/admin/update_org_info', methods=['POST'])
+def update_org_info():
     try:
         data = request.get_json()
-        user_id = str(data.get('user_id'))
-        if not user_id: return jsonify({"status": "error", "message": "User ID is required"}), 400
-
-        with _data_lock:
-            if user_id not in visitor_data_cache or user_id == 'organization_info':
-                return jsonify({"status": "error", "message": "User not found"}), 404
-            user_to_delete = visitor_data_cache[user_id]
-            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]
+        org_name = data.get('organization_name')
+        address = data.get('address')
+        phone_numbers = data.get('phone_numbers', [])
+        whatsapp_link = data.get('whatsapp_link')
+        telegram_link = data.get('telegram_link')
+
+        updated_org_info = {
+            "organization_name": org_name,
+            "address": address,
+            "phone_numbers": phone_numbers,
+            "whatsapp_link": whatsapp_link,
+            "telegram_link": telegram_link
+        }
         
-        save_data_sync()
-        return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
+        save_organization_info(updated_org_info)
+        return jsonify({"status": "ok", "message": "Organization settings updated successfully"}), 200
     except Exception as e:
-        logging.exception("Error in /admin/delete_client")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-@app.route('/admin/save_organization_info', methods=['POST'])
-def save_organization_info_endpoint():
+@app.route('/admin/add_invoice', methods=['POST'])
+def add_invoice():
     try:
         data = request.get_json()
-        with _data_lock:
-            visitor_data_cache['organization_info'] = {
-                "name": data.get("name", DEFAULT_ORGANIZATION_INFO["name"]),
-                "address": data.get("address", DEFAULT_ORGANIZATION_INFO["address"]),
-                "phones": data.get("phones", DEFAULT_ORGANIZATION_INFO["phones"]),
-                "links": data.get("links", DEFAULT_ORGANIZATION_INFO["links"]),
-            }
-        save_data_sync()
-        return jsonify({"status": "ok", "message": "Organization info saved"}), 200
+        user_id = data.get('user_id')
+        items = data.get('items', [])
+
+        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 items"}), 400
+        
+        user_id_str = str(user_id)
+        all_data = load_visitor_data()
+
+        if user_id_str not in all_data:
+            return jsonify({"status": "error", "message": "User not found"}), 404
+
+        user = all_data[user_id_str]
+        now = get_now_bishkek()
+        now_iso = now.isoformat()
+        now_str = now.strftime('%Y-%m-%d %H:%M:%S')
+
+        total_amount = sum(item['quantity'] * item['price_per_unit'] for item in items)
+
+        new_invoice = {
+            "id": str(uuid.uuid4()),
+            "date": now_iso,
+            "date_str": now_str,
+            "items": items,
+            "total_amount": total_amount
+        }
+
+        if 'invoices' not in user or not isinstance(user['invoices'], list):
+            user['invoices'] = []
+        user['invoices'].append(new_invoice)
+        
+        save_visitor_data({user_id_str: user})
+        return jsonify({"status": "ok", "message": "Invoice added successfully", "invoice_id": new_invoice['id']}), 200
+
     except Exception as e:
-        logging.exception("Error saving organization info")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-@app.route('/admin/add_invoice', methods=['POST'])
-def add_invoice_endpoint():
+@app.route('/admin/delete_client', methods=['POST'])
+def delete_client():
     try:
         data = request.get_json()
-        user_id = str(data.get('user_id'))
-        items = data.get('items', [])
-        grand_total = float(data.get('grand_total', 0))
+        user_id = data.get('user_id')
+
+        if not user_id:
+            return jsonify({"status": "error", "message": "User ID is required"}), 400
 
-        if not user_id: return jsonify({"status": "error", "message": "User ID required"}), 400
-        if not items: return jsonify({"status": "error", "message": "Invoice must have items"}), 400
+        user_id_str = str(user_id)
+        load_visitor_data()
 
         with _data_lock:
-            if user_id not in visitor_data_cache or user_id == 'organization_info':
+            if user_id_str not in visitor_data_cache:
                 return jsonify({"status": "error", "message": "User not found"}), 404
-            
-            user = visitor_data_cache[user_id]
-            if 'invoices' not in user or not isinstance(user['invoices'], list):
-                user['invoices'] = []
-            
-            now_dt = get_current_time_bishkek()
-            new_invoice = {
-                "id": generate_invoice_id(),
-                "date": now_dt.isoformat(),
-                "date_str": now_dt.strftime('%Y-%m-%d %H:%M:%S'),
-                "items": items,
-                "grand_total": grand_total
-            }
-            user['invoices'].append(new_invoice)
-        
-        save_data_sync()
-        return jsonify({"status": "ok", "message": "Invoice added successfully", "invoice_id": new_invoice["id"]}), 201
+
+            user_to_delete = visitor_data_cache[user_id_str]
+            if user_to_delete.get('telegram_id') is not None:
+                return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
+
+            del visitor_data_cache[user_id_str]
+
+            try:
+                data_to_save = visitor_data_cache.copy()
+                if _organization_info_cache:
+                    data_to_save['__ORG_INFO__'] = _organization_info_cache
+                with open(DATA_FILE, 'w', encoding='utf-8') as f:
+                    json.dump(data_to_save, f, ensure_ascii=False, indent=4)
+                upload_data_to_hf_async()
+            except Exception:
+                return jsonify({"status": "error", "message": "Failed to save data after deletion"}), 500
+
+        return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
+
     except Exception as e:
-        logging.exception("Error adding invoice")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 if __name__ == '__main__':
-    print(f"Server starting on http://{HOST}:{PORT}")
-    if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
-         print("WARNING: Hugging Face token(s) not set. Backup/restore functionality will be limited.")
-    else:
-         print("Attempting initial data download from Hugging Face...")
-         download_data_from_hf()
+    download_data_from_hf()
+    load_visitor_data()
 
-    load_data()
-    print("WARNING: The /admin route is NOT protected. Implement proper authentication for production.")
-    
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
-        print("Periodic backup thread started (every hour).")
 
-    print("--- Server Ready ---")
     app.run(host=HOST, port=PORT, debug=False)
\ No newline at end of file