Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, render_template_string, request, redirect, url_for, jsonify, flash
+from flask import Flask, render_template_string, request, redirect, url_for, jsonify, flash, session
 import json
 import os
 import logging
@@ -12,9 +12,11 @@ import uuid
 from decimal import Decimal, InvalidOperation, ROUND_HALF_UP
 import functools
 from collections import defaultdict
+from urllib.parse import quote
 
 app = Flask(__name__)
 app.secret_key = os.urandom(24)
+app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(hours=8)
 
 DATA_DIR = 'pos_data'
 os.makedirs(DATA_DIR, exist_ok=True)
@@ -78,7 +80,7 @@ def load_json_data(file_key):
             with open(filepath, 'r', encoding='utf-8') as f:
                 return json.load(f)
         except (FileNotFoundError, json.JSONDecodeError):
-            return []
+            return [] if file_key != 'users' else [] # Default for most is a list
 
 def save_json_data(file_key, data):
     filepath, lock = DATA_FILES[file_key]
@@ -130,7 +132,7 @@ def periodic_backup():
             
 def find_item_by_field(data, field, value):
     for item in data:
-        if isinstance(item, dict) and item.get(field) == value:
+        if isinstance(item, dict) and str(item.get(field)) == str(value):
             return item
     return None
 
@@ -143,7 +145,7 @@ def format_currency_py(value):
 
 @app.context_processor
 def inject_utils():
-    return {'format_currency_py': format_currency_py, 'get_current_time': get_current_time}
+    return {'format_currency_py': format_currency_py, 'get_current_time': get_current_time, 'quote': quote}
 
 @app.route('/')
 def sales_screen():
@@ -329,7 +331,9 @@ def complete_sale():
             'kassa_name': kassa.get('name', 'N/A'),
             'items': sale_items,
             'total_amount': str(total_amount),
-            'payment_method': payment_method
+            'payment_method': payment_method,
+            'type': 'sale',
+            'is_returned': False
         }
         
         transactions = load_json_data('transactions')
@@ -375,49 +379,86 @@ def complete_sale():
 def transaction_history():
     transactions = load_json_data('transactions')
     transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
-    html = BASE_TEMPLATE.replace('__TITLE__', "История продаж").replace('__CONTENT__', TRANSACTIONS_CONTENT).replace('__SCRIPTS__', TRANSACTIONS_SCRIPTS)
+    html = BASE_TEMPLATE.replace('__TITLE__', "История транзакций").replace('__CONTENT__', TRANSACTIONS_CONTENT).replace('__SCRIPTS__', TRANSACTIONS_SCRIPTS)
     return render_template_string(html, transactions=transactions)
 
 @app.route('/reports')
 def reports():
     today = get_current_time().date()
     start_date_str = request.args.get('start_date', (today.replace(day=1)).strftime('%Y-%m-%d'))
-    end_date_str = request.args.get('end_date', (today).strftime('%Y-%m-%d'))
+    end_date_str = request.args.get('end_date', today.strftime('%Y-%m-%d'))
 
     start_date = datetime.strptime(start_date_str, '%Y-%m-%d').replace(tzinfo=BISHKEK_TZ)
-    end_date = (datetime.strptime(end_date_str, '%Y-%m-%d') + timedelta(days=1)).replace(tzinfo=BISHKEK_TZ)
+    end_date_dt = datetime.strptime(end_date_str, '%Y-%m-%d')
+    end_date = (end_date_dt + timedelta(days=1)).replace(tzinfo=BISHKEK_TZ)
+    days_in_period = (end_date_dt - start_date.date()).days + 1
 
     transactions = load_json_data('transactions')
     expenses = load_json_data('expenses')
+    users = load_json_data('users')
+    user_map = {u['id']: u for u in users}
+
+    filtered_transactions = [t for t in transactions if start_date <= datetime.fromisoformat(t['timestamp']) < end_date]
+    filtered_expenses = [e for e in expenses if start_date <= datetime.fromisoformat(e['timestamp']) < end_date]
 
-    filtered_transactions = [
-        t for t in transactions 
-        if start_date <= datetime.fromisoformat(t['timestamp']) < end_date
-    ]
-    filtered_expenses = [
-        e for e in expenses 
-        if start_date <= datetime.fromisoformat(e['timestamp']) < end_date
-    ]
+    total_revenue = sum(to_decimal(t['total_amount']) for t in filtered_transactions if t.get('type', 'sale') == 'sale')
+    total_returns = sum(to_decimal(t['total_amount']) for t in filtered_transactions if t.get('type') == 'return')
+    net_revenue = total_revenue + total_returns
+
+    total_cogs = sum(to_decimal(item.get('cost_price_at_sale', '0')) * to_decimal(str(item['quantity'])) for t in filtered_transactions for item in t['items'])
+    gross_profit = net_revenue - total_cogs
+    
+    total_manual_expenses = sum(to_decimal(e['amount']) for e in filtered_expenses)
     
