Update app.py

app.py

@@ -25,7 +25,6 @@ TRANSACTIONS_FILE = os.path.join(DATA_DIR, 'transactions.json')
 USERS_FILE = os.path.join(DATA_DIR, 'users.json')
 KASSAS_FILE = os.path.join(DATA_DIR, 'kassas.json')
 EXPENSES_FILE = os.path.join(DATA_DIR, 'expenses.json')
-STOCK_MOVEMENTS_FILE = os.path.join(DATA_DIR, 'stock_movements.json')
 
 DATA_FILES = {
     'inventory': (INVENTORY_FILE, threading.Lock()),
@@ -33,7 +32,6 @@ DATA_FILES = {
     'users': (USERS_FILE, threading.Lock()),
     'kassas': (KASSAS_FILE, threading.Lock()),
     'expenses': (EXPENSES_FILE, threading.Lock()),
-    'stock_movements': (STOCK_MOVEMENTS_FILE, threading.Lock()),
 }
 
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE", "YOUR_WRITE_TOKEN_HERE")
@@ -206,14 +204,19 @@ def generate_receipt_html(transaction):
 
 @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():
     inventory = load_json_data('inventory')
     users = load_json_data('users')
     kassas = load_json_data('kassas')
-    active_inventory = [p for p in inventory if isinstance(p, dict) and p.get('stock', 0) > 0]
+    
+    active_inventory = []
+    for p in inventory:
+        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())
     html = BASE_TEMPLATE.replace('__TITLE__', "Касса").replace('__CONTENT__', SALES_SCREEN_CONTENT).replace('__SCRIPTS__', SALES_SCREEN_SCRIPTS)
     return render_template_string(html, inventory=active_inventory, users=users, kassas=kassas)
@@ -224,52 +227,57 @@ def inventory_management():
         try:
             name = request.form.get('name', '').strip()
             barcode = request.form.get('barcode', '').strip()
-            price = to_decimal(request.form.get('price', '0'))
-            cost_price = to_decimal(request.form.get('cost_price', '0'))
-            stock = int(to_decimal(request.form.get('stock', '0')))
-
-            if not name or price <= 0:
-                flash("Название и цена - обязательные поля.", "danger")
+            
+            if not name or not barcode:
+                flash("Название и штрих-код - обязательные поля.", "danger")
                 return redirect(url_for('inventory_management'))
 
             inventory = load_json_data('inventory')
-            new_product_id = uuid.uuid4().hex
+            if find_item_by_field(inventory, 'barcode', barcode):
+                flash(f"Товар со штрих-кодом {barcode} уже существует.", "warning")
+                return redirect(url_for('inventory_management'))
+
+            variants = []
+            variant_names = request.form.getlist('variant_name[]')
+            variant_prices = request.form.getlist('variant_price[]')
+            variant_cost_prices = request.form.getlist('variant_cost_price[]')
+            variant_stocks = request.form.getlist('variant_stock[]')
+
+            for i in range(len(variant_names)):
+                v_name = variant_names[i].strip()
+                if not v_name: continue
+                variants.append({
+                    'id': uuid.uuid4().hex,
+                    'option_name': "Вариант",
+                    'option_value': v_name,
+                    'price': str(to_decimal(variant_prices[i])),
+                    'cost_price': str(to_decimal(variant_cost_prices[i])),
+                    'stock': int(to_decimal(variant_stocks[i], '0')),
+                })
             
+            if not variants:
+                flash("Нужно добавить хотя бы один вариант товара.", "danger")
+                return redirect(url_for('inventory_management'))
+
             new_product = {
-                'id': new_product_id,
+                'id': uuid.uuid4().hex,
                 'name': name,
                 'barcode': barcode,
-                'price': str(price),
-                'cost_price': str(cost_price),
-                'stock': stock,
+                'variants': variants,
                 'timestamp_added': get_current_time().isoformat(),
                 'timestamp_updated': get_current_time().isoformat()
             }
             inventory.append(new_product)
             save_json_data('inventory', inventory)
             upload_db_to_hf('inventory')
-            
-            if stock > 0:
-                stock_movements = load_json_data('stock_movements')
-                stock_movements.append({
-                    'id': uuid.uuid4().hex,
-                    'product_id': new_product_id,
-                    'type': 'stock-in',
-                    'quantity': stock,
-                    'cost_price': str(cost_price),
-                    'timestamp': get_current_time().isoformat(),
-                    'description': 'Нача��ьный остаток'
-                })
-                save_json_data('stock_movements', stock_movements)
-                upload_db_to_hf('stock_movements')
-
             flash(f"Товар '{name}' успешно добавлен.", "success")
         except Exception as e:
+            logging.error(f"Error adding product: {e}", exc_info=True)
             flash(f"Ошибка при добавлении товара: {e}", "danger")
         return redirect(url_for('inventory_management'))
     
     inventory_list = load_json_data('inventory')
-    inventory_list.sort(key=lambda x: (x.get('barcode', ''), x.get('name', '').lower()))
+    inventory_list.sort(key=lambda x: x.get('name', '').lower())
     html = BASE_TEMPLATE.replace('__TITLE__', "Склад").replace('__CONTENT__', INVENTORY_CONTENT).replace('__SCRIPTS__', INVENTORY_SCRIPTS)
     return render_template_string(html, inventory=inventory_list)
 
@@ -282,25 +290,44 @@ def edit_product(product_id):
             try:
                 name = request.form.get('name', '').strip()
                 barcode = request.form.get('barcode', '').strip()
-                price = to_decimal(request.form.get('price'))
-                cost_price = to_decimal(request.form.get('cost_price'))
-                stock = int(to_decimal(request.form.get('stock')))
 
-                if not name or price <= 0:
-                    flash("Название и цена обязательны.", "danger")
+                if not name or not barcode:
+                    flash("Название и штрих-код обязательны.", "danger")
                     return redirect(url_for('inventory_management'))
 
-                inventory[i].update({
-                    'name': name,
-                    'barcode': barcode,
-                    'price': str(price),
-                    'cost_price': str(cost_price),
-                    'stock': stock,
-                    'timestamp_updated': get_current_time().isoformat()
-                })
+                existing_barcode = find_item_by_field(inventory, 'barcode', barcode)
+                if existing_barcode and existing_barcode.get('id') != product_id:
+                    flash(f"Штрих-код {barcode} уже используется другим товаром.", "warning")
+                    return redirect(url_for('inventory_management'))
+
+                inventory[i]['name'] = name
+                inventory[i]['barcode'] = barcode
+                
+                new_variants = []
+                variant_ids = request.form.getlist('variant_id[]')
+                variant_names = request.form.getlist('variant_name[]')
+                variant_prices = request.form.getlist('variant_price[]')
+                variant_cost_prices = request.form.getlist('variant_cost_price[]')
+                variant_stocks = request.form.getlist('variant_stock[]')
+
+                for j in range(len(variant_ids)):
+                    v_name = variant_names[j].strip()
+                    if not v_name: continue
+                    new_variants.append({
+                        'id': variant_ids[j] or uuid.uuid4().hex,
+                        'option_name': "Вариант",
+                        'option_value': v_name,
+                        'price': str(to_decimal(variant_prices[j])),
+                        'cost_price': str(to_decimal(variant_cost_prices[j])),
+                        'stock': int(to_decimal(variant_stocks[j], '0')),
+                    })
+                
+                inventory[i]['variants'] = new_variants
+                inventory[i]['timestamp_updated'] = get_current_time().isoformat()
                 product_found = True
                 break
             except Exception as e:
