Update app.py

app.py

@@ -95,7 +95,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 []
 
 def save_json_data(file_key, data):
     filepath, lock = DATA_FILES[file_key]
@@ -142,7 +142,7 @@ def periodic_backup():
             for key in DATA_FILES.keys():
                 upload_db_to_hf(key)
         except Exception as e:
-            logging.error(f"Error scheduled backup: {e}", exc_info=True)
+            logging.error(f"Error during scheduled backup: {e}", exc_info=True)
             
 def find_item_by_field(data, field, value):
     for item in data:
@@ -162,7 +162,7 @@ def format_currency_py(value):
         return "0"
 
 def generate_receipt_html(transaction):
-    has_discounts = any(to_decimal(item.get('discount_per_item', '0')) > 0 for item in transaction.get('items',[]))
+    has_discounts = any(to_decimal(item.get('discount_per_item', '0')) > 0 for item in transaction.get('items', []))
     delivery_cost = to_decimal(transaction.get('delivery_cost', '0'))
     note = transaction.get('note', '')
 
@@ -187,9 +187,7 @@ def generate_receipt_html(transaction):
         total_colspan = 4
 
     items_html = ""
-    total_qty = 0
     for i, item in enumerate(transaction['items']):
-        total_qty += int(item.get('quantity', 0))
         discount_cell = f"""<td style="text-align: right;">{format_currency_py(item.get('discount_per_item', '0'))}</td>""" if has_discounts else ""
         items_html += f"""
         <tr>
@@ -204,13 +202,7 @@ def generate_receipt_html(transaction):
         
     total_amount_from_db = to_decimal(transaction['total_amount'])
     
-    totals_html = f"""
-    <tr>
-        <td colspan="{total_colspan}" style="text-align: right;">Общее кол-во:</td>
-        <td style="text-align: right;">{total_qty} шт.</td>
-    </tr>
-    """
-    
+    totals_html = ""
     if delivery_cost > 0:
         subtotal = total_amount_from_db - delivery_cost
         totals_html += f"""
