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]
@@ -162,64 +162,73 @@ 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', '')
 
     if has_discounts:
         table_headers = """
-        <th style="text-align: center; width: 5%;">№</th>
-        <th style="text-align: left;">Наименование</th>
-        <th style="text-align: right;">Кол-во</th>
-        <th style="text-align: right;">Цена</th>
-        <th style="text-align: right;">Скидка</th>
-        <th style="text-align: right;">Сумма</th>
+        <th style="text-align: center; width: 5%; white-space: nowrap;">№</th>
+        <th style="text-align: left; white-space: nowrap;">Наименование</th>
+        <th style="text-align: right; white-space: nowrap;">Кол-во</th>
+        <th style="text-align: right; white-space: nowrap;">Цена</th>
+        <th style="text-align: right; white-space: nowrap;">Скидка</th>
+        <th style="text-align: right; white-space: nowrap;">Сумма</th>
         """
         total_colspan = 5
     else:
         table_headers = """
-        <th style="text-align: center; width: 5%;">№</th>
-        <th style="text-align: left;">Наименование</th>
-        <th style="text-align: right;">Кол-во</th>
-        <th style="text-align: right;">Цена</th>
-        <th style="text-align: right;">Сумма</th>
+        <th style="text-align: center; width: 5%; white-space: nowrap;">№</th>
+        <th style="text-align: left; white-space: nowrap;">Наименование</th>
+        <th style="text-align: right; white-space: nowrap;">Кол-во</th>
+        <th style="text-align: right; white-space: nowrap;">Цена</th>
+        <th style="text-align: right; white-space: nowrap;">Сумма</th>
         """
         total_colspan = 4
 
     items_html = ""
+    total_quantity = 0
     for i, item in enumerate(transaction['items']):
-        discount_cell = f"""<td style="text-align: right;">{format_currency_py(item.get('discount_per_item', '0'))}</td>""" if has_discounts else ""
+        total_quantity += int(item.get('quantity', 0))
+        discount_cell = f"""<td style="text-align: right; white-space: nowrap;">{format_currency_py(item.get('discount_per_item', '0'))}</td>""" if has_discounts else ""
         items_html += f"""
         <tr>
-            <td style="text-align: center;">{i + 1}</td>
-            <td>{item['name']}</td>
-            <td style="text-align: right;">{item['quantity']}</td>
-            <td style="text-align: right;">{format_currency_py(item['price_at_sale'])}</td>
+            <td style="text-align: center; white-space: nowrap;">{i + 1}</td>
+            <td style="white-space: nowrap;">{item['name']}</td>
+            <td style="text-align: right; white-space: nowrap;">{item['quantity']}</td>
+            <td style="text-align: right; white-space: nowrap;">{format_currency_py(item['price_at_sale'])}</td>
             {discount_cell}
-            <td style="text-align: right;">{format_currency_py(item['total'])}</td>
+            <td style="text-align: right; white-space: nowrap;">{format_currency_py(item['total'])}</td>
         </tr>
         """
         
     total_amount_from_db = to_decimal(transaction['total_amount'])
     
     totals_html = ""
+    totals_html += f"""
+    <tr>
+        <td colspan="{total_colspan}" style="text-align: right; white-space: nowrap;">Общее кол-во единиц:</td>
+        <td style="text-align: right; white-space: nowrap;">{total_quantity}</td>
+    </tr>
+    """
+
     if delivery_cost > 0:
         subtotal = total_amount_from_db - delivery_cost
         totals_html += f"""
         <tr>
-            <td colspan="{total_colspan}" style="text-align: right;">Подытог:</td>
-            <td style="text-align: right;">{format_currency_py(subtotal)} ₸</td>
+            <td colspan="{total_colspan}" style="text-align: right; white-space: nowrap;">Подытог:</td>
+            <td style="text-align: right; white-space: nowrap;">{format_currency_py(subtotal)} ₸</td>
         </tr>
         <tr>
-            <td colspan="{total_colspan}" style="text-align: right;">Доставка:</td>
-            <td style="text-align: right;">{format_currency_py(delivery_cost)} ₸</td>
+            <td colspan="{total_colspan}" style="text-align: right; white-space: nowrap;">Доставка:</td>
+            <td style="text-align: right; white-space: nowrap;">{format_currency_py(delivery_cost)} ₸</td>
         </tr>
         """
 
     totals_html += f"""
     <tr class="total">
-        <td colspan="{total_colspan}" style="text-align: right;">Итого к оплате:</td>
-        <td style="text-align: right;">{format_currency_py(total_amount_from_db)} ₸</td>
+        <td colspan="{total_colspan}" style="text-align: right; white-space: nowrap;">Итого к оплате:</td>
+        <td style="text-align: right; white-space: nowrap;">{format_currency_py(total_amount_from_db)} ₸</td>
     </tr>
     """
 