+                logging.error(f"Error updating product: {e}", exc_info=True)
                 flash(f"Ошибка при обновлении товара: {e}", "danger")
                 return redirect(url_for('inventory_management'))
     
@@ -312,81 +339,82 @@ def edit_product(product_id):
         flash("Товар не найден.", "danger")
     return redirect(url_for('inventory_management'))
 
+@app.route('/inventory/delete/<product_id>', methods=['POST'])
+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)]
+    if len(inventory) < initial_len:
+        save_json_data('inventory', inventory)
+        upload_db_to_hf('inventory')
+        flash("Товар удален.", "success")
+    else:
+        flash("Товар не найден.", "warning")
+    return redirect(url_for('inventory_management'))
+
 @app.route('/inventory/stock_in', methods=['POST'])
 def stock_in():
     try:
         product_id = request.form.get('product_id')
-        quantity = int(to_decimal(request.form.get('quantity', '0')))
-        cost_price = to_decimal(request.form.get('cost_price', '0'))
+        variant_id = request.form.get('variant_id')
+        quantity = int(request.form.get('quantity', 0))
+        cost_price_str = request.form.get('cost_price')
         
-        if not product_id or quantity <= 0:
-            flash("Выберите товар и укажите положительное количество.", "danger")
+        if not product_id or not variant_id or quantity <= 0:
+            flash("Неверные данные для оприходования.", "danger")
             return redirect(url_for('inventory_management'))
 
         inventory = load_json_data('inventory')
-        stock_movements = load_json_data('stock_movements')
-        
-        product_found = False
-        for i, product in enumerate(inventory):
-            if isinstance(product, dict) and product.get('id') == product_id:
-                inventory[i]['stock'] += quantity
-                inventory[i]['cost_price'] = str(cost_price) 
-                inventory[i]['timestamp_updated'] = get_current_time().isoformat()
-                product_found = True
-                break
-        
-        if not product_found:
+        product = find_item_by_field(inventory, 'id', product_id)
+        if not product:
             flash("Товар не найден.", "danger")
             return redirect(url_for('inventory_management'))
 
-        stock_movements.append({
-            'id': uuid.uuid4().hex,
-            'product_id': product_id,
-            'type': 'stock-in',
-            'quantity': quantity,
-            'cost_price': str(cost_price),
-            'timestamp': get_current_time().isoformat(),
-            'description': 'Оприходование'
-        })
-        
+        variant_found = False
+        for i, variant in enumerate(product.get('variants', [])):
+            if variant.get('id') == variant_id:
+                variant['stock'] = variant.get('stock', 0) + quantity
+                # Update cost price if provided, using weighted average
+                if cost_price_str:
+                    new_cost = to_decimal(cost_price_str)
+                    old_stock = variant.get('stock', 0) - quantity
+                    old_cost = to_decimal(variant.get('cost_price', '0'))
+                    if old_stock + quantity > 0:
+                        avg_cost = ((old_cost * old_stock) + (new_cost * quantity)) / (old_stock + quantity)
+                        variant['cost_price'] = str(avg_cost.quantize(Decimal('0.01'), rounding=ROUND_HALF_UP))
+                
+                variant_found = True
+                break
+
+        if not variant_found:
+            flash("Вариант товара не найден.", "danger")
+            return redirect(url_for('inventory_management'))
+
+        product['timestamp_updated'] = get_current_time().isoformat()
         save_json_data('inventory', inventory)
-        save_json_data('stock_movements', stock_movements)
         upload_db_to_hf('inventory')
-        upload_db_to_hf('stock_movements')
-        flash("Товар успешно оприходован.", "success")
+        flash(f"Остаток товара '{product['name']} ({variant['option_value']})' увеличен на {quantity}.", "success")
+
     except Exception as e:
+        logging.error(f"Error stocking in: {e}", exc_info=True)
         flash(f"Ошибка при оприходовании: {e}", "danger")
-    
-    return redirect(url_for('inventory_management'))
 
-@app.route('/inventory/delete/<product_id>', methods=['POST'])
-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)]
-    if len(inventory) < initial_len:
-        save_json_data('inventory', inventory)
-        upload_db_to_hf('inventory')
-        flash("Товар удален.", "success")
-    else:
-        flash("Товар не найден.", "warning")
     return redirect(url_for('inventory_management'))
 
 @app.route('/api/product_by_barcode/<barcode>')
 def get_product_by_barcode(barcode):
     inventory = load_json_data('inventory')
-    variants = [p for p in inventory if isinstance(p, dict) and p.get('barcode') == barcode and p.get('stock', 0) > 0]
-    
-    if not variants:
-        return jsonify({'success': False, 'message': 'Товар не найден или закончился'}), 404
-        
-    if len(variants) == 1:
-        return jsonify({'success': True, 'product': variants[0]})
-        
-    if len(variants) > 1:
-        return jsonify({'success': True, 'is_variant': True, 'variants': variants})
-    
-    return jsonify({'success': False, 'message': 'Неизвестная ошибка'}), 500
+    product = find_item_by_field(inventory, 'barcode', barcode)
+    if product:
+        # Return only variants that are in stock
+        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
+            return jsonify({'success': True, 'product': product_copy})
+        else:
+            return jsonify({'success': False, 'message': 'Товар закончился на складе'}), 404
+    return jsonify({'success': False, 'message': 'Товар не найден'}), 404
 
 @app.route('/api/complete_sale', methods=['POST'])
 def complete_sale():
@@ -414,32 +442,37 @@ def complete_sale():
         total_amount = Decimal('0.00')
         inventory_updates = {}
 
-        for item_id, cart_item in cart.items():
-            product = find_item_by_field(inventory, 'id', item_id)
+        for variant_id, cart_item in cart.items():
+            product = find_item_by_field(inventory, 'id', cart_item['productId'])
             if not product:
