Update app.py

app.py

@@ -33,6 +33,8 @@ KASSAS_FILE = os.path.join(DATA_DIR, 'kassas.json')
 EXPENSES_FILE = os.path.join(DATA_DIR, 'expenses.json')
 PERSONAL_EXPENSES_FILE = os.path.join(DATA_DIR, 'personal_expenses.json')
 SHIFTS_FILE = os.path.join(DATA_DIR, 'shifts.json')
+HELD_BILLS_FILE = os.path.join(DATA_DIR, 'held_bills.json')
+CUSTOMERS_FILE = os.path.join(DATA_DIR, 'customers.json')
 
 DATA_FILES = {
     'inventory': (INVENTORY_FILE, threading.Lock()),
@@ -42,6 +44,8 @@ DATA_FILES = {
     'expenses': (EXPENSES_FILE, threading.Lock()),
     'personal_expenses': (PERSONAL_EXPENSES_FILE, threading.Lock()),
     'shifts': (SHIFTS_FILE, threading.Lock()),
+    'held_bills': (HELD_BILLS_FILE, threading.Lock()),
+    'customers': (CUSTOMERS_FILE, threading.Lock()),
 }
 
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE", "YOUR_WRITE_TOKEN_HERE")
@@ -1612,6 +1616,126 @@ def admin_logout():
     flash("Вы вышли из системы.", "info")
     return redirect(url_for('sales_screen'))
 
+@app.route('/api/held_bills', methods=['GET'])
+def get_held_bills():
+    bills = load_json_data('held_bills')
+    bills.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
+    return jsonify(bills)
+
+@app.route('/api/hold_bill', methods=['POST'])
+def hold_bill():
+    data = request.json
+    if not data or 'name' not in data or 'cart' not in data:
+        return jsonify({'success': False, 'message': 'Invalid data'}), 400
+    
+    bills = load_json_data('held_bills')
+    new_bill = {
+        'id': uuid.uuid4().hex,
+        'name': data['name'],
+        'cart': data['cart'],
+        'timestamp': get_current_time().isoformat()
+    }
+    bills.append(new_bill)
+    save_json_data('held_bills', bills)
+    upload_db_to_hf('held_bills')
+    return jsonify({'success': True, 'bill': new_bill})
+
+@app.route('/api/restore_bill/<bill_id>', methods=['POST'])
+def restore_bill(bill_id):
+    bills = load_json_data('held_bills')
+    bill_to_restore = find_item_by_field(bills, 'id', bill_id)
+    if not bill_to_restore:
+        return jsonify({'success': False, 'message': 'Bill not found'}), 404
+        
+    remaining_bills = [b for b in bills if b.get('id') != bill_id]
+    save_json_data('held_bills', remaining_bills)
+    upload_db_to_hf('held_bills')
+    return jsonify({'success': True, 'bill': bill_to_restore})
+
+@app.route('/api/hold_bill/<bill_id>', methods=['DELETE'])
+def delete_held_bill(bill_id):
+    bills = load_json_data('held_bills')
+    initial_len = len(bills)
+    bills = [b for b in bills if b.get('id') != bill_id]
+    if len(bills) < initial_len:
+        save_json_data('held_bills', bills)
+        upload_db_to_hf('held_bills')
+        return jsonify({'success': True})
+    else:
+        return jsonify({'success': False, 'message': 'Bill not found'}), 404
+
+@app.route('/customers')
+@admin_required
+def customer_management():
+    customers = load_json_data('customers')
+    customers.sort(key=lambda x: x.get('name', '').lower())
+    html = BASE_TEMPLATE.replace('__TITLE__', "Клиенты").replace('__CONTENT__', CUSTOMERS_CONTENT).replace('__SCRIPTS__', '')
+    return render_template_string(html, customers=customers)
+
+@app.route('/admin/customer', methods=['POST'])
+@admin_required
+def manage_customer():
+    action = request.form.get('action')
+    customers = load_json_data('customers')
+    
+    if action == 'add':
+        name = request.form.get('name', '').strip()
+        phone = request.form.get('phone', '').strip().replace('+', '').replace(' ', '')
+        if name and phone:
+            if not find_item_by_field(customers, 'phone', phone):
+                new_customer = {'id': uuid.uuid4().hex, 'name': name, 'phone': phone}
+                customers.append(new_customer)
+                flash(f"Клиент '{name}' добавлен.", "success")
+            else:
+                flash(f"Клиент с номером {phone} уже существует.", "warning")
+        else:
+            flash("Имя и телефон обязательны.", "danger")
+    
+    elif action == 'delete':
+        customer_id = request.form.get('id')
+        initial_len = len(customers)
+        customers = [c for c in customers if c.get('id') != customer_id]
+        if len(customers) < initial_len:
+            flash("Клиент удален.", "success")
+        else:
+            flash("Клиент не найден.", "warning")
+
+    save_json_data('customers', customers)
+    upload_db_to_hf('customers')
+    return redirect(url_for('customer_management'))
+
+@app.route('/api/customers/search')
+def search_customers():
+    query = request.args.get('q', '').lower()
+    if not query:
+        return jsonify([])
+    customers = load_json_data('customers')
+    matches = [
+        c for c in customers 
+        if query in c.get('name', '').lower() or query in c.get('phone', '')
+    ]
+    return jsonify(matches[:10])
+
+@app.route('/api/customers/save', methods=['POST'])
+def save_customer():
+    data = request.json
+    name = data.get('name', '').strip()
+    phone = data.get('phone', '').strip()
+    if not name or not phone:
+        return jsonify({'success': False, 'message': 'Name and phone required'}), 400
+
+    customers = load_json_data('customers')
+    existing_customer = find_item_by_field(customers, 'phone', phone)
+    if existing_customer:
+        existing_customer['name'] = name
+    else:
+        new_customer = {'id': uuid.uuid4().hex, 'name': name, 'phone': phone}
+        customers.append(new_customer)
+    
+    save_json_data('customers', customers)
+    upload_db_to_hf('customers')
+    return jsonify({'success': True})
+    
 BASE_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru" data-bs-theme="light">
@@ -1665,6 +1789,7 @@ BASE_TEMPLATE = """
                 <li><a class="dropdown-item" href="{{ url_for('product_roi_report') }}">Окупаемость товаров</a></li>
             </ul>
         </li>
+        <li class="nav-item"><a class="nav-link {% if request.endpoint == 'customer_management' %}active{% endif %}" href="{{ url_for('customer_management') }}"><i class="fas fa-fw fa-users me-2"></i>Клиенты</a></li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint in ['cashier_login', 'cashier_dashboard'] %}active{% endif %}" href="{{ url_for('cashier_login') }}"><i class="fas fa-fw fa-user-circle me-2"></i>Кабинет кассира</a></li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint in ['admin_panel', 'admin_shifts'] %}active{% endif %}" href="{{ url_for('admin_panel') }}"><i class="fas fa-fw fa-cogs me-2"></i>Админка</a></li>
         {% if session.admin_logged_in %}
@@ -1714,6 +1839,19 @@ BASE_TEMPLATE = """
             </div>
             <div class="form-text">Введите номер без +7.</div>
         </div>
+        <div class="mb-3">
+            <label for="customer-search" class="form-label">Поиск клиента</label>
+            <input type="text" id="customer-search" class="form-control" placeholder="Начните вводить имя...">
+            <div id="customer-search-results" class="list-group mt-1" style="max-height: 150px; overflow-y: auto;"></div>
+        </div>
+        <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="save-customer-checkbox">
+            <label class="form-check-label" for="save-customer-checkbox">Сохранить/обновить клиента</label>
+        </div>
+        <div class="mb-3 mt-2" id="customer-name-container" style="display:none;">
+            <label for="customer-name-input" class="form-label">Имя клиента</label>
+            <input type="text" class="form-control" id="customer-name-input">
+        </div>
         <input type="hidden" id="receipt-url">
       </div>
       <div class="modal-footer">
@@ -1741,7 +1879,9 @@ BASE_TEMPLATE = """
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
 <script src="https://unpkg.com/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
 <script>
+    let receiptModal;
     document.addEventListener('DOMContentLoaded', () => {
+        receiptModal = new bootstrap.Modal(document.getElementById('receiptModal'));
         document.getElementById('sidebar-toggle')?.addEventListener('click', () => document.querySelector('.sidebar').classList.toggle('active'));
         const themeToggle = document.getElementById('theme-toggle');
         const getStoredTheme = () => localStorage.getItem('theme');
@@ -1757,6 +1897,92 @@ BASE_TEMPLATE = """
             setStoredTheme(newTheme);
             setTheme(newTheme);
         });