-    total_revenue = sum(to_decimal(t['total_amount']) for t in filtered_transactions)
-    total_cogs = sum(
-        to_decimal(item.get('cost_price_at_sale', '0')) * to_decimal(str(item['quantity']))
-        for t in filtered_transactions for item in t['items']
-    )
-    gross_profit = total_revenue - total_cogs
-    total_expenses = sum(to_decimal(e['amount']) for e in filtered_expenses)
+    cashier_expenses = Decimal('0.00')
+    cashier_expense_details = defaultdict(lambda: {'amount': Decimal('0.00'), 'type': ''})
+    salaried_cashiers_in_period = set()
+    
+    for t in filtered_transactions:
+        if t.get('type', 'sale') != 'sale': continue
+        user = user_map.get(t['user_id'])
+        if not user: continue
+        
+        payment_type = user.get('payment_type', 'salary')
+        payment_value = to_decimal(user.get('payment_value', '0'))
+
+        if payment_type == 'percentage':
+            commission = to_decimal(t['total_amount']) * (payment_value / 100)
+            cashier_expenses += commission
+            cashier_expense_details[user['name']]['amount'] += commission
+            cashier_expense_details[user['name']]['type'] = f'{payment_value}%'
+        elif payment_type == 'salary':
+            salaried_cashiers_in_period.add(user['id'])
+
+    for user_id in salaried_cashiers_in_period:
+        user = user_map.get(user_id)
+        if not user: continue
+        payment_value = to_decimal(user.get('payment_value', '0'))
+        daily_salary = payment_value / Decimal('30.44') # Average days in a month
+        salary_for_period = daily_salary * Decimal(days_in_period)
+        cashier_expenses += salary_for_period
+        cashier_expense_details[user['name']]['amount'] += salary_for_period
+        cashier_expense_details[user['name']]['type'] = f'Оклад ({format_currency_py(payment_value)}/мес)'
+
+    total_expenses = total_manual_expenses + cashier_expenses
     net_profit = gross_profit - total_expenses
     
     sales_by_cashier = defaultdict(lambda: {'count': 0, 'total': Decimal(0)})
     for t in filtered_transactions:
