Update app.py

app.py

@@ -260,13 +260,11 @@ TEMPLATE = """
             background-color: var(--tg-theme-secondary-bg-color);
             border-radius: var(--border-radius-m); padding: 20px;
         }
-        .promo-card .card-label-container { display: flex; align-items: center; justify-content: center; gap: 8px; margin-bottom: 12px; }
-        .promo-card .card-label { font-size: 1em; font-weight: 500; color: var(--tg-theme-hint-color); }
-        .info-icon {
-            font-weight: bold; cursor: pointer; color: var(--tg-theme-hint-color);
-            border: 1.5px solid var(--tg-theme-hint-color); border-radius: 50%; width: 20px; height: 20px;
-            display: inline-flex; justify-content: center; align-items: center; font-size: 0.8em;
+        .promo-card .card-label { 
+            font-size: 1em; font-weight: 500; color: var(--tg-theme-hint-color); 
+            margin-bottom: 12px; text-align: center; display: flex; align-items: center; justify-content: center; gap: 8px; 
         }
+        .info-icon { cursor: pointer; font-weight: bold; color: var(--tg-theme-button-color); border-radius: 50%; width: 20px; height: 20px; display: inline-flex; justify-content: center; align-items: center; background-color: rgba(0,0,0,0.2); }
         .promo-code-display {
             display: flex; align-items: center; justify-content: center; gap: 12px;
             background-color: rgba(0,0,0,0.2); border-radius: 12px; padding: 12px;
@@ -329,6 +327,7 @@ TEMPLATE = """
             background-color: rgba(0,0,0,0.7); backdrop-filter: blur(8px); -webkit-backdrop-filter: blur(8px);
             align-items: flex-end; justify-content: center;
         }
+        .modal.is-open { display: flex; }
         .modal-content {
             background-color: var(--tg-theme-secondary-bg-color); width: 100%;
             border-top-left-radius: var(--border-radius-l); border-top-right-radius: var(--border-radius-l);
@@ -343,20 +342,19 @@ TEMPLATE = """
         }
         .modal-title { font-size: 1.5em; font-weight: 700; margin-bottom: 20px; text-align: center; color: var(--tg-theme-button-color); }
         .invoice-detail-list { list-style: none; padding: 0; margin: 0; }
-        .invoice-detail-item {
-            display: flex; justify-content: space-between; padding: 12px 0; border-bottom: 1px dashed rgba(255,255,255,0.1);
-        }
+        .invoice-detail-item { display: flex; justify-content: space-between; padding: 12px 0; border-bottom: 1px dashed rgba(255,255,255,0.1); }
         .item-name { font-weight: 500; flex-basis: 60%; }
         .item-qty-price { font-size: 0.9em; color: var(--tg-theme-hint-color); flex-basis: 20%; text-align: right; }
-        .item-total { font-weight: 700; flex-basis: 20%; text-align: right; color: var(--tg-theme-button-color); }
-        .invoice-total-display {
-            padding-top: var(--padding-m); border-top: 1px solid rgba(255,255,255,0.2); margin-top: var(--padding-m);
-            display: flex; flex-direction: column; gap: 8px; font-size: 1.1em; font-weight: 600;
-        }
-        .total-row { display: flex; justify-content: space-between; }
+        .item-total { font-weight: 700; flex-basis: 20%; text-align: right; }
+        .invoice-summary-grid { display: grid; gap: 8px; margin-top: 1rem; padding-top: 1rem; border-top: 1px solid rgba(255,255,255,0.2); }
+        .summary-row { display: flex; justify-content: space-between; font-size: 1.1em; }
+        .summary-row.total { font-weight: bold; font-size: 1.2em; margin-top: 8px; }
+        .summary-row .label { color: var(--tg-theme-hint-color); }
+        .summary-row .value.deducted { color: var(--brand-red); }
+        .summary-row .value.final { color: var(--brand-green); }
         #promoCodeModal .modal-content, #promoInfoModal .modal-content { align-items: center; text-align: center; padding: 40px 24px 24px; }
         #promoCodeModal h2, #promoInfoModal h2 { margin-bottom: 12px; }
-        #promoCodeModal p, #promoInfoModal p { color: var(--tg-theme-hint-color); margin-bottom: 20px; line-height: 1.5; }
+        #promoCodeModal p, #promoInfoModal p { color: var(--tg-theme-hint-color); margin-bottom: 20px; max-width: 300px; }
         #promoCodeModal input {
             width: 100%; padding: 16px; margin-bottom: 16px; font-size: 1.2em;
             background-color: var(--tg-theme-bg-color); border: 1px solid rgba(255,255,255,0.1);
@@ -364,12 +362,12 @@ TEMPLATE = """
             text-align: center; letter-spacing: 2px;
         }
         #promoCodeModal .promo-modal-actions { display: flex; gap: 1rem; width: 100%; }
-        #promoCodeModal button, .btn-close-modal {
+        #promoCodeModal button {
             flex-grow: 1; padding: 16px; font-size: 1em; font-weight: 700; border: none;
             border-radius: var(--border-radius-m); cursor: pointer; transition: all 0.2s;
         }
-        .btn-apply-promo, .btn-close-modal { background-color: var(--tg-theme-button-color); color: var(--tg-theme-button-text-color); }
-        .btn-skip-promo { background-color: var(--tg-theme-secondary-bg-color); color: var(--tg-theme-text-color); }
+        .btn-apply-promo { background-color: var(--tg-theme-button-color); color: var(--tg-theme-button-text-color); }
+        .btn-skip-promo, .btn-close-modal { background-color: var(--tg-theme-secondary-bg-color); color: var(--tg-theme-text-color); }
         #promoStatus { margin-top: 1rem; font-weight: 500; min-height: 20px; }
     </style>
 </head>
@@ -400,10 +398,10 @@ TEMPLATE = """
                 </div>
             </section>
             <section class="promo-card">
-                <div class="card-label-container">
-                    <p class="card-label">Ваш промокод для друзей</p>
+                <p class="card-label">
+                    Ваш промокод для друзей 
                     <span class="info-icon" onclick="openModal('promoInfoModal')">?</span>
-                </div>
+                </p>
                 <div class="promo-code-display">
                     <span class="promo-code-value" id="userPromoCode">{{ user.referral_code }}</span>
                     <button class="copy-btn" onclick="copyPromoCode()">Копировать</button>
@@ -449,7 +447,7 @@ TEMPLATE = """
                                         <span class="history-description">{{ item.description }}</span>
                                         <span class="history-date">{{ item.date_str }}</span>
                                     </div>
-                                    <span class="history-amount {{ 'referral' if item.type == 'accrual' else 'negative' }}">
+                                    <span class="history-amount referral">
                                         {{ '+' if item.type == 'accrual' else '-' }}{{ "%.2f"|format(item.amount|float) }}
                                     </span>
                                 {% endif %}