+
+        const receiptModalEl = document.getElementById('receiptModal');
+        if (receiptModalEl) {
+            const saveCustomerCheckbox = document.getElementById('save-customer-checkbox');
+            const customerNameContainer = document.getElementById('customer-name-container');
+            const customerSearchInput = document.getElementById('customer-search');
+            const customerSearchResults = document.getElementById('customer-search-results');
+            const whatsappPhoneInput = document.getElementById('whatsapp-phone');
+            const customerNameInput = document.getElementById('customer-name-input');
+            const sendWhatsappBtn = document.getElementById('send-whatsapp-btn');
+
+            saveCustomerCheckbox.addEventListener('change', () => {
+                customerNameContainer.style.display = saveCustomerCheckbox.checked ? 'block' : 'none';
+            });
+
+            let searchTimeout;
+            customerSearchInput.addEventListener('input', () => {
+                clearTimeout(searchTimeout);
+                const query = customerSearchInput.value.trim();
+                if (query.length < 2) {
+                    customerSearchResults.innerHTML = '';
+                    return;
+                }
+                searchTimeout = setTimeout(() => {
+                    fetch(`/api/customers/search?q=${encodeURIComponent(query)}`)
+                        .then(res => res.json())
+                        .then(customers => {
+                            customerSearchResults.innerHTML = '';
+                            if (customers.length > 0) {
+                                customers.forEach(customer => {
+                                    const item = document.createElement('a');
+                                    item.href = '#';
+                                    item.className = 'list-group-item list-group-item-action';
+                                    item.textContent = `${customer.name} - ${customer.phone}`;
+                                    item.addEventListener('click', (e) => {
+                                        e.preventDefault();
+                                        whatsappPhoneInput.value = customer.phone;
+                                        customerNameInput.value = customer.name;
+                                        customerSearchInput.value = customer.name;
+                                        customerSearchResults.innerHTML = '';
+                                    });
+                                    customerSearchResults.appendChild(item);
+                                });
+                            } else {
+                                customerSearchResults.innerHTML = '<div class="list-group-item">Клиенты не найдены.</div>';
+                            }
+                        });
+                }, 300);
+            });
+
+            sendWhatsappBtn.addEventListener('click', () => {
+                const phone = whatsappPhoneInput.value.replace(/\\D/g, '');
+                const receiptUrl = document.getElementById('receipt-url').value;
+                if (!phone || !receiptUrl) {
+                    alert('Введите номер телефона.');
+                    return;
+                }
+                const fullPhone = '7' + phone;
+                const message = encodeURIComponent(`Ваша накладная: ${receiptUrl}`);
+                window.open(`https://wa.me/${fullPhone}?text=${message}`, '_blank');
+                
+                if (saveCustomerCheckbox.checked) {
+                    const name = customerNameInput.value.trim();
+                    if (name && phone) {
+                        fetch('/api/customers/save', {
+                            method: 'POST',
+                            headers: {'Content-Type': 'application/json'},
+                            body: JSON.stringify({name: name, phone: phone})
+                        })
+                        .then(res => res.json())
+                        .then(data => {
+                            if (!data.success) console.error('Failed to save customer:', data.message);
+                        });
+                    }
+                }
+            });
+
+            receiptModalEl.addEventListener('show.bs.modal', () => {
+                whatsappPhoneInput.value = '';
+                customerSearchInput.value = '';
+                customerNameInput.value = '';
+                customerSearchResults.innerHTML = '';
+                saveCustomerCheckbox.checked = false;
+                customerNameContainer.style.display = 'none';
+            });
+        }
     });
 </script>
 __SCRIPTS__