@@ -256,8 +265,8 @@ def generate_receipt_html(transaction):
             .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 {{ background: #f2f2f2; font-weight: bold; padding: 8px; border-bottom: 2px solid #ddd; }}
-            table td {{ padding: 8px; border-bottom: 1px solid #eee; }}
+            table th {{ background: #f2f2f2; font-weight: bold; padding: 8px; border-bottom: 2px solid #ddd; white-space: nowrap; }}
+            table td {{ padding: 8px; border-bottom: 1px solid #eee; white-space: nowrap; }}
             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; }}
@@ -360,22 +369,16 @@ 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())
+    letters = sorted(list(set([p.get('name', '#')[0].upper() for p in active_inventory])))
 
     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, grouped_inventory=sorted_grouped_inventory, edit_tx=edit_tx)
+    return render_template_string(html, inventory=active_inventory, kassas=kassas, letters=letters, edit_tx=edit_tx)
 
 @app.route('/inventory', methods=['GET', 'POST'])
 def inventory_management():
@@ -461,7 +464,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')))
@@ -588,7 +591,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')
@@ -620,7 +623,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', '')
                 
@@ -704,7 +707,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
@@ -734,11 +737,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
@@ -750,7 +753,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(),
@@ -774,7 +777,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 = {}
 
@@ -803,7 +806,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
             
@@ -862,7 +865,7 @@ def complete_sale():
         }
         
         if edit_tx_id:
-            new_transaction['edits'] = original_tx.get('edits', []) + [{'timestamp': now_iso, 'type': 'full_edit'}]
+            new_transaction['edits'] = original_tx.get('edits', []) +[{'timestamp': now_iso, 'type': 'full_edit'}]
             
         new_transaction['invoice_html'] = generate_receipt_html(new_transaction)
         
@@ -877,7 +880,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
@@ -950,7 +953,7 @@ def transaction_history():
     ]
     
     if selected_kassa_id:
-        filtered_transactions = [
+        filtered_transactions =[
             t for t in filtered_transactions
             if t.get('kassa_id') == selected_kassa_id
         ]
@@ -960,7 +963,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)
@@ -973,7 +976,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')
@@ -1030,7 +1033,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(),
@@ -1061,14 +1064,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)
@@ -1086,14 +1089,14 @@ 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(),
                 'description': f"Удаление транзакции {transaction_id[:8]}"
             })
 
-    transactions = [t for t in transactions if t.get('id') != transaction_id]
+    transactions =[t for t in transactions if t.get('id') != transaction_id]
     
     if transaction_to_delete.get('type') == 'return':
         original_id = transaction_to_delete.get('original_transaction_id')
@@ -1130,20 +1133,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)
 
@@ -1222,7 +1225,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:
@@ -1254,17 +1257,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'],
@@ -1302,13 +1305,13 @@ def product_roi_report():
     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
 
             for t in transactions:
-                if t['type'] in ['sale', 'return']:
+                if t['type'] in['sale', 'return']:
                     for item in t['items']:
                         if item.get('variant_id') == variant['id']:
                             total_revenue += to_decimal(item['total'])
@@ -1438,7 +1441,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:
@@ -1476,7 +1479,7 @@ def kassa_operation():
                 new_balance -= amount
             
             kassas[i]['balance'] = str(new_balance)
-            if 'history' not in kassas[i]: kassas[i]['history'] = []
+            if 'history' not in kassas[i]: kassas[i]['history'] =[]
             kassas[i]['history'].append({
                 'type': op_type,
                 'amount': str(amount),
@@ -1560,7 +1563,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')
@@ -1582,7 +1585,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')
@@ -1679,7 +1682,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'])
             ]
@@ -1740,7 +1743,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']:
@@ -1761,7 +1764,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)
@@ -1806,7 +1809,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}
 
@@ -1841,7 +1844,7 @@ def return_transaction(transaction_id):
         for variant_id, update_info in inventory_updates.items():
             for p_idx, p in enumerate(inventory):
                 if p.get('id') == update_info['product_id']:
-                    for v_idx, v in enumerate(p.get('variants', [])):
+                    for v_idx, v in enumerate(p.get('variants',[])):
                         if v.get('id') == variant_id:
                             inventory[p_idx]['variants'][v_idx]['stock'] += update_info['stock_change']
                             inventory[p_idx]['timestamp_updated'] = now_iso
@@ -1853,7 +1856,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
                     })
@@ -1883,7 +1886,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]
@@ -1963,7 +1966,7 @@ def restore_bill(bill_id):
 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]
+    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')
@@ -2001,7 +2004,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:
@@ -2017,7 +2020,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', '')
     ]
