Update app.py

app.py

@@ -89,7 +89,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]
@@ -232,22 +232,15 @@ def sales_screen():
     inventory = load_json_data('inventory')
     kassas = load_json_data('kassas')
     
-    active_inventory = []
+    active_inventory =[]
     for p in inventory:
-        if isinstance(p, dict) and any(v.get('stock', 0) > 0 for v in p.get('variants', [])):
+        if isinstance(p, dict) and any(v.get('stock', 0) > 0 for v in p.get('variants',[])):
             active_inventory.append(p)
 
     active_inventory.sort(key=lambda x: x.get('name', '').lower())
 
-    grouped_inventory = defaultdict(list)
-    for p in active_inventory:
-        first_letter = p.get('name', '#')[0].upper()
-        grouped_inventory[first_letter].append(p)
-
-    sorted_grouped_inventory = sorted(grouped_inventory.items())
-
     html = BASE_TEMPLATE.replace('__TITLE__', "Касса").replace('__CONTENT__', SALES_SCREEN_CONTENT).replace('__SCRIPTS__', SALES_SCREEN_SCRIPTS)
-    return render_template_string(html, inventory=active_inventory, kassas=kassas, grouped_inventory=sorted_grouped_inventory)
+    return render_template_string(html, inventory=active_inventory, kassas=kassas)
 
 @app.route('/inventory', methods=['GET', 'POST'])
 @admin_required
@@ -316,7 +309,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', '0'))
@@ -359,7 +352,7 @@ def edit_product(product_id):
                 inventory[i]['name'] = name
                 inventory[i]['barcode'] = barcode
                 
-                new_variants = []
+                new_variants =[]
                 variant_ids = request.form.getlist('variant_id[]')
                 variant_names = request.form.getlist('variant_name[]')
                 variant_prices = request.form.getlist('variant_price[]')
@@ -402,7 +395,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')
@@ -433,7 +426,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', '')
                 
@@ -534,7 +527,7 @@ def complete_sale():
         if not user or not kassa:
             return jsonify({'success': False, 'message': 'Кассир или касса не найдены.'}), 404
 
-        sale_items = []
+        sale_items =[]
         total_amount = Decimal('0.00')
         inventory_updates = {}
 
@@ -563,7 +556,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
             
@@ -635,7 +628,7 @@ def complete_sale():
                     current_balance = to_decimal(k.get('balance', '0'))
                     kassas[i]['balance'] = str(current_balance + total_amount)
                     if 'history' not in kassas[i] or not isinstance(kassas[i]['history'], list):
-                        kassas[i]['history'] = []
+                        kassas[i]['history'] =[]
                     kassas[i]['history'].append({
                         'type': 'sale',
                         'amount': str(total_amount),
@@ -686,13 +679,13 @@ def transaction_history():
     transactions = load_json_data('transactions')
     kassas = load_json_data('kassas')
     
-    filtered_transactions = [
+    filtered_transactions =[
         t for t in transactions 
         if datetime.fromisoformat(t['timestamp']).date() == selected_date
     ]
     
     if selected_kassa_id:
-        filtered_transactions = [
+        filtered_transactions =[
             t for t in filtered_transactions
             if t.get('kassa_id') == selected_kassa_id
         ]
@@ -702,7 +695,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)
@@ -715,7 +708,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')
@@ -770,7 +763,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(),
@@ -801,14 +794,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)
@@ -826,14 +819,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')
@@ -870,15 +863,15 @@ 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
     ]
@@ -949,10 +942,10 @@ def product_roi_report():
     inventory = load_json_data('inventory')
     transactions = load_json_data('transactions')
 
-    product_stats = []
+    product_stats =[]
 
     for product in inventory:
-        for variant in product.get('variants', []):
+        for variant in product.get('variants',[]):
             total_revenue = Decimal('0.00')
             total_cogs = Decimal('0.00')
             total_qty_sold = 0
@@ -1087,7 +1080,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:
@@ -1125,7 +1118,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),
@@ -1209,7 +1202,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')
@@ -1301,7 +1294,7 @@ def end_shift():
             kassa = find_item_by_field(kassas, 'id', shift['kassa_id'])
             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'])
             ]
@@ -1332,7 +1325,7 @@ def cashier_dashboard(user_id):
         abort(404, "Кассир не найден")
     
     transactions = load_json_data('transactions')