@@ -1835,6 +2061,10 @@ SALES_SCREEN_CONTENT = """
                 </div>
                 <div class="d-grid gap-2">
                     <div class="btn-group"><button class="btn btn-success flex-grow-1" id="pay-cash-btn"><i class="fas fa-money-bill-wave me-2"></i>Наличные</button><button class="btn btn-info flex-grow-1" id="pay-card-btn"><i class="far fa-credit-card me-2"></i>Карта</button></div>
+                    <div class="btn-group">
+                        <button class="btn btn-secondary" id="hold-bill-btn"><i class="fas fa-pause me-2"></i>Отложить накладную</button>
+                        <button class="btn btn-secondary" id="list-held-bills-btn"><i class="fas fa-list me-2"></i>Отложенные <span id="held-bills-count" class="badge bg-primary ms-1" style="display:none;"></span></button>
+                    </div>
                     <button class="btn btn-danger" id="clear-cart-btn">Очистить</button>
                 </div>
             </div>
@@ -1891,6 +2121,33 @@ SALES_SCREEN_CONTENT = """
     </div>
   </div>
 </div>
+
+<div class="modal fade" id="holdBillModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header"><h5 class="modal-title">Отложить накладную</h5></div>
+      <form id="hold-bill-form">
+        <div class="modal-body">
+          <label for="hold-bill-name" class="form-label">Название для этой накладной</label>
+          <input type="text" id="hold-bill-name" class="form-control" placeholder="Напр. 'Стол 5', 'Мария'" required>
+        </div>
+        <div class="modal-footer"><button type="submit" class="btn btn-primary">Отложить</button></div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="heldBillsListModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header"><h5 class="modal-title">Отложенные накладные</h5></div>
+      <div class="modal-body">
+        <div id="held-bills-list" class="list-group">
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 """
 
 SALES_SCREEN_SCRIPTS = """