+        if t.get('type', 'sale') != 'sale': continue
         cashier_name = t.get('user_name', 'Неизвестный')
         sales_by_cashier[cashier_name]['count'] += 1
         sales_by_cashier[cashier_name]['total'] += to_decimal(t['total_amount'])
 
     stats = {
         'total_revenue': total_revenue,
+        'total_returns': total_returns,
+        'net_revenue': net_revenue,
         'total_cogs': total_cogs,
         'gross_profit': gross_profit,
+        'total_manual_expenses': total_manual_expenses,
+        'cashier_expenses': cashier_expenses,
+        'cashier_expense_details': sorted(cashier_expense_details.items(), key=lambda item: item[1]['amount'], reverse=True),
         'total_expenses': total_expenses,
         'net_profit': net_profit,
         'sales_by_cashier': sorted(sales_by_cashier.items(), key=lambda item: item[1]['total'], reverse=True)
@@ -445,10 +486,22 @@ def manage_user():
     if action == 'add':
         name = request.form.get('name', '').strip()
         pin = request.form.get('pin', '').strip()
+        payment_type = request.form.get('payment_type', 'salary')
+        payment_value = to_decimal(request.form.get('payment_value', '0'))
+
         if name and pin and pin.isdigit():
-            new_user = {'id': uuid.uuid4().hex, 'name': name, 'pin': pin}
-            users.append(new_user)
-            flash(f"Кассир '{name}' добавлен.", "success")
+            if find_item_by_field(users, 'pin', pin):
+                flash(f"ПИН-код {pin} уже используется.", "danger")
+            else:
+                new_user = {
+                    'id': uuid.uuid4().hex, 
+                    'name': name, 
+                    'pin': pin,
+                    'payment_type': payment_type,
+                    'payment_value': str(payment_value)
+                }
+                users.append(new_user)
+                flash(f"Кассир '{name}' добавлен.", "success")
         else:
             flash("Имя и цифровой ПИН-код обязательны.", "danger")
     
@@ -465,6 +518,44 @@ def manage_user():
     upload_db_to_hf('users')
     return redirect(url_for('admin_panel'))
 
+@app.route('/admin/user/edit/<user_id>', methods=['POST'])
+def edit_user(user_id):
+    users = load_json_data('users')
+    user_found = False
+    for i, user in enumerate(users):
+        if user.get('id') == user_id:
+            name = request.form.get('name', '').strip()
+            pin = request.form.get('pin', '').strip()
+            payment_type = request.form.get('payment_type', 'salary')
+            payment_value = to_decimal(request.form.get('payment_value', '0'))
+
+            if not name or not pin or not pin.isdigit():
+                flash("Имя и цифровой ПИН-код обязательны.", "danger")
+                return redirect(url_for('admin_panel'))
+
+            existing_pin_user = find_item_by_field(users, 'pin', pin)
+            if existing_pin_user and existing_pin_user.get('id') != user_id:
+                flash(f"ПИН-код {pin} уже используется другим кассиром.", "warning")
+                return redirect(url_for('admin_panel'))
+            
+            users[i].update({
+                'name': name,
+                'pin': pin,
+                'payment_type': payment_type,
+                'payment_value': str(payment_value)
+            })
+            user_found = True
+            break
+    
+    if user_found:
+        save_json_data('users', users)
+        upload_db_to_hf('users')
+        flash("Данные кассира обновлены.", "success")
+    else:
+        flash("Кассир не найден.", "danger")
+
+    return redirect(url_for('admin_panel'))
+
 @app.route('/admin/kassa', methods=['POST'])
 def manage_kassa():
     action = request.form.get('action')
@@ -604,6 +695,144 @@ def download_hf():
         flash("Произошли ошибки: " + "; ".join(errors), "danger")
     return redirect(url_for('admin_panel'))
 
+@app.route('/cashier_view', methods=['GET', 'POST'])
+def cashier_view():
+    if request.method == 'POST':
+        pin = request.form.get('pin')
+        users = load_json_data('users')
+        user = find_item_by_field(users, 'pin', pin)
+        if user:
+            session['cashier_id'] = user['id']
+            session['cashier_name'] = user['name']
+            return redirect(url_for('cashier_sales'))
+        else:
+            flash('Неверный ПИН-код', 'danger')
+            return redirect(url_for('cashier_view'))
+            
+    if 'cashier_id' in session:
+        return redirect(url_for('cashier_sales'))
+
+    html = BASE_TEMPLATE.replace('__TITLE__', "Вход для кассира").replace('__CONTENT__', CASHIER_LOGIN_CONTENT).replace('__SCRIPTS__', '')
+    return render_template_string(html)
+
+@app.route('/cashier_sales')
+def cashier_sales():
+    if 'cashier_id' not in session:
+        return redirect(url_for('cashier_view'))
+
+    user_id = session['cashier_id']
+    transactions = load_json_data('transactions')
+    user_transactions = [t for t in transactions if t.get('user_id') == user_id]
+    user_transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
+    
+    html = BASE_TEMPLATE.replace('__TITLE__', f"Продажи кассира: {session['cashier_name']}").replace('__CONTENT__', CASHIER_SALES_CONTENT).replace('__SCRIPTS__', '')
+    return render_template_string(html, transactions=user_transactions)
+
+@app.route('/cashier_logout')
+def cashier_logout():
+    session.pop('cashier_id', None)
+    session.pop('cashier_name', None)
+    flash('Вы вышли из своего аккаунта.', 'info')
+    return redirect(url_for('cashier_view'))
+
+@app.route('/api/process_return', methods=['POST'])
+def process_return():
+    if 'cashier_id' not in session:
+        return jsonify({'success': False, 'message': 'Требуется авторизация.'}), 401
+    
+    transaction_id = request.form.get('transaction_id')
+    return_kassa_id = request.form.get('kassa_id')
+    if not transaction_id or not return_kassa_id:
+        flash('Не указана транзакция или касса для возврата.', 'danger')
+        return redirect(url_for('cashier_sales'))
+    
+    transactions = load_json_data('transactions')
+    inventory = load_json_data('inventory')
+    kassas = load_json_data('kassas')
+
+    original_transaction = find_item_by_field(transactions, 'id', transaction_id)
+    if not original_transaction:
+        flash('Транзакция не найдена.', 'danger')
+        return redirect(url_for('cashier_sales'))
+    if original_transaction.get('is_returned'):
+        flash('Эта продажа уже была возвращена.', 'warning')
+        return redirect(url_for('cashier_sales'))
+
+    return_kassa = find_item_by_field(kassas, 'id', return_kassa_id)
+    if not return_kassa:
+        flash('Касса для возврата не найдена.', 'danger')
+        return redirect(url_for('cashier_sales'))
+
+    amount_to_return = to_decimal(original_transaction.get('total_amount', '0'))
+    kassa_balance = to_decimal(return_kassa.get('balance', '0'))
+    if amount_to_return > kassa_balance:
+        flash(f"Недостаточно средств в кассе '{return_kassa['name']}' для возврата.", 'danger')
+        return redirect(url_for('cashier_sales'))
+
+    now_iso = get_current_time().isoformat()
+    return_items = []
+    inventory_updates = {}
+    for item in original_transaction.get('items', []):
+        return_items.append({**item, 'quantity': -item['quantity'], 'total': str(-to_decimal(item['total']))})
+        inventory_updates[item['product_id']] = item['quantity']
+
+    new_return = {
+        'id': uuid.uuid4().hex,
+        'timestamp': now_iso,
+        'user_id': session['cashier_id'],
+        'user_name': session['cashier_name'],
+        'kassa_id': return_kassa_id,
+        'kassa_name': return_kassa['name'],
+        'items': return_items,
+        'total_amount': str(-amount_to_return),
+        'payment_method': 'return',
+        'type': 'return',
+        'original_transaction_id': transaction_id
+    }
+    transactions.append(new_return)
+
+    for i, t in enumerate(transactions):
+        if t['id'] == transaction_id:
+            transactions[i]['is_returned'] = True
+            break
+            
+    for prod_id, qty in inventory_updates.items():
+        for i, p in enumerate(inventory):
+            if p['id'] == prod_id:
+                inventory[i]['stock'] = inventory[i].get('stock', 0) + qty
+                inventory[i]['timestamp_updated'] = now_iso
+                break
+
+    for i, k in enumerate(kassas):
+        if k['id'] == return_kassa_id:
+            kassas[i]['balance'] = str(kassa_balance - amount_to_return)
+            if 'history' not in kassas[i]: kassas[i]['history'] = []
+            kassas[i]['history'].append({
+                'type': 'return',
+                'amount': str(-amount_to_return),
+                'timestamp': now_iso,
+                'transaction_id': new_return['id']
+            })
+            break
+
+    save_json_data('transactions', transactions)
+    save_json_data('inventory', inventory)
+    save_json_data('kassas', kassas)
+    upload_db_to_hf('transactions')
+    upload_db_to_hf('inventory')
+    upload_db_to_hf('kassas')
+
+    flash('Возврат успешно оформлен.', 'success')
+    return redirect(url_for('cashier_sales'))
+
+@app.route('/receipt/<transaction_id>')
+def receipt(transaction_id):
+    transactions = load_json_data('transactions')
+    transaction = find_item_by_field(transactions, 'id', transaction_id)
+    if not transaction:
+        return "Чек не найден", 404
+    return render_template_string(RECEIPT_TEMPLATE, transaction=transaction)
+
 BASE_TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru" data-bs-theme="light">
@@ -627,6 +856,7 @@ BASE_TEMPLATE = """
         }
         [data-bs-theme="dark"] body { background-color: #212529; color: #dee2e6; }
         [data-bs-theme="dark"] .card, [data-bs-theme="dark"] .list-group-item, [data-bs-theme="dark"] .table { background-color: #343a40; }
+        [data-bs-theme="dark"] .modal-content { background-color: #2b3035; }
         [data-bs-theme="dark"] .table-hover>tbody>tr:hover>* { color: var(--bs-table-hover-color); background-color: rgba(255, 255, 255, 0.075); }
     </style>
 </head>
@@ -638,7 +868,8 @@ BASE_TEMPLATE = """
     <ul class="nav flex-column">
         <li class="nav-item"><a class="nav-link {% if request.endpoint == 'sales_screen' %}active{% endif %}" href="{{ url_for('sales_screen') }}"><i class="fas fa-fw fa-dollar-sign me-2"></i>Касса</a></li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint == 'inventory_management' %}active{% endif %}" href="{{ url_for('inventory_management') }}"><i class="fas fa-fw fa-boxes me-2"></i>Склад</a></li>
