Update app.py

app.py

@@ -8,165 +8,225 @@ 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 uuid
+import pytz
 
 BOT_TOKEN = os.getenv("BOT_TOKEN", "7835463659:AAGNePbelZIAOeaglyQi1qulOqnjs4BGQn4")
 HOST = '0.0.0.0'
 PORT = 7860
 DATA_FILE = 'data.json'
+ORG_INFO_FILE = 'organization_info.json'
 
 REPO_ID = "flpolprojects/examplebonus"
 HF_DATA_FILE_PATH = "data.json"
+HF_ORG_INFO_FILE_PATH = "organization_info.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()
+_org_info_lock = threading.Lock()
 visitor_data_cache = {}
-_organization_info_cache = {}
-
-BISHKEK_TZ = ZoneInfo("Asia/Bishkek")
+organization_info_cache = {}
 
-def get_now_bishkek():
+def get_current_bishkek_time():
     return datetime.now(BISHKEK_TZ)
 
 def generate_unique_id(all_data):
     while True:
         new_id = str(random.randint(10000, 99999))
-        if new_id not in all_data and new_id != '__ORG_INFO__':
+        if new_id not in all_data:
             return new_id
 
-def download_data_from_hf():
-    global visitor_data_cache, _organization_info_cache
-    if not HF_TOKEN_READ:
-        return False
+def download_file_from_hf(filename, hf_path, token):
     try:
         hf_hub_download(
             repo_id=REPO_ID,
-            filename=HF_DATA_FILE_PATH,
+            filename=hf_path,
             repo_type="dataset",
-            token=HF_TOKEN_READ,
+            token=token,
             local_dir=".",
             local_dir_use_symlinks=False,
             force_download=True,
             etag_timeout=10
         )
-        with _data_lock:
-            try:
-                with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    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 = {}
+        logging.info(f"File {filename} successfully downloaded from Hugging Face.")
         return True
     except RepositoryNotFoundError:
-        pass
-    except Exception:
-        pass
+        logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download {filename}.")
+    except Exception as e:
+        logging.error(f"Error downloading {filename} from Hugging Face: {e}")
     return False
 
+def upload_file_to_hf(file_path, hf_path, commit_message):
+    if not HF_TOKEN_WRITE:
+        logging.warning("HF_TOKEN_WRITE not set. Skipping Hugging Face upload.")
+        return
+    if not os.path.exists(file_path):
+        logging.warning(f"{file_path} does not exist. Skipping upload.")
+        return
+
+    try:
+        api = HfApi()
+        file_content_exists = os.path.getsize(file_path) > 0
+        if not file_content_exists:
+            logging.warning(f"{file_path} is empty. Skipping upload.")
+            return
+
+        logging.info(f"Attempting to upload {file_path} to {REPO_ID}/{hf_path}...")
+        api.upload_file(
+            path_or_fileobj=file_path,
+            path_in_repo=hf_path,
+            repo_id=REPO_ID,
+            repo_type="dataset",
+            token=HF_TOKEN_WRITE,
+            commit_message=commit_message
+        )
+        logging.info(f"{file_path} successfully uploaded to Hugging Face.")
+    except Exception as e:
+        logging.error(f"Error uploading {file_path} to Hugging Face: {e}")
+
+def upload_file_to_hf_async(file_path, hf_path, commit_message):
+    upload_thread = threading.Thread(target=upload_file_to_hf, args=(file_path, hf_path, commit_message), daemon=True)
+    upload_thread.start()
+
+def download_all_data_from_hf():
+    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
+
+    success_data = download_file_from_hf(DATA_FILE, HF_DATA_FILE_PATH, HF_TOKEN_READ)
+    success_org_info = download_file_from_hf(ORG_INFO_FILE, HF_ORG_INFO_FILE_PATH, HF_TOKEN_READ)
+
+    with _data_lock:
+        try:
+            if success_data and os.path.exists(DATA_FILE) and os.path.getsize(DATA_FILE) > 0:
+                with open(DATA_FILE, 'r', encoding='utf-8') as f:
+                    visitor_data_cache = json.load(f)
+                logging.info(f"Successfully loaded downloaded {DATA_FILE} into cache.")
+            else:
+                logging.warning(f"Downloaded {DATA_FILE} is empty or not found after download. Starting with empty visitor cache.")
+                visitor_data_cache = {}
+        except json.JSONDecodeError as e:
+            logging.error(f"Error decoding downloaded {DATA_FILE}: {e}. Starting with empty visitor cache.")
+            visitor_data_cache = {}
+
+    with _org_info_lock:
+        try:
+            if success_org_info and os.path.exists(ORG_INFO_FILE) and os.path.getsize(ORG_INFO_FILE) > 0:
+                with open(ORG_INFO_FILE, 'r', encoding='utf-8') as f:
+                    organization_info_cache = json.load(f)
+                logging.info(f"Successfully loaded downloaded {ORG_INFO_FILE} into cache.")
+            else:
+                logging.warning(f"Downloaded {ORG_INFO_FILE} is empty or not found after download. Loading default organization info.")
+                organization_info_cache = {}
+                load_organization_data()
+        except json.JSONDecodeError as e:
+            logging.error(f"Error decoding downloaded {ORG_INFO_FILE}: {e}. Loading default organization info.")
+            organization_info_cache = {}
+            load_organization_data()
+
+    return success_data and success_org_info
+
 def load_visitor_data():
-    global visitor_data_cache, _organization_info_cache
+    global visitor_data_cache
     with _data_lock:
-        if not visitor_data_cache and not _organization_info_cache:
+        if not visitor_data_cache:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
-                    full_data = json.load(f)
-                    _organization_info_cache = full_data.pop('__ORG_INFO__', {})
-                    visitor_data_cache = full_data
+                    visitor_data_cache = json.load(f)
+                logging.info("Visitor data loaded from local JSON.")
             except FileNotFoundError:
+                logging.warning(f"{DATA_FILE} not found locally. Starting with empty data.")
                 visitor_data_cache = {}
-                _organization_info_cache = {}
             except json.JSONDecodeError:
+                logging.error(f"Error decoding {DATA_FILE}. Starting with empty data.")
                 visitor_data_cache = {}
-                _organization_info_cache = {}
-            except Exception:
+            except Exception as e:
+                logging.error(f"Unexpected error loading visitor data: {e}")
                 visitor_data_cache = {}
-                _organization_info_cache = {}
         return visitor_data_cache
 
-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):
+def save_visitor_data(data_to_save):
     with _data_lock:
+        for user_id, user_entry in data_to_save.items():
+            if user_id in visitor_data_cache:
+                visitor_data_cache[user_id].update(user_entry)
+            else:
+                visitor_data_cache[user_id] = user_entry
         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(data_to_save, f, ensure_ascii=False, indent=4)