@@ -1902,11 +2159,12 @@ document.addEventListener('DOMContentLoaded', () => {
     let audioCtx;
     let isScannerPaused = false;
     
-    const receiptModal = new bootstrap.Modal(document.getElementById('receiptModal'));
     const variantSelectModal = new bootstrap.Modal(document.getElementById('variantSelectModal'));
     const cashierLoginModal = new bootstrap.Modal(document.getElementById('cashierLoginModal'));
     const startShiftModal = new bootstrap.Modal(document.getElementById('startShiftModal'));
     const customItemModal = new bootstrap.Modal(document.getElementById('customItemModal'));
+    const holdBillModal = new bootstrap.Modal(document.getElementById('holdBillModal'));
+    const heldBillsListModal = new bootstrap.Modal(document.getElementById('heldBillsListModal'));
     const allProducts = {{ inventory|tojson|safe }};
 
     const session = {
@@ -2199,18 +2457,6 @@ document.addEventListener('DOMContentLoaded', () => {
     
     document.getElementById('pay-cash-btn').addEventListener('click', () => completeSale('cash'));
     document.getElementById('pay-card-btn').addEventListener('click', () => completeSale('card'));
-    
-    document.getElementById('send-whatsapp-btn').addEventListener('click', () => {
-        const phone = document.getElementById('whatsapp-phone').value.replace(/\\D/g, '');
-        const receiptUrl = document.getElementById('receipt-url').value;
-        if (phone && receiptUrl) {
-            const fullPhone = '7' + phone;
-            const message = encodeURIComponent(`Ваша накладная: ${receiptUrl}`);
-            window.open(`https://wa.me/${fullPhone}?text=${message}`, '_blank');
-        } else {
-            alert('Введите номер телефона.');
-        }
-    });
 
     const html5QrCode = new Html5Qrcode("reader");
     const scannerStatusEl = document.getElementById('scanner-status');
@@ -2431,8 +2677,121 @@ document.addEventListener('DOMContentLoaded', () => {
         }
     });
 
+    const updateHeldBillsCount = () => {
+        fetch('/api/held_bills')
+            .then(res => res.json())
+            .then(data => {
+                const count = data.length;
+                const badge = document.getElementById('held-bills-count');
+                if (count > 0) {
+                    badge.textContent = count;
+                    badge.style.display = '';
+                } else {
+                    badge.style.display = 'none';
+                }
+            });
+    };
+
+    document.getElementById('hold-bill-btn').addEventListener('click', () => {
+        if (Object.keys(cart).length === 0) {
+            alert('Корзина пуста. Нечего откладывать.');
+            return;
+        }
+        document.getElementById('hold-bill-form').reset();
+        holdBillModal.show();
+    });
+
+    document.getElementById('hold-bill-form').addEventListener('submit', (e) => {
+        e.preventDefault();
+        const name = document.getElementById('hold-bill-name').value.trim();
+        if (!name) return;
+        
+        fetch('/api/hold_bill', {
+            method: 'POST',
+            headers: {'Content-Type': 'application/json'},
+            body: JSON.stringify({ name: name, cart: cart })
+        })
+        .then(res => res.json())
+        .then(data => {
+            if (data.success) {
+                for(const id in cart) delete cart[id];
+                updateCartView();
+                updateHeldBillsCount();
+                holdBillModal.hide();
+            } else {
+                alert('Ошибка: ' + data.message);
+            }
+        });
+    });
+
+    document.getElementById('list-held-bills-btn').addEventListener('click', () => {
+        fetch('/api/held_bills')
+            .then(res => res.json())
+            .then(bills => {
+                const listEl = document.getElementById('held-bills-list');
+                listEl.innerHTML = '';
+                if (bills.length === 0) {
+                    listEl.innerHTML = '<p class="text-center text-muted">Нет отложенных накладных.</p>';
+                } else {
+                    bills.forEach(bill => {
+                        listEl.innerHTML += `
+                            <div class="list-group-item d-flex justify-content-between align-items-center">
+                                <span><strong>${bill.name}</strong> - ${new Date(bill.timestamp).toLocaleTimeString('ru-RU')}</span>
+                                <div>
+                                    <button class="btn btn-sm btn-success restore-bill-btn" data-id="${bill.id}">Восстановить</button>
+                                    <button class="btn btn-sm btn-danger delete-held-bill-btn ms-2" data-id="${bill.id}">Удалить</button>
+                                </div>
+                            </div>`;
+                    });
+                }
+                heldBillsListModal.show();
+            });
+    });
+
+    document.getElementById('held-bills-list').addEventListener('click', (e) => {
+        const billId = e.target.dataset.id;
+        if (!billId) return;
+
+        if (e.target.classList.contains('restore-bill-btn')) {
+            if (Object.keys(cart).length > 0 && !confirm('Текущая корзина будет заменена. Продолжить?')) {
+                return;
+            }
+            fetch(`/api/restore_bill/${billId}`, { method: 'POST' })
+                .then(res => res.json())
+                .then(data => {
+                    if (data.success) {
+                        for(const id in cart) delete cart[id];
+                        Object.assign(cart, data.bill.cart);
+                        updateCartView();
+                        updateHeldBillsCount();
+                        heldBillsListModal.hide();
+                    } else {
+                        alert('Ошибка: ' + data.message);
+                    }
+                });
+        }
+
+        if (e.target.classList.contains('delete-held-bill-btn')) {
+            if (!confirm('Удалить эту отложенную накладную?')) return;
+            fetch(`/api/hold_bill/${billId}`, { method: 'DELETE' })
+                .then(res => res.json())
+                .then(data => {
+                    if (data.success) {
+                        e.target.closest('.list-group-item').remove();
+                        updateHeldBillsCount();
+                        if (document.getElementById('held-bills-list').children.length === 0) {
+                            document.getElementById('held-bills-list').innerHTML = '<p class="text-center text-muted">Нет отложенных накладных.</p>';
+                        }
+                    } else {
+                        alert('Ошибка: ' + data.message);
+                    }
+                });
+        }
+    });
+
     updateCartView();
     initializeSession();
+    updateHeldBillsCount();
 });
 </script>
 """
@@ -3466,6 +3825,55 @@ RETURN_PAGE_CONTENT = """
 </div>
 """
 
+CUSTOMERS_CONTENT = """
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">Клиенты</h5>
+        <button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#addCustomerModal"><i class="fas fa-plus me-2"></i>Добавить клиента</button>
+    </div>
+    <div class="card-body">
+        <div class="table-responsive">
+            <table class="table table-hover">
+                <thead><tr><th>Имя</th><th>Телефон</th><th></th></tr></thead>
+                <tbody>
+                {% for c in customers %}
+                <tr>
+                    <td>{{ c.name }}</td>
+                    <td>{{ c.phone }}</td>
+                    <td class="text-end">
+                        <form action="{{ url_for('manage_customer') }}" method="POST" onsubmit="return confirm('Удалить этого клиента?');">
+                            <input type="hidden" name="action" value="delete">
+                            <input type="hidden" name="id" value="{{ c.id }}">
+                            <button type="submit" class="btn btn-sm btn-outline-danger"><i class="fas fa-trash"></i></button>
+                        </form>
+                    </td>
+                </tr>
+                {% else %}
+                <tr><td colspan="3" class="text-center">Список клиентов пуст.</td></tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+<div class="modal fade" id="addCustomerModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header"><h5 class="modal-title">Новый клиент</h5><button type="button" class="btn-close" data-bs-dismiss="modal"></button></div>
+      <form action="{{ url_for('manage_customer') }}" method="POST">
+        <input type="hidden" name="action" value="add">
+        <div class="modal-body">
+          <div class="mb-3"><label class="form-label">Имя</label><input type="text" name="name" class="form-control" required></div>
+          <div class="mb-3"><label class="form-label">Телефон</label><input type="tel" name="phone" class="form-control" placeholder="7071234567" required></div>
+        </div>
+        <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
+      </form>
+    </div>
+  </div>
+</div>
+"""
+
 if __name__ == '__main__':
     backup_thread = threading.Thread(target=periodic_backup, daemon=True)
     backup_thread.start()