-    user_transactions = [t for t in transactions if t.get('user_id') == user_id]
+    user_transactions =[t for t in transactions if t.get('user_id') == user_id]
     user_transactions.sort(key=lambda x: x['timestamp'], reverse=True)
     
     html = BASE_TEMPLATE.replace('__TITLE__', f"Продажи кассира: {user['name']}").replace('__CONTENT__', CASHIER_DASHBOARD_CONTENT).replace('__SCRIPTS__', '')
@@ -1360,14 +1353,14 @@ def return_transaction(transaction_id):
 
     total_amount = to_decimal(original_transaction['total_amount'])
     
-    return_items = []
+    return_items =[]
     inventory_updates = {}
     for item in original_transaction['items']:
         return_items.append({**item, 'quantity': -item['quantity'], 'total': str(-to_decimal(item['total']))})
         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', item['variant_id'])
+                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']}
 
@@ -1398,7 +1391,7 @@ def return_transaction(transaction_id):
     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
@@ -1410,7 +1403,7 @@ def return_transaction(transaction_id):
             if k['id'] == original_transaction['kassa_id']:
                 current_balance = to_decimal(k.get('balance', '0'))
                 kassas[i]['balance'] = str(current_balance - total_amount)
-                kassas[i].setdefault('history', []).append({
+                kassas[i].setdefault('history',[]).append({
                     'type': 'return', 'amount': str(-total_amount), 'timestamp': now_iso,
                     'transaction_id': return_transaction['id']
                 })
@@ -1440,7 +1433,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]
@@ -1500,13 +1493,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"] .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"] 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"] .text-dark { color: #dee2e6 !important; }
         .product-card { cursor: pointer; }
         .product-card:hover { border-color: var(--bs-primary); }
@@ -1525,7 +1515,7 @@ BASE_TEMPLATE = """
         <li class="nav-item"><a class="nav-link {% if request.endpoint == 'inventory_management' %}active{% endif %}" href="{{ url_for('inventory_management') }}"><i class="fas fa-fw fa-boxes me-2"></i>Склад</a></li>
         <li class="nav-item"><a class="nav-link {% if request.endpoint == 'transaction_history' %}active{% endif %}" href="{{ url_for('transaction_history') }}"><i class="fas fa-fw fa-history me-2"></i>Транзакции</a></li>
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle {% if request.endpoint in ['reports', 'product_roi_report'] %}active{% endif %}" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            <a class="nav-link dropdown-toggle {% if request.endpoint in['reports', 'product_roi_report'] %}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">
@@ -1533,8 +1523,8 @@ BASE_TEMPLATE = """
                 <li><a class="dropdown-item" href="{{ url_for('product_roi_report') }}">Окупаемость товаров</a></li>
             </ul>
         </li>
-        <li class="nav-item"><a class="nav-link {% if request.endpoint 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['cashier_login', 'cashier_dashboard'] %}active{% endif %}" href="{{ url_for('cashier_login') }}"><i class="fas fa-fw fa-user-circle me-2"></i>Кабинет кассира</a></li>
+        <li class="nav-item"><a class="nav-link {% if request.endpoint in['admin_panel', 'admin_shifts'] %}active{% endif %}" href="{{ url_for('admin_panel') }}"><i class="fas fa-fw fa-cogs me-2"></i>Админка</a></li>
         {% if session.admin_logged_in %}
         <li class="nav-item"><a class="nav-link" href="{{ url_for('admin_logout') }}"><i class="fas fa-fw fa-sign-out-alt me-2"></i>Выйти (Админ)</a></li>
         {% endif %}