-            upload_data_to_hf_async()
-        except Exception:
-            pass
+                json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
+            logging.info(f"Visitor data successfully saved to {DATA_FILE}.")
+            upload_file_to_hf_async(DATA_FILE, HF_DATA_FILE_PATH, f"Update user data {get_current_bishkek_time().strftime('%Y-%m-%d %H:%M:%S')}")
+        except Exception as e:
+            logging.error(f"Error saving visitor data: {e}")
+
+def load_organization_data():
+    global organization_info_cache
+    with _org_info_lock:
+        if not organization_info_cache:
+            try:
+                with open(ORG_INFO_FILE, 'r', encoding='utf-8') as f:
+                    organization_info_cache = json.load(f)
+                logging.info("Organization data loaded from local JSON.")
+            except (FileNotFoundError, json.JSONDecodeError):
+                logging.warning(f"{ORG_INFO_FILE} not found or invalid. Initializing with default data.")
+                organization_info_cache = {
+                    "org_name": "Бонус Система",
+                    "phone_numbers": ["+996555123456", "+996777654321"],
+                    "address": "г. Бишкек, ул. Примерная 123",
+                    "links": {
+                        "website": "https://example.com",
+                        "telegram": "https://t.me/your_telegram_channel",
+                        "whatsapp": "https://wa.me/996555123456"
+                    }
+                }
+            except Exception as e:
+                logging.error(f"Unexpected error loading organization data: {e}")
+                organization_info_cache = {
+                    "org_name": "Бонус Система",
+                    "phone_numbers": ["+996555123456", "+996777654321"],
+                    "address": "г. Бишкек, ул. Примерная 123",
+                    "links": {
+                        "website": "https://example.com",
+                        "telegram": "https://t.me/your_telegram_channel",
+                        "whatsapp": "https://wa.me/996555123456"
+                    }
+                }
+        return organization_info_cache
 
-def save_organization_info(org_info):
-    global _organization_info_cache
-    with _data_lock:
+def save_organization_data(data):
+    global organization_info_cache
+    with _org_info_lock:
+        organization_info_cache.update(data)
         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
+            with open(ORG_INFO_FILE, 'w', encoding='utf-8') as f:
+                json.dump(organization_info_cache, f, ensure_ascii=False, indent=4)
+            logging.info(f"Organization data successfully saved to {ORG_INFO_FILE}.")
+            upload_file_to_hf_async(ORG_INFO_FILE, HF_ORG_INFO_FILE_PATH, f"Update org data {get_current_bishkek_time().strftime('%Y-%m-%d %H:%M:%S')}")
+        except Exception as e:
+            logging.error(f"Error saving organization data: {e}")
 
-def upload_data_to_hf():
+def periodic_backup():
     if not HF_TOKEN_WRITE:
+        logging.info("Periodic backup disabled: HF_TOKEN_WRITE not set.")
         return
-    if not os.path.exists(DATA_FILE):
-        return
-
-    try:
-        api = HfApi()
-        with _data_lock:
-             file_content_exists = os.path.getsize(DATA_FILE) > 0
-             if not file_content_exists:
-                 return
-
-             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 bonus data {get_now_bishkek().strftime('%Y-%m-%d %H:%M:%S')}"
-             )
-    except Exception:
-        pass
-
-def upload_data_to_hf_async():
-     upload_thread = threading.Thread(target=upload_data_to_hf, daemon=True)
-     upload_thread.start()
-
-def periodic_backup():
-     if not HF_TOKEN_WRITE:
-         return
-     while True:
-         time.sleep(3600)
-         upload_data_to_hf()
+    while True:
+        time.sleep(3600)
+        logging.info("Initiating periodic backup...")
+        upload_file_to_hf(DATA_FILE, HF_DATA_FILE_PATH, f"Periodic backup of user data {get_current_bishkek_time().strftime('%Y-%m-%d %H:%M:%S')}")
+        upload_file_to_hf(ORG_INFO_FILE, HF_ORG_INFO_FILE_PATH, f"Periodic backup of org data {get_current_bishkek_time().strftime('%Y-%m-%d %H:%M:%S')}")
 
 def verify_telegram_data(init_data_str):
     try:
@@ -188,11 +248,13 @@ def verify_telegram_data(init_data_str):
             auth_date = int(parsed_data.get('auth_date', [0])[0])
             current_time = int(time.time())
             if current_time - auth_date > 86400:
-                 pass
+                logging.warning(f"Telegram InitData is older than 24 hours (Auth Date: {auth_date}, Current: {current_time}).")
             return parsed_data, True
         else:
+            logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
             return parsed_data, False
-    except Exception:
+    except Exception as e:
+        logging.error(f"Error verifying Telegram data: {e}")
         return None, False
 
 TEMPLATE = """
@@ -222,9 +284,6 @@ 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 {
@@ -323,19 +382,45 @@ TEMPLATE = """
             padding: 4px 10px;
             border-radius: 8px;
         }