-                return jsonify({'success': False, 'message': f"Товар с ID {item_id} не найден."}), 404
+                return jsonify({'success': False, 'message': f"Товар с ID {cart_item['productId']} не найден."}), 404
+            
+            variant = find_item_by_field(product.get('variants', []), 'id', variant_id)
+            if not variant:
+                 return jsonify({'success': False, 'message': f"Вариант товара с ID {variant_id} не найден."}), 404
             
             quantity_sold = cart_item['quantity']
-            current_stock = product.get('stock', 0)
+            current_stock = variant.get('stock', 0)
 
             if quantity_sold > current_stock:
-                return jsonify({'success': False, 'message': f"Недостаточно товара '{product['name']}'. В наличии: {current_stock}"}), 400
+                return jsonify({'success': False, 'message': f"Недостаточно товара '{product['name']} ({variant['option_value']})'. В наличии: {current_stock}"}), 400
 
-            price_at_sale = to_decimal(product.get('price', '0'))
-            cost_price_at_sale = to_decimal(product.get('cost_price', '0'))
+            price_at_sale = to_decimal(variant.get('price', '0'))
+            cost_price_at_sale = to_decimal(variant.get('cost_price', '0'))
             item_total = price_at_sale * Decimal(quantity_sold)
             total_amount += item_total
 
             sale_items.append({
-                'product_id': item_id,
-                'name': product['name'],
+                'product_id': product['id'],
+                'variant_id': variant_id,
+                'name': f"{product['name']} ({variant['option_value']})",
                 'barcode': product.get('barcode'),
                 'quantity': quantity_sold,
                 'price_at_sale': str(price_at_sale),
                 'cost_price_at_sale': str(cost_price_at_sale),
                 'total': str(item_total)
             })
-            inventory_updates[item_id] = current_stock - quantity_sold
+            inventory_updates[variant_id] = {'product_id': product['id'], 'new_stock': current_stock - quantity_sold}
 
         now_iso = get_current_time().isoformat()
         
@@ -461,24 +494,15 @@ def complete_sale():
         new_transaction['receipt_html'] = generate_receipt_html(new_transaction)
         transactions = load_json_data('transactions')
         transactions.append(new_transaction)
-        
-        stock_movements = load_json_data('stock_movements')
-        for item in sale_items:
-            stock_movements.append({
-                'id': uuid.uuid4().hex,
-                'product_id': item['product_id'],
-                'type': 'sale',
-                'quantity': -item['quantity'],
-                'cost_price': item['cost_price_at_sale'],
-                'timestamp': now_iso,
-                'description': f"Продажа, чек {new_transaction['id'][:8]}"
-            })
 
-        for prod_id, new_stock in inventory_updates.items():
-            for i, p in enumerate(inventory):
-                if p.get('id') == prod_id:
-                    inventory[i]['stock'] = new_stock
-                    inventory[i]['timestamp_updated'] = now_iso
+        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', []):
+                        if v.get('id') == variant_id:
+                            v['stock'] = update_info['new_stock']
+                            p['timestamp_updated'] = now_iso
+                            break
                     break
 
         if payment_method == 'cash':
@@ -499,12 +523,10 @@ def complete_sale():
         save_json_data('transactions', transactions)
         save_json_data('inventory', inventory)
         save_json_data('kassas', kassas)
-        save_json_data('stock_movements', stock_movements)
         
         upload_db_to_hf('transactions')
         upload_db_to_hf('inventory')
         upload_db_to_hf('kassas')