@@ -542,20 +540,23 @@ TEMPLATE = """
             <div class="modal-close-handle" onclick="closeModal('invoiceDetailModal')"></div>
             <h2 id="invoiceDetailTitle" class="modal-title"></h2>
             <ul id="invoiceDetailList" class="invoice-detail-list"></ul>
-            <div id="invoiceDetailTotal" class="invoice-total-display"></div>
+            <div id="invoiceSummary" class="invoice-summary-grid"></div>
         </div>
     </div>
     <div id="promoInfoModal" class="modal">
         <div class="modal-content">
-            <h2 class="modal-title">Как это работает?</h2>
+            <h2 class="modal-title">Реферальная программа</h2>
             <p>
-                Передайте ваш промокод другу. При активации промокода он получит <strong>{{ bonus_settings.referral_promo_bonus|int }} бонусов</strong>, а вы получите <strong>{{ bonus_settings.referrer_first_purchase_percentage|float }}%</strong> на ваш бонусный счет "от друзей" с его первой покупки.
+                Передай свой промокод другу! При активации твоего промокода он получит 
+                <strong>{{ bonus_settings.referral_promo_bonus|int }}</strong> бонусов, 
+                а ты получишь <strong>{{ bonus_settings.referrer_first_purchase_percentage|float }}%</strong> 
+                на свой бонусный счет "с друзей" с его первой покупки.
             </p>
-            <button class="btn-close-modal" onclick="closeModal('promoInfoModal')" style="width: 100%;">Понятно</button>
+            <button class="btn-close-modal" style="width: 100%; padding: 16px; font-size: 1em; font-weight: 700;" onclick="closeModal('promoInfoModal')">Понятно</button>
         </div>
     </div>
     {% if is_first_visit %}
-    <div id="promoCodeModal" class="modal" style="display: flex; align-items: center;">
+    <div id="promoCodeModal" class="modal is-open" style="align-items: center;">
         <div class="modal-content">
             <h2 class="modal-title">Есть промокод?</h2>
             <p>Если у вас есть промокод от друга, введите его, чтобы получить бонус.</p>
@@ -640,8 +641,14 @@ TEMPLATE = """
             document.querySelector(`.nav-btn[data-target="${sectionId}"]`).classList.add('active');
         }
 
-        function openModal(modalId) { document.getElementById(modalId).style.display = 'flex'; }
-        function closeModal(modalId) { document.getElementById(modalId).style.display = 'none'; }
+        function openModal(modalId) { 
+            const modal = document.getElementById(modalId);
+            if(modal) modal.classList.add('is-open'); 
+        }
+        function closeModal(modalId) { 
+            const modal = document.getElementById(modalId);
+            if(modal) modal.classList.remove('is-open');
+        }
 
         function openInvoiceDetailModal(invoiceData) {
             document.getElementById('invoiceDetailTitle').textContent = `Накладная #${invoiceData.invoice_id}`;
@@ -653,16 +660,22 @@ TEMPLATE = """
                 li.innerHTML = `<span class="item-name">${item.product_name}</span><span class="item-qty-price">${item.quantity} x ${parseFloat(item.unit_price).toFixed(2)}</span><span class="item-total">${parseFloat(item.item_total).toFixed(2)}</span>`;
                 invoiceDetailList.appendChild(li);
             });
-            const totalDisplay = document.getElementById('invoiceDetailTotal');
-            const totalAmount = parseFloat(invoiceData.total_amount);
-            const bonusesDeducted = parseFloat(invoiceData.bonuses_deducted || 0);
 
-            let totalHtml = `<div class="total-row"><span>Итого:</span><span>${totalAmount.toFixed(2)}</span></div>`;
+            const summaryContainer = document.getElementById('invoiceSummary');
+            let totalAmount = parseFloat(invoiceData.total_amount);
+            let bonusesDeducted = parseFloat(invoiceData.bonuses_deducted || 0);
+            let finalAmount = totalAmount - bonusesDeducted;
+            
+            let summaryHTML = `<div class="summary-row"><span class="label">Сумма:</span><span class="value">${totalAmount.toFixed(2)}</span></div>`;
             if (bonusesDeducted > 0) {
-                totalHtml += `<div class="total-row"><span>Списано бонусов:</span><span style="color: var(--brand-red);">- ${bonusesDeducted.toFixed(2)}</span></div>`;
-                totalHtml += `<div class="total-row" style="margin-top: 8px; padding-top: 8px; border-top: 1px solid rgba(255,255,255,0.1);"><strong>К оплате:</strong><strong>${(totalAmount - bonusesDeducted).toFixed(2)}</strong></div>`;
+                let bonusType = invoiceData.bonus_type_deducted === 'referral' ? 'Бонусы от друзей' : 'Бонусы';
+                summaryHTML += `<div class="summary-row"><span class="label">Списано (${bonusType}):</span><span class="value deducted">- ${bonusesDeducted.toFixed(2)}</span></div>`;
+                summaryHTML += `<div class="summary-row total"><span class="label">К оплате:</span><span class="value final">${finalAmount.toFixed(2)}</span></div>`;
+            } else {
+                summaryHTML += `<div class="summary-row total"><span class="label">Итого:</span><span class="value">${totalAmount.toFixed(2)}</span></div>`;
             }
-            totalDisplay.innerHTML = totalHtml;
+            summaryContainer.innerHTML = summaryHTML;
+            
             openModal('invoiceDetailModal');
         }
         
@@ -702,6 +715,12 @@ TEMPLATE = """
                 statusEl.textContent = error.message;
             }
         }