-        .content-section {
-            background-color: var(--card-bg);
-            border-radius: var(--border-radius);
-            padding: var(--padding-l);
+        .navigation-buttons {
+            display: flex;
+            gap: 10px;
+            margin-bottom: var(--padding-m);
+            flex-wrap: wrap;
+        }
+        .navigation-buttons button {
+            flex-grow: 1;
+            background-color: var(--brand-yellow);
+            color: var(--brand-black);
+            border: none;
+            border-radius: 12px;
+            padding: 12px 15px;
+            font-size: 1em;
+            font-weight: 600;
+            cursor: pointer;
+            transition: background-color 0.2s ease;
+        }
+        .navigation-buttons button:hover {
+            background-color: #e0a800;
+        }
+        .section-container {
             display: none;
         }
-        .section-title {
+        .section-container.active {
+            display: block;
+        }
+        .section-header {
             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);
         }
+        .section-card {
+            background-color: var(--card-bg);
+            border-radius: var(--border-radius);
+            padding: var(--padding-l);
+        }
         .history-list, .invoice-list {
             list-style: none;
             padding: 0;
@@ -343,125 +428,137 @@ TEMPLATE = """
             max-height: 35vh;
             overflow-y: auto;
         }
-        .history-item {
+        .history-item, .invoice-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-item:last-child, .invoice-item:last-child { border-bottom: none; }
+        .history-details, .invoice-details { display: flex; flex-direction: column; }
+        .history-description, .invoice-description { font-size: 1em; font-weight: 500; }
+        .history-date, .invoice-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 {
+        .invoice-total { font-size: 1.1em; font-weight: 700; color: var(--brand-yellow); }
+        .no-records {
             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);
+        .invoice-item { cursor: pointer; }
+
+        .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);
+            padding: var(--padding-m);
         }
-        .biz-card-section .org-info-card {
+        .modal-content {
             background-color: var(--card-bg);
+            margin: auto;
+            padding: var(--padding-l);
             border-radius: var(--border-radius);
-            padding: var(--padding-m);
+            max-width: 500px;
+            width: 100%;
+            box-shadow: 0 5px 15px rgba(0,0,0,0.3);
+            position: relative;
         }
-        .org-info-card p {
-            margin-bottom: 10px;
-            line-height: 1.4;
+        .modal-close {
+            color: var(--text-secondary-color);
+            position: absolute;
+            top: 15px;
+            right: 25px;
+            font-size: 28px;
+            font-weight: bold;
+            cursor: pointer;
         }
-        .org-info-card strong {
-            color: var(--brand-yellow);
+        .modal-header {
+            font-size: 1.5em;
+            font-weight: 700;
+            margin-bottom: var(--padding-m);
+            border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+            padding-bottom: 10px;
         }
-        .org-info-card ul {
-            list-style: none;
-            padding-left: 20px;
-            margin-bottom: 10px;
+        .org-info-item {
+            margin-bottom: 15px;
         }
-        .org-info-card ul li {
+        .org-info-item label {
+            font-size: 0.9em;
+            color: var(--text-secondary-color);
+            display: block;
             margin-bottom: 5px;
         }
-        .org-info-card a {
-            color: var(--brand-yellow);
+        .org-info-item p, .org-info-item a {
+            font-size: 1.1em;
+            font-weight: 500;
+            color: var(--text-color);
             text-decoration: none;
+            display: block;
             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;
+        .org-info-item a:hover {
+            color: var(--brand-yellow);
         }
-        .social-link.whatsapp {
-            background-color: #25D366;
-            color: white;
+        .org-info-item a.phone-link {
+            color: var(--brand-yellow);
+            text-decoration: underline;
         }
-        .social-link.telegram {
-            background-color: #0088CC;
-            color: white;
+        .org-info-item a.phone-link:hover {
+            color: #e0a800;
         }
-        .invoice-item {
-            display: flex;
-            flex-direction: column;
-            padding: 14px 4px;
-            border-bottom: 1px solid rgba(255, 255, 255, 0.05);
-            cursor: pointer;
+
+        .invoice-detail-list {
+            list-style: none;
+            padding: 0;
+            margin: 0;
+            border-top: 1px solid rgba(255,255,255,0.1);
+            padding-top: 10px;
         }
-        .invoice-item:last-child { border-bottom: none; }
-        .invoice-summary {
+        .invoice-detail-item {
             display: flex;
             justify-content: space-between;
-            font-weight: 600;
+            padding: 8px 0;
+            border-bottom: 1px solid rgba(255,255,255,0.05);
+            font-size: 0.95em;
         }
-        .invoice-date {
-            font-size: 1em;
-            color: var(--text-secondary-color);
+        .invoice-detail-item:last-child {
+            border-bottom: none;
         }
-        .invoice-total {
-            font-size: 1.1em;
-            color: var(--brand-yellow);
+        .invoice-detail-item .item-name {
+            font-weight: 500;
+            flex-grow: 1;
         }
-        .invoice-details {
-            margin-top: 10px;
-            padding-left: 10px;
-            font-size: 0.9em;
+        .invoice-detail-item .item-qty-price {
             color: var(--text-secondary-color);
+            margin-left: 10px;
+            min-width: 80px;
+            text-align: right;
         }
-        .invoice-details ul {
-            list-style: disc;
-            padding-left: 20px;
-        }
-        .invoice-details li {
-            margin-bottom: 5px;
+        .invoice-detail-item .item-total {
+            font-weight: 600;
+            margin-left: 15px;
+            min-width: 60px;
+            text-align: right;
+        }
+        .invoice-detail-total {
+            padding-top: 15px;
+            margin-top: 15px;
+            border-top: 1px dashed rgba(255,255,255,0.2);
+            font-size: 1.2em;
+            font-weight: 700;
+            display: flex;
+            justify-content: space-between;
+            color: var(--brand-yellow);
         }
     </style>
 </head>
@@ -488,14 +585,14 @@ TEMPLATE = """
             <p class="client-id-value">{{ user.id }}</p>
         </section>
 
-        <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 class="navigation-buttons">
+            <button id="showBusinessCardBtn">Визитка</button>
+            <button id="showInvoicesBtn">Мои накладные</button>
+            <button id="showHistoryBtn">История операций</button>
+        </section>
 
-        <section class="content-section" id="historySection">
-            <h2 class="section-title">История операций</h2>
+        <section id="historySection" class="section-container active section-card">
+            <h2 class="section-header">История операций</h2>
             {% if user.combined_history %}
                 <ul class="history-list">
                     {% for item in user.combined_history %}
@@ -517,54 +614,63 @@ TEMPLATE = """
                     {% endfor %}
                 </ul>
             {% else %}
-                <p class="no-history">Операций пока не было.</p>
+                <p class="no-records">Операций пока не было.</p>
             {% endif %}
         </section>
-
-        <section class="content-section" id="invoicesSection">
-            <h2 class="section-title">Мои накладные</h2>
+        
+        <section id="invoicesSection" class="section-container section-card">
+            <h2 class="section-header">Мои накладные</h2>
             {% if user.invoices %}
                 <ul class="invoice-list">
-                    {% for invoice in user.invoices|sort(attribute='date', reverse=true) %}
-                        <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>
+                    {% for invoice in user.invoices %}
+                        <li class="invoice-item" onclick="openInvoiceDetailModal({{ invoice|tojson }})">
+                            <div class="invoice-details">
+                                <span class="invoice-description">Накладная от {{ invoice.date_str }}</span>
+                                <span class="invoice-date">Товаров: {{ invoice.items|length }}</span>
                             </div>
+                            <span class="invoice-total">{{ "%.2f"|format(invoice.grand_total|float) }}</span>
                         </li>
                     {% endfor %}
                 </ul>
             {% else %}
-                <p class="no-history">Накладных пока нет.</p>
+                <p class="no-records">У вас пока нет накладных.</p>
             {% endif %}
         </section>
 
-        <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>
+
+    <div id="businessCardModal" class="modal">
+        <div class="modal-content">
+            <span class="modal-close" onclick="closeModal('businessCardModal')">×</span>
+            <h2 class="modal-header" id="orgName"></h2>
+            <div id="orgInfoContent">
+                <div class="org-info-item">
+                    <label>Телефон:</label>
+                    <div id="orgPhoneNumbers"></div>
+                </div>
+                <div class="org-info-item">
+                    <label>Адрес:</label>
+                    <p id="orgAddress"></p>
+                </div>
+                <div class="org-info-item">
+                    <label>Ссылки:</label>
+                    <div id="orgLinks"></div>
+                </div>
             </div>
-        </section>
+        </div>
+    </div>
+
+    <div id="invoiceDetailModal" class="modal">
+        <div class="modal-content">
+            <span class="modal-close" onclick="closeModal('invoiceDetailModal')">×</span>
+            <h2 class="modal-header">Детали накладной <span id="invoiceDetailId"></span></h2>
+            <p class="invoice-date" style="margin-bottom: 15px;">Дата: <span id="invoiceDetailDate"></span></p>
+            <ul id="invoiceDetailItems" class="invoice-detail-list"></ul>
+            <div class="invoice-detail-total">
+                <span>Итого:</span>
+                <span id="invoiceDetailGrandTotal"></span>
+            </div>
+        </div>
     </div>
 
     <script>
@@ -579,47 +685,12 @@ 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;
              }
              
@@ -633,7 +704,6 @@ 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', {
@@ -644,16 +714,18 @@ 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 + '&view=' + currentView);
+                        window.location.replace('/?user_id_for_test=' + data.user_id);
                     } else {
-                        showSection(currentView);
+                        console.warn('Backend verification failed:', data.message);
+                        document.body.style.visibility = 'visible';
                     }
                 })
                 .catch(error => {
-                    showSection(currentView);
+                    console.error('Error sending initData for verification:', error);
+                    document.body.style.visibility = 'visible';
                 });
              } else {
-                 showSection(currentView);
+                 document.body.style.visibility = 'visible';
              }
 
              const user = tg.initDataUnsafe?.user;
@@ -673,10 +745,120 @@ TEMPLATE = """
              setTimeout(() => {
                  if (document.body.style.visibility !== 'visible') {
                       document.body.style.visibility = 'visible';
-                      showSection(new URLSearchParams(window.location.search).get('view') || 'history');
                   }
              }, 3000);
         }
+
+        // --- Navigation Logic ---
+        const sections = {
+            'historySection': document.getElementById('historySection'),
+            'invoicesSection': document.getElementById('invoicesSection'),
+        };
+
+        function showSection(sectionId) {
+            for (const id in sections) {
+                if (sections[id]) {
+                    sections[id].classList.remove('active');
+                }
+            }
+            if (sections[sectionId]) {
+                sections[sectionId].classList.add('active');
+            }
+        }
+
+        document.getElementById('showHistoryBtn').addEventListener('click', () => showSection('historySection'));
+        document.getElementById('showInvoicesBtn').addEventListener('click', () => showSection('invoicesSection'));
+
+        // --- Modals Logic ---
+        function openModal(modalId) {
+            document.getElementById(modalId).style.display = 'block';
+        }
+
+        function closeModal(modalId) {
+            document.getElementById(modalId).style.display = 'none';
+        }
+
+        window.onclick = function(event) {
+            if (event.target.classList.contains('modal')) {
+                event.target.style.display = 'none';
+            }
+        }
+
+        // --- Business Card Modal Logic ---
+        document.getElementById('showBusinessCardBtn').addEventListener('click', fetchAndShowBusinessCard);
+
+        async function fetchAndShowBusinessCard() {
+            try {
+                const response = await fetch('/organization_info');
+                const orgInfo = await response.json();
+
+                document.getElementById('orgName').textContent = orgInfo.org_name || 'Информация об организации';
+                
+                const phoneNumbersDiv = document.getElementById('orgPhoneNumbers');
+                phoneNumbersDiv.innerHTML = '';
+                if (orgInfo.phone_numbers && orgInfo.phone_numbers.length > 0) {
+                    orgInfo.phone_numbers.forEach(phone => {
+                        const p = document.createElement('p');
+                        p.innerHTML = `<a href="tel:${phone}" class="phone-link">${phone} (позвонить)</a><br>` +
+                                      `<a href="https://wa.me/${phone.replace(/[^0-9]/g, '')}" target="_blank" class="phone-link">Написать в WhatsApp</a><br>` +
+                                      `<a href="https://t.me/share/url?url=&text=${encodeURIComponent(phone)}" target="_blank" class="phone-link">Написать в Telegram</a>`;
+                        phoneNumbersDiv.appendChild(p);
+                    });
+                } else {
+                    phoneNumbersDiv.innerHTML = '<p>Не указано</p>';
+                }
+
+                document.getElementById('orgAddress').textContent = orgInfo.address || 'Не указан';
+                
+                const linksDiv = document.getElementById('orgLinks');
+                linksDiv.innerHTML = '';
+                if (orgInfo.links) {
+                    for (const key in orgInfo.links) {
+                        if (orgInfo.links[key]) {
+                            const p = document.createElement('p');
+                            p.innerHTML = `<a href="${orgInfo.links[key]}" target="_blank">${key.charAt(0).toUpperCase() + key.slice(1)}</a>`;
+                            linksDiv.appendChild(p);
+                        }
+                    }
+                }
+                if (linksDiv.innerHTML === '') {
+                    linksDiv.innerHTML = '<p>Не указаны</p>';
+                }
+
+                openModal('businessCardModal');
+            } catch (error) {
+                console.error('Error fetching organization info:', error);
+                alert('Не удалось загрузить информацию об организации.');
+            }
+        }
+
+        // --- Invoice Detail Modal Logic ---
+        function openInvoiceDetailModal(invoiceData) {
+            document.getElementById('invoiceDetailId').textContent = invoiceData.invoice_id;
+            document.getElementById('invoiceDetailDate').textContent = invoiceData.date_str;
+            document.getElementById('invoiceDetailGrandTotal').textContent = parseFloat(invoiceData.grand_total).toFixed(2);
+
+            const itemsList = document.getElementById('invoiceDetailItems');
+            itemsList.innerHTML = '';
+
+            if (invoiceData.items && invoiceData.items.length > 0) {
+                invoiceData.items.forEach(item => {
+                    const li = document.createElement('li');
+                    li.className = 'invoice-detail-item';
+                    li.innerHTML = `
+                        <span class="item-name">${item.name}</span>
+                        <span class="item-qty-price">${item.quantity} x ${parseFloat(item.price_per_unit).toFixed(2)}</span>
+                        <span class="item-total">${parseFloat(item.total).toFixed(2)}</span>
+                    `;
+                    itemsList.appendChild(li);
+                });
+            } else {
+                itemsList.innerHTML = '<li class="no-records" style="text-align:left;">Нет товаров в этой накладной.</li>';
+            }
+
+            openModal('invoiceDetailModal');
+        }
+
     </script>
 </body>
 </html>
@@ -770,23 +952,117 @@ ADMIN_TEMPLATE = """
         .btn-submit { background-color: var(--admin-success); color: white; }
         .status-message { text-align: center; font-weight: 500; flex-grow: 1; text-align: left; }
 
-        .invoice-items-preview {
-            border: 1px dashed var(--admin-border);
+        /* Invoice Admin Modal Specific Styles */
+        #invoiceItemList {
+            list-style: none;
+            padding: 0;
+            margin-top: 1rem;
+            max-height: 150px;
+            overflow-y: auto;
+            border: 1px solid var(--admin-border);
             border-radius: 8px;
-            padding: 1rem;
+        }
+        .invoice-item-entry {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 8px 12px;
+            border-bottom: 1px solid var(--admin-border);
+        }
+        .invoice-item-entry:last-child {
+            border-bottom: none;
+        }
+        .invoice-item-entry .item-info {
+            flex-grow: 1;
+            font-size: 0.9em;
+        }
+        .invoice-item-entry .item-actions button {
+            background: none;
+            border: none;
+            color: var(--admin-danger);
+            cursor: pointer;
+            font-size: 1em;
+            padding: 5px;
+        }
+        .invoice-summary-total {
+            font-size: 1.2em;
+            font-weight: 700;
+            margin-top: 1rem;
+            text-align: right;
+            color: var(--admin-primary-dark);
+        }
+        .invoice-add-form {
+            display: grid;
+            grid-template-columns: repeat(3, 1fr) auto;
+            gap: 10px;
             margin-top: 1rem;
+            align-items: flex-end;
+        }
+        .invoice-add-form button {
+            height: fit-content;
         }
-        .invoice-items-preview ul {
+        .invoice-history-list {
             list-style: none;
             padding: 0;
+            max-height: 200px;
+            overflow-y: auto;
+            border: 1px solid var(--admin-border);
+            border-radius: 8px;
+            margin-top: 1rem;
         }
-        .invoice-items-preview li {
-            padding: 5px 0;
-            border-bottom: 1px dotted rgba(0,0,0,0.1);
+        .invoice-history-item {
+            padding: 8px 12px;
+            border-bottom: 1px solid var(--admin-border);
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
         }
-        .invoice-items-preview li:last-child {
+        .invoice-history-item:last-child {
             border-bottom: none;
         }
+        .invoice-history-item .details {
+            font-size: 0.9em;
+        }
+        .invoice-history-item .total {
+            font-weight: 600;
+            color: var(--admin-primary-dark);
+        }
+
+        /* Org Info Modal Specific Styles */
+        .org-info-form label {
+            font-weight: 500;
+            margin-bottom: 5px;
+            display: block;
+        }
+        .org-info-form input, .org-info-form textarea {
+            margin-bottom: 15px;
+        }
+        .org-info-form .add-phone-btn {
+            background-color: var(--admin-secondary);
+            color: white;
+            padding: 8px 15px;
+            border-radius: 8px;
+            cursor: pointer;
+            margin-left: 10px;
+        }
+        .phone-input-group {
+            display: flex;
+            align-items: center;
+            margin-bottom: 10px;
+        }
+        .phone-input-group input {
+            flex-grow: 1;
+            margin-bottom: 0;
+        }
+        .phone-input-group .remove-phone-btn {
+            background: none;
+            border: none;
+            color: var(--admin-danger);
+            cursor: pointer;
+            font-size: 1.2em;
+            margin-left: 10px;
+        }
+
     </style>
 </head>
 <body>
@@ -814,7 +1090,7 @@ ADMIN_TEMPLATE = """
         <div class="controls-bar">
             <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
             <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
-            <button class="btn btn-primary" onclick="openOrgSettingsModal()">Настройки организации</button>
+            <button class="btn btn-primary" onclick="openOrgInfoModal()">Настройки организации</button>
         </div>
 
         {% if users %}
@@ -840,7 +1116,7 @@ ADMIN_TEMPLATE = """
                         </div>
                         <div class="user-actions">
                             <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление счетом</button>
-                            <button class="btn-manage" onclick='openInvoiceManagementModal({{ user|tojson }})'>Управление накладными</button>
+                            <button class="btn-manage" onclick='openInvoiceAdminModal({{ user|tojson }})'>Управление накладными</button>
                             {% if user.telegram_id == None %}
                             <button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>
                             {% endif %}
@@ -936,95 +1212,101 @@ ADMIN_TEMPLATE = """
       </div>
     </div>
 
-    <div id="orgSettingsModal" class="modal">
+    <div id="invoiceAdminModal" class="modal">
         <div class="modal-content">
-            <span class="modal-close" onclick="closeModal('orgSettingsModal')">×</span>
+            <span class="modal-close" onclick="closeModal('invoiceAdminModal')">×</span>
             <div class="modal-header">
-                <h2>Настройки организации</h2>
+                <h2>Управление накладными для <span id="invoiceModalUserName"></span></h2>
+                <div id="invoiceModalUserUsername" class="username"></div>
             </div>
+            <input type="hidden" id="invoiceModalUserId">
+
             <div class="form-section">
-                <div class="form-group">
-                    <label for="orgName">Название организации</label>
-                    <input type="text" id="orgName" value="{{ org_info.organization_name }}">
+                <h3>Добавить новую накладную</h3>
+                <div class="invoice-add-form">
+                    <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" min="0" step="0.01">
+                    </div>
+                    <button class="btn btn-primary" onclick="addInvoiceItem()">Добавить товар</button>
                 </div>
-                <div class="form-group">
-                    <label for="orgAddress">Адрес</label>
-                    <textarea id="orgAddress">{{ org_info.address }}</textarea>
+                <ul id="invoiceItemList">
+                    <!-- Items will be added here -->
+                </ul>
+                <div class="invoice-summary-total">Итоговая сумма: <span id="currentInvoiceGrandTotal">0.00</span></div>
+                <div class="modal-footer" style="justify-content: flex-start; margin-top: 1rem; border-top: 1px solid var(--admin-border); padding-top: 1rem;">
+                    <div id="invoiceAddStatus" class="status-message"></div>
+                    <button class="btn-submit" onclick="submitNewInvoice()">Сохранить накладную</button>
                 </div>
+            </div>
+
+            <div class="history-container">
+                <h3>История накладных</h3>
+                <ul id="invoiceHistoryList" class="invoice-history-list">
+                    <!-- Existing invoices will be listed here -->
+                </ul>
+                <p id="noInvoiceHistory" class="no-users" style="display: none;">Накладных пока нет.</p>
+            </div>
+        </div>
+    </div>
+
+    <div id="orgInfoModal" class="modal">
+        <div class="modal-content">
+            <span class="modal-close" onclick="closeModal('orgInfoModal')">×</span>
+            <div class="modal-header">
+                <h2>Настройки организации</h2>
+            </div>
+            <div class="org-info-form">
                 <div class="form-group">
-                    <label for="orgPhones">Номера телефонов (через запятую)</label>
-                    <input type="text" id="orgPhones" value="{{ ','.join(org_info.phone_numbers) }}">
+                    <label for="orgNameInput">Название организации</label>
+                    <input type="text" id="orgNameInput">
                 </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 }}">