@@ -258,20 +250,20 @@ def generate_receipt_html(transaction):
         <title>Накладная {transaction['id'][:8]}</title>
         <style>
             body {{ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; margin: 0; padding: 10px; background-color: #f4f4f4; color: #333; }}
-            .invoice-box {{ max-width: 1000px; margin: auto; padding: 20px; border: 1px solid #eee; background: white; box-shadow: 0 0 10px rgba(0,0,0,0.15); overflow-x: auto; }}
+            .invoice-box {{ max-width: 800px; margin: auto; padding: 20px; border: 1px solid #eee; background: white; box-shadow: 0 0 10px rgba(0,0,0,0.15); }}
             .header {{ text-align: center; margin-bottom: 20px; }}
             .header h1 {{ margin: 0; font-size: 22px; font-weight: 600; }}
             .header p {{ margin: 2px 0; font-size: 14px; }}
             .details-grid {{ display: grid; grid-template-columns: 1fr 1fr; gap: 20px; margin-bottom: 20px; font-size: 14px; }}
             table {{ width: 100%; line-height: inherit; text-align: left; border-collapse: collapse; }}
-            table th, table td {{ padding: 8px; border-bottom: 1px solid #eee; white-space: nowrap; }}
-            table th {{ background: #f2f2f2; font-weight: bold; border-bottom: 2px solid #ddd; }}
+            table th {{ background: #f2f2f2; font-weight: bold; padding: 8px; border-bottom: 2px solid #ddd; }}
+            table td {{ padding: 8px; border-bottom: 1px solid #eee; }}
             table tr.total td {{ font-weight: bold; font-size: 1.1em; border-top: 2px solid #ddd; }}
             .footer-info {{ font-size: 14px; margin-top: 20px; }}
             .print-hide {{ display: block; }}
             @media print {{
                 body {{ margin: 0; padding: 0; background-color: #fff; }}
-                .invoice-box {{ box-shadow: none; border: none; margin: 0; padding: 0; overflow-x: visible; }}
+                .invoice-box {{ box-shadow: none; border: none; margin: 0; padding: 0; }}
                 .print-hide {{ display: none; }}
             }}
             @media screen and (max-width: 600px) {{
@@ -295,13 +287,13 @@ def generate_receipt_html(transaction):
                 <h1>Товарная накладная № {transaction['id'][:8]}</h1>
                 <p>от {datetime.fromisoformat(transaction['timestamp']).strftime('%d.%m.%Y %H:%M')}</p>
             </div>
-            <table style="width: 100%;">
+            <table>
                 <thead>
                     <tr>{table_headers}</tr>
                 </thead>
                 <tbody>{items_html}</tbody>
             </table>
-            <table style="margin-top: 20px; width: 100%;">
+            <table style="margin-top: 20px;">
                 {totals_html}
             </table>
             {note_html}
@@ -368,15 +360,22 @@ def sales_screen():
         transactions = load_json_data('transactions')
         edit_tx = find_item_by_field(transactions, 'id', edit_tx_id)
     
-    active_inventory =[]
+    active_inventory = []
     for p in inventory:
-        if isinstance(p, dict) and any(v.get('stock', 0) > 0 for v in p.get('variants',[])):
+        if isinstance(p, dict) and any(v.get('stock', 0) > 0 for v in p.get('variants', [])):
             active_inventory.append(p)
 
     active_inventory.sort(key=lambda x: x.get('name', '').lower())
 
+    grouped_inventory = defaultdict(list)
+    for p in active_inventory:
+        first_letter = p.get('name', '#')[0].upper()
+        grouped_inventory[first_letter].append(p)
+
+    sorted_grouped_inventory = sorted(grouped_inventory.items())
+
     html = BASE_TEMPLATE.replace('__TITLE__', "Касса").replace('__CONTENT__', SALES_SCREEN_CONTENT).replace('__SCRIPTS__', SALES_SCREEN_SCRIPTS)
-    return render_template_string(html, inventory=active_inventory, kassas=kassas, edit_tx=edit_tx)
+    return render_template_string(html, inventory=active_inventory, kassas=kassas, grouped_inventory=sorted_grouped_inventory, edit_tx=edit_tx)
 
 @app.route('/inventory', methods=['GET', 'POST'])
 def inventory_management():
@@ -396,7 +395,7 @@ def inventory_management():
                 flash(f"Товар со штрих-кодом {barcode} уже существует.", "warning")
                 return redirect(url_for('inventory_management'))
 
-            variants =[]
+            variants = []
             variant_names = request.form.getlist('variant_name[]')
             variant_prices_regular = request.form.getlist('variant_price_regular[]')
             variant_prices_min = request.form.getlist('variant_price_min[]')
@@ -462,7 +461,7 @@ def inventory_management():
 
     for product in inventory_list:
         if isinstance(product, dict) and 'variants' in product:
-            for variant in product.get('variants',[]):
+            for variant in product.get('variants', []):
                 stock = variant.get('stock', 0)
                 cost_price = to_decimal(variant.get('cost_price', '0'))
                 price = to_decimal(variant.get('price_regular', variant.get('price', '0')))
@@ -504,7 +503,7 @@ def update_prices():
     
     for p in inventory:
         updated = False
-        for v in p.get('variants',[]):
+        for v in p.get('variants', []):
             if v.get('id') in updates:
                 v['price_regular'] = str(to_decimal(updates[v['id']][0]))
                 v['price_min'] = str(to_decimal(updates[v['id']][1]))
@@ -542,7 +541,7 @@ def edit_product(product_id):
                 inventory[i]['name'] = name
                 inventory[i]['barcode'] = barcode
                 
-                new_variants =[]
+                new_variants = []
                 variant_ids = request.form.getlist('variant_id[]')
                 variant_names = request.form.getlist('variant_name[]')
                 variant_prices_regular = request.form.getlist('variant_price_regular[]')
@@ -589,7 +588,7 @@ def edit_product(product_id):
 def delete_product(product_id):
     inventory = load_json_data('inventory')
     initial_len = len(inventory)
-    inventory =[p for p in inventory if not (isinstance(p, dict) and p.get('id') == product_id)]
+    inventory = [p for p in inventory if not (isinstance(p, dict) and p.get('id') == product_id)]
     if len(inventory) < initial_len:
         save_json_data('inventory', inventory)
         upload_db_to_hf('inventory')
@@ -621,7 +620,7 @@ def stock_in():
 
         variant_found = False
         variant_name_for_log = ""
-        for i, variant in enumerate(product.get('variants',[])):
+        for i, variant in enumerate(product.get('variants', [])):
             if variant.get('id') == variant_id:
                 variant_name_for_log = variant.get('option_value', '')
                 
@@ -705,7 +704,7 @@ def get_product_by_barcode(barcode):
     inventory = load_json_data('inventory')
     product = find_item_by_field(inventory, 'barcode', barcode)
     if product:
-        active_variants =[v for v in product.get('variants', []) if v.get('stock', 0) > 0]
+        active_variants = [v for v in product.get('variants', []) if v.get('stock', 0) > 0]
         if active_variants:
             product_copy = product.copy()
             product_copy['variants'] = active_variants
@@ -735,11 +734,11 @@ def complete_sale():
             if not original_tx:
                 return jsonify({'success': False, 'message': 'Оригинальная накладная не найдена.'}), 404
             
-            for item in original_tx.get('items',[]):
+            for item in original_tx.get('items', []):
                 if not item.get('is_custom'):
                     for p in inventory:
                         if p.get('id') == item.get('product_id'):
-                            for v in p.get('variants',[]):
+                            for v in p.get('variants', []):
                                 if v.get('id') == item.get('variant_id'):
                                     v['stock'] = v.get('stock', 0) + item.get('quantity', 0)
                                     break
@@ -751,7 +750,7 @@ def complete_sale():
                         current_balance = to_decimal(k.get('balance', '0'))
                         amount = to_decimal(original_tx.get('total_amount', '0'))
                         k['balance'] = str(current_balance - amount)
-                        k.setdefault('history',[]).append({
+                        k.setdefault('history', []).append({
                             'type': 'correction_revert',
                             'amount': str(-amount),
                             'timestamp': get_current_time().isoformat(),
@@ -775,7 +774,7 @@ def complete_sale():
         if not user or not kassa:
             return jsonify({'success': False, 'message': 'Кассир или касса были удалены. Требуется повторный вход.', 'logout_required': True}), 401
 
-        sale_items =[]
+        sale_items = []
         items_total = Decimal('0')
         inventory_updates = {}
 
@@ -804,7 +803,7 @@ def complete_sale():
             if not product:
                 return jsonify({'success': False, 'message': f"Товар с ID {cart_item['productId']} не найден."}), 404
             
-            variant = find_item_by_field(product.get('variants',[]), 'id', variant_id)
+            variant = find_item_by_field(product.get('variants', []), 'id', variant_id)
             if not variant:
                  return jsonify({'success': False, 'message': f"Вариант товара с ID {variant_id} не найден."}), 404
             
@@ -878,7 +877,7 @@ def complete_sale():
         for variant_id, update_info in inventory_updates.items():
             for p in inventory:
                 if p.get('id') == update_info['product_id']:
-                    for v in p.get('variants',[]):
+                    for v in p.get('variants', []):
                         if v.get('id') == variant_id:
                             v['stock'] = update_info['new_stock']
                             p['timestamp_updated'] = now_iso
@@ -945,13 +944,13 @@ def transaction_history():
     transactions = load_json_data('transactions')
     kassas = load_json_data('kassas')
     
-    filtered_transactions =[
+    filtered_transactions = [
         t for t in transactions 
         if datetime.fromisoformat(t['timestamp']).date() == selected_date
     ]
     
     if selected_kassa_id:
-        filtered_transactions =[
+        filtered_transactions = [
             t for t in filtered_transactions
             if t.get('kassa_id') == selected_kassa_id
         ]
@@ -961,7 +960,7 @@ def transaction_history():
     total_quantity_sold = 0
     for t in filtered_transactions:
         if t.get('type') == 'sale':
-            for item in t.get('items',[]):
+            for item in t.get('items', []):
                 total_quantity_sold += int(item.get('quantity', 0))
     
     filtered_transactions.sort(key=lambda x: x.get('timestamp', ''), reverse=True)
@@ -974,7 +973,7 @@ def transaction_history():
 def edit_transaction(transaction_id):
     try:
         data = request.get_json()
-        items_update = data.get('items',[])
+        items_update = data.get('items', [])
         
         transactions = load_json_data('transactions')
         kassas = load_json_data('kassas')
@@ -992,7 +991,7 @@ def edit_transaction(transaction_id):
         old_total_amount = to_decimal(original_transaction['total_amount'])
         
         new_items_total = Decimal('0')
-        updated_items =[]
+        updated_items = []
         
         for item in original_transaction['items']:
             item_id = item.get('variant_id') or item.get('product_id') 
@@ -1014,7 +1013,7 @@ def edit_transaction(transaction_id):
         transactions[transaction_index]['total_amount'] = str(new_total_amount)
         
         if 'edits' not in transactions[transaction_index]:
-            transactions[transaction_index]['edits'] =[]
+            transactions[transaction_index]['edits'] = []
             
         transactions[transaction_index]['edits'].append({
             'timestamp': get_current_time().isoformat(),
@@ -1031,7 +1030,7 @@ def edit_transaction(transaction_id):
             for i, k in enumerate(kassas):
                 if k.get('id') == kassa_id:
                     k['balance'] = str(to_decimal(k.get('balance', '0')) + amount_diff)
-                    k.setdefault('history',[]).append({
+                    k.setdefault('history', []).append({
                         'type': 'correction',
                         'amount': str(amount_diff),
                         'timestamp': get_current_time().isoformat(),
@@ -1062,14 +1061,14 @@ def delete_transaction(transaction_id):
         flash("Транзакция не найдена.", "danger")
         return redirect(url_for('transaction_history'))
 
-    for item in transaction_to_delete.get('items',[]):
+    for item in transaction_to_delete.get('items', []):
         if item.get('is_custom'):
             continue
         
         product = find_item_by_field(inventory, 'id', item.get('product_id'))
         if not product: continue
         
-        variant = find_item_by_field(product.get('variants',[]), 'id', item.get('variant_id'))
+        variant = find_item_by_field(product.get('variants', []), 'id', item.get('variant_id'))
         if not variant: continue
 
         quantity_change = item.get('quantity', 0)
@@ -1087,7 +1086,7 @@ def delete_transaction(transaction_id):
             
             kassa['balance'] = str(current_balance - amount_change)
             
-            kassa.setdefault('history',[]).append({
+            kassa.setdefault('history', []).append({
                 'type': 'deletion',
                 'amount': str(-amount_change),
                 'timestamp': get_current_time().isoformat(),
@@ -1131,20 +1130,20 @@ def reports():
     personal_expenses = load_json_data('personal_expenses')
     users = load_json_data('users')
 
-    filtered_transactions =[
+    filtered_transactions = [
         t for t in transactions 
         if start_date <= datetime.fromisoformat(t['timestamp']) < end_date
     ]
-    filtered_expenses =[
+    filtered_expenses = [
         e for e in expenses 
         if start_date <= datetime.fromisoformat(e['timestamp']) < end_date
     ]
-    filtered_personal_expenses =[
+    filtered_personal_expenses = [
         e for e in personal_expenses 
         if start_date <= datetime.fromisoformat(e['timestamp']) < end_date
     ]
     
-    return_transactions =[t for t in filtered_transactions if t.get('type') == 'return']
+    return_transactions = [t for t in filtered_transactions if t.get('type') == 'return']
     total_returns_amount = sum(to_decimal(t['total_amount']) for t in return_transactions)
     total_returns_count = len(return_transactions)
 
@@ -1223,7 +1222,7 @@ def employee_report():
     end_date = (datetime.strptime(end_date_str, '%Y-%m-%d') + timedelta(days=1)).replace(tzinfo=ALMATY_TZ)
 
     transactions = load_json_data('transactions')
-    employee_transactions =[]
+    employee_transactions = []
     totals = {'sales': Decimal(0), 'returns': Decimal(0), 'net': Decimal(0)}
 
     if user_id:
@@ -1255,17 +1254,17 @@ def item_movement_report():
     product_id = request.args.get('product_id', '')
     variant_id = request.args.get('variant_id', '')
 
-    movements =[]
+    movements = []
     selected_product = None
     selected_variant = None
 
     if product_id:
         selected_product = find_item_by_field(inventory, 'id', product_id)
         if selected_product and variant_id:
-            selected_variant = find_item_by_field(selected_product.get('variants',[]), 'id', variant_id)
+            selected_variant = find_item_by_field(selected_product.get('variants', []), 'id', variant_id)
 
         for t in transactions:
-            for item in t.get('items',[]):
+            for item in t.get('items', []):
                 if item.get('product_id') == product_id and (not variant_id or item.get('variant_id') == variant_id):
                     movements.append({
                         'timestamp': t['timestamp'],
@@ -1300,10 +1299,10 @@ def product_roi_report():
     inventory = load_json_data('inventory')
     transactions = load_json_data('transactions')
 
-    product_stats =[]
+    product_stats = []
 
     for product in inventory:
-        for variant in product.get('variants',[]):
+        for variant in product.get('variants', []):
             total_revenue = Decimal('0')
             total_cogs = Decimal('0')
             total_qty_sold = 0
@@ -1398,7 +1397,7 @@ def manage_user():
     elif action == 'delete':
         user_id = request.form.get('id')
         initial_len = len(users)
-        users =[u for u in users if u.get('id') != user_id]
+        users = [u for u in users if u.get('id') != user_id]
         if len(users) < initial_len:
             flash("Кассир удален.", "success")
         else:
@@ -1422,7 +1421,7 @@ def manage_kassa():
                 'id': uuid.uuid4().hex,
                 'name': name,
                 'balance': str(balance),
-                'history':[]
+                'history': []
             }
             if balance > 0:
                 new_kassa['history'].append({
@@ -1439,7 +1438,7 @@ def manage_kassa():
     elif action == 'delete':
         kassa_id = request.form.get('id')
         initial_len = len(kassas)
-        kassas =[k for k in kassas if k.get('id') != kassa_id]
+        kassas = [k for k in kassas if k.get('id') != kassa_id]
         if len(kassas) < initial_len:
             flash("Касса удалена.", "success")
         else:
@@ -1524,7 +1523,7 @@ def manage_expense():
 def delete_expense(expense_id):
     expenses = load_json_data('expenses')
     initial_len = len(expenses)
-    expenses =[e for e in expenses if e.get('id') != expense_id]
+    expenses = [e for e in expenses if e.get('id') != expense_id]
     if len(expenses) < initial_len:
         save_json_data('expenses', expenses)
         upload_db_to_hf('expenses')
@@ -1561,7 +1560,7 @@ def manage_personal_expense():
 def delete_personal_expense(expense_id):
     expenses = load_json_data('personal_expenses')
     initial_len = len(expenses)
-    expenses =[e for e in expenses if e.get('id') != expense_id]
+    expenses = [e for e in expenses if e.get('id') != expense_id]
     if len(expenses) < initial_len:
         save_json_data('personal_expenses', expenses)
         upload_db_to_hf('personal_expenses')
@@ -1583,7 +1582,7 @@ def manage_link():
             flash("Ссылка добавлена.", "success")
     elif action == 'delete':
         link_id = request.form.get('id')
-        links =[l for l in links if l.get('id') != link_id]
+        links = [l for l in links if l.get('id') != link_id]
         flash("Ссылка удалена.", "success")
     save_json_data('links', links)
     upload_db_to_hf('links')
@@ -1680,7 +1679,7 @@ def end_shift():
             
             shift['end_balance'] = kassa.get('balance', '0') if kassa else '0'
 
-            shift_transactions =[
+            shift_transactions = [
                 t for t in transactions 
                 if t.get('shift_id') == shift_id and datetime.fromisoformat(t['timestamp']) >= datetime.fromisoformat(shift['start_time'])
             ]
@@ -1711,7 +1710,7 @@ def cashier_dashboard(user_id):
         abort(404, "Кассир не найден")
     
     transactions = load_json_data('transactions')
-    user_transactions =[t for t in transactions if t.get('user_id') == user_id]
+    user_transactions = [t for t in transactions if t.get('user_id') == user_id]
     user_transactions.sort(key=lambda x: x['timestamp'], reverse=True)
     
     html = BASE_TEMPLATE.replace('__TITLE__', f"Продажи кассира: {user['name']}").replace('__CONTENT__', CASHIER_DASHBOARD_CONTENT).replace('__SCRIPTS__', '')
@@ -1741,7 +1740,7 @@ def return_transaction(transaction_id):
             flash("Не указан ID кассира.", "danger")
             return redirect(url_for('cashier_login'))
             
-        returnable_items =[]
+        returnable_items = []
         already_returned = original_transaction.get('return_info', {}).get('returned_items', {})
         
         for item in original_transaction['items']:
@@ -1762,7 +1761,7 @@ def return_transaction(transaction_id):
             flash("Не удалось определить кассира.", "danger")
             return redirect(url_for('cashier_login'))
 
-        return_items =[]
+        return_items = []
         total_return_amount = Decimal('0')
         inventory_updates = {}
         items_to_process = defaultdict(int)
@@ -1807,7 +1806,7 @@ def return_transaction(transaction_id):
                 if not item.get('is_custom'):
                     product = find_item_by_field(inventory, 'id', item['product_id'])
                     if product:
-                        variant = find_item_by_field(product.get('variants',[]), 'id', variant_id)
+                        variant = find_item_by_field(product.get('variants', []), 'id', variant_id)
                         if variant:
                             inventory_updates[variant_id] = {'product_id': item['product_id'], 'stock_change': qty_to_return}
 
@@ -1854,7 +1853,7 @@ def return_transaction(transaction_id):
                 if k.get('id') == original_transaction['kassa_id']:
                     current_balance = to_decimal(k.get('balance', '0'))
                     kassas[k_idx]['balance'] = str(current_balance - total_return_amount)
-                    kassas[k_idx].setdefault('history',[]).append({
+                    kassas[k_idx].setdefault('history', []).append({
                         'type': 'return', 'amount': str(-total_return_amount), 'timestamp': now_iso,
                         'transaction_id': return_transaction_id
                     })
@@ -1884,7 +1883,7 @@ def backup_hf():
 @app.route('/download', methods=['GET'])
 @admin_required
 def download_hf():
-    errors =[]
+    errors = []
     success_count = 0
     for key in DATA_FILES.keys():
         filepath, _ = DATA_FILES[key]
@@ -1955,7 +1954,7 @@ def restore_bill(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]
+    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})
@@ -2002,7 +2001,7 @@ def manage_customer():
     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]
+        customers = [c for c in customers if c.get('id') != customer_id]
         if len(customers) < initial_len:
             flash("Клиент удален.", "success")
         else:
@@ -2018,7 +2017,7 @@ def search_customers():
     if not query:
         return jsonify([])
     customers = load_json_data('customers')
-    matches =[
+    matches = [
         c for c in customers 
         if query in c.get('name', '').lower() or query in c.get('phone', '')
     ]
@@ -2064,11 +2063,13 @@ BASE_TEMPLATE = """
             .sidebar { transform: translateX(calc(-1 * var(--sidebar-width))); transition: transform 0.3s ease-in-out; z-index: 1040; }
             .sidebar.active { transform: translateX(0); }
             .main-content { margin-left: 0; }
-        }[data-bs-theme="dark"] body { background-color: #212529; color: #dee2e6; }
-        [data-bs-theme="dark"] .card,[data-bs-theme="dark"] .modal-content, [data-bs-theme="dark"] .list-group-item,[data-bs-theme="dark"] .table, [data-bs-theme="dark"] .accordion-item { background-color: #343a40; }
+        }
+        [data-bs-theme="dark"] body { background-color: #212529; color: #dee2e6; }
+        [data-bs-theme="dark"] .card, [data-bs-theme="dark"] .modal-content, [data-bs-theme="dark"] .list-group-item, [data-bs-theme="dark"] .table, [data-bs-theme="dark"] .accordion-item { background-color: #343a40; }
         [data-bs-theme="dark"] .accordion-button { background-color: #3e444a; color: #fff; }
         [data-bs-theme="dark"] .accordion-button:not(.collapsed) { background-color: #495057;}
-        [data-bs-theme="dark"] .accordion-button::after { filter: invert(1) grayscale(100) brightness(200%); }[data-bs-theme="dark"] .table-hover>tbody>tr:hover>* { color: var(--bs-table-hover-color); background-color: rgba(255, 255, 255, 0.075); }
+        [data-bs-theme="dark"] .accordion-button::after { filter: invert(1) grayscale(100) brightness(200%); }
+        [data-bs-theme="dark"] .table-hover>tbody>tr:hover>* { color: var(--bs-table-hover-color); background-color: rgba(255, 255, 255, 0.075); }
         [data-bs-theme="dark"] .text-dark { color: #dee2e6 !important; }
         .product-card { cursor: pointer; }
         .product-card:hover { border-color: var(--bs-primary); }
@@ -2087,7 +2088,7 @@ BASE_TEMPLATE = """
         <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 dropdown">
-            <a class="nav-link dropdown-toggle {% if request.endpoint in['reports', 'product_roi_report', 'employee_report', 'item_movement_report'] %}active{% endif %}" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            <a class="nav-link dropdown-toggle {% if request.endpoint in ['reports', 'product_roi_report', 'employee_report', 'item_movement_report'] %}active{% endif %}" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                 <i class="fas fa-fw fa-chart-line me-2"></i>Отчеты
             </a>
             <ul class="dropdown-menu dropdown-menu-dark">
@@ -2099,7 +2100,7 @@ BASE_TEMPLATE = """
         </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>
+        <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 not session.admin_logged_in %}
         <li class="nav-item mt-3"><a class="nav-link text-warning" href="{{ url_for('admin_login') }}"><i class="fas fa-fw fa-user-shield me-2"></i>Войти как админ</a></li>
@@ -2338,13 +2339,40 @@ SALES_SCREEN_CONTENT = """
                     <div id="scanner-status" style="position: absolute; top: 10px; left: 10px; background: rgba(0,0,0,0.5); color: white; padding: 5px; border-radius: 5px; display: none;"></div>
                     <button id="stop-scan-btn" class="btn btn-danger btn-sm mt-2">Остановить</button>
                 </div>
-                
-                <input type="text" id="product-search" class="form-control mb-2" placeholder="Поиск по названию или штрих-коду...">
-                <div id="alphabet-filter" class="d-flex flex-wrap gap-1 justify-content-end mb-3"></div>
-                
+                <input type="text" id="product-search" class="form-control mb-3" placeholder="Поиск по названию или штрих-коду...">
                 <div id="product-search-results" class="d-grid gap-2" style="display: none; grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));"></div>
                 
-                <div id="product-grid" class="d-grid gap-2" style="grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));"></div>
+                <div id="product-accordion" class="accordion">
+                    {% for letter, products in grouped_inventory %}
+                    <div class="accordion-item">
+                        <h2 class="accordion-header" id="heading-{{ letter }}">
+                            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-{{ letter }}" aria-expanded="false" aria-controls="collapse-{{ letter }}">
+                                {{ letter }}
+                            </button>
+                        </h2>
+                        <div id="collapse-{{ letter }}" class="accordion-collapse collapse" aria-labelledby="heading-{{ letter }}" data-bs-parent="#product-accordion">
+                            <div class="accordion-body d-grid gap-2" style="grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));">
+                                {% for p in products %}
+                                <div class="card text-center product-card" data-barcode="{{ p.barcode }}">
+                                    <div class="card-body p-2">
+                                        <h6 class="card-title small mb-1">{{ p.name }}</h6>
+                                        <p class="card-text fw-bold mb-0">
+                                            {% if p.variants|length > 1 %}
+                                                от {{ format_currency_py(p.variants|map(attribute='price_regular')|min) }} ₸ 
+                                            {% elif p.variants|length == 1 %}
+                                                {{ format_currency_py(p.variants[0].get('price_regular', p.variants[0].get('price'))) }} ₸
+                                            {% else %}
+                                                Нет в наличии
+                                            {% endif %}
+                                        </p>
+                                    </div>
+                                </div>
+                                {% endfor %}
+                            </div>
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
             </div>
         </div>
     </div>
@@ -2364,7 +2392,6 @@ SALES_SCREEN_CONTENT = """
                 </div>
                 <div id="cart-items" class="list-group mb-3" style="max-height: 400px; overflow-y: auto;"></div>
                 <div class="mb-3">
-                    <div class="d-flex justify-content-between"><span>Общее кол-во:</span><span id="cart-total-qty">0 шт.</span></div>
                     <div class="d-flex justify-content-between"><span>Подытог:</span><span id="cart-subtotal">0 ₸</span></div>
                     <div class="d-flex justify-content-between"><span>Доставка:</span><span id="cart-delivery">0 ₸</span></div>
                     <hr class="my-1">
@@ -2476,7 +2503,6 @@ document.addEventListener('DOMContentLoaded', () => {
     const cartSubtotalEl = document.getElementById('cart-subtotal');
     const cartDeliveryEl = document.getElementById('cart-delivery');
     const cartTotalEl = document.getElementById('cart-total');
-    const cartTotalQtyEl = document.getElementById('cart-total-qty');
     
     let audioCtx;
     let isScannerPaused = false;
@@ -2525,63 +2551,6 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     }
 
-    const alphabetFilterEl = document.getElementById('alphabet-filter');
-    const productGridEl = document.getElementById('product-grid');
-    const productSearchResultsEl = document.getElementById('product-search-results');
-    const productSearchInput = document.getElementById('product-search');
-
-    const letters = new Set();
-    allProducts.forEach(p => {
-        if(p.name) letters.add(p.name.trim().charAt(0).toUpperCase());
-    });
-    const sortedLetters = Array.from(letters).sort();
-    
-    let filterHtml = `<div class="btn-group flex-wrap" role="group">
-        <button type="button" class="btn btn-outline-primary btn-sm alpha-filter active" data-letter="ALL">Все</button>`;
-    sortedLetters.forEach(l => {
-        filterHtml += `<button type="button" class="btn btn-outline-primary btn-sm alpha-filter" data-letter="${l}">${l}</button>`;
-    });
-    filterHtml += `</div>`;
-    alphabetFilterEl.innerHTML = filterHtml;
-
-    const renderGrid = (letter) => {
-        const filtered = letter === 'ALL' ? allProducts : allProducts.filter(p => p.name.trim().toUpperCase().startsWith(letter));
-        productGridEl.innerHTML = filtered.map(p => {
-            let priceText = 'Нет в наличии';
-            if (p.variants && p.variants.length > 0) {
-                const activeVariants = editTx ? p.variants : p.variants.filter(v => v.stock > 0);
-                if (activeVariants.length > 0) {
-                    if (activeVariants.length === 1) {
-                        priceText = `${formatCurrencyJS(activeVariants[0].price_regular || activeVariants[0].price)} ₸`;
-                    } else {
-                        const prices = activeVariants.map(v => parseFloat(v.price_regular || v.price));
-                        priceText = `от ${formatCurrencyJS(Math.min(...prices))} ₸`;
-                    }
-                }
-            }
-            return `
-                <div class="card text-center product-card" data-barcode="${p.barcode}">
-                    <div class="card-body p-2">
-                        <h6 class="card-title small mb-1">${p.name}</h6>
-                        <p class="card-text fw-bold mb-0">${priceText}</p>
-                    </div>
-                </div>`;
-        }).join('');
-    };
-
-    alphabetFilterEl.addEventListener('click', e => {
-        if(e.target.classList.contains('alpha-filter')) {
-            document.querySelectorAll('.alpha-filter').forEach(btn => btn.classList.remove('active'));
-            e.target.classList.add('active');
-            renderGrid(e.target.dataset.letter);
-            productSearchInput.value = '';
-            productGridEl.style.display = 'grid';
-            productSearchResultsEl.style.display = 'none';
-        }
-    });
-
-    renderGrid('ALL');
-
     function playBeep() {
         if (!audioCtx) {
             try { audioCtx = new (window.AudioContext || window.webkitAudioContext)(); } 
@@ -2616,14 +2585,12 @@ document.addEventListener('DOMContentLoaded', () => {
     const updateCartView = () => {
         cartItemsEl.innerHTML = '';
         let subtotal = 0;
-        let totalQty = 0;
         if (Object.keys(cart).length === 0) {
             cartItemsEl.innerHTML = '<p class="text-center text-muted">Корзина пуста</p>';
         }
         for (const id in cart) {
             const item = cart[id];
             subtotal += (parseLocaleNumber(item.price) - parseLocaleNumber(item.discount)) * item.quantity;
-            totalQty += item.quantity;
             
             let nameField = '';
             let priceField = '';
@@ -2667,7 +2634,6 @@ document.addEventListener('DOMContentLoaded', () => {
         cartSubtotalEl.textContent = formatCurrencyJS(subtotal) + ' ₸';
         cartDeliveryEl.textContent = formatCurrencyJS(deliveryCost) + ' ₸';
         cartTotalEl.textContent = formatCurrencyJS(total) + ' ₸';
-        cartTotalQtyEl.textContent = totalQty + ' шт.';
     };
 
     const addToCart = (product, variant, price, priceType) => {
@@ -2693,7 +2659,7 @@ document.addEventListener('DOMContentLoaded', () => {
         const container = document.getElementById('price-options-container');
         container.innerHTML = '';
         
-        const prices =[
+        const prices = [
             { type: 'Общая', value: variant.price_regular || variant.price },
             { type: 'Минимальная', value: variant.price_min },
             { type: 'Оптовая', value: variant.price_wholesale }
@@ -2833,17 +2799,24 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     }
 
+    const productSearchInput = document.getElementById('product-search');
+    const productAccordionEl = document.getElementById('product-accordion');
+    const productSearchResultsEl = document.getElementById('product-search-results');
+
     productSearchInput.addEventListener('input', e => {
         const term = e.target.value.toLowerCase().trim();
 
         if (term === '') {
-            productGridEl.style.display = 'grid';
+            productAccordionEl.style.display = '';
             productSearchResultsEl.style.display = 'none';
             productSearchResultsEl.innerHTML = '';
+            document.querySelectorAll('#product-accordion .accordion-collapse.show').forEach(el => {
+                bootstrap.Collapse.getOrCreateInstance(el).hide();
+            });
             return;
         }
 
-        productGridEl.style.display = 'none';
+        productAccordionEl.style.display = 'none';
         productSearchResultsEl.style.display = 'grid';
 
         const filtered = allProducts.filter(p => p.name.toLowerCase().includes(term) || p.barcode.toLowerCase().includes(term));
@@ -4653,7 +4626,7 @@ CASHIER_DASHBOARD_CONTENT = """
                         {% endif %}
                     </td>
                     <td>
-                        {% if t.type == 'sale' and t.status in['completed', 'partially_returned'] %}
+                        {% if t.type == 'sale' and t.status in ['completed', 'partially_returned'] %}
                         <a href="{{ url_for('return_transaction', transaction_id=t.id, cashier_id=user.id) }}" class="btn btn-sm btn-warning">Возврат</a>
                         {% endif %}
                     </td>
@@ -4768,4 +4741,4 @@ if __name__ == '__main__':
     backup_thread.start()
     for key in DATA_FILES.keys():
         load_json_data(key)
-    app.run(debug=False, host='0.0.0.0', port=7860, use_reloader=False)
+    app.run(debug=False, host='0.0.0.0', port=7860, use_reloader=False)