-        upload_db_to_hf('stock_movements')
 
         receipt_url = url_for('view_receipt', transaction_id=new_transaction['id'], _external=True)
         return jsonify({
@@ -612,56 +634,50 @@ def reports():
     html = BASE_TEMPLATE.replace('__TITLE__', "Отчеты").replace('__CONTENT__', REPORTS_CONTENT).replace('__SCRIPTS__', REPORTS_SCRIPTS)
     return render_template_string(html, stats=stats, start_date=start_date_str, end_date=end_date_str, expenses=filtered_expenses)
 
-@app.route('/reports/profitability')
-def profitability_report():
+@app.route('/reports/product_roi')
+def product_roi_report():
     inventory = load_json_data('inventory')
     transactions = load_json_data('transactions')
-    stock_movements = load_json_data('stock_movements')
 
-    profit_data = {}
+    product_stats = []
+
     for product in inventory:
-        product_id = product.get('id')
-        if not product_id: continue
-        profit_data[product_id] = {
-            'id': product_id,
-            'name': product.get('name', 'N/A'),
-            'barcode': product.get('barcode', 'N/A'),
-            'stock': product.get('stock', 0),
-            'cost_price': to_decimal(product.get('cost_price', '0')),
-            'total_revenue': Decimal('0'),
-            'total_cogs': Decimal('0'),
-            'total_sold_qty': 0,
-            'total_investment': Decimal('0'),
-        }
+        for variant in product.get('variants', []):
+            total_revenue = Decimal('0.00')
+            total_cogs = Decimal('0.00')
+            total_qty_sold = 0
+
+            for t in transactions:
+                if t['type'] in ['sale', 'return']:
+                    for item in t['items']:
+                        if item.get('variant_id') == variant['id']:
+                            total_revenue += to_decimal(item['total'])
+                            total_cogs += to_decimal(item.get('cost_price_at_sale', '0')) * to_decimal(str(item['quantity']))
+                            if t['type'] == 'sale':
+                                total_qty_sold += item['quantity']
+                            elif t['type'] == 'return':
+                                total_qty_sold += item['quantity'] # quantity is negative on returns
+
+            current_stock = to_decimal(str(variant.get('stock', 0)))
+            cost_price = to_decimal(variant.get('cost_price', '0'))
+            
+            inventory_value = current_stock * cost_price
+            total_investment = total_cogs + inventory_value
+            payback = total_revenue - total_investment
 
-    for t in transactions:
-        for item in t.get('items', []):
-            prod_id = item.get('product_id')
-            if prod_id in profit_data:
-                qty = to_decimal(str(item.get('quantity', 0))) 
-                price = to_decimal(item.get('price_at_sale', '0'))
-                profit_data[prod_id]['total_revenue'] += price * qty
-                profit_data[prod_id]['total_sold_qty'] += int(qty)
-
-    for sm in stock_movements:
-        if sm.get('type') == 'stock-in':
-            prod_id = sm.get('product_id')
-            if prod_id in profit_data:
-                qty = to_decimal(str(sm.get('quantity', 0)))
-                cost = to_decimal(sm.get('cost_price', '0'))
-                profit_data[prod_id]['total_investment'] += qty * cost
-
-    final_data = []
-    for prod_id, data in profit_data.items():
-        data['current_stock_value'] = Decimal(data['stock']) * data['cost_price']
-        data['payback_status'] = data['total_revenue'] - data['total_investment']
-        data['net_result'] = data['payback_status'] + data['current_stock_value']
-        final_data.append(data)
-
-    final_data.sort(key=lambda x: x.get('name', '').lower())
-    
-    html = BASE_TEMPLATE.replace('__TITLE__', "Окупаемость товаров").replace('__CONTENT__', PROFITABILITY_REPORT_CONTENT).replace('__SCRIPTS__', "")
-    return render_template_string(html, profit_data=final_data)
+            product_stats.append({
+                'name': product['name'],
+                'variant_name': variant['option_value'],
+                'total_qty_sold': total_qty_sold,
+                'total_revenue': total_revenue,
+                'total_investment': total_investment,
+                'inventory_value': inventory_value,
+                'payback': payback
+            })
+
+    product_stats.sort(key=lambda x: x['payback'], reverse=True)
+    html = BASE_TEMPLATE.replace('__TITLE__', "Отчет по окупаемости товаров").replace('__CONTENT__', PRODUCT_ROI_CONTENT).replace('__SCRIPTS__', '')
+    return render_template_string(html, stats=product_stats)
 
 @app.route('/admin', methods=['GET'])
 def admin_panel():
@@ -879,10 +895,13 @@ def return_transaction(transaction_id):
         return_items.append({**item, 'quantity': -item['quantity'], 'total': str(-to_decimal(item['total']))})
         product = find_item_by_field(inventory, 'id', item['product_id'])
         if product:
-            inventory_updates[item['product_id']] = product.get('stock', 0) + item['quantity']
+            variant = find_item_by_field(product.get('variants', []), 'id', item['variant_id'])
+            if variant:
+                 inventory_updates[item['variant_id']] = {'product_id': item['product_id'], 'new_stock': variant.get('stock', 0) + item['quantity']}
+
 
     now_iso = get_current_time().isoformat()
-    return_transaction_obj = {
+    return_transaction = {
         'id': uuid.uuid4().hex,
         'timestamp': now_iso,
         'type': 'return',
@@ -896,30 +915,21 @@ def return_transaction(transaction_id):
         'total_amount': str(-total_amount),
         'payment_method': original_transaction['payment_method']
     }
-    transactions.append(return_transaction_obj)
-
-    stock_movements = load_json_data('stock_movements')
-    for item in original_transaction['items']:
-        stock_movements.append({
-            'id': uuid.uuid4().hex,
-            'product_id': item['product_id'],
-            'type': 'return',
-            'quantity': item['quantity'],
-            'cost_price': item['cost_price_at_sale'],
-            'timestamp': now_iso,
-            'description': f"Возврат, чек {return_transaction_obj['id'][:8]}"
-        })
+    transactions.append(return_transaction)
 
     for i, t in enumerate(transactions):
         if t['id'] == transaction_id:
             transactions[i]['status'] = 'returned'
             break
 
-    for prod_id, new_stock in inventory_updates.items():
-        for i, p in enumerate(inventory):
-            if p['id'] == prod_id:
-                inventory[i]['stock'] = new_stock
-                inventory[i]['timestamp_updated'] = now_iso
+    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', []):
+                    if v.get('id') == variant_id:
+                        v['stock'] = update_info['new_stock']
+                        p['timestamp_updated'] = now_iso
+                        break
                 break
     
     if original_transaction['payment_method'] == 'cash':
@@ -929,23 +939,20 @@ def return_transaction(transaction_id):
                 kassas[i]['balance'] = str(current_balance - total_amount)
                 kassas[i].setdefault('history', []).append({
                     'type': 'return', 'amount': str(-total_amount), 'timestamp': now_iso,
-                    'transaction_id': return_transaction_obj['id']
+                    'transaction_id': return_transaction['id']
                 })
                 break
                 
     save_json_data('transactions', transactions)
     save_json_data('inventory', inventory)
     save_json_data('kassas', kassas)
-    save_json_data('stock_movements', stock_movements)
     upload_db_to_hf('transactions')
     upload_db_to_hf('inventory')
     upload_db_to_hf('kassas')
-    upload_db_to_hf('stock_movements')
     
     flash("Возврат успешно оформлен.", "success")
     return redirect(url_for('cashier_dashboard', user_id=cashier_id))
 
-
 @app.route('/backup', methods=['POST'])
 def backup_hf():
     try:
@@ -999,14 +1006,13 @@ BASE_TEMPLATE = """
             .main-content { margin-left: 0; }
         }
         [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"] .card, [data-bs-theme="dark"] .modal-content, [data-bs-theme="dark"] .list-group-item, [data-bs-theme="dark"] .table { background-color: #343a40; }
         [data-bs-theme="dark"] .table-hover>tbody>tr:hover>* { color: var(--bs-table-hover-color); background-color: rgba(255, 255, 255, 0.075); }
-        .table-danger-light { background-color: #f8d7da; }
-        [data-bs-theme="dark"] .table-danger-light { background-color: #582123; }
-        .table-success-light { background-color: #d1e7dd; }
-        [data-bs-theme="dark"] .table-success-light { background-color: #143624; }
-        .table-warning-light { background-color: #fff3cd; }
-        [data-bs-theme="dark"] .table-warning-light { background-color: #533f00; }
+        .product-card { cursor: pointer; }
+        .product-card:hover { border-color: var(--bs-primary); }
+        .payback-positive { color: var(--bs-success); }
+        .payback-negative { color: var(--bs-danger); }
+        .payback-zero { color: var(--bs-secondary); }
     </style>
 </head>
 <body>
@@ -1018,8 +1024,15 @@ BASE_TEMPLATE = """
         <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 == '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 == 'profitability_report' %}active{% endif %}" href="{{ url_for('profitability_report') }}"><i class="fas fa-fw fa-balance-scale me-2"></i>Окупаемость</a></li>
+        <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle {% if request.endpoint in ['reports', 'product_roi_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">
+                <li><a class="dropdown-item" href="{{ url_for('reports') }}">Сводный отчет</a></li>
+                <li><a class="dropdown-item" href="{{ url_for('product_roi_report') }}">Окупаемость товаров</a></li>
+            </ul>
+        </li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint 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 == 'admin_panel' %}active{% endif %}" href="{{ url_for('admin_panel') }}"><i class="fas fa-fw fa-cogs me-2"></i>Админка</a></li>
     </ul>
@@ -1076,11 +1089,15 @@ BASE_TEMPLATE = """
   </div>
 </div>
 
-<div class="modal fade" id="variantSelectModal" tabindex="-1">
+<div class="modal fade" id="variantSelectModal" tabindex="-1" aria-hidden="true">
   <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>
-      <div class="modal-body" id="variantSelectBody">
+      <div class="modal-header">
+        <h5 class="modal-title" id="variantSelectModalTitle">Выберите вариант</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <div id="variant-list" class="list-group"></div>
       </div>
     </div>
   </div>
@@ -1126,13 +1143,21 @@ 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="Поиск по названию или ввод/сканирование штрих-кода...">
+                <input type="text" id="product-search" class="form-control mb-3" placeholder="Поиск по названию или штрих-коду...">
                 <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-id="{{ p.id }}" data-name="{{ p.name|lower }}" data-barcode="{{ p.barcode }}">
+                    <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">{{ format_currency_py(p.price) }} с</p>
+                            <p class="card-text fw-bold mb-0">
+                                {% if p.variants|length > 1 %}
+                                    от {{ format_currency_py(p.variants|map(attribute='price')|min) }} с
+                                {% elif p.variants|length == 1 %}
+                                    {{ format_currency_py(p.variants[0].price) }} с
+                                {% else %}
+                                    Нет в наличии
+                                {% endif %}
+                            </p>
                         </div>
                     </div>
                     {% endfor %}
@@ -1174,11 +1199,10 @@ document.addEventListener('DOMContentLoaded', () => {
     let isScannerPaused = false;
     const receiptModal = new bootstrap.Modal(document.getElementById('receiptModal'));
     const variantSelectModal = new bootstrap.Modal(document.getElementById('variantSelectModal'));
-    const variantSelectBody = document.getElementById('variantSelectBody');
 
     function playBeep() {
         if (!audioCtx) {
-            try { audioCtx = new (window.AudioContext || window.webkitContext)(); } 
+            try { audioCtx = new (window.AudioContext || window.webkitAudioContext)(); } 
             catch (e) { console.error("Web Audio API is not supported"); return; }
         }
         const oscillator = audioCtx.createOscillator();
@@ -1205,7 +1229,7 @@ document.addEventListener('DOMContentLoaded', () => {
             cartItemsEl.innerHTML += `
                 <div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
-                        <h6 class="mb-0 small">${item.name}</h6>
+                        <h6 class="mb-0 small">${item.productName} (${item.variantName})</h6>
                         <small>${item.quantity} x ${item.price} с</small>
                     </div>
                     <div>
@@ -1217,70 +1241,61 @@ document.addEventListener('DOMContentLoaded', () => {
         cartTotalEl.textContent = total.toLocaleString('ru-RU', {minimumFractionDigits: 2, maximumFractionDigits: 2}) + ' с';
     };
 
-    const addToCart = (product) => {
-        if (cart[product.id]) {
-            cart[product.id].quantity++;
+    const addToCart = (product, variant) => {
+        if (cart[variant.id]) {
+            cart[variant.id].quantity++;
         } else {
-            cart[product.id] = {
-                name: product.name,
-                price: String(product.price).replace('.',','),
+            cart[variant.id] = {
+                productId: product.id,
+                productName: product.name,
+                variantName: variant.option_value,
+                price: String(variant.price).replace('.',','),
                 quantity: 1
             };
         }
         playBeep();
         updateCartView();
     };
-
-    const processBarcode = (barcode) => {
+    
+    const handleProductSelection = (product) => {
+        if (!product.variants || product.variants.length === 0) {
+            alert("У этого товара нет доступных вариантов.");
+            return;
+        }
+        if (product.variants.length === 1) {
+            addToCart(product, product.variants[0]);
+        } else {
+            document.getElementById('variantSelectModalTitle').textContent = `Выберите вариант для "${product.name}"`;
+            const variantList = document.getElementById('variant-list');
+            variantList.innerHTML = '';
+            product.variants.forEach(variant => {
+                const btn = document.createElement('button');
+                btn.type = 'button';
+                btn.className = 'list-group-item list-group-item-action';
+                btn.innerHTML = `${variant.option_value} - <strong>${parseFloat(variant.price).toLocaleString('ru-RU', {minimumFractionDigits: 2})} с</strong> <span class="badge bg-secondary float-end">Остаток: ${variant.stock}</span>`;
+                btn.addEventListener('click', () => {
+                    addToCart(product, variant);
+                    variantSelectModal.hide();
+                });
+                variantList.appendChild(btn);
+            });
+            variantSelectModal.show();
+        }
+    };
+    
+    const fetchAndHandleProduct = (barcode) => {
         fetch(`/api/product_by_barcode/${barcode}`)
             .then(res => res.json())
             .then(data => {
-                if (!data.success) {
-                    alert(data.message);
-                    return;
-                }
-                if (data.is_variant) {
-                    variantSelectBody.innerHTML = '';
-                    data.variants.forEach(variant => {
-                        const btn = document.createElement('button');
-                        btn.className = 'btn btn-outline-primary w-100 mb-2';
-                        btn.textContent = `${variant.name} (${variant.stock} шт.)`;
-                        btn.onclick = () => {
-                            addToCart(variant);
-                            variantSelectModal.hide();
-                        };
-                        variantSelectBody.appendChild(btn);
-                    });
-                    variantSelectModal.show();
-                } else {
-                    addToCart(data.product);
-                }
-            })
-            .catch(err => alert(`Сетевая ошибка: ${err}`));
-    };
-
-    document.getElementById('product-search').addEventListener('keypress', e => {
-        if (e.key === 'Enter') {
-            e.preventDefault();
-            const barcode = e.target.value.trim();
-            if (barcode) {
-                processBarcode(barcode);
-                e.target.value = '';
-                e.target.blur();
-            }
-        }
-    });
+                if (data.success) handleProductSelection(data.product);
+                else alert(data.message);
+            });
+    }
 
     productGrid.addEventListener('click', e => {
         const card = e.target.closest('.product-card');
         if (card) {
-            fetch(`/api/product_by_barcode/${card.dataset.barcode}`)
-                .then(res => res.json())
-                .then(data => {
-                    if (data.success && !data.is_variant) addToCart(data.product);
-                    else if (data.success && data.is_variant) processBarcode(card.dataset.barcode);
-                    else alert(data.message);
-                });
+            fetchAndHandleProduct(card.dataset.barcode);
         }
     });
 
@@ -1304,8 +1319,9 @@ document.addEventListener('DOMContentLoaded', () => {
     document.getElementById('product-search').addEventListener('input', e => {
         const term = e.target.value.toLowerCase();
         document.querySelectorAll('.product-card').forEach(card => {
-            const show = card.dataset.name.includes(term) || card.dataset.barcode.includes(term);
-            card.style.display = show ? '' : 'none';
+            const productName = card.querySelector('.card-title').textContent.toLowerCase();
+            const show = productName.includes(term) || card.dataset.barcode.includes(term);
+            card.parentElement.style.display = show ? '' : 'none'; // Target parent if inside a grid wrapper
         });
     });
 
@@ -1365,8 +1381,8 @@ document.addEventListener('DOMContentLoaded', () => {
         scannerStatusEl.style.display = 'block';
         if (html5QrCode.getState() === 2) html5QrCode.pause();
 
-        processBarcode(decodedText);
-        
+        fetchAndHandleProduct(decodedText);
+
         setTimeout(() => {
             isScannerPaused = false;
             scannerStatusEl.style.display = 'none';
@@ -1400,47 +1416,68 @@ document.addEventListener('DOMContentLoaded', () => {
 """
 
 INVENTORY_CONTENT = """
-<button class="btn btn-primary mb-3" data-bs-toggle="modal" data-bs-target="#addProductModal"><i class="fas fa-plus me-2"></i>Добавить товар</button>
-<div class="card">
-    <div class="card-body">
-        <div class="table-responsive">
-            <table class="table table-hover">
-                <thead><tr><th>Название</th><th>Штрих-код</th><th>Цена</th><th>Себест.</th><th>Остаток</th><th>Действия</th></tr></thead>
-                <tbody>
-                {% for p in inventory %}
+<div class="d-flex justify-content-between mb-3">
+    <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addProductModal"><i class="fas fa-plus me-2"></i>Добавить товар</button>
+    <button class="btn btn-success" data-bs-toggle="modal" data-bs-target="#stockInModal"><i class="fas fa-truck-loading me-2"></i>Оприходовать</button>
+</div>
+
+<div class="accordion" id="inventoryAccordion">
+  {% for p in inventory %}
+  <div class="accordion-item">
+    <h2 class="accordion-header" id="heading-{{ p.id }}">
+      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-{{ p.id }}">
+        <strong>{{ p.name }}</strong>&nbsp;<small class="text-muted"> ({{ p.barcode }})</small>
+      </button>
+    </h2>
+    <div id="collapse-{{ p.id }}" class="accordion-collapse collapse" data-bs-parent="#inventoryAccordion">
+      <div class="accordion-body">
+        <div class="d-flex justify-content-end mb-2">
+            <button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal" data-bs-target="#editProductModal-{{ p.id }}"><i class="fas fa-edit me-1"></i>Редактировать товар</button>
+            <form action="{{ url_for('delete_product', product_id=p.id) }}" method="POST" class="d-inline ms-2" onsubmit="return confirm('Удалить товар?');">
+                <button type="submit" class="btn btn-sm btn-outline-danger"><i class="fas fa-trash"></i></button>
+            </form>
+        </div>
+        <table class="table table-sm table-bordered">
+            <thead><tr><th>Вариант</th><th>Цена</th><th>Себест.</th><th>Остаток</th></tr></thead>
+            <tbody>
+                {% for v in p.variants %}
                 <tr>
-                    <td>{{ p.name }}</td><td>{{ p.barcode }}</td><td>{{ format_currency_py(p.price) }} с</td><td>{{ format_currency_py(p.cost_price) }} с</td><td>{{ p.stock }}</td>
-                    <td>
-                        <button class="btn btn-sm btn-outline-success" data-bs-toggle="modal" data-bs-target="#stockInModal-{{ p.id }}" title="Оприходовать"><i class="fas fa-plus-circle"></i></button>
-                        <button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal" data-bs-target="#editProductModal-{{ p.id }}" title="Редактировать"><i class="fas fa-edit"></i></button>
-                        <form action="{{ url_for('delete_product', product_id=p.id) }}" method="POST" class="d-inline" onsubmit="return confirm('Удалить товар?');">
-                            <button type="submit" class="btn btn-sm btn-outline-danger" title="Удалить"><i class="fas fa-trash"></i></button>
-                        </form>
-                    </td>
+                    <td>{{ v.option_value }}</td>
+                    <td>{{ format_currency_py(v.price) }} с</td>
+                    <td>{{ format_currency_py(v.cost_price) }} с</td>
+                    <td>{{ v.stock }}</td>
                 </tr>
+                {% else %}
+                <tr><td colspan="4" class="text-center text-muted">Нет вариантов</td></tr>
                 {% endfor %}
-                </tbody>
-            </table>
-        </div>
+            </tbody>
+        </table>
+      </div>
     </div>
+  </div>
+  {% endfor %}
 </div>
 
+<!-- Add Product Modal -->
 <div class="modal fade" id="addProductModal" tabindex="-1">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <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('inventory_management') }}" method="POST">
         <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>
-            <div class="input-group"><input type="text" name="barcode" class="form-control barcode-input"><button type="button" class="btn btn-outline-secondary scan-modal-btn"><i class="fas fa-barcode"></i></button></div>
+          <div class="row">
+              <div class="col-md-6 mb-3"><label class="form-label">Название</label><input type="text" name="name" class="form-control" required></div>
+              <div class="col-md-6 mb-3"><label class="form-label">Штрих-код</label>
+                <div class="input-group"><input type="text" name="barcode" class="form-control barcode-input" required><button type="button" class="btn btn-outline-secondary scan-modal-btn"><i class="fas fa-barcode"></i></button></div>
+              </div>
           </div>
           <div id="modal-scanner-add" class="mb-2" style="display:none;"></div>
-          <div class="row">
-            <div class="col-6 mb-3"><label class="form-label">Цена</label><input type="text" name="price" class="form-control" inputmode="decimal" required></div>
-            <div class="col-6 mb-3"><label class="form-label">Себестоимость</label><input type="text" name="cost_price" class="form-control" inputmode="decimal"></div>
+          <hr>
+          <h6>Варианты товара</h6>
+          <div id="variants-container-add">
+            <!-- Variant fields will be added here by JS -->
           </div>
-          <div class="mb-3"><label class="form-label">Начальный остаток</label><input type="number" name="stock" class="form-control" value="0" step="1"></div>
+          <button type="button" class="btn btn-sm btn-outline-success mt-2" id="add-variant-btn-add">Добавить вариант</button>
         </div>
         <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
       </form>
@@ -1448,57 +1485,85 @@ INVENTORY_CONTENT = """
   </div>
 </div>
 
+<!-- Edit Product Modals -->
 {% for p in inventory %}
 <div class="modal fade" id="editProductModal-{{ p.id }}" tabindex="-1">
-  <div class="modal-dialog">
+  <div class="modal-dialog modal-lg">
     <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_product', product_id=p.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="{{ p.name }}" required></div>
-          <div class="mb-3"><label class="form-label">Штрих-код</label><input type="text" name="barcode" class="form-control" value="{{ p.barcode }}"></div>
           <div class="row">
-            <div class="col-6 mb-3"><label class="form-label">Цена</label><input type="text" name="price" class="form-control" value="{{ p.price|string|replace('.', ',') }}" inputmode="decimal" required></div>
-            <div class="col-6 mb-3"><label class="form-label">Себестоимость</label><input type="text" name="cost_price" value="{{ p.cost_price|string|replace('.', ',') }}" class="form-control" inputmode="decimal"></div>
+              <div class="col-md-6 mb-3"><label class="form-label">Название</label><input type="text" name="name" class="form-control" value="{{ p.name }}" required></div>
+              <div class="col-md-6 mb-3"><label class="form-label">Штрих-код</label><input type="text" name="barcode" class="form-control" value="{{ p.barcode }}" required></div>
           </div>
-          <div class="mb-3"><label class="form-label">Остаток</label><input type="number" name="stock" class="form-control" value="{{ p.stock }}" step="1"></div>
+          <hr>
+          <h6>Варианты товара</h6>
+          <div id="variants-container-edit-{{ p.id }}">
+            {% for v in p.variants %}
+            <div class="row g-2 mb-2 align-items-center variant-row">
+                <input type="hidden" name="variant_id[]" value="{{ v.id }}">
+                <div class="col-3"><input type="text" name="variant_name[]" class="form-control" placeholder="Название варианта" value="{{ v.option_value }}" required></div>
+                <div class="col"><input type="text" name="variant_price[]" class="form-control" placeholder="Цена" value="{{ v.price|string|replace('.', ',') }}" inputmode="decimal"></div>
+                <div class="col"><input type="text" name="variant_cost_price[]" class="form-control" placeholder="Себестоимость" value="{{ v.cost_price|string|replace('.', ',') }}" inputmode="decimal"></div>
+                <div class="col"><input type="number" name="variant_stock[]" class="form-control" placeholder="Остаток" value="{{ v.stock }}"></div>
+                <div class="col-auto"><button type="button" class="btn btn-sm btn-danger remove-variant-btn"><i class="fas fa-times"></i></button></div>
+            </div>
+            {% endfor %}
+          </div>
+          <button type="button" class="btn btn-sm btn-outline-success mt-2 add-variant-btn-edit" data-target-container="variants-container-edit-{{ p.id }}">Добавить вариант</button>
         </div>
         <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
       </form>
     </div>
   </div>
 </div>
-<div class="modal fade" id="stockInModal-{{ p.id }}" tabindex="-1">
+{% endfor %}
+
+<!-- Stock In Modal -->
+<div class="modal fade" id="stockInModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
-        <div class="modal-header"><h5 class="modal-title">Оприходование: {{ p.name }}</h5><button type="button" class="btn-close" data-bs-dismiss="modal"></button></div>
-        <form action="{{ url_for('stock_in') }}" method="POST">
-            <div class="modal-body">
-                <input type="hidden" name="product_id" value="{{ p.id }}">
-                <div class="mb-3">
-                    <label class="form-label">Текущий остаток:</label>
-                    <p class="form-control-plaintext"><strong>{{ p.stock }} шт.</strong></p>
-                </div>
-                <div class="mb-3">
-                    <label class="form-label" for="quantity-{{ p.id }}">Количество для добавления</label>
-                    <input type="number" id="quantity-{{ p.id }}" name="quantity" class="form-control" step="1" min="1" required>
+      <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('stock_in') }}" method="POST">
+        <div class="modal-body">
+            <div class="mb-3">
+                <label for="stockin-product" class="form-label">Товар</label>
+                <select id="stockin-product" name="product_id" class="form-select" required>
+                    <option value="">-- Выберите товар --</option>
+                    {% for p in inventory %}
+                    <option value="{{ p.id }}">{{ p.name }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="mb-3">
+                <label for="stockin-variant" class="form-label">Вариант</label>
+                <select id="stockin-variant" name="variant_id" class="form-select" required disabled>
+                    <option value="">-- Сначала выберите товар --</option>
+                </select>
+            </div>
+            <div class="row">
+                <div class="col-6 mb-3">
+                    <label for="stockin-quantity" class="form-label">Количество</label>
+                    <input type="number" id="stockin-quantity" name="quantity" class="form-control" required min="1">
                 </div>
-                <div class="mb-3">
-                    <label class="form-label" for="cost_price-{{ p.id }}">Себестоимость (за единицу)</label>
-                    <input type="text" id="cost_price-{{ p.id }}" name="cost_price" class="form-control" value="{{ p.cost_price|string|replace('.', ',') }}" inputmode="decimal" required>
+                <div class="col-6 mb-3">
+                    <label for="stockin-cost" class="form-label">Себестоимость (за ед.)</label>
+                    <input type="text" id="stockin-cost" name="cost_price" class="form-control" inputmode="decimal" placeholder="Необязательно">
                 </div>
             </div>
-            <div class="modal-footer"><button type="submit" class="btn btn-success">Оприходовать</button></div>
-        </form>
+        </div>
+        <div class="modal-footer"><button type="submit" class="btn btn-primary">Оприходовать</button></div>
+      </form>
     </div>
   </div>
 </div>
-{% endfor %}
 """
 
 INVENTORY_SCRIPTS = """
 <script>
 document.addEventListener('DOMContentLoaded', () => {
+    // --- Barcode Scanner Logic for Modals ---
     let currentScanner = null;
     let currentScannerContainer = null;
     document.querySelectorAll('.scan-modal-btn').forEach(btn => {
@@ -1508,7 +1573,7 @@ document.addEventListener('DOMContentLoaded', () => {
             const barcodeInput = form.querySelector('.barcode-input');
             
             if (currentScanner) {
-                currentScanner.stop();
+                try { currentScanner.stop(); } catch(e) {}
                 currentScanner = null;
                 if(currentScannerContainer) currentScannerContainer.style.display = 'none';
                 return;
@@ -1516,17 +1581,17 @@ document.addEventListener('DOMContentLoaded', () => {
             scannerContainer.style.display = 'block';
             currentScannerContainer = scannerContainer;
             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;
             const onScanSuccess = (decodedText, decodedResult) => {
                 barcodeInput.value = decodedText;
-                html5QrCode.stop();
+                try { html5QrCode.stop(); } catch(e) {}
                 currentScanner = null;
                 scannerContainer.style.display = 'none';
             };
-            html5QrCode.start({ facingMode: "environment" }, { fps: 10, qrbox: 250 }, onScanSuccess);
+            html5QrCode.start({ facingMode: "environment" }, { fps: 10, qrbox: { width: 250, height: 250 } }, onScanSuccess);
         });
     });
     
@@ -1542,6 +1607,70 @@ document.addEventListener('DOMContentLoaded', () => {
              }
         });
     });
+    
+    // --- Dynamic Variant Fields Logic ---
+    const createVariantRow = () => {
+        const div = document.createElement('div');
+        div.className = 'row g-2 mb-2 align-items-center variant-row';
+        div.innerHTML = `
+            <input type="hidden" name="variant_id[]" value="">
+            <div class="col-3"><input type="text" name="variant_name[]" class="form-control" placeholder="Название варианта" required></div>
+            <div class="col"><input type="text" name="variant_price[]" class="form-control" placeholder="Цена" inputmode="decimal"></div>
+            <div class="col"><input type="text" name="variant_cost_price[]" class="form-control" placeholder="Себестоимость" inputmode="decimal"></div>
+            <div class="col"><input type="number" name="variant_stock[]" class="form-control" placeholder="Остаток" value="0"></div>
+            <div class="col-auto"><button type="button" class="btn btn-sm btn-danger remove-variant-btn"><i class="fas fa-times"></i></button></div>
+        `;
+        div.querySelector('.remove-variant-btn').addEventListener('click', () => div.remove());
+        return div;
+    };
+
+    document.getElementById('add-variant-btn-add').addEventListener('click', () => {
+        document.getElementById('variants-container-add').appendChild(createVariantRow());
+    });
+    
+    document.querySelectorAll('.add-variant-btn-edit').forEach(btn => {
+        btn.addEventListener('click', (e) => {
+            const containerId = e.target.dataset.targetContainer;
+            document.getElementById(containerId).appendChild(createVariantRow());
+        });
+    });
+    
+    document.querySelectorAll('.remove-variant-btn').forEach(btn => {
+        btn.addEventListener('click', e => e.target.closest('.variant-row').remove());
+    });
+    
+    // Auto-add first variant row on add modal show
+    const addProductModal = document.getElementById('addProductModal');
+    addProductModal.addEventListener('shown.bs.modal', () => {
+        const container = document.getElementById('variants-container-add');
+        if (container.children.length === 0) {
+            container.appendChild(createVariantRow());
+        }
+    });
+
+    // --- Stock In Modal Logic ---
+    const inventoryData = JSON.parse('{{ inventory|tojson|safe }}');
+    const productSelect = document.getElementById('stockin-product');
+    const variantSelect = document.getElementById('stockin-variant');
+
+    productSelect.addEventListener('change', () => {
+        const productId = productSelect.value;
+        variantSelect.innerHTML = '<option value="">-- Выберите вариант --</option>';
+        variantSelect.disabled = true;
+
+        if (productId) {
+            const product = inventoryData.find(p => p.id === productId);
+            if (product && product.variants) {
+                product.variants.forEach(v => {
+                    const option = document.createElement('option');
+                    option.value = v.id;
+                    option.textContent = v.option_value;
+                    variantSelect.appendChild(option);
+                });
+                variantSelect.disabled = false;
+            }
+        }
+    });
 });
 </script>
 """
@@ -1659,57 +1788,48 @@ REPORTS_CONTENT = """
 
 REPORTS_SCRIPTS = ""
 
-PROFITABILITY_REPORT_CONTENT = """
+PRODUCT_ROI_CONTENT = """
 <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-0">
         <div class="table-responsive">
             <table class="table table-hover table-sm mb-0">
-                <thead>
+                <thead class="table-light">
                     <tr>
-                        <th>Товар</th>
+                        <th>Товар (вариант)</th>
                         <th class="text-end">Продано, шт</th>
                         <th class="text-end">Выручка</th>
-                        <th class="text-end">Инвестировано</th>
-                        <th class="text-end">Остаток на складе (в деньгах)</th>
-                        <th class="text-end">Статус окупаемости</th>
-                        <th class="text-end">Итоговый результат</th>
+                        <th class="text-end">Стоимость на складе</th>
+                        <th class="text-end">Общие вложения</th>
+                        <th class="text-end">Результат (Окупаемость)</th>
                     </tr>
                 </thead>
                 <tbody>
-                {% for p in profit_data %}
-                    {% set status_class = 'table-warning-light' %}
-                    {% if p.payback_status > 0 %}
-                        {% set status_class = 'table-success-light' %}
-                    {% elif p.payback_status < 0 %}
-                        {% set status_class = 'table-danger-light' %}
-                    {% endif %}
-                    <tr class="{{ status_class }}">
-                        <td>{{ p.name }} <br><small class="text-muted">{{ p.barcode }}</small></td>
-                        <td class="text-end">{{ p.total_sold_qty }}</td>
-                        <td class="text-end">{{ format_currency_py(p.total_revenue) }}</td>
-                        <td class="text-end">{{ format_currency_py(p.total_investment) }}</td>
-                        <td class="text-end">{{ format_currency_py(p.current_stock_value) }}</td>
-                        <td class="text-end fw-bold">{{ format_currency_py(p.payback_status) }}</td>
-                        <td class="text-end fw-bold">{{ format_currency_py(p.net_result) }}</td>
+                {% for item in stats %}
+                    <tr>
+                        <td><strong>{{ item.name }}</strong><br><small class="text-muted">{{ item.variant_name }}</small></td>
+                        <td class="text-end">{{ item.total_qty_sold }}</td>
+                        <td class="text-end">{{ format_currency_py(item.total_revenue) }} с</td>
+                        <td class="text-end">{{ format_currency_py(item.inventory_value) }} с</td>
+                        <td class="text-end text-secondary">{{ format_currency_py(item.total_investment) }} с</td>
+                        <td class="text-end fw-bold 
+                            {% if item.payback > 0 %}payback-positive
+                            {% elif item.payback < 0 %}payback-negative
+                            {% else %}payback-zero{% endif %}">
+                            {{ format_currency_py(item.payback) }} с
+                        </td>
                     </tr>
                 {% else %}
-                    <tr><td colspan="7" class="text-center text-muted">Нет данных для анализа.</td></tr>
+                    <tr><td colspan="6" class="text-center">Нет данных для анализа.</td></tr>
                 {% endfor %}
                 </tbody>
             </table>
         </div>
     </div>
     <div class="card-footer small text-muted">
-        <ul class="list-unstyled mb-0">
-            <li><strong>Выручка:</strong> Сумма всех продаж по товару (с учетом возвратов).</li>
-            <li><strong>Инвестировано:</strong> Общая сумма закупки товара (себестоимость * количество).</li>
-            <li><strong>Остаток на складе (в деньгах):</strong> Текущий остаток * последняя себестоимость.</li>
-            <li><strong>Статус окупаемости:</strong> Выручка - Инвестировано. Показы��ает, окупились ли уже вложенные в товар деньги.</li>
-            <li><strong>Итоговый результат:</strong> (Выручка + Остаток на складе) - Инвестировано. Показывает итоговую прибыль/убыток по товару.</li>
-        </ul>
+        <i class="fas fa-info-circle me-1"></i>
+        <strong>Общие вложения</strong> = Себестоимость проданных товаров + Стоимость текущих остатков на складе.
+        <strong>Результат</strong> = Выручка - Общие вложения.
     </div>
 </div>
 """