+                    <label>Номера телефонов</label>
+                    <div id="phoneNumbersContainer">
+                        <!-- Phone inputs will be added here -->
+                    </div>
+                    <button type="button" class="btn add-phone-btn" onclick="addPhoneInputField()">Добавить телефон</button>
                 </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 }}">
+                    <label for="orgAddressInput">Адрес</label>
+                    <textarea id="orgAddressInput" rows="3"></textarea>
                 </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 class="form-row">
                 <div class="form-group">
-                    <label for="invoiceItemName">Название товара</label>
-                    <input type="text" id="invoiceItemName" placeholder="Название товара">
+                    <label for="orgWebsiteInput">Ссылка на сайт</label>
+                    <input type="url" id="orgWebsiteInput">
                 </div>
                 <div class="form-group">
-                    <label for="invoiceItemQuantity">Количество</label>
-                    <input type="number" id="invoiceItemQuantity" value="1" min="1">
+                    <label for="orgTelegramInput">Ссылка на Telegram</label>
+                    <input type="url" id="orgTelegramInput">
                 </div>
                 <div class="form-group">
-                    <label for="invoiceItemPrice">Стоимость за единицу</label>
-                    <input type="number" id="invoiceItemPrice" placeholder="0.00" step="0.01">
+                    <label for="orgWhatsappInput">Ссылка на WhatsApp (с кодом страны, без '+')</label>
+                    <input type="url" id="orgWhatsappInput">
                 </div>
             </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 class="modal-footer">
