Update app.py

app.py

@@ -656,10 +656,17 @@ TEMPLATE = """
             const totalSection = document.getElementById('invoiceTotalSection');
             const totalAmount = parseFloat(invoiceData.total_amount);
             const bonusesDeducted = parseFloat(invoiceData.bonuses_deducted || 0);
+            const bonusSource = invoiceData.bonus_source_used;
+            let bonusSourceText = '';
+            if (bonusSource === 'referral') {
+                bonusSourceText = ' (от друзей)';
+            } else if (bonusSource === 'main') {
+                bonusSourceText = ' (основных)';
+            }
             
             let html = `<div class="total-row"><span>Сумма</span> <span>${totalAmount.toFixed(2)}</span></div>`;
             if (bonusesDeducted > 0) {
-                html += `<div class="total-row"><span>Списано бонусов</span> <span class="deduction">- ${bonusesDeducted.toFixed(2)}</span></div>`;
+                html += `<div class="total-row"><span>Списано бонусов${bonusSourceText}</span> <span class="deduction">- ${bonusesDeducted.toFixed(2)}</span></div>`;
                 html += `<div class="total-row final"><span>К оплате</span> <span>${(totalAmount - bonusesDeducted).toFixed(2)}</span></div>`;
             } else {
                 html += `<div class="total-row final"><span>К оплате</span> <span>${totalAmount.toFixed(2)}</span></div>`;
@@ -1405,20 +1412,22 @@ ADMIN_TEMPLATE = """
         }
 
         function addNewInvoiceItemRow() {
-            const tableBody = document.getElementById('newInvoiceItemsTable').getElementsByTagName('tbody')[0];
-            const rowIndex = tableBody.rows.length;
             newInvoiceItems.push({ product_name: '', quantity: 1, unit_price: 0, item_total: 0 });
             renderNewInvoiceItems();
         }
 
         function updateInvoiceItem(index, field, value) {
-            if (newInvoiceItems[index]) {
-                newInvoiceItems[index][field] = value;
-                const qty = parseFloat(newInvoiceItems[index].quantity) || 0;
-                const price = parseFloat(newInvoiceItems[index].unit_price) || 0;
-                newInvoiceItems[index].item_total = qty * price;
-                renderNewInvoiceItems();
+            if (!newInvoiceItems[index]) return;
+            newInvoiceItems[index][field] = value;
+            const qty = parseFloat(newInvoiceItems[index].quantity) || 0;
+            const price = parseFloat(newInvoiceItems[index].unit_price) || 0;
+            const itemTotal = qty * price;
+            newInvoiceItems[index].item_total = itemTotal;
+            const tableBody = document.getElementById('newInvoiceItemsTable').getElementsByTagName('tbody')[0];
+            if (tableBody.rows[index]) {
+                tableBody.rows[index].querySelector('.item-total-display').textContent = itemTotal.toFixed(2);
             }
+            updateNewInvoiceTotal();
         }
 
         function removeInvoiceItemRow(index) {
@@ -1431,7 +1440,8 @@ ADMIN_TEMPLATE = """
             tableBody.innerHTML = '';
             newInvoiceItems.forEach((item, index) => {
                 const newRow = tableBody.insertRow();
-                newRow.innerHTML = `<td><input type="text" placeholder="Название товара" value="${item.product_name}" oninput="updateInvoiceItem(${index}, 'product_name', this.value)"></td><td><input type="number" step="1" min="1" placeholder="1" value="${item.quantity || '1'}" oninput="updateInvoiceItem(${index}, 'quantity', parseFloat(this.value))"></td><td><input type="number" step="0.01" min="0" placeholder="0.00" value="${item.unit_price || ''}" oninput="updateInvoiceItem(${index}, 'unit_price', parseFloat(this.value))"></td><td class="item-total-display">${(item.item_total || 0).toFixed(2)}</td><td><button class="action-btn" onclick="removeInvoiceItemRow(${index})">🗑️</button></td>`;
+                const productName = item.product_name ? String(item.product_name).replace(/"/g, '&quot;') : '';
+                newRow.innerHTML = `<td><input type="text" placeholder="Название товара" value="${productName}" oninput="updateInvoiceItem(${index}, 'product_name', this.value)"></td><td><input type="number" step="1" min="1" placeholder="1" value="${item.quantity || '1'}" oninput="updateInvoiceItem(${index}, 'quantity', this.value)"></td><td><input type="number" step="0.01" min="0" placeholder="0.00" value="${item.unit_price || ''}" oninput="updateInvoiceItem(${index}, 'unit_price', this.value)"></td><td class="item-total-display">${(item.item_total || 0).toFixed(2)}</td><td><button class="action-btn" onclick="removeInvoiceItemRow(${index})">🗑️</button></td>`;
             });
             updateNewInvoiceTotal();
         }
@@ -1449,8 +1459,9 @@ ADMIN_TEMPLATE = """
             let deductAmount = parseFloat(deductBonusesInput.value) || 0;
 
             let cappedDeductAmount = Math.max(0, Math.min(deductAmount, availableBonuses, total));
-            if (deductAmount !== cappedDeductAmount && document.activeElement === deductBonusesInput) {
-                deductBonusesInput.value = cappedDeductAmount > 0 ? cappedDeductAmount.toFixed(2) : '';
+            
+            if (deductAmount > cappedDeductAmount) {
+                 deductBonusesInput.value = cappedDeductAmount > 0 ? cappedDeductAmount.toFixed(2) : '';
             }
             
             let finalAmount = total - cappedDeductAmount;
@@ -1466,7 +1477,7 @@ ADMIN_TEMPLATE = """
                 statusEl.textContent = 'Пользователь не выбран.';
                 return;
             }
-            const itemsToAdd = newInvoiceItems.filter(item => item.product_name && (item.quantity > 0 || item.unit_price > 0));
+            const itemsToAdd = newInvoiceItems.filter(item => item.product_name && item.product_name.trim() !== '' && (item.quantity > 0 || item.unit_price > 0));
             if (itemsToAdd.length === 0) {
                 statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = 'Добавьте хотя бы один товар.';