-        <li class="nav-item"><a class="nav-link {% if request.endpoint == 'transaction_history' %}active{% endif %}" href="{{ url_for('transaction_history') }}"><i class="fas fa-fw fa-history me-2"></i>Продажи</a></li>
+        <li class="nav-item"><a class="nav-link {% if request.endpoint in ['cashier_view', 'cashier_sales'] %}active{% endif %}" href="{{ url_for('cashier_view') }}"><i class="fas fa-fw fa-user-check me-2"></i>Мои продажи</a></li>
+        <li class="nav-item"><a class="nav-link {% if request.endpoint == 'transaction_history' %}active{% endif %}" href="{{ url_for('transaction_history') }}"><i class="fas fa-fw fa-history me-2"></i>История</a></li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint == 'reports' %}active{% endif %}" href="{{ url_for('reports') }}"><i class="fas fa-fw fa-chart-line me-2"></i>Отчеты</a></li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint == 'admin_panel' %}active{% endif %}" href="{{ url_for('admin_panel') }}"><i class="fas fa-fw fa-cogs me-2"></i>Админка</a></li>
     </ul>
@@ -743,6 +974,29 @@ SALES_SCREEN_CONTENT = """
         </div>
     </div>
 </div>
+
+<div class="modal fade" id="saleSuccessModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title text-success"><i class="fas fa-check-circle me-2"></i>Продажа завершена</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+      <div class="modal-body">
+        <p>Чек успешно создан.</p>
+        <a href="#" id="receiptLink" target="_blank" class="btn btn-primary w-100 mb-3"><i class="fas fa-receipt me-2"></i>Посмотреть чек</a>
+        <div class="mb-3">
+            <label for="whatsapp-number" class="form-label">Отправить на WhatsApp:</label>
+            <div class="input-group">
+                <span class="input-group-text">+996</span>
+                <input type="tel" class="form-control" id="whatsapp-number" placeholder="555123456">
+            </div>
+        </div>
+        <button id="send-whatsapp-btn" class="btn btn-success w-100"><i class="fab fa-whatsapp me-2"></i>Отправить</button>
+      </div>
+    </div>
+  </div>
+</div>
 """
 
 SALES_SCREEN_SCRIPTS = """
@@ -754,6 +1008,7 @@ document.addEventListener('DOMContentLoaded', () => {
     const cartTotalEl = document.getElementById('cart-total');
     let audioCtx;
     let isScannerPaused = false;
+    const saleSuccessModal = new bootstrap.Modal(document.getElementById('saleSuccessModal'));
 
     function playBeep() {
         if (!audioCtx) {
@@ -870,7 +1125,10 @@ document.addEventListener('DOMContentLoaded', () => {
         .then(res => res.json())
         .then(data => {
             if (data.success) {
-                alert('Продажа завершена!');
+                document.getElementById('receiptLink').href = `/receipt/${data.transactionId}`;
+                document.getElementById('whatsapp-number').value = '';
+                saleSuccessModal.show();
+                
                 for(const id in cart) delete cart[id];
                 updateCartView();
             } else {
@@ -883,6 +1141,20 @@ 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 phoneInput = document.getElementById('whatsapp-number');
+        let phone = phoneInput.value.replace(/\\D/g, '');
+        if (phone.length === 9) { // Expecting 9 digits for KG mobile
+            const fullPhone = '996' + phone;
+            const receiptUrl = document.getElementById('receiptLink').href;
+            const message = encodeURIComponent(`Спасибо за покупку! Ваш электронный чек: ${receiptUrl}`);
+            window.open(`https://wa.me/${fullPhone}?text=${message}`, '_blank');
+        } else {
+            alert('Пожалуйста, введите корректный 9-значный номер телефона (без кода страны).');
+            phoneInput.focus();
+        }
+    });
+
     const html5QrCode = new Html5Qrcode("reader");
     const scannerStatusEl = document.getElementById('scanner-status');
     
@@ -1011,30 +1283,41 @@ INVENTORY_SCRIPTS = """
 <script>
 document.addEventListener('DOMContentLoaded', () => {
     let currentScanner = null;
+    let currentScannerContainer = null;
     document.querySelectorAll('.scan-modal-btn').forEach(btn => {
         btn.addEventListener('click', e => {
             const form = e.target.closest('form');
             const scannerContainer = form.querySelector('[id^="modal-scanner-"]');
             const barcodeInput = form.querySelector('.barcode-input');
-            if (currentScanner) {
+            
+            if (currentScanner && currentScannerContainer === scannerContainer) {
                 currentScanner.stop();
                 currentScanner = null;
-                scannerContainer.style.display = 'none';
+                currentScannerContainer.style.display = 'none';
+                currentScannerContainer = null;
                 return;
+            } else if (currentScanner) {
+                currentScanner.stop();
+                currentScannerContainer.style.display = 'none';
             }
+
             scannerContainer.style.display = 'block';
             const scannerId = scannerContainer.id + '-reader';
-            if(!document.getElementById(scannerId)) scannerContainer.innerHTML = `<div id="${scannerId}"></div>`;
+            if(!document.getElementById(scannerId)) scannerContainer.innerHTML = `<div id="${scannerId}" style="width: 100%;"></div>`;
 
             const html5QrCode = new Html5Qrcode(scannerId);
             currentScanner = html5QrCode;
+            currentScannerContainer = scannerContainer;
             const onScanSuccess = (decodedText, decodedResult) => {
                 barcodeInput.value = decodedText;
-                html5QrCode.stop();
-                currentScanner = null;
-                scannerContainer.style.display = 'none';
+                html5QrCode.stop().then(() => {
+                    scannerContainer.style.display = 'none';
+                    currentScanner = null;
+                    currentScannerContainer = null;
+                });
             };
-            html5QrCode.start({ facingMode: "environment" }, { fps: 10, qrbox: 250 }, onScanSuccess);
+            html5QrCode.start({ facingMode: "environment" }, { fps: 10, qrbox: {width: 250, height: 150} }, onScanSuccess)
+                .catch(err => { console.error("Scanner start failed", err); });
         });
     });
     
@@ -1043,8 +1326,9 @@ document.addEventListener('DOMContentLoaded', () => {
              if (currentScanner) {
                 currentScanner.stop();
                 currentScanner = null;
+                if(currentScannerContainer) currentScannerContainer.style.display = 'none';
+                currentScannerContainer = null;
              }
-             modal.querySelectorAll('[id^="modal-scanner-"]').forEach(c => c.style.display = 'none');
         });
     });
 });