+                <div id="orgInfoStatus" class="status-message"></div>
+                <button class="btn-submit" onclick="submitOrgInfo()">Сохранить</button>
             </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>
 
     <script>
         const transactionModal = document.getElementById('transactionModal');
         const addClientModal = document.getElementById('addClientModal');
-        const orgSettingsModal = document.getElementById('orgSettingsModal');
-        const invoiceManagementModal = document.getElementById('invoiceManagementModal');
+        const invoiceAdminModal = document.getElementById('invoiceAdminModal');
+        const orgInfoModal = document.getElementById('orgInfoModal');
         let currentUserData = null;
-        let currentNewInvoiceItems = [];
+        let currentInvoiceItems = [];
 
         function searchUsers() {
             const searchTerm = document.getElementById('searchInput').value.toLowerCase();
@@ -1039,6 +1321,17 @@ ADMIN_TEMPLATE = """
             });
         }
 
+        function openModal(modalId) {
+            document.getElementById(modalId).style.display = 'block';
+        }
+
+        function closeModal(modalId) {
+            document.getElementById(modalId).style.display = 'none';
+            if (modalId === 'transactionModal' || modalId === 'invoiceAdminModal') {
+                currentUserData = null;
+            }
+        }
+
         function openTransactionModal(userData) {
             currentUserData = userData;
             document.getElementById('modalUserId').value = userData.id;
@@ -1066,7 +1359,7 @@ ADMIN_TEMPLATE = """
                         sign = item.type === 'accrual' ? '+' : '-';
                         amountClass = item.type === 'accrual' ? 'bonus-accrual' : 'bonus-deduction';
                         amountText = `${sign}${parseFloat(item.amount).toFixed(2)}`;
-                    } else {
+                    } else { // debt
                         sign = item.type === 'accrual' ? '+' : '-';
                         amountClass = item.type === 'accrual' ? 'debt-accrual' : 'debt-payment';
                         amountText = `${sign}${parseFloat(item.amount).toFixed(2)}`;
@@ -1085,40 +1378,14 @@ ADMIN_TEMPLATE = """
             }
             
             updateCalculations();
-            transactionModal.style.display = 'block';
+            openModal('transactionModal');
         }
 
         function openAddClientModal() {
             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' || modalId === 'invoiceManagementModal') {
-                currentUserData = null;
-            }
+            openModal('addClientModal');
         }
 
         function updateCalculations() {
@@ -1126,31 +1393,31 @@ ADMIN_TEMPLATE = """
 
             const currentBalance = parseFloat(currentUserData.bonuses) || 0;
             const purchaseAmount = parseFloat(document.getElementById('purchaseAmount').value) || 0;
-            const deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
+            let deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
             const accrualAmount = purchaseAmount * 0.02;
-            let finalDeductAmount = deductAmount;
+            
             if (deductAmount > currentBalance) {
-                finalDeductAmount = currentBalance;
-                document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
+                deductAmount = currentBalance;
+                document.getElementById('deductAmount').value = deductAmount > 0 ? deductAmount.toFixed(2) : '';
             }
-            const finalBalance = currentBalance + accrualAmount - finalDeductAmount;
+            const finalBonusBalance = currentBalance + accrualAmount - deductAmount;
             document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
             document.getElementById('summaryAccrual').textContent = `+${accrualAmount.toFixed(2)}`;
-            document.getElementById('summaryDeduction').textContent = `-${finalDeductAmount.toFixed(2)}`;
-            document.getElementById('summaryFinalBalance').textContent = finalBalance.toFixed(2);
+            document.getElementById('summaryDeduction').textContent = `-${deductAmount.toFixed(2)}`;
+            document.getElementById('summaryFinalBalance').textContent = finalBonusBalance.toFixed(2);
 
             const currentDebt = parseFloat(currentUserData.debts) || 0;
             const addDebtAmount = parseFloat(document.getElementById('addDebtAmount').value) || 0;
-            const repayDebtAmount = parseFloat(document.getElementById('repayDebtAmount').value) || 0;
-            let finalRepayAmount = repayDebtAmount;
+            let repayDebtAmount = parseFloat(document.getElementById('repayDebtAmount').value) || 0;
+            
             if (repayDebtAmount > currentDebt) {
-                finalRepayAmount = currentDebt;
-                document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
+                repayDebtAmount = currentDebt;
+                document.getElementById('repayDebtAmount').value = repayDebtAmount > 0 ? repayDebtAmount.toFixed(2) : '';
             }
-            const finalDebt = currentDebt + addDebtAmount - finalRepayAmount;
+            const finalDebt = currentDebt + addDebtAmount - repayDebtAmount;
             document.getElementById('summaryCurrentDebt').textContent = currentDebt.toFixed(2);
             document.getElementById('summaryAddDebt').textContent = `+${addDebtAmount.toFixed(2)}`;
-            document.getElementById('summaryRepayDebt').textContent = `-${finalRepayAmount.toFixed(2)}`;
+            document.getElementById('summaryRepayDebt').textContent = `-${repayDebtAmount.toFixed(2)}`;
             document.getElementById('summaryFinalDebt').textContent = finalDebt.toFixed(2);
         }
 