+        
+        document.addEventListener('click', function (event) {
+            if (event.target.classList.contains('modal')) {
+                event.target.classList.remove('is-open');
+            }
+        });
 
         document.addEventListener('DOMContentLoaded', () => {
             document.querySelectorAll('.nav-btn').forEach(button => {
@@ -811,9 +830,8 @@ ADMIN_TEMPLATE = """
         .history-item .amount.bonus-deduction { color: var(--admin-danger); font-weight: 600; }
         .history-item .amount.debt-accrual { color: var(--admin-danger); font-weight: 600; }
         .history-item .amount.debt-payment { color: var(--admin-success); font-weight: 600; }
-        .history-item .amount.referral-accrual, .history-item .amount.referral-deduction { font-weight: 600; }
-        .history-item .amount.referral-accrual { color: var(--admin-info); }
-        .history-item .amount.referral-deduction { color: var(--admin-danger); }
+        .history-item .amount.referral-accrual { color: var(--admin-info); font-weight: 600; }
+        .history-item .amount.referral-deduction { color: var(--admin-danger); 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; }
@@ -848,11 +866,10 @@ ADMIN_TEMPLATE = """
         .item-name { flex-basis: 60%; }
         .item-qty-price { flex-basis: 20%; text-align: right; color: #6c757d; }
         .item-total { flex-basis: 20%; text-align: right; font-weight: bold; }
-        .invoice-total-display { margin-top: 1rem; padding-top: 1rem; border-top: 1px solid #dee2e6; display: flex; flex-direction: column; gap: 0.5rem; font-size: 1.1em; }
-        .invoice-total-display div { display: flex; justify-content: space-between; }
-        .invoice-total-display strong { font-weight: bold; }
-        .bonus-type-selector { display: flex; gap: 15px; margin-bottom: 1rem; }
-        .bonus-type-selector label { font-weight: 500; }
+        .invoice-total-display { margin-top: 1rem; padding-top: 1rem; border-top: 1px solid #dee2e6; font-size: 1.2em; font-weight: bold; }
+        .invoice-total-display > div { display: flex; justify-content: space-between; margin-bottom: 5px; }
+        .bonus-type-selector { margin-bottom: 1rem; }
+        .bonus-type-selector label { margin-right: 15px; font-weight: 500; }
     </style>
 </head>
 <body>
@@ -940,51 +957,34 @@ ADMIN_TEMPLATE = """
             <button class="tab-btn" data-tab="history-tab">История</button>
         </div>
         <div id="bonus-debt-tab" class="tab-content active">
-             <div class="form-section">
+            <div class="form-section">
                 <h3>Основные бонусы</h3>
                 <div class="form-row">
-                    <div class="form-group">
-                        <label for="accrueAmount">Начислить</label>
-                        <input type="number" id="accrueAmount" placeholder="0" oninput="updateCalculations()">
-                    </div>
-                    <div class="form-group">
-                        <label for="deductAmount">Списать</label>
-                        <input type="number" id="deductAmount" placeholder="0" oninput="updateCalculations()">
-                    </div>
+                    <div class="form-group"><label for="accrueAmount">Начислить</label><input type="number" id="accrueAmount" placeholder="0" oninput="updateCalculations()"></div>
+                    <div class="form-group"><label for="deductAmount">Списать</label><input type="number" id="deductAmount" placeholder="0" 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"><strong>Итоговый баланс:</strong> <strong id="summaryFinalBalance">0.00</strong></div>
+                    <div class="summary-item"><span>Итоговый баланс:</span> <strong id="summaryFinalBalance">0.00</strong></div>
                 </div>
             </div>
-             <div class="form-section">
+            <div class="form-section">
                 <h3>Бонусы от друзей</h3>
-                 <div class="form-row">
-                    <div class="form-group">
-                        <label for="deductReferralAmount">Списать</label>
-                        <input type="number" id="deductReferralAmount" placeholder="0" oninput="updateCalculations()">
-                    </div>
+                <div class="form-row">
+                    <div class="form-group"><label>Начислить</label><input type="number" disabled placeholder="Автоматически"></div>
+                    <div class="form-group"><label for="deductReferralAmount">Списать</label><input type="number" id="deductReferralAmount" placeholder="0" oninput="updateCalculations()"></div>
                 </div>
-                <div class="calculation-summary">
-                    <div class="summary-item"><span>Текущий баланс:</span> <strong id="summaryCurrentReferralBalance">0.00</strong></div>
-                    <div class="summary-item"><strong>Итоговый баланс:</strong> <strong id="summaryFinalReferralBalance">0.00</strong></div>
+                 <div class="calculation-summary">
+                    <div class="summary-item"><span>Итоговый баланс:</span> <strong id="summaryFinalReferralBalance">0.00</strong></div>
                 </div>
             </div>
             <div class="form-section">
                 <h3>Долги</h3>
                 <div class="form-row">
-                     <div class="form-group">
-                        <label for="addDebtAmount">Добавить долг</label>
-                        <input type="number" id="addDebtAmount" placeholder="0" oninput="updateCalculations()">
-                    </div>
-                    <div class="form-group">
-                        <label for="repayDebtAmount">Погасить долг</label>
-                        <input type="number" id="repayDebtAmount" placeholder="0" oninput="updateCalculations()">
-                    </div>
+                     <div class="form-group"><label for="addDebtAmount">Добавить долг</label><input type="number" id="addDebtAmount" placeholder="0" oninput="updateCalculations()"></div>
+                    <div class="form-group"><label for="repayDebtAmount">Погасить долг</label><input type="number" id="repayDebtAmount" placeholder="0" 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"><strong>Итоговый долг:</strong> <strong id="summaryFinalDebt">0.00</strong></div>
+                    <div class="summary-item"><span>Итоговый долг:</span> <strong id="summaryFinalDebt">0.00</strong></div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -996,42 +996,30 @@ ADMIN_TEMPLATE = """
             <div class="form-section">
                 <h3>Добавить новую накладную</h3>
                 <table class="invoice-items-table" id="newInvoiceItemsTable">
-                    <thead>
-                        <tr>
-                            <th>Товар</th><th>Кол-во</th><th>Цена за ед.</th>
-                            <th>Сумма</th><th></th>
-                        </tr>
-                    </thead>
+                    <thead><tr><th>Товар</th><th>Кол-во</th><th>Цена за ед.</th><th>Сумма</th><th></th></tr></thead>
                     <tbody></tbody>
-                    <tfoot>
-                        <tr class="total-row">
-                            <td colspan="3" style="text-align: right;"><strong>Итоговая сумма:</strong></td>
-                            <td id="newInvoiceTotalAmount">0.00</td><td></td>
-                        </tr>
-                    </tfoot>
+                    <tfoot><tr class="total-row"><td colspan="3" style="text-align: right;"><strong>Итоговая сумма:</strong></td><td id="newInvoiceTotalAmount">0.00</td><td></td></tr></tfoot>
                 </table>
                 <button class="btn btn-primary" style="margin-top: 1rem;" onclick="addNewInvoiceItemRow()">Добавить товар</button>
             </div>
             <div class="form-section">
                 <h3>Оплата бонусами</h3>
                 <div class="bonus-type-selector">
-                    <label><input type="radio" name="bonus_type" value="regular" onchange="updateNewInvoiceTotal()" checked> Обычные</label>
-                    <label><input type="radio" name="bonus_type" value="referral" onchange="updateNewInvoiceTotal()"> От друзей</label>
+                    <label><input type="radio" name="bonus_type_to_use" value="main" checked onchange="updateNewInvoiceTotal()"> Основные</label>
+                    <label><input type="radio" name="bonus_type_to_use" value="referral" onchange="updateNewInvoiceTotal()"> От друзей</label>
                 </div>
                 <p>Доступно для списания: <strong id="invoiceAvailableBonuses">0.00</strong></p>
                 <div class="form-group">
                     <label for="invoiceDeductBonuses">Списать бонусов</label>
                     <input type="number" id="invoiceDeductBonuses" oninput="updateNewInvoiceTotal()" placeholder="0.00" step="0.01">
                 </div>
-                <div class="invoice-section-summary">
-                    К оплате: <span id="invoiceFinalAmount">0.00</span>
-                </div>
+                <div class="invoice-section-summary">К оплате: <span id="invoiceFinalAmount">0.00</span></div>
             </div>
             <div class="modal-footer">
                 <div id="invoiceStatus" class="status-message"></div>
                 <button class="btn-submit" onclick="submitInvoice()">Сохранить накладную</button>
             </div>
-             <div class="history-container">
+            <div class="history-container">
                 <h3>История накладных клиента</h3>
                 <ul id="modalInvoiceList" class="invoice-list-admin"></ul>
             </div>
@@ -1047,98 +1035,44 @@ ADMIN_TEMPLATE = """
     <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="+77001234567">
-        </div>
-        <div class="modal-footer">
-            <div id="addClientStatus" class="status-message"></div>
-            <button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button>
-        </div>
+        <div class="modal-header"><h2>Добавить нового клиента</h2></div>
+        <div class="form-group" style="margin-bottom: 1rem;"><label for="newClientFirstName">Имя</label><input type="text" id="newClientFirstName" placeholder="Иван"></div>
+        <div class="form-group" style="margin-bottom: 1.5rem;"><label for="newClientPhone">Номер телефона (уникальный)</label><input type="tel" id="newClientPhone" placeholder="+77001234567"></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="modal-header"><h2>Настройки организации</h2></div>
             <div class="details-form">
-                <div class="form-group">
-                    <label for="orgName">Название организации</label>
-                    <input type="text" id="orgName" placeholder="Название вашей организации">
-                </div>
-                <div class="form-group">
-                    <label for="orgPhoneNumbers">Номера телефонов (через запятую)</label>
-                    <input type="text" id="orgPhoneNumbers" placeholder="+77001112233,+77004445566">
-                </div>
-                <div class="form-group">
-                    <label for="orgAddress">Адрес</label>
-                    <textarea id="orgAddress" placeholder="Город, улица, дом"></textarea>
-                </div>
-                <div class="form-group">
-                    <label for="orgWhatsAppLink">Ссылка на WhatsApp</label>
-                    <input type="url" id="orgWhatsAppLink" placeholder="https://wa.me/77001112233">
-                </div>
-                <div class="form-group">
-                    <label for="orgTelegramLink">Ссылка на Telegram</label>
-                    <input type="url" id="orgTelegramLink" placeholder="https://t.me/your_telegram_username">
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div id="orgStatus" class="status-message"></div>
-                <button class="btn-submit" onclick="saveOrgSettings()">Сохранить настройки</button>
+                <div class="form-group"><label for="orgName">Название организации</label><input type="text" id="orgName" placeholder="Название вашей организации"></div>
+                <div class="form-group"><label for="orgPhoneNumbers">Номера телефонов (через запятую)</label><input type="text" id="orgPhoneNumbers" placeholder="+77001112233,+77004445566"></div>
+                <div class="form-group"><label for="orgAddress">Адрес</label><textarea id="orgAddress" placeholder="Город, улица, дом"></textarea></div>
+                <div class="form-group"><label for="orgWhatsAppLink">Ссылка на WhatsApp</label><input type="url" id="orgWhatsAppLink" placeholder="https://wa.me/77001112233"></div>
+                <div class="form-group"><label for="orgTelegramLink">Ссылка на Telegram</label><input type="url" id="orgTelegramLink" placeholder="https://t.me/your_telegram_username"></div>
             </div>
+            <div class="modal-footer"><div id="orgStatus" class="status-message"></div><button class="btn-submit" onclick="saveOrgSettings()">Сохранить настройки</button></div>
         </div>
     </div>
      <div id="bonusSettingsModal" class="modal">
         <div class="modal-content">
             <span class="modal-close" onclick="closeModal('bonusSettingsModal')">×</span>
-            <div class="modal-header">
-                <h2>Настройка бонусной программы</h2>
-            </div>
+            <div class="modal-header"><h2>Настройка бонусной программы</h2></div>
             <div class="details-form">
-                <div class="form-group">
-                    <label for="settingInvoiceBonus">Процент бонусов с накладных</label>
-                    <div class="form-group-horizontal">
-                        <input type="number" step="0.1" id="settingInvoiceBonus" placeholder="2">
-                        <span>%</span>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="settingPromoBonus">Количество бонусов за ввод промокода</label>
-                    <input type="number" id="settingPromoBonus" placeholder="50">
-                </div>
-                <div class="form-group">
-                    <label for="settingReferrerBonus">Процент партнеру с первой покупки друга</label>
-                    <div class="form-group-horizontal">
-                        <input type="number" step="0.1" id="settingReferrerBonus" placeholder="5">
-                         <span>%</span>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div id="bonusSettingsStatus" class="status-message"></div>
-                <button class="btn-submit" onclick="saveBonusSettings()">Сохранить настройки</button>
+                <div class="form-group"><label for="settingInvoiceBonus">Процент бонусов с накладных</label><div class="form-group-horizontal"><input type="number" step="0.1" id="settingInvoiceBonus" placeholder="2"><span>%</span></div></div>
+                <div class="form-group"><label for="settingPromoBonus">Количество бонусов за ввод промокода</label><input type="number" id="settingPromoBonus" placeholder="50"></div>
+                <div class="form-group"><label for="settingReferrerBonus">Процент партнеру с первой покупки друга</label><div class="form-group-horizontal"><input type="number" step="0.1" id="settingReferrerBonus" placeholder="5"><span>%</span></div></div>
             </div>
+            <div class="modal-footer"><div id="bonusSettingsStatus" class="status-message"></div><button class="btn-submit" onclick="saveBonusSettings()">Сохранить настройки</button></div>
         </div>
     </div>
     <div id="adminInvoiceDetailModal" class="modal">
         <div class="modal-content">
             <span class="modal-close" onclick="closeModal('adminInvoiceDetailModal')">×</span>
-            <div class="modal-header">
-                <h2 id="adminInvoiceDetailTitle"></h2>
-            </div>
+            <div class="modal-header"><h2 id="adminInvoiceDetailTitle"></h2></div>
             <ul id="adminInvoiceDetailList" class="invoice-detail-list"></ul>
-            <div id="adminInvoiceDetailTotal" class="invoice-total-display">
-            </div>
+            <div id="adminInvoiceDetailTotal" class="invoice-total-display"></div>
         </div>
     </div>
     <script>
@@ -1164,7 +1098,8 @@ ADMIN_TEMPLATE = """
             document.getElementById('modalUserUsername').textContent = `@${userData.username || userData.phone_number || ''} | ID: ${userData.id}`;
             ['accrueAmount', 'deductAmount', 'addDebtAmount', 'repayDebtAmount', 'deductReferralAmount', 'invoiceDeductBonuses'].forEach(id => document.getElementById(id).value = '');
             ['modalStatus', 'invoiceStatus'].forEach(id => document.getElementById(id).textContent = '');
-            
+            document.querySelector('input[name="bonus_type_to_use"][value="main"]').checked = true;
+
             newInvoiceItems = [];
             renderNewInvoiceItems();
             loadUserHistoryAndInvoices();
@@ -1184,12 +1119,12 @@ ADMIN_TEMPLATE = """
                     const li = document.createElement('li');
                     li.className = 'history-item';
                     let sign, amountClass, amountText;
-                     if (item.transaction_type === 'bonus') {
+                    if (item.transaction_type === 'bonus') {
                         sign = item.type === 'accrual' ? '+' : '-';
                         amountClass = item.type === 'accrual' ? 'bonus-accrual' : 'bonus-deduction';
                     } else if (item.transaction_type === 'debt') {
-                        sign = item.type === 'payment' ? '-' : '+';
-                        amountClass = item.type === 'payment' ? 'debt-payment' : 'debt-accrual';
+                        sign = item.type === 'accrual' ? '+' : '-';
+                        amountClass = item.type === 'accrual' ? 'debt-accrual' : 'debt-payment';
                     } else if (item.transaction_type === 'referral') {
                         sign = item.type === 'accrual' ? '+' : '-';
                         amountClass = item.type === 'accrual' ? 'referral-accrual' : 'referral-deduction';
@@ -1225,41 +1160,31 @@ ADMIN_TEMPLATE = """
         }
 
         function openOrgSettingsModal() {
-            fetch('/admin/organization_details')
-                .then(response => response.json())
-                .then(data => {
-                    document.getElementById('orgName').value = data.name || '';
-                    document.getElementById('orgPhoneNumbers').value = (data.phone_numbers || []).join(',') || '';
-                    document.getElementById('orgAddress').value = data.address || '';
-                    document.getElementById('orgWhatsAppLink').value = data.whatsapp_link || '';
-                    document.getElementById('orgTelegramLink').value = data.telegram_link || '';
-                    document.getElementById('orgStatus').textContent = '';
-                    orgSettingsModal.style.display = 'block';
-                })
-                .catch(error => {
-                    console.error('Error fetching organization details:', error);
-                    const orgStatus = document.getElementById('orgStatus');
-                    orgStatus.style.color = 'var(--admin-danger)';
-                    orgStatus.textContent = 'Ошибка загрузки данных.';
-                    orgSettingsModal.style.display = 'block';
-                });
+            fetch('/admin/organization_details').then(response => response.json()).then(data => {
+                document.getElementById('orgName').value = data.name || '';
+                document.getElementById('orgPhoneNumbers').value = (data.phone_numbers || []).join(',') || '';
+                document.getElementById('orgAddress').value = data.address || '';
+                document.getElementById('orgWhatsAppLink').value = data.whatsapp_link || '';
+                document.getElementById('orgTelegramLink').value = data.telegram_link || '';
+                document.getElementById('orgStatus').textContent = '';
+                orgSettingsModal.style.display = 'block';
+            }).catch(error => {
+                document.getElementById('orgStatus').textContent = 'Ошибка загрузки данных.';
+                orgSettingsModal.style.display = 'block';
+            });
         }
 
         function openBonusSettingsModal() {
-            fetch('/admin/bonus_settings')
-                .then(response => response.json())
-                .then(data => {
-                    document.getElementById('settingInvoiceBonus').value = data.invoice_bonus_percentage || 0;
-                    document.getElementById('settingPromoBonus').value = data.referral_promo_bonus || 0;
-                    document.getElementById('settingReferrerBonus').value = data.referrer_first_purchase_percentage || 0;
-                    document.getElementById('bonusSettingsStatus').textContent = '';
-                    bonusSettingsModal.style.display = 'block';
-                })
-                .catch(error => {
-                    console.error('Error fetching bonus settings:', error);
-                    document.getElementById('bonusSettingsStatus').textContent = 'Ошибка загрузки настроек.';
-                    bonusSettingsModal.style.display = 'block';
-                });
+            fetch('/admin/bonus_settings').then(response => response.json()).then(data => {
+                document.getElementById('settingInvoiceBonus').value = data.invoice_bonus_percentage || 0;
+                document.getElementById('settingPromoBonus').value = data.referral_promo_bonus || 0;
+                document.getElementById('settingReferrerBonus').value = data.referrer_first_purchase_percentage || 0;
+                document.getElementById('bonusSettingsStatus').textContent = '';
+                bonusSettingsModal.style.display = 'block';
+            }).catch(error => {
+                document.getElementById('bonusSettingsStatus').textContent = 'Ошибка загрузки настроек.';
+                bonusSettingsModal.style.display = 'block';
+            });
         }
 
         function closeModal(modalId) {
@@ -1282,37 +1207,27 @@ ADMIN_TEMPLATE = """
             if (!currentUserData) return;
             const currentBalance = parseFloat(currentUserData.bonuses) || 0;
             const accrueAmount = parseFloat(document.getElementById('accrueAmount').value) || 0;
-            const deductAmountInput = document.getElementById('deductAmount');
-            const deductAmount = parseFloat(deductAmountInput.value) || 0;
-            let finalDeductAmount = Math.min(deductAmount, currentBalance);
-            if (deductAmount > currentBalance) deductAmountInput.value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
-            const finalBalance = currentBalance + accrueAmount - finalDeductAmount;
-            document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
-            document.getElementById('summaryFinalBalance').textContent = finalBalance.toFixed(2);
-
+            const deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
+            const finalDeductAmount = Math.min(deductAmount, currentBalance + accrueAmount);
+            if (deductAmount > currentBalance + accrueAmount) document.getElementById('deductAmount').value = finalDeductAmount > 0 ? finalDeductAmount.toFixed(2) : '';
+            document.getElementById('summaryFinalBalance').textContent = (currentBalance + accrueAmount - finalDeductAmount).toFixed(2);
+            
             const currentReferralBalance = parseFloat(currentUserData.referral_bonuses) || 0;
-            const deductReferralAmountInput = document.getElementById('deductReferralAmount');
-            const deductReferralAmount = parseFloat(deductReferralAmountInput.value) || 0;
-            let finalDeductReferralAmount = Math.min(deductReferralAmount, currentReferralBalance);
-            if (deductReferralAmount > currentReferralBalance) deductReferralAmountInput.value = finalDeductReferralAmount > 0 ? finalDeductReferralAmount.toFixed(2) : '';
-            const finalReferralBalance = currentReferralBalance - finalDeductReferralAmount;
-            document.getElementById('summaryCurrentReferralBalance').textContent = currentReferralBalance.toFixed(2);
-            document.getElementById('summaryFinalReferralBalance').textContent = finalReferralBalance.toFixed(2);
+            const deductReferralAmount = parseFloat(document.getElementById('deductReferralAmount').value) || 0;
+            const finalDeductReferralAmount = Math.min(deductReferralAmount, currentReferralBalance);
+            if(deductReferralAmount > currentReferralBalance) document.getElementById('deductReferralAmount').value = finalDeductReferralAmount > 0 ? finalDeductReferralAmount.toFixed(2) : '';
+            document.getElementById('summaryFinalReferralBalance').textContent = (currentReferralBalance - finalDeductReferralAmount).toFixed(2);
 
             const currentDebt = parseFloat(currentUserData.debts) || 0;
             const addDebtAmount = parseFloat(document.getElementById('addDebtAmount').value) || 0;
-            const repayDebtAmountInput = document.getElementById('repayDebtAmount');
-            const repayDebtAmount = parseFloat(repayDebtAmountInput.value) || 0;
-            let finalRepayAmount = Math.min(repayDebtAmount, currentDebt);
-            if (repayDebtAmount > currentDebt) repayDebtAmountInput.value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
-            const finalDebt = currentDebt + addDebtAmount - finalRepayAmount;
-            document.getElementById('summaryCurrentDebt').textContent = currentDebt.toFixed(2);
-            document.getElementById('summaryFinalDebt').textContent = finalDebt.toFixed(2);
+            const repayDebtAmount = parseFloat(document.getElementById('repayDebtAmount').value) || 0;
+            const finalRepayAmount = Math.min(repayDebtAmount, currentDebt + addDebtAmount);
+            if (repayDebtAmount > currentDebt + addDebtAmount) document.getElementById('repayDebtAmount').value = finalRepayAmount > 0 ? finalRepayAmount.toFixed(2) : '';
+            document.getElementById('summaryFinalDebt').textContent = (currentDebt + addDebtAmount - finalRepayAmount).toFixed(2);
         }
 
         async function submitTransaction() {
             const statusEl = document.getElementById('modalStatus');
-            statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Обработка...';
             const payload = {
                 user_id: document.getElementById('modalUserId').value,
@@ -1323,58 +1238,46 @@ ADMIN_TEMPLATE = """
                 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;
             }
             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) {
-                    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.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) {
-                    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 saveOrgSettings() {
             const statusEl = document.getElementById('orgStatus');
-            statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Сохранение...';
             const phoneNumbersRaw = document.getElementById('orgPhoneNumbers').value.trim();
             const payload = {
@@ -1385,24 +1288,19 @@ ADMIN_TEMPLATE = """
                 telegram_link: document.getElementById('orgTelegramLink').value.trim(),
             };
             try {
-                const response = await fetch('/admin/organization_details', {
-                    method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload)
-                });
+                const response = await fetch('/admin/organization_details', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
                 const result = await response.json();
                 if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
                     statusEl.textContent = 'Настройки организации успешно сохранены!';
                     setTimeout(() => closeModal('orgSettingsModal'), 1500);
                 } else { throw new Error(result.message || 'Произошла ошибка'); }
             } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = `Ошибка: ${error.message}`;
             }
         }
 
         async function saveBonusSettings() {
             const statusEl = document.getElementById('bonusSettingsStatus');
-            statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Сохранение...';
             const payload = {
                 invoice_bonus_percentage: parseFloat(document.getElementById('settingInvoiceBonus').value) || 0,
@@ -1410,17 +1308,13 @@ ADMIN_TEMPLATE = """
                 referrer_first_purchase_percentage: parseFloat(document.getElementById('settingReferrerBonus').value) || 0,
             };
             try {
-                const response = await fetch('/admin/bonus_settings', {
-                    method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload)
-                });
+                const response = await fetch('/admin/bonus_settings', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
                 const result = await response.json();
                 if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
                     statusEl.textContent = 'Настройки бонусной программы сохранены!';
                     setTimeout(() => closeModal('bonusSettingsModal'), 1500);
                 } else { throw new Error(result.message || 'Произошла ошибка'); }
             } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = `Ошибка: ${error.message}`;
             }
         }
@@ -1428,9 +1322,7 @@ ADMIN_TEMPLATE = """
         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 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 || 'Не удалось удалить клиента.');
@@ -1439,14 +1331,8 @@ ADMIN_TEMPLATE = """
 
         function addNewInvoiceItemRow() {
             const tableBody = document.getElementById('newInvoiceItemsTable').getElementsByTagName('tbody')[0];
-            const newRow = tableBody.insertRow();
-            const rowIndex = tableBody.rows.length - 1;
+            const rowIndex = tableBody.rows.length;
             newInvoiceItems.push({ product_name: '', quantity: 1, unit_price: 0, item_total: 0 });
-            newRow.innerHTML = `<td><input type="text" placeholder="Название товара" oninput="updateInvoiceItem(${rowIndex}, 'product_name', this.value)"></td><td><input type="number" step="1" min="1" value="1" placeholder="1" oninput="updateInvoiceItem(${rowIndex}, 'quantity', parseFloat(this.value))"></td><td><input type="number" step="0.01" min="0" placeholder="0.00" oninput="updateInvoiceItem(${rowIndex}, 'unit_price', parseFloat(this.value))"></td><td class="item-total-display">0.00</td><td><button class="action-btn" onclick="removeInvoiceItemRow(${rowIndex})">🗑️</button></td>`;
-        }
-        
-        function removeInvoiceItemRow(index) {
-            newInvoiceItems.splice(index, 1);
             renderNewInvoiceItems();
         }
 
@@ -1459,6 +1345,11 @@ ADMIN_TEMPLATE = """
                 renderNewInvoiceItems();
             }
         }
+
+        function removeInvoiceItemRow(index) {
+            newInvoiceItems.splice(index, 1);
+            renderNewInvoiceItems();
+        }
         
         function renderNewInvoiceItems() {
             const tableBody = document.getElementById('newInvoiceItemsTable').getElementsByTagName('tbody')[0];
@@ -1474,12 +1365,10 @@ ADMIN_TEMPLATE = """
             let total = newInvoiceItems.reduce((sum, item) => sum + (parseFloat(item.item_total) || 0), 0);
             document.getElementById('newInvoiceTotalAmount').textContent = total.toFixed(2);
             
-            const selectedBonusType = document.querySelector('input[name="bonus_type"]:checked').value;
-            const availableBonuses = (selectedBonusType === 'referral') 
-                ? (parseFloat(currentUserData.referral_bonuses) || 0) 
-                : (parseFloat(currentUserData.bonuses) || 0);
-
+            const bonusType = document.querySelector('input[name="bonus_type_to_use"]:checked').value;
+            const availableBonuses = bonusType === 'main' ? (parseFloat(currentUserData.bonuses) || 0) : (parseFloat(currentUserData.referral_bonuses) || 0);
             document.getElementById('invoiceAvailableBonuses').textContent = availableBonuses.toFixed(2);
+
             const deductBonusesInput = document.getElementById('invoiceDeductBonuses');
             let deductAmount = parseFloat(deductBonusesInput.value) || 0;
 
@@ -1494,66 +1383,59 @@ ADMIN_TEMPLATE = """
 
         async function submitInvoice() {
             const statusEl = document.getElementById('invoiceStatus');
-            statusEl.style.color = 'var(--admin-secondary)';
-            statusEl.textContent = 'Сохранение накладной...';
+            statusEl.textContent = 'Сохранение...';
             if (!currentUserData) {
-                statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = 'Пользователь не выбран.';
                 return;
             }
             const itemsToAdd = newInvoiceItems.filter(item => item.product_name && (item.quantity > 0 || item.unit_price > 0));
             if (itemsToAdd.length === 0) {
-                statusEl.style.color = 'var(--admin-danger)';
-                statusEl.textContent = 'Добавьте хотя бы один товар в накладную.';
+                statusEl.textContent = 'Добавьте хотя бы один товар.';
                 return;
             }
             const totalAmount = itemsToAdd.reduce((sum, item) => sum + item.item_total, 0);
             const deductBonuses = parseFloat(document.getElementById('invoiceDeductBonuses').value) || 0;
-            const bonusType = document.querySelector('input[name="bonus_type"]:checked').value;
+            const bonusType = document.querySelector('input[name="bonus_type_to_use"]:checked').value;
             const payload = { 
                 user_id: currentUserData.id, 
                 total_amount: totalAmount, 
                 items: itemsToAdd,
                 deduct_bonuses: deductBonuses,
-                bonus_type: bonusType
+                bonus_type_to_deduct: bonusType
             };
             try {
-                const response = await fetch('/admin/add_invoice', {
-                    method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload)
-                });
+                const response = await fetch('/admin/add_invoice', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) });
                 const result = await response.json();
                 if (response.ok) {
-                    statusEl.style.color = 'var(--admin-success)';
                     statusEl.textContent = 'Накладная успешно сохранена!';
                     setTimeout(() => location.reload(), 1500);
                 } else { throw new Error(result.message || 'Произошла ошибка'); }
             } catch (error) {
-                statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = `Ошибка: ${error.message}`;
             }
         }
 
         function openAdminInvoiceDetailModal(invoiceData) {
             document.getElementById('adminInvoiceDetailTitle').textContent = `Накладная #${invoiceData.invoice_id} от ${invoiceData.date_str}`;
-            const invoiceDetailList = document.getElementById('adminInvoiceDetailList');
-            invoiceDetailList.innerHTML = '';
+            const list = document.getElementById('adminInvoiceDetailList');
+            list.innerHTML = '';
             invoiceData.items.forEach(item => {
                 const li = document.createElement('li');
                 li.className = 'invoice-detail-item';
                 li.innerHTML = `<span class="item-name">${item.product_name}</span><span class="item-qty-price">${item.quantity} x ${parseFloat(item.unit_price).toFixed(2)}</span><span class="item-total">${parseFloat(item.item_total).toFixed(2)}</span>`;
-                invoiceDetailList.appendChild(li);
+                list.appendChild(li);
             });
 
             const totalDisplay = document.getElementById('adminInvoiceDetailTotal');
             let bonusesDeducted = parseFloat(invoiceData.bonuses_deducted || 0);
             let totalAmount = parseFloat(invoiceData.total_amount);
             let finalAmount = totalAmount - bonusesDeducted;
-            let bonusTypeLabel = invoiceData.bonus_type_deducted === 'referral' ? ' (от друзей)' : '';
-
-            let totalHTML = `<div><span>Итого:</span><strong>${totalAmount.toFixed(2)}</strong></div>`;
+            
+            let totalHTML = `<div><span>Итого:</span><span>${totalAmount.toFixed(2)}</span></div>`;
             if (bonusesDeducted > 0) {
-                totalHTML += `<div><span>Списано бонусов${bonusTypeLabel}:</span><strong style="color: var(--admin-danger);">- ${bonusesDeducted.toFixed(2)}</strong></div>`;
-                totalHTML += `<hr style="border: none; border-top: 1px solid #ccc; margin: 8px 0;"><div style="font-size: 1.2em;"><span>К оплате:</span><strong style="color: var(--admin-success);">${finalAmount.toFixed(2)}</strong></div>`;
+                let bonusTypeLabel = invoiceData.bonus_type_deducted === 'referral' ? 'Бонусы от друзей' : 'Основные бонусы';
+                totalHTML += `<div><span>Списано (${bonusTypeLabel}):</span><span style="color: var(--admin-danger);">- ${bonusesDeducted.toFixed(2)}</span></div>`;
+                totalHTML += `<hr style="border-top: 1px solid #dee2e6; margin: 5px 0;"><div><strong>К оплате:</strong><strong style="color: var(--admin-success);">${finalAmount.toFixed(2)}</strong></div>`;
             }
             totalDisplay.innerHTML = totalHTML;
             adminInvoiceDetailModal.style.display = 'block';
@@ -1562,9 +1444,7 @@ ADMIN_TEMPLATE = """
         async function deleteInvoice(userId, invoiceId) {
             if (!confirm(`Вы уверены, что хотите удалить накладную #${invoiceId} для клиента ID ${userId}?`)) return;
             try {
-                const response = await fetch('/admin/delete_invoice', {
-                    method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ user_id: userId, invoice_id: invoiceId })
-                });
+                const response = await fetch('/admin/delete_invoice', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ user_id: userId, invoice_id: invoiceId }) });
                 const result = await response.json();
                 if (response.ok) location.reload();
                 else throw new Error(result.message || 'Не удалось удалить накладную.');
@@ -1572,11 +1452,9 @@ ADMIN_TEMPLATE = """
         }
 
         window.onclick = function(event) {
-            if (event.target == transactionModal) closeModal('transactionModal');
-            if (event.target == addClientModal) closeModal('addClientModal');
-            if (event.target == orgSettingsModal) closeModal('orgSettingsModal');
-            if (event.target == bonusSettingsModal) closeModal('bonusSettingsModal');
-            if (event.target == adminInvoiceDetailModal) closeModal('adminInvoiceDetailModal');
+            if (event.target.classList.contains('modal')) {
+                event.target.style.display = 'none';
+            }
         }
 
         document.addEventListener('DOMContentLoaded', () => { addNewInvoiceItemRow(); });
@@ -1689,24 +1567,22 @@ def submit_referral():
             promo_bonus = float(bonus_settings.get('referral_promo_bonus', 0))
 
             if referral_code:
-                referrer = next((u for u_id, u in visitor_data_cache.items() if u_id not in ["organization_details", "bonus_program_settings"] and u.get('referral_code') == referral_code), None)
+                referrer_id = next((u_id for u_id, u in visitor_data_cache.items() if u_id not in ["organization_details", "bonus_program_settings"] and u.get('referral_code') == referral_code), None)
                 
-                if not referrer:
+                if not referrer_id:
                     return jsonify({"status": "error", "message": "Промокод не найден."}), 404
-                if referrer['id'] == user_id:
+                if referrer_id == user_id:
                     return jsonify({"status": "error", "message": "Нельзя использовать свой промокод."}), 400
-
-                user['referred_by'] = referrer['id']
+                
+                referrer = visitor_data_cache[referrer_id]
+                user['referred_by'] = referrer_id
                 if 'referrals' not in referrer: referrer['referrals'] = []
                 referrer['referrals'].append(user_id)
 
                 if promo_bonus > 0:
                     user['bonuses'] = user.get('bonuses', 0) + promo_bonus
                     now = datetime.now(ALMATY_TZ)
-                    history_entry = {
-                        "type": "accrual", "amount": promo_bonus, "description": "Бонус за промокод",
-                        "date": now.isoformat(), "date_str": now.strftime('%Y-%m-%d %H:%M:%S')
-                    }
+                    history_entry = { "type": "accrual", "amount": promo_bonus, "description": "Бонус за промокод", "date": now.isoformat(), "date_str": now.strftime('%Y-%m-%d %H:%M:%S') }
                     if 'history' not in user: user['history'] = []
                     user['history'].append(history_entry)
             
@@ -1737,10 +1613,7 @@ def admin_panel():
     total_debts = sum(u.get('debts', 0) for u in users_list)
     total_referral_bonuses = sum(u.get('referral_bonuses', 0) for u in users_list)
     
-    summary_stats = {
-        "total_users": total_users, "total_bonuses": total_bonuses,
-        "total_debts": total_debts, "total_referral_bonuses": total_referral_bonuses
-    }
+    summary_stats = { "total_users": total_users, "total_bonuses": total_bonuses, "total_debts": total_debts, "total_referral_bonuses": total_referral_bonuses }
     return render_template_string(ADMIN_TEMPLATE, users=users_list, summary=summary_stats)
 
 @app.route('/admin/add_client', methods=['POST'])
@@ -1759,11 +1632,9 @@ def add_client():
             now = datetime.now(ALMATY_TZ)
             new_id = generate_unique_id(visitor_data_cache)
             new_client = {
-                'id': new_id, 'telegram_id': None, 'first_name': first_name, 'last_name': None,
-                'username': None, 'photo_url': None, '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': [],
-                'referral_code': f'PROMO{new_id}', 'referred_by': None, 'referrals': [], 'has_been_welcomed': True,
+                'id': new_id, 'telegram_id': None, 'first_name': first_name, 'last_name': None, 'username': None, 'photo_url': None, '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': [], 'referral_code': f'PROMO{new_id}', 'referred_by': None, 'referrals': [], 'has_been_welcomed': True,
                 'referral_bonuses': 0, 'referral_bonus_history': [], 'has_made_first_purchase': False,
             }
             visitor_data_cache[new_id] = new_client
@@ -1783,7 +1654,7 @@ def add_transaction():
         deduct_referral_amount = float(data.get('deduct_referral_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
         
         with _data_lock:
@@ -1791,36 +1662,36 @@ def add_transaction():
             user = visitor_data_cache[user_id]
             now = datetime.now(ALMATY_TZ)
             now_iso, now_str = now.isoformat(), now.strftime('%Y-%m-%d %H:%M:%S')
-            
-            if deduct_amount > user.get('bonuses', 0): return jsonify({"status": "error", "message": "Недостаточно бонусов для списания"}), 400
+
+            if deduct_amount > user.get('bonuses', 0) + accrue_amount: return jsonify({"status": "error", "message": "Недостаточно основных бонусов для списания"}), 400
             if deduct_referral_amount > user.get('referral_bonuses', 0): return jsonify({"status": "error", "message": "Недостаточно бонусов от друзей для списания"}), 400
-            if repay_debt_amount > user.get('debts', 0): return jsonify({"status": "error", "message": "Сумма погашения превышает текущий долг"}), 400
+            if repay_debt_amount > user.get('debts', 0) + add_debt_amount: return jsonify({"status": "error", "message": "Сумма погашения превышает долг"}), 400
 
             if 'history' not in user: user['history'] = []
             if accrue_amount > 0:
                 user['bonuses'] = round(user.get('bonuses', 0) + accrue_amount, 2)
-                user['history'].append({"type": "accrual", "amount": round(accrue_amount, 2), "description": f"Начисление бонусов (админ)", "date": now_iso, "date_str": now_str})
+                user['history'].append({"type": "accrual", "amount": accrue_amount, "description": "Начисление бонусов", "date": now_iso, "date_str": now_str})
             if deduct_amount > 0:
                 user['bonuses'] = round(user.get('bonuses', 0) - deduct_amount, 2)
-                user['history'].append({"type": "deduction", "amount": round(deduct_amount, 2), "description": "Списание бонусов (админ)", "date": now_iso, "date_str": now_str})
+                user['history'].append({"type": "deduction", "amount": deduct_amount, "description": "Списание бонусов", "date": now_iso, "date_str": now_str})
 
             if 'referral_bonus_history' not in user: user['referral_bonus_history'] = []
             if deduct_referral_amount > 0:
                 user['referral_bonuses'] = round(user.get('referral_bonuses', 0) - deduct_referral_amount, 2)
-                user['referral_bonus_history'].append({"type": "deduction", "amount": round(deduct_referral_amount, 2), "description": "Списание бонусов от друзей (админ)", "date": now_iso, "date_str": now_str})
+                user['referral_bonus_history'].append({"type": "deduction", "amount": deduct_referral_amount, "description": "Списание бонусов от друзей", "date": now_iso, "date_str": now_str})
 
             if 'debt_history' not in user: user['debt_history'] = []
             if add_debt_amount > 0:
                 user['debts'] = round(user.get('debts', 0) + add_debt_amount, 2)
-                user['debt_history'].append({"type": "accrual", "amount": round(add_debt_amount, 2), "description": "Добавление долга", "date": now_iso, "date_str": now_str})
+                user['debt_history'].append({"type": "accrual", "amount": add_debt_amount, "description": "Добавление долга", "date": now_iso, "date_str": now_str})
             if repay_debt_amount > 0:
                 user['debts'] = round(user.get('debts', 0) - repay_debt_amount, 2)
-                user['debt_history'].append({"type": "payment", "amount": round(repay_debt_amount, 2), "description": "Погашение долга", "date": now_iso, "date_str": now_str})
+                user['debt_history'].append({"type": "payment", "amount": repay_debt_amount, "description": "Погашение долга", "date": now_iso, "date_str": now_str})
             
             save_visitor_data()
             return jsonify({"status": "ok", "message": "Transaction successful"}), 200
     except Exception as e:
-        logging.exception("Error in /admin/add_transaction endpoint")
+        logging.exception("Error in /admin/add_transaction")
         return jsonify({"status": "error", "message": str(e)}), 500
 
 @app.route('/admin/add_invoice', methods=['POST'])
@@ -1831,7 +1702,7 @@ def add_invoice():
         total_amount = float(data.get('total_amount', 0))
         items = data.get('items', [])
         deduct_bonuses = float(data.get('deduct_bonuses', 0))
-        bonus_type = data.get('bonus_type', 'regular')
+        bonus_type_to_deduct = data.get('bonus_type_to_deduct', 'main')
 
         if not user_id: return jsonify({"status": "error", "message": "User ID is required"}), 400
         if not items: return jsonify({"status": "error", "message": "Необходимо добавить товары в накладную."}), 400
@@ -1840,8 +1711,8 @@ def add_invoice():
             if user_id not in visitor_data_cache: return jsonify({"status": "error", "message": "User not found"}), 404
             user = visitor_data_cache[user_id]
             
-            if bonus_type == 'regular' and deduct_bonuses > user.get('bonuses', 0): return jsonify({"status": "error", "message": "Недостаточно обычных бонусов для списания."}), 400
-            if bonus_type == 'referral' and deduct_bonuses > user.get('referral_bonuses', 0): return jsonify({"status": "error", "message": "Недостаточно бонусов от друзей для списания."}), 400
+            available_bonuses = user.get('referral_bonuses', 0) if bonus_type_to_deduct == 'referral' else user.get('bonuses', 0)
+            if deduct_bonuses > available_bonuses: return jsonify({"status": "error", "message": "Недостаточно бонусов для списания."}), 400
             if deduct_bonuses > total_amount: return jsonify({"status": "error", "message": "Сумма списания не может превышать сумму накладной."}), 400
 
             now = datetime.now(ALMATY_TZ)
@@ -1854,25 +1725,25 @@ def add_invoice():
                 "invoice_id": invoice_id, "date": now_iso, "date_str": now_str, 
                 "total_amount": round(total_amount, 2), "items": processed_items,
                 "bonuses_deducted": round(deduct_bonuses, 2),
-                "bonus_type_deducted": bonus_type if deduct_bonuses > 0 else None
+                "bonus_type_deducted": bonus_type_to_deduct
             }
             if 'invoices' not in user: user['invoices'] = []
             user['invoices'].append(new_invoice)
             
             if deduct_bonuses > 0:
-                if bonus_type == 'regular':
-                    user['bonuses'] = round(user.get('bonuses', 0) - deduct_bonuses, 2)
-                    if 'history' not in user: user['history'] = []
-                    user['history'].append({"type": "deduction", "amount": deduct_bonuses, "description": f"Оплата по накладной #{invoice_id}", "date": now_iso, "date_str": now_str})
-                elif bonus_type == 'referral':
+                if bonus_type_to_deduct == 'referral':
                     user['referral_bonuses'] = round(user.get('referral_bonuses', 0) - deduct_bonuses, 2)
                     if 'referral_bonus_history' not in user: user['referral_bonus_history'] = []
                     user['referral_bonus_history'].append({"type": "deduction", "amount": deduct_bonuses, "description": f"Оплата по накладной #{invoice_id}", "date": now_iso, "date_str": now_str})
-
+                else:
+                    user['bonuses'] = round(user.get('bonuses', 0) - deduct_bonuses, 2)
+                    if 'history' not in user: user['history'] = []
+                    user['history'].append({"type": "deduction", "amount": deduct_bonuses, "description": f"Оплата по накладной #{invoice_id}", "date": now_iso, "date_str": now_str})
+            
             bonus_settings = visitor_data_cache.get('bonus_program_settings', {})
             invoice_bonus_percentage = float(bonus_settings.get('invoice_bonus_percentage', 0))
             if invoice_bonus_percentage > 0 and total_amount > 0:
-                bonus_from_invoice = round((total_amount * invoice_bonus_percentage) / 100, 2)
+                bonus_from_invoice = round(((total_amount - deduct_bonuses) * invoice_bonus_percentage) / 100, 2)
                 if bonus_from_invoice > 0:
                     user['bonuses'] = user.get('bonuses', 0) + bonus_from_invoice
                     if 'history' not in user: user['history'] = []
@@ -1885,16 +1756,11 @@ def add_invoice():
                     referrer = visitor_data_cache[referrer_id]
                     referrer_bonus_percentage = float(bonus_settings.get('referrer_first_purchase_percentage', 0))
                     if referrer_bonus_percentage > 0:
-                        commission = round((total_amount * referrer_bonus_percentage) / 100, 2)
+                        commission = round(((total_amount - deduct_bonuses) * referrer_bonus_percentage) / 100, 2)
                         if commission > 0:
                             referrer['referral_bonuses'] = referrer.get('referral_bonuses', 0) + commission
                             if 'referral_bonus_history' not in referrer: referrer['referral_bonus_history'] = []
-                            referrer['referral_bonus_history'].append({
-                                "type": "accrual", "amount": commission,
-                                "description": f"Бонус от друга {user.get('first_name', 'ID:'+user_id)}",
-                                "date": now_iso, "date_str": now_str
-                            })
-
+                            referrer['referral_bonus_history'].append({ "type": "accrual", "amount": commission, "description": f"Бонус от друга {user.get('first_name', 'ID:'+user_id)}", "date": now_iso, "date_str": now_str })
             save_visitor_data()
         return jsonify({"status": "ok", "message": "Invoice added successfully", "invoice_id": invoice_id}), 200
     except Exception as e:
@@ -1996,7 +1862,6 @@ def save_bonus_settings():
 if __name__ == '__main__':
     print("--- BONUS SYSTEM SERVER ---")
     print(f"Server starting on http://{HOST}:{PORT}")
-
     print("Attempting to load local data file...")
     load_visitor_data()