@@ -1056,15 +1340,27 @@ TRANSACTIONS_CONTENT = """
     <div class="card-body">
         <div class="table-responsive">
             <table class="table table-sm table-hover">
-                <thead><tr><th>ID</th><th>Дата</th><th>Кассир</th><th>Касса</th><th>Сумма</th><th>Тип опл.</th><th>Позиции</th></tr></thead>
+                <thead><tr><th>ID</th><th>Дата</th><th>Тип</th><th>Кассир</th><th>Касса</th><th>Сумма</th><th>Тип опл.</th><th>Позиции</th></tr></thead>
                 <tbody>
                 {% for t in transactions %}
-                <tr>
+                <tr class="{{ 'table-danger' if t.type == 'return' else '' }}">
                     <td><small class="text-muted">{{ t.id[:8] }}</small></td>
                     <td>{{ t.timestamp[:16]|replace('T', ' ') }}</td>
+                    <td>
+                        {% if t.type == 'return' %}
+                            <span class="badge bg-danger">Возврат</span>
+                        {% else %}
+                            <span class="badge bg-success">Продажа</span>
+                        {% endif %}
+                    </td>
                     <td>{{ t.user_name }}</td><td>{{ t.kassa_name }}</td>
                     <td class="fw-bold">{{ format_currency_py(t.total_amount) }} с</td>
-                    <td><span class="badge bg-{{'success' if t.payment_method == 'cash' else 'info'}}">{{'Нал.' if t.payment_method == 'cash' else 'Карта'}}</span></td>
+                    <td>
+                      {% if t.payment_method == 'cash' %} <span class="badge bg-success">Нал.</span>
+                      {% elif t.payment_method == 'card' %} <span class="badge bg-info">Карта</span>
+                      {% elif t.payment_method == 'return' %} <span class="badge bg-warning text-dark">Возврат</span>
+                      {% endif %}
+                    </td>
                     <td>
                         <ul class="list-unstyled mb-0 small">
                         {% for item in t['items'] %}<li>{{ item.name }} ({{ item.quantity }}x{{ format_currency_py(item.price_at_sale) }})</li>{% endfor %}
@@ -1100,19 +1396,36 @@ REPORTS_CONTENT = """
             <div class="card-header"><h5 class="mb-0">Сводный отчет за период</h5></div>
             <div class="card-body">
                 <ul class="list-group list-group-flush">
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-chart-bar me-2 text-primary"></i>Выручка (сумма продаж)</span> <strong>{{ format_currency_py(stats.total_revenue) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-cogs me-2 text-secondary"></i>Себестоимость проданных товаров</span> <strong>{{ format_currency_py(stats.total_cogs) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-arrow-up me-2 text-primary"></i>Выручка (сумма продаж)</span> <strong>{{ format_currency_py(stats.total_revenue) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-arrow-down me-2 text-warning"></i>Сумма возвратов</span> <strong>{{ format_currency_py(stats.total_returns) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-equals me-2 text-info"></i>Чистая выручка</span> <strong class="text-info">{{ format_currency_py(stats.net_revenue) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-cogs me-2 text-secondary"></i>Себестоимость (с учетом возвратов)</span> <strong>{{ format_currency_py(stats.total_cogs) }} с</strong></li>
                     <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-piggy-bank me-2 text-info"></i>Валовая прибыль</span> <strong class="text-info">{{ format_currency_py(stats.gross_profit) }} с</strong></li>
-                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-receipt me-2 text-danger"></i>Расходы</span> <strong class="text-danger">-{{ format_currency_py(stats.total_expenses) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-receipt me-2 text-danger"></i>Операционные расходы</span> <strong class="text-danger">-{{ format_currency_py(stats.total_manual_expenses) }} с</strong></li>
+                    <li class="list-group-item d-flex justify-content-between"><span><i class="fas fa-users-cog me-2 text-danger"></i>Расходы на кассиров</span> <strong class="text-danger">-{{ format_currency_py(stats.cashier_expenses) }} с</strong></li>
                     <li class="list-group-item d-flex justify-content-between fs-5"><span><i class="fas fa-check-circle me-2 text-success"></i>Чистая прибыль</span> <strong class="text-success">{{ format_currency_py(stats.net_profit) }} с</strong></li>
                 </ul>
             </div>
         </div>
         <div class="card mb-4">
-            <div class="card-header"><h5 class="mb-0">Расходы за период</h5></div>
+            <div class="card-header"><h5 class="mb-0">Расходы на кассиров (детализация)</h5></div>
             <div class="card-body p-0">
-                <div class="table-responsive">
-                <table class="table table-sm mb-0">
+                <div class="table-responsive"><table class="table table-sm mb-0">
+                    <thead><tr><th>Кассир</th><th>Тип</th><th class="text-end">Сумма</th></tr></thead>
+                    <tbody>
+                    {% for name, data in stats.cashier_expense_details %}
+                    <tr><td>{{ name }}</td><td>{{ data.type }}</td><td class="text-end">{{ format_currency_py(data.amount) }} с</td></tr>
+                    {% else %}
+                    <tr><td colspan="3" class="text-center text-muted">Нет данных</td></tr>
+                    {% endfor %}
+                    </tbody>
+                </table></div>
+            </div>
+        </div>
+        <div class="card mb-4">
+            <div class="card-header"><h5 class="mb-0">Операционные расходы за период</h5></div>
+            <div class="card-body p-0">
+                <div class="table-responsive"><table class="table table-sm mb-0">
                     <thead><tr><th>Дата</th><th>Описание</th><th class="text-end">Сумма</th></tr></thead>
                     <tbody>
                     {% for expense in expenses %}
@@ -1125,8 +1438,7 @@ REPORTS_CONTENT = """
                     <tr><td colspan="3" class="text-center text-muted">Нет расходов за выбранный период.</td></tr>
                     {% endfor %}
                     </tbody>
-                </table>
-                </div>
+                </table></div>
             </div>
         </div>
     </div>
@@ -1134,8 +1446,7 @@ REPORTS_CONTENT = """
         <div class="card mb-4">
             <div class="card-header"><h5 class="mb-0">Продажи по кассирам</h5></div>
             <div class="card-body p-0">
-                <div class="table-responsive">
-                <table class="table table-hover mb-0">
+                <div class="table-responsive"><table class="table table-hover mb-0">
                     <thead><tr><th>Кассир</th><th>Чеков</th><th class="text-end">Сумма</th></tr></thead>
                     <tbody>
                     {% for name, data in stats.sales_by_cashier %}
@@ -1148,8 +1459,7 @@ REPORTS_CONTENT = """
                     <tr><td colspan="3" class="text-center text-muted">Нет продаж за выбранный период.</td></tr>
                     {% endfor %}
                     </tbody>
-                </table>
-                </div>
+                </table></div>
             </div>
         </div>
     </div>
@@ -1160,26 +1470,34 @@ REPORTS_SCRIPTS = ""
 
 ADMIN_CONTENT = """
 <div class="row">
-    <div class="col-md-6 mb-4">
+    <div class="col-12 mb-4">
         <div class="card h-100">
-            <div class="card-header"><h5 class="mb-0">Кассиры</h5></div>
+            <div class="card-header"><h5 class="mb-0">Управление кассирами</h5></div>
             <div class="card-body">
-                <form action="{{ url_for('manage_user') }}" method="POST" class="mb-3">
-                    <input type="hidden" name="action" value="add">
-                    <div class="input-group">
-                        <input type="text" name="name" class="form-control" placeholder="Имя кассира" required>
-                        <input type="password" name="pin" class="form-control" placeholder="ПИН-код" required>
-                        <button type="submit" class="btn btn-primary">Добавить</button>
-                    </div>
-                </form>
-                <ul class="list-group">
-                    {% for u in users %}
-                    <li class="list-group-item d-flex justify-content-between align-items-center">
-                        {{ u.name }}
-                        <form action="{{ url_for('manage_user') }}" method="POST" onsubmit="return confirm('Удалить кассира?');"><input type="hidden" name="action" value="delete"><input type="hidden" name="id" value="{{ u.id }}"><button type="submit" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i></button></form>
-                    </li>
-                    {% endfor %}
-                </ul>
+                <button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addUserModal"><i class="fas fa-plus me-2"></i>Добавить кассира</button>
+                <div class="table-responsive">
+                    <table class="table table-hover">
+                        <thead><tr><th>Имя</th><th>ПИН-код</th><th>Тип оплаты</th><th>Ставка/Зарплата</th><th>Действия</th></tr></thead>
+                        <tbody>
+                            {% for u in users %}
+                            <tr>
+                                <td>{{ u.name }}</td>
+                                <td>****</td>
+                                <td>{{ 'Оклад' if u.get('payment_type') == 'salary' else 'Процент' }}</td>
+                                <td>{{ format_currency_py(u.get('payment_value', '0')) }}{{ ' с' if u.get('payment_type') == 'salary' else '%' }}</td>
+                                <td>
+                                    <button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal" data-bs-target="#editUserModal-{{ u.id }}"><i class="fas fa-edit"></i></button>
+                                    <form class="d-inline" action="{{ url_for('manage_user') }}" method="POST" onsubmit="return confirm('Удалить кассира?');">
+                                        <input type="hidden" name="action" value="delete">
+                                        <input type="hidden" name="id" value="{{ u.id }}">
+                                        <button type="submit" class="btn btn-sm btn-outline-danger"><i class="fas fa-trash"></i></button>
+                                    </form>
+                                </td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
     </div>
@@ -1206,6 +1524,20 @@ ADMIN_CONTENT = """
             </div>
         </div>
     </div>
+    <div class="col-md-6 mb-4">
+        <div class="card">
+            <div class="card-header"><h5 class="mb-0">Резервное копирование</h5></div>
+            <div class="card-body">
+                <p>Данные периодически сохраняются в облако. Можно сделать это вручную.</p>
+                <form method="POST" action="{{ url_for('backup_hf') }}" class="d-inline-block me-2">
+                    <button type="submit" class="btn btn-outline-primary"><i class="fas fa-cloud-upload-alt me-2"></i>Сохранить в облако</button>
+                </form>
+                <form method="GET" action="{{ url_for('download_hf') }}" class="d-inline-block" onsubmit="return confirm('ВНИМАНИЕ! Это действие заменит все локальные данные данными из облака. Продолжить?');">
+                    <button type="submit" class="btn btn-outline-danger"><i class="fas fa-cloud-download-alt me-2"></i>Загрузить из облака</button>
+                </form>
+            </div>
+        </div>
+    </div>
     <div class="col-12 mb-4">
         <div class="card">
             <div class="card-header"><h5 class="mb-0">Операции по кассе (Внесение/Изъятие)</h5></div>
@@ -1234,34 +1566,84 @@ ADMIN_CONTENT = """
                     </div>
                 </form>
                 <h6>Последние 10 расходов:</h6>
-                <div class="table-responsive">
-                    <table class="table table-sm table-striped">
-                        <tbody>
-                        {% for e in expenses %}
-                        <tr>
-                            <td><small>{{ e.timestamp[:16]|replace('T', ' ') }}</small></td>
-                            <td>{{ e.description }}</td>
-                            <td class="text-end fw-bold">{{ format_currency_py(e.amount) }} с</td>
-                        </tr>
-                        {% else %}
-                        <tr><td colspan="3" class="text-center">Расходов пока нет</td></tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
+                <div class="table-responsive"><table class="table table-sm table-striped">
+                    <tbody>
+                    {% for e in expenses %}
+                    <tr>
+                        <td><small>{{ e.timestamp[:16]|replace('T', ' ') }}</small></td>
+                        <td>{{ e.description }}</td>
+                        <td class="text-end fw-bold">{{ format_currency_py(e.amount) }} с</td>
+                    </tr>
+                    {% else %}
+                    <tr><td colspan="3" class="text-center">Расходов пока нет</td></tr>
+                    {% endfor %}
+                    </tbody>
+                </table></div>
             </div>
         </div>
     </div>
-    <div class="col-12">
+</div>
+
+<div class="modal fade" id="addUserModal" 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_user') }}" 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="password" name="pin" class="form-control" required inputmode="numeric" pattern="[0-9]*"></div>
+          <div class="mb-3"><label class="form-label">Тип оплаты</label><select name="payment_type" class="form-select"><option value="salary">Оклад</option><option value="percentage">Процент от продаж</option></select></div>
+          <div class="mb-3"><label class="form-label">Ставка / Зарплата</label><input type="text" name="payment_value" class="form-control" value="0" inputmode="decimal"></div>
+        </div>
+        <div class="modal-footer"><button type="submit" class="btn btn-primary">Добавить</button></div>
+      </form>
+    </div>
+  </div>
+</div>
+
+{% for u in users %}
+<div class="modal fade" id="editUserModal-{{ u.id }}" 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('edit_user', user_id=u.id) }}" method="POST">
+        <div class="modal-body">
+          <div class="mb-3"><label class="form-label">Имя</label><input type="text" name="name" class="form-control" value="{{ u.name }}" required></div>
+          <div class="mb-3"><label class="form-label">Новый ПИН-код (оставьте пустым, чтобы не менять)</label><input type="password" name="pin" value="{{ u.pin }}" class="form-control" required inputmode="numeric" pattern="[0-9]*"></div>
+          <div class="mb-3"><label class="form-label">Тип оплаты</label>
+            <select name="payment_type" class="form-select">
+                <option value="salary" {% if u.get('payment_type') == 'salary' %}selected{% endif %}>Оклад</option>
+                <option value="percentage" {% if u.get('payment_type') == 'percentage' %}selected{% endif %}>Процент от продаж</option>
+            </select>
+          </div>
+          <div class="mb-3"><label class="form-label">Ставка / Зарплата</label><input type="text" name="payment_value" class="form-control" value="{{ u.get('payment_value', '0')|string|replace('.', ',') }}" inputmode="decimal"></div>
+        </div>
+        <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
+      </form>
+    </div>
+  </div>
+</div>
+{% endfor %}
+"""
+
+ADMIN_SCRIPTS = ""
+
+CASHIER_LOGIN_CONTENT = """
+<div class="row justify-content-center">
+    <div class="col-md-6 col-lg-4">
         <div class="card">
-            <div class="card-header"><h5 class="mb-0">Резервное копирование</h5></div>
+            <div class="card-header"><h5 class="mb-0">Вход для кассира</h5></div>
             <div class="card-body">
-                <p>Данные периодически сохраняются в облако. Можно сделать это вручную.</p>
-                <form method="POST" action="{{ url_for('backup_hf') }}" class="d-inline-block me-2">
-                    <button type="submit" class="btn btn-outline-primary"><i class="fas fa-cloud-upload-alt me-2"></i>Сохранить в облако</button>
-                </form>
-                <form method="GET" action="{{ url_for('download_hf') }}" class="d-inline-block" onsubmit="return confirm('ВНИМАНИЕ! Это действие заменит все локальные данные данными из облака. Продолжить?');">
-                    <button type="submit" class="btn btn-outline-danger"><i class="fas fa-cloud-download-alt me-2"></i>Загрузить из облака</button>
+                <p class="text-muted">Введите ваш персональный ПИН-код для доступа к вашим продажам и для оформления возвратов.</p>
+                <form method="POST" action="{{ url_for('cashier_view') }}">
+                    <div class="mb-3">
+                        <label for="pin" class="form-label">ПИН-код</label>
+                        <input type="password" id="pin" name="pin" class="form-control form-control-lg text-center" required inputmode="numeric" pattern="[0-9]*" autofocus>
+                    </div>
+                    <div class="d-grid">
+                        <button type="submit" class="btn btn-primary btn-lg">Войти</button>
+                    </div>
                 </form>
             </div>
         </div>
@@ -1269,7 +1651,147 @@ ADMIN_CONTENT = """
 </div>
 """
 
-ADMIN_SCRIPTS = ""
+CASHIER_SALES_CONTENT = """
+<div class="d-flex justify-content-between align-items-center mb-3">
+    <h4 class="mb-0">Ваши транзакции</h4>
+    <a href="{{ url_for('cashier_logout') }}" class="btn btn-sm btn-outline-secondary">Выйти</a>
+</div>
+<div class="card">
+    <div class="card-body">
+        <div class="table-responsive">
+            <table class="table table-sm table-hover">
+                <thead><tr><th>ID</th><th>Дата</th><th>Сумма</th><th>Статус</th><th>Действия</th></tr></thead>
+                <tbody>
+                {% set kassas = load_json_data('kassas') %}
+                {% for t in transactions %}
+                {% if t.type == 'sale' %}
+                <tr>
+                    <td><small class="text-muted">{{ t.id[:8] }}</small></td>
+                    <td>{{ t.timestamp[:16]|replace('T', ' ') }}</td>
+                    <td class="fw-bold">{{ format_currency_py(t.total_amount) }} с</td>
+                    <td>
+                        {% if t.is_returned %}
+                            <span class="badge bg-warning text-dark">Возвращен</span>
+                        {% else %}
+                            <span class="badge bg-success">Продан</span>
+                        {% endif %}
+                    </td>
+                    <td>
+                        <button class="btn btn-sm btn-danger" 
+                                data-bs-toggle="modal" 
+                                data-bs-target="#returnModal-{{ t.id }}"
+                                {% if t.is_returned %}disabled{% endif %}>
+                            <i class="fas fa-undo me-1"></i> Возврат
+                        </button>
+                    </td>
+                </tr>
+                {% endif %}
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+{% for t in transactions %}
+<div class="modal fade" id="returnModal-{{ t.id }}" 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('api_process_return') }}" method="POST" onsubmit="return confirm('Вы уверены, что хотите оформить возврат на сумму {{ format_currency_py(t.total_amount) }} с? Это действие нельзя отменить.');">
+        <div class="modal-body">
+            <p>Вы собираетесь оформить возврат для транзакции <strong>#{{ t.id[:8] }}</strong> от {{ t.timestamp[:10] }}.</p>
+            <p>Сумма к возврату: <strong class="fs-5">{{ format_currency_py(t.total_amount) }} с</strong>.</p>
+            <input type="hidden" name="transaction_id" value="{{ t.id }}">
+            <div class="mb-3">
+                <label for="kassa_id_{{t.id}}" class="form-label">Из какой кассы вернуть средства?</label>
+                <select id="kassa_id_{{t.id}}" name="kassa_id" class="form-select" required>
+                    <option value="">-- Выберите кассу --</option>
+                    {% for k in kassas %}
+                    <option value="{{ k.id }}">{{ k.name }} (Баланс: {{ format_currency_py(k.balance) }} с)</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <p class="small text-muted">Средства будут списаны с баланса выбранной кассы, а товары будут возвращены на склад.</p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
+          <button type="submit" class="btn btn-danger">Подтвердить возврат</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+{% endfor %}
+"""
+
+RECEIPT_TEMPLATE = """
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Чек #{{ transaction.id[:8] }}</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        body { background-color: #f0f2f5; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; }
+        .receipt-container { max-width: 400px; margin: 2rem auto; background: #fff; border: 1px solid #ddd; padding: 1.5rem; box-shadow: 0 0 10px rgba(0,0,0,0.05); }
+        .receipt-header { text-align: center; border-bottom: 2px dashed #ccc; padding-bottom: 1rem; margin-bottom: 1rem; }
+        .receipt-header h3 { margin-bottom: 0.25rem; }
+        .receipt-items table { width: 100%; font-size: 0.9rem; }
+        .receipt-items th, .receipt-items td { padding: 0.25rem 0; }
+        .receipt-items thead th { border-bottom: 1px solid #eee; text-align: left; }
+        .receipt-items .price { text-align: right; }
+        .receipt-total { border-top: 2px dashed #ccc; margin-top: 1rem; padding-top: 1rem; }
+        .receipt-total .total-row { display: flex; justify-content: space-between; font-weight: bold; font-size: 1.2rem; }
+        .receipt-footer { text-align: center; margin-top: 1.5rem; font-size: 0.8rem; color: #777; }
+        @media print {
+            body { background-color: #fff; }
+            .receipt-container { margin: 0; box-shadow: none; border: none; }
+        }
+    </style>
+</head>
+<body>
+    <div class="receipt-container">
+        <div class="receipt-header">
+            <h3>Магазин "Kgshop"</h3>
+            <p class="mb-0">Товарный чек #{{ transaction.id[:8] }}</p>
+            <p class="text-muted small mb-0">{{ transaction.timestamp[:16]|replace('T', ' ') }}</p>
+        </div>
+        <div class="receipt-items">
+            <table>
+                <thead>
+                    <tr><th>Товар</th><th>Кол-во</th><th class="price">Цена</th><th class="price">Сумма</th></tr>
+                </thead>
+                <tbody>
+                {% for item in transaction.items %}
+                    <tr>
+                        <td>{{ item.name }}</td>
+                        <td>{{ item.quantity }}</td>
+                        <td class="price">{{ format_currency_py(item.price_at_sale) }}</td>
+                        <td class="price">{{ format_currency_py(item.total) }}</td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        <div class="receipt-total">
+            <div class="total-row">
+                <span>ИТОГО:</span>
+                <span>{{ format_currency_py(transaction.total_amount) }} с</span>
+            </div>
+            <p class="text-muted small mt-2 mb-0">
+                Способ оплаты: {{ 'Наличные' if transaction.payment_method == 'cash' else 'Карта' }} <br>
+                Кассир: {{ transaction.user_name }}
+            </p>
+        </div>
+        <div class="receipt-footer">
+            <p>Спасибо за покупку!</p>
+        </div>
+    </div>
+</body>
+</html>
+"""
 
 if __name__ == '__main__':
     backup_thread = threading.Thread(target=periodic_backup, daemon=True)