@@ -1228,91 +1495,116 @@ ADMIN_TEMPLATE = """
             }
         }
 
-        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(),
-            };
-            
+        async function deleteClient(userId) {
+            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) {
+                return;
+            }
             try {
-                const response = await fetch('/admin/update_org_info', {
+                const response = await fetch('/admin/delete_client', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(payload)
+                    body: JSON.stringify({ user_id: userId })
                 });
                 const result = await response.json();
                 if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
-                    statusEl.textContent = 'Настройки успешно сохранены!';
-                    setTimeout(() => { location.reload(); }, 1500);
+                    location.reload();
                 } else {
-                    throw new Error(result.message || 'Произошла ошибка');
+                    throw new Error(result.message || 'Не удалось удалить клиента.');
                 }
             } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = `Ошибка: ${error.message}`;
+                alert(`Ошибка: ${error.message}`);
+            }
+        }
+
+        // --- Invoice Admin Modal Logic ---
+        function openInvoiceAdminModal(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('invoiceItemName').value = '';
+            document.getElementById('invoiceItemQuantity').value = '1';
+            document.getElementById('invoiceItemPrice').value = '';
+            document.getElementById('invoiceAddStatus').textContent = '';
+            currentInvoiceItems = [];
+            updateInvoiceItemList();
+            loadInvoiceHistory(userData.invoices || []);
+            openModal('invoiceAdminModal');
+        }
+
+        function updateInvoiceItemList() {
+            const list = document.getElementById('invoiceItemList');
+            list.innerHTML = '';
+            let grandTotal = 0;
+            if (currentInvoiceItems.length === 0) {
+                list.innerHTML = '<li style="padding: 10px; text-align: center; color: var(--admin-secondary);">Нет добавленных товаров</li>';
+            } else {
+                currentInvoiceItems.forEach((item, index) => {
+                    const li = document.createElement('li');
+                    li.className = 'invoice-item-entry';
+                    const itemTotal = item.quantity * item.price_per_unit;
+                    grandTotal += itemTotal;
+                    li.innerHTML = `
+                        <div class="item-info">
+                            ${item.name} (${item.quantity} x ${item.price_per_unit.toFixed(2)})
+                        </div>
+                        <div class="item-total">${itemTotal.toFixed(2)}</div>
+                        <div class="item-actions">
+                            <button onclick="removeInvoiceItem(${index})">×</button>
+                        </div>
+                    `;
+                    list.appendChild(li);
+                });
             }
+            document.getElementById('currentInvoiceGrandTotal').textContent = grandTotal.toFixed(2);
         }
 
-        function addItemToNewInvoice() {
+        function addInvoiceItem() {
             const name = document.getElementById('invoiceItemName').value.trim();
             const quantity = parseInt(document.getElementById('invoiceItemQuantity').value);
             const price = parseFloat(document.getElementById('invoiceItemPrice').value);
 
             if (!name || isNaN(quantity) || quantity <= 0 || isNaN(price) || price < 0) {
-                alert('Пожалуйста, введите корректные данные для товара (название, количество > 0, цена >= 0).');
+                alert('Пожалуйста, введите корректные данные для товара (название, кол-во > 0, цена >= 0).');
                 return;
             }
 
-            currentNewInvoiceItems.push({ name, quantity, price_per_unit: price });
-            renderNewInvoiceItems();
+            currentInvoiceItems.push({
+                name: name,
+                quantity: quantity,
+                price_per_unit: price,
+                total: quantity * price
+            });
 
             document.getElementById('invoiceItemName').value = '';
             document.getElementById('invoiceItemQuantity').value = '1';
             document.getElementById('invoiceItemPrice').value = '';
+            updateInvoiceItemList();
         }
 
-        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('newInvoiceTotal').textContent = total.toFixed(2);
-        }
-
-        function removeItemFromNewInvoice(index) {
-            currentNewInvoiceItems.splice(index, 1);
-            renderNewInvoiceItems();
+        function removeInvoiceItem(index) {
+            currentInvoiceItems.splice(index, 1);
+            updateInvoiceItemList();
         }
 
         async function submitNewInvoice() {
-            const statusEl = document.getElementById('invoiceStatus');
+            const statusEl = document.getElementById('invoiceAddStatus');
             statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Сохранение накладной...';
 
-            if (currentNewInvoiceItems.length === 0) {
+            if (currentInvoiceItems.length === 0) {
                 statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
+                statusEl.textContent = 'Накладная не может быть пустой.';
                 return;
             }
 
+            const userId = document.getElementById('invoiceModalUserId').value;
+            const grandTotal = parseFloat(document.getElementById('currentInvoiceGrandTotal').textContent);
+
             const payload = {
-                user_id: document.getElementById('invoiceModalUserId').value,
-                items: currentNewInvoiceItems
+                user_id: userId,
+                items: currentInvoiceItems,
+                grand_total: grandTotal
             };
 
             try {
@@ -1327,7 +1619,7 @@ ADMIN_TEMPLATE = """
                     statusEl.textContent = 'Накладная успешно сохранена!';
                     setTimeout(() => { location.reload(); }, 1500);
                 } else {
-                    throw new Error(result.message || 'Произошла ошибка');
+                    throw new Error(result.message || 'Произошла ошибка при сохранении накладной');
                 }
             } catch (error) {
                 statusEl.style.color = 'var(--admin-danger)';
@@ -1335,48 +1627,105 @@ ADMIN_TEMPLATE = """
             }
         }
 
-        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;
+        function loadInvoiceHistory(invoices) {
+            const list = document.getElementById('invoiceHistoryList');
+            const noHistoryText = document.getElementById('noInvoiceHistory');
+            list.innerHTML = '';
+            if (invoices && invoices.length > 0) {
+                const sortedInvoices = [...invoices].sort((a, b) => new Date(b.date) - new Date(a.date));
+                sortedInvoices.forEach(invoice => {
+                    const li = document.createElement('li');
+                    li.className = 'invoice-history-item';
+                    li.innerHTML = `
+                        <div class="details">
+                            Накладная от ${invoice.date_str} <br>
+                            ${invoice.items.length} товаров
+                        </div>
+                        <div class="total">${parseFloat(invoice.grand_total).toFixed(2)}</div>
+                    `;
+                    list.appendChild(li);
+                });
+                noHistoryText.style.display = 'none';
+            } else {
+                noHistoryText.style.display = 'block';
             }
-            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;
+        // --- Organization Info Modal Logic ---
+        async function openOrgInfoModal() {
+            document.getElementById('orgInfoStatus').textContent = '';
+            try {
+                const response = await fetch('/admin/organization_info');
+                const orgInfo = await response.json();
+
+                document.getElementById('orgNameInput').value = orgInfo.org_name || '';
+                document.getElementById('orgAddressInput').value = orgInfo.address || '';
+                document.getElementById('orgWebsiteInput').value = orgInfo.links?.website || '';
+                document.getElementById('orgTelegramInput').value = orgInfo.links?.telegram || '';
+                document.getElementById('orgWhatsappInput').value = orgInfo.links?.whatsapp || '';
+
+                const phoneNumbersContainer = document.getElementById('phoneNumbersContainer');
+                phoneNumbersContainer.innerHTML = '';
+                if (orgInfo.phone_numbers && orgInfo.phone_numbers.length > 0) {
+                    orgInfo.phone_numbers.forEach(phone => addPhoneInputField(phone));
+                } else {
+                    addPhoneInputField(); // Add one empty field if none exist
+                }
+                
+                openModal('orgInfoModal');
+            } catch (error) {
+                console.error('Error fetching organization info for admin:', error);
+                alert('Не удалось загрузить информацию об организации.');
             }
+        }
+
+        function addPhoneInputField(phoneNumber = '') {
+            const container = document.getElementById('phoneNumbersContainer');
+            const div = document.createElement('div');
+            div.className = 'phone-input-group';
+            div.innerHTML = `
+                <input type="tel" class="phone-input" value="${phoneNumber}" placeholder="+996XXXXXXXXX">
+                <button type="button" class="remove-phone-btn" onclick="this.parentNode.remove()">×</button>
+            `;
+            container.appendChild(div);
+        }
+
+        async function submitOrgInfo() {
+            const statusEl = document.getElementById('orgInfoStatus');
+            statusEl.style.color = 'var(--admin-secondary)';
+            statusEl.textContent = 'Сохранение...';
+
+            const phoneInputs = document.querySelectorAll('.phone-input');
+            const phoneNumbers = Array.from(phoneInputs).map(input => input.value.trim()).filter(phone => phone !== '');
+
+            const payload = {
+                org_name: document.getElementById('orgNameInput').value.trim(),
+                phone_numbers: phoneNumbers,
+                address: document.getElementById('orgAddressInput').value.trim(),
+                links: {
+                    website: document.getElementById('orgWebsiteInput').value.trim(),
+                    telegram: document.getElementById('orgTelegramInput').value.trim(),
+                    whatsapp: document.getElementById('orgWhatsappInput').value.trim()
+                }
+            };
+
             try {
-                const response = await fetch('/admin/delete_client', {
+                const response = await fetch('/admin/update_organization_info', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ user_id: userId })
+                    body: JSON.stringify(payload)
                 });
                 const result = await response.json();
                 if (response.ok) {
-                    location.reload();
+                    statusEl.style.color = 'var(--admin-success)';
+                    statusEl.textContent = 'Информация сохранена!';
+                    // No reload needed, but status message helps
                 } else {
-                    throw new Error(result.message || 'Не удалось удалить клиента.');
+                    throw new Error(result.message || 'Произошла ошибка при сохранении.');
                 }
             } catch (error) {
-                alert(`Ошибка: ${error.message}`);
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = `Ошибка: ${error.message}`;
             }
         }
 
@@ -1387,11 +1736,11 @@ ADMIN_TEMPLATE = """
             if (event.target == addClientModal) {
                 closeModal('addClientModal');
             }
-            if (event.target == orgSettingsModal) {
-                closeModal('orgSettingsModal');
+            if (event.target == invoiceAdminModal) {
+                closeModal('invoiceAdminModal');
             }
-            if (event.target == invoiceManagementModal) {
-                closeModal('invoiceManagementModal');
+            if (event.target == orgInfoModal) {
+                closeModal('orgInfoModal');
             }
         }
     </script>
@@ -1417,14 +1766,16 @@ def index():
         debt_history = user_data.get('debt_history', [])
         for item in debt_history:
             item['transaction_type'] = 'debt'
-
+        
+        invoices = user_data.get('invoices', [])
+        
         combined_history = sorted(
             bonus_history + debt_history,
-            key=lambda x: datetime.fromisoformat(x['date']),
+            key=lambda x: x['date'],
             reverse=True
         )
         user_data['combined_history'] = combined_history
-        user_data['invoices'] = user_data.get('invoices', [])
+        user_data['invoices'] = invoices
     else:
         user_data = {
             "id": "N/A",
@@ -1436,8 +1787,7 @@ def index():
             "invoices": []
         }
 
-    org_info = get_organization_info()
-    return render_template_string(TEMPLATE, user=user_data, org_info=org_info)
+    return render_template_string(TEMPLATE, user=user_data)
 
 @app.route('/verify', methods=['POST'])
 def verify_data():
@@ -1454,13 +1804,14 @@ def verify_data():
             try:
                 user_json_str = unquote(user_data_parsed['user'][0])
                 user_info_dict = json.loads(user_json_str)
-            except Exception:
+            except Exception as e:
+                logging.error(f"Could not parse user JSON: {e}")
                 user_info_dict = {}
 
         if is_valid:
             tg_user_id = user_info_dict.get('id')
             if tg_user_id:
-                now = get_now_bishkek()
+                now = get_current_bishkek_time()
                 all_data = load_visitor_data()
                 
                 existing_user_key = None
@@ -1469,6 +1820,9 @@ def verify_data():
                         existing_user_key = key
                         break
                 
+                user_entry_to_save = {}
+                user_id_to_save = ""
+
                 if existing_user_key:
                     user_entry = all_data[existing_user_key]
                     user_entry.update({
@@ -1480,6 +1834,7 @@ def verify_data():
                         'visited_at': now.timestamp(),
                         'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S')
                     })
+                    user_entry_to_save = {existing_user_key: user_entry}
                     user_id_to_save = existing_user_key
                 else:
                     new_user_id = generate_unique_id(all_data)
@@ -1501,19 +1856,27 @@ def verify_data():
                         'debt_history': [],
                         'invoices': []
                     }