@@ -1651,36 +1641,7 @@ SALES_SCREEN_CONTENT = """
                 </div>
                 <input type="text" id="product-search" class="form-control mb-3" placeholder="Поиск по названию или штрих-коду...">
                 
-                <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')|min) }} с
-                                            {% elif p.variants|length == 1 %}
-                                                {{ format_currency_py(p.variants[0].price) }} с
-                                            {% else %}
-                                                Нет в наличии
-                                            {% endif %}
-                                        </p>
-                                    </div>
-                                </div>
-                                {% endfor %}
-                            </div>
-                        </div>
-                    </div>
-                    {% endfor %}
+                <div id="product-grid" class="d-grid gap-2" style="grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); max-height: 65vh; overflow-y: auto;">
                 </div>
             </div>
         </div>
@@ -1764,12 +1725,14 @@ SALES_SCREEN_SCRIPTS = """
 <script>
 document.addEventListener('DOMContentLoaded', () => {
     const cart = {};
-    const productGrid = document.getElementById('product-accordion');
+    const productGrid = document.getElementById('product-grid');
     const cartItemsEl = document.getElementById('cart-items');
     const cartTotalEl = document.getElementById('cart-total');
     let audioCtx;
     let isScannerPaused = false;
     
+    const activeInventory = JSON.parse('{{ inventory|tojson|safe }}');
+    
     const receiptModal = new bootstrap.Modal(document.getElementById('receiptModal'));
     const variantSelectModal = new bootstrap.Modal(document.getElementById('variantSelectModal'));
     const cashierLoginModal = new bootstrap.Modal(document.getElementById('cashierLoginModal'));
@@ -1803,6 +1766,40 @@ document.addEventListener('DOMContentLoaded', () => {
         return parseFloat(String(stringNumber).replace(/\\s/g, '').replace(',', '.')) || 0;
     }
 
+    const renderProducts = (products) => {
+        const toRender = products.slice(0, 200);
+        productGrid.innerHTML = toRender.map(p => {
+            let priceStr = 'Нет в наличии';
+            if(p.variants && p.variants.length > 1) {
+                const minPrice = Math.min(...p.variants.map(v => parseLocaleNumber(v.price)));
+                priceStr = 'от ' + minPrice.toLocaleString('ru-RU', {minimumFractionDigits: 2}) + ' с';
+            } else if(p.variants && p.variants.length === 1) {
+                priceStr = parseLocaleNumber(p.variants[0].price).toLocaleString('ru-RU', {minimumFractionDigits: 2}) + ' с';
+            }
+            return `<div class="card text-center product-card" data-barcode="${p.barcode}">
+                <div class="card-body p-2">
+                    <h6 class="card-title small mb-1">${p.name}</h6>
+                    <p class="card-text fw-bold mb-0">${priceStr}</p>
+                </div>
+            </div>`;
+        }).join('');
+    };
+
+    renderProducts(activeInventory);
+
+    document.getElementById('product-search').addEventListener('input', e => {
+        const term = e.target.value.toLowerCase().trim();
+        if(!term) {
+            renderProducts(activeInventory);
+            return;
+        }
+        const filtered = activeInventory.filter(p =>
+            (p.name && p.name.toLowerCase().includes(term)) ||
+            (p.barcode && p.barcode.toLowerCase().includes(term))
+        );
+        renderProducts(filtered);
+    });
+
     const updateCartView = () => {
         cartItemsEl.innerHTML = '';
         let total = 0;
@@ -1941,32 +1938,6 @@ document.addEventListener('DOMContentLoaded', () => {
         updateCartView();
     });
 
-    document.getElementById('product-search').addEventListener('input', e => {
-        const term = e.target.value.toLowerCase();
-        const productCards = document.querySelectorAll('#product-accordion .product-card');
-        productCards.forEach(card => {
-            const productName = card.querySelector('.card-title').textContent.toLowerCase();
-            const barcode = card.dataset.barcode.toLowerCase();
-            const show = productName.includes(term) || barcode.includes(term);
-            card.style.display = show ? '' : 'none';
-        });
-        document.querySelectorAll('#product-accordion .accordion-item').forEach(accordionItem => {
-            const collapseElement = accordionItem.querySelector('.accordion-collapse');
-            const matchingCardsInGroup = accordionItem.querySelectorAll('.product-card:not([style*="display: none"])');
-            const bsCollapse = bootstrap.Collapse.getOrCreateInstance(collapseElement, { toggle: false });
-
-            if (term === '') {
-                bsCollapse.hide(); 
-            } else {
-                if (matchingCardsInGroup.length > 0) {
-                    bsCollapse.show();
-                } else {
-                    bsCollapse.hide();
-                }
-            }
-        });
-    });
-
     const completeSale = (paymentMethod) => {
         if (!session.shift || !session.cashier || !session.kassa) {
             alert('Смена не активна. Начните смену, чтобы проводить продажи.');
@@ -2354,6 +2325,14 @@ INVENTORY_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('stock_in') }}" method="POST">
         <div class="modal-body">
+            <div class="mb-3">
+                <label class="form-label">Поиск по штрих-коду</label>
+                <div class="input-group">
+                    <input type="text" id="stockin-barcode" class="form-control barcode-input" placeholder="Отсканируйте или введите">
+                    <button type="button" class="btn btn-outline-secondary scan-modal-btn"><i class="fas fa-barcode"></i></button>
+                </div>
+            </div>
+            <div id="modal-scanner-stockin" class="mb-2" style="display:none;"></div>
             <div class="mb-3">
                 <label for="stockin-product" class="form-label">Товар</label>
                 <select id="stockin-product" name="product_id" class="form-select" required>
@@ -2402,31 +2381,42 @@ document.addEventListener('DOMContentLoaded', () => {
     document.querySelectorAll('.scan-modal-btn').forEach(btn => {
         btn.addEventListener('click', e => {
             const form = e.target.closest('form');
-            const scannerContainer = form.querySelector('[id^="modal-scanner-"]');
-            const barcodeInput = form.querySelector('.barcode-input');
-            
-            if (currentScanner) {
-                try { currentScanner.stop(); } catch(e) {}
-                currentScanner = null;
-                if(currentScannerContainer) currentScannerContainer.style.display = 'none';
-                return;
+            if(!form) {
+                const modal = e.target.closest('.modal-content');
+                const scannerContainer = modal.querySelector('[id^="modal-scanner-"]');
+                const barcodeInput = modal.querySelector('.barcode-input');
+                toggleScanner(scannerContainer, barcodeInput);
+            } else {
+                const scannerContainer = form.querySelector('[id^="modal-scanner-"]');
+                const barcodeInput = form.querySelector('.barcode-input');
+                toggleScanner(scannerContainer, barcodeInput);
             }
-            scannerContainer.style.display = 'block';
-            currentScannerContainer = scannerContainer;
-            const scannerId = scannerContainer.id + '-reader';
-            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;
-                try { html5QrCode.stop(); } catch(e) {}
-                currentScanner = null;
-                scannerContainer.style.display = 'none';
-            };
-            html5QrCode.start({ facingMode: "environment" }, { fps: 10, qrbox: { width: 250, height: 250 } }, onScanSuccess);
         });
     });
+
+    function toggleScanner(scannerContainer, barcodeInput) {
+        if (currentScanner) {
+            try { currentScanner.stop(); } catch(e) {}
+            currentScanner = null;
+            if(currentScannerContainer) currentScannerContainer.style.display = 'none';
+            return;
+        }
+        scannerContainer.style.display = 'block';
+        currentScannerContainer = scannerContainer;
+        const scannerId = scannerContainer.id + '-reader';
+        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;
+            barcodeInput.dispatchEvent(new Event('input'));
+            try { html5QrCode.stop(); } catch(e) {}
+            currentScanner = null;
+            scannerContainer.style.display = 'none';
+        };
+        html5QrCode.start({ facingMode: "environment" }, { fps: 10, qrbox: { width: 250, height: 250 } }, onScanSuccess);
+    }
     
     document.querySelectorAll('.modal').forEach(modal => {
         modal.addEventListener('hidden.bs.modal', () => {
@@ -2452,7 +2442,7 @@ document.addEventListener('DOMContentLoaded', () => {
         const formData = new FormData();
         formData.append('image', file);
         
-        preview.src = "data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw=="; // Spinner
+        preview.src = "data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw=="; 
 
         fetch("{{ url_for('upload_image') }}", {
             method: 'POST',
@@ -2528,6 +2518,18 @@ document.addEventListener('DOMContentLoaded', () => {
     const inventoryData = JSON.parse('{{ inventory|tojson|safe }}');
     const productSelect = document.getElementById('stockin-product');
     const variantSelect = document.getElementById('stockin-variant');
+    const stockinBarcode = document.getElementById('stockin-barcode');
+
+    if (stockinBarcode) {
+        stockinBarcode.addEventListener('input', (e) => {
+            const term = e.target.value.trim().toLowerCase();
+            const product = inventoryData.find(p => (p.barcode || '').toLowerCase() === term);
+            if (product) {
+                productSelect.value = product.id;
+                productSelect.dispatchEvent(new Event('change'));
+            }
+        });
+    }
 
     productSelect.addEventListener('change', () => {
         const productId = productSelect.value;
@@ -2692,7 +2694,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
     document.getElementById('save-trans-btn').addEventListener('click', () => {
         const form = document.getElementById('edit-trans-form');
-        const items_update = [];
+        const items_update =[];
         form.querySelectorAll('tbody tr').forEach(row => {
             items_update.push({
                 id: row.dataset.itemId,