@@ -2063,13 +2066,10 @@ 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"] .accordion-button { background-color: #3e444a; color: #fff; }
+        }[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); }
@@ -2100,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>
@@ -2339,36 +2339,33 @@ 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-3" placeholder="Поиск по названию или штрих-коду...">
+                
+                <div class="d-flex flex-column flex-md-row justify-content-between align-items-start mb-3 gap-2">
+                    <input type="text" id="product-search" class="form-control flex-grow-1" style="max-width: 400px;" placeholder="Поиск по названию или штрих-коду...">
+                    <div class="d-flex flex-wrap gap-1 justify-content-md-end" id="alphabet-filter">
+                        <button class="btn btn-secondary btn-sm filter-btn active" data-letter="all">Все</button>
+                        {% for letter in letters %}
+                        <button class="btn btn-outline-secondary btn-sm filter-btn" data-letter="{{ letter }}">{{ letter }}</button>
+                        {% endfor %}
+                    </div>
+                </div>
+
                 <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-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 id="product-grid" class="d-grid gap-2" style="grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));">
+                    {% for p in inventory %}
+                    <div class="card text-center product-card" data-barcode="{{ p.barcode }}" data-letter="{{ p.name[0]|upper }}">
+                        <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 %}
@@ -2392,6 +2389,7 @@ 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">
@@ -2503,6 +2501,7 @@ 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;
@@ -2585,12 +2584,14 @@ 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 += parseInt(item.quantity, 10) || 0;
             
             let nameField = '';
             let priceField = '';
@@ -2634,6 +2635,7 @@ document.addEventListener('DOMContentLoaded', () => {
         cartSubtotalEl.textContent = formatCurrencyJS(subtotal) + ' ₸';
         cartDeliveryEl.textContent = formatCurrencyJS(deliveryCost) + ' ₸';
         cartTotalEl.textContent = formatCurrencyJS(total) + ' ₸';
+        if(cartTotalQtyEl) cartTotalQtyEl.textContent = totalQty + ' шт.';
     };
 
     const addToCart = (product, variant, price, priceType) => {
@@ -2659,7 +2661,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 }
@@ -2799,24 +2801,49 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     }
 
+    document.getElementById('alphabet-filter')?.addEventListener('click', e => {
+        if (e.target.classList.contains('filter-btn')) {
+            document.querySelectorAll('.filter-btn').forEach(b => {
+                b.classList.remove('active', 'btn-secondary');
+                b.classList.add('btn-outline-secondary');
+            });
+            e.target.classList.remove('btn-outline-secondary');
+            e.target.classList.add('active', 'btn-secondary');
+            
+            const letter = e.target.dataset.letter;
+            document.querySelectorAll('#product-grid .product-card').forEach(card => {
+                if (letter === 'all' || card.dataset.letter === letter) {
+                    card.style.display = 'block';
+                } else {
+                    card.style.display = 'none';
+                }
+            });
+            
+            document.getElementById('product-search-results').style.display = 'none';
+            document.getElementById('product-grid').style.display = 'grid';
+            document.getElementById('product-search').value = '';
+        }
+    });
+
     const productSearchInput = document.getElementById('product-search');
-    const productAccordionEl = document.getElementById('product-accordion');
+    const productGridEl = document.getElementById('product-grid');
+    const alphabetFilterEl = document.getElementById('alphabet-filter');
     const productSearchResultsEl = document.getElementById('product-search-results');
 
     productSearchInput.addEventListener('input', e => {
         const term = e.target.value.toLowerCase().trim();
 
         if (term === '') {
-            productAccordionEl.style.display = '';
+            productGridEl.style.display = 'grid';
+            alphabetFilterEl.style.display = 'flex';
             productSearchResultsEl.style.display = 'none';
-            productSearchResultsEl.innerHTML = '';
-            document.querySelectorAll('#product-accordion .accordion-collapse.show').forEach(el => {
-                bootstrap.Collapse.getOrCreateInstance(el).hide();
-            });
+            const activeFilter = document.querySelector('.filter-btn.active');
+            if (activeFilter) activeFilter.click();
             return;
         }
 
-        productAccordionEl.style.display = 'none';
+        productGridEl.style.display = 'none';
+        alphabetFilterEl.style.display = 'none';
         productSearchResultsEl.style.display = 'grid';
 
         const filtered = allProducts.filter(p => p.name.toLowerCase().includes(term) || p.barcode.toLowerCase().includes(term));
@@ -4452,7 +4479,8 @@ ADMIN_CONTENT = """
                             <td class="text-end fw-bold">{{ format_currency_py(e.amount) }} ₸</td>
                             <td class="text-end">
                                 <form action="{{ url_for('delete_personal_expense', expense_id=e.id) }}" method="POST" onsubmit="return confirm('Удалить этот расход?');">
-                                    <button type="submit" class="btn btn-sm btn-outline-danger py-0 px-1"><i class="fas fa-trash"></i></button>
+                                    <button type="submit" class="btn btn-sm btn-outline-danger py-0 px-1"><i class="fas fa-trash">
+</i></button>
                                 </form>
                             </td>
                         </tr>
@@ -4626,7 +4654,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>
@@ -4731,7 +4759,7 @@ CUSTOMERS_CONTENT = """
         </div>
         <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
       </form>
-</div>
+    </div>
   </div>
 </div>
 """