+                    user_entry_to_save = {new_user_id: user_entry}
                     user_id_to_save = new_user_id
                 
-                save_visitor_data({user_id_to_save: user_entry})
+                save_visitor_data(user_entry_to_save)
                 
                 return jsonify({"status": "ok", "verified": True, "user_id": user_id_to_save})
             else:
                  return jsonify({"status": "error", "verified": True, "message": "User ID not found in parsed data"}), 400
         else:
+            logging.warning(f"Verification failed for user: {user_info_dict.get('id')}")
             return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
 
-    except Exception:
+    except Exception as e:
+        logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
+@app.route('/organization_info')
+def get_organization_info_for_client():
+    org_info = load_organization_data()
+    return jsonify(org_info)
+
 @app.route('/admin')
 def admin_panel():
     current_data = load_visitor_data()
@@ -1534,8 +1897,7 @@ def admin_panel():
         "users_with_debt": users_with_debt
     }
     
-    org_info = get_organization_info()
-    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats, org_info=org_info)
+    return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats)
 
 @app.route('/admin/add_client', methods=['POST'])
 def add_client():
@@ -1553,7 +1915,7 @@ def add_client():
             if user.get('phone_number') == phone_number:
                 return jsonify({"status": "error", "message": "Клиент с таким номером телефона уже существует."}), 409
 
-        now = get_now_bishkek()
+        now = get_current_bishkek_time()
         new_id = generate_unique_id(all_data)
         
         new_client = {
@@ -1580,9 +1942,9 @@ def add_client():
         return jsonify({"status": "ok", "message": "Client added successfully"}), 201
 
     except Exception as e:
+        logging.exception("Error in /admin/add_client endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-
 @app.route('/admin/add_transaction', methods=['POST'])
 def add_transaction():
     try:
@@ -1603,7 +1965,7 @@ def add_transaction():
             return jsonify({"status": "error", "message": "User not found"}), 404
 
         user = all_data[user_id_str]
-        now = get_now_bishkek()
+        now = get_current_bishkek_time()
         now_iso = now.isoformat()
         now_str = now.strftime('%Y-%m-%d %H:%M:%S')
         
@@ -1656,29 +2018,7 @@ def add_transaction():
         }), 200
 
     except Exception as e:
-        return jsonify({"status": "error", "message": str(e)}), 500
-
-@app.route('/admin/update_org_info', methods=['POST'])
-def update_org_info():
-    try:
-        data = request.get_json()
-        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_organization_info(updated_org_info)
-        return jsonify({"status": "ok", "message": "Organization settings updated successfully"}), 200
-    except Exception as e:
+        logging.exception("Error in /admin/add_transaction endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/admin/add_invoice', methods=['POST'])
@@ -1686,12 +2026,11 @@ def add_invoice():
     try:
         data = request.get_json()
         user_id = data.get('user_id')
-        items = data.get('items', [])
+        items = data.get('items')
+        grand_total = float(data.get('grand_total', 0))
 
-        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
+        if not user_id or not items:
+            return jsonify({"status": "error", "message": "User ID and invoice items are required"}), 400
         
         user_id_str = str(user_id)
         all_data = load_visitor_data()
@@ -1700,28 +2039,28 @@ def add_invoice():
             return jsonify({"status": "error", "message": "User not found"}), 404
 
         user = all_data[user_id_str]
-        now = get_now_bishkek()
+        now = get_current_bishkek_time()
         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)
+        if 'invoices' not in user or not isinstance(user['invoices'], list):
+            user['invoices'] = []
 
         new_invoice = {
-            "id": str(uuid.uuid4()),
+            "invoice_id": f"INV-{generate_unique_id(user.get('invoices', []))}",
             "date": now_iso,
             "date_str": now_str,
             "items": items,
-            "total_amount": total_amount
+            "grand_total": grand_total
         }
-
-        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
+
+        return jsonify({"status": "ok", "message": "Invoice added successfully", "invoice": new_invoice}), 200
 
     except Exception as e:
+        logging.exception("Error in /admin/add_invoice endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/admin/delete_client', methods=['POST'])
@@ -1747,26 +2086,63 @@ def delete_client():
             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:
+                    json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
+                logging.info(f"User {user_id_str} deleted. Data saved to {DATA_FILE}.")
+                upload_file_to_hf_async(DATA_FILE, HF_DATA_FILE_PATH, f"Delete user {user_id_str} {get_current_bishkek_time().strftime('%Y-%m-%d %H:%M:%S')}")
+            except Exception as e:
+                logging.error(f"Error saving data after deletion: {e}")
                 return jsonify({"status": "error", "message": "Failed to save data after deletion"}), 500
 
         return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
 
     except Exception as e:
+        logging.exception("Error in /admin/delete_client endpoint")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
+@app.route('/admin/organization_info')
+def admin_get_organization_info():
+    org_info = load_organization_data()
+    return jsonify(org_info)
+
+@app.route('/admin/update_organization_info', methods=['POST'])
+def admin_update_organization_info():
+    try:
+        data = request.get_json()
+        
+        # Validate data types
+        if not isinstance(data.get('org_name'), str): return jsonify({"status": "error", "message": "Invalid org_name"}), 400
+        if not isinstance(data.get('phone_numbers'), list): return jsonify({"status": "error", "message": "Invalid phone_numbers"}), 400
+        if not all(isinstance(p, str) for p in data['phone_numbers']): return jsonify({"status": "error", "message": "Invalid phone_numbers format"}), 400
+        if not isinstance(data.get('address'), str): return jsonify({"status": "error", "message": "Invalid address"}), 400
+        if not isinstance(data.get('links'), dict): return jsonify({"status": "error", "message": "Invalid links"}), 400
+        if not all(isinstance(v, str) for v in data['links'].values()): return jsonify({"status": "error", "message": "Invalid links format"}), 400
+
+        save_organization_data(data)
+        return jsonify({"status": "ok", "message": "Organization info updated successfully"}), 200
+    except Exception as e:
+        logging.exception("Error in /admin/update_organization_info endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
+
 if __name__ == '__main__':
-    download_data_from_hf()
+    print("--- BONUS SYSTEM SERVER ---")
+    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_all_data_from_hf()
+
     load_visitor_data()
+    load_organization_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)