Update app.py

app.py

@@ -140,7 +140,7 @@ def load_data():
                     'logo_url': DEFAULT_LOGO_URL,
                     'whatsapp_number': DEFAULT_WHATSAPP_NUMBER,
                     'track_inventory': False,
-                    'enable_barcodes': False,
+                    'use_barcodes': False,
                     'business_type': 'mixed',
                     'system_mode': 'both',
                     'customer_fields': {
@@ -173,7 +173,7 @@ def load_data():
         if 'logo_url' not in settings: settings['logo_url'] = DEFAULT_LOGO_URL; changed = True
         if 'whatsapp_number' not in settings: settings['whatsapp_number'] = DEFAULT_WHATSAPP_NUMBER; changed = True
         if 'track_inventory' not in settings: settings['track_inventory'] = False; changed = True
-        if 'enable_barcodes' not in settings: settings['enable_barcodes'] = False; changed = True
+        if 'use_barcodes' not in settings: settings['use_barcodes'] = False; changed = True
         if 'business_type' not in settings: settings['business_type'] = 'mixed'; changed = True
         if 'system_mode' not in settings: settings['system_mode'] = 'both'; changed = True
         if 'customer_fields' not in settings:
@@ -204,8 +204,7 @@ def load_data():
         for order_id, order in env_data['orders'].items():
             if 'status' not in order: order['status'] = 'confirmed'; changed = True
             if 'staff_name' not in order: order['staff_name'] = ''; changed = True
-            for item in order.get('cart', []):
-                if 'assembled' not in item: item['assembled'] = 0; changed = True
+            if 'assembled' not in order: order['assembled'] = {}; changed = True
 
     if changed or not os.path.exists(DATA_FILE):
         try:
@@ -242,7 +241,7 @@ def get_env_data(env_id):
                 'logo_url': DEFAULT_LOGO_URL,
                 'whatsapp_number': DEFAULT_WHATSAPP_NUMBER,
                 'track_inventory': False,
-                'enable_barcodes': False,
+                'use_barcodes': False,
                 'business_type': 'mixed',
                 'system_mode': 'both',
                 'customer_fields': {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
@@ -441,7 +440,7 @@ CATALOG_TEMPLATE = '''
         .search-bar { padding: 15px 20px; background: var(--surface); border-bottom: 1px solid var(--border); }
         .search-container { position: relative; display: flex; align-items: center; background: var(--bg); border-radius: 12px; padding: 0 15px; border: 1px solid transparent; transition: all 0.2s; }
         .search-container:focus-within { border-color: #dcdde1; background: var(--surface); box-shadow: 0 4px 12px rgba(0,0,0,0.05); }
-        .search-container i { color: var(--text-muted); font-size: 0.9rem; }
+        .search-container i.fa-search { color: var(--text-muted); font-size: 0.9rem; }
         .search-bar input { width: 100%; padding: 12px 10px; border: none; background: transparent; outline: none; font-size: 0.95rem; }
         
         .categories-container { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 15px; padding: 20px; }
@@ -532,7 +531,7 @@ CATALOG_TEMPLATE = '''
         .btn-float-ig { background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 45%, #d6249f 60%, #285AEB 90%); }
         .btn-float-tg { background: #0088cc; }
         .btn-float-returns { background: #e17055; }
-        .btn-float-assembly { background: #0984e3; }
+        .btn-float-history { background: #0984e3; }
 
         .staff-banner { background: #ffeaa7; color: #d63031; text-align: center; padding: 10px; font-weight: 600; font-size: 0.9rem; }
         .returns-list { display: flex; flex-direction: column; gap: 15px; }
@@ -540,9 +539,8 @@ CATALOG_TEMPLATE = '''
         .return-item-row { display: flex; justify-content: space-between; align-items: center; margin-top: 10px; font-size: 0.9rem; border-top: 1px dashed #ccc; padding-top: 10px; }
         .return-input { width: 50px; padding: 5px; border: 1px solid #ccc; border-radius: 6px; text-align: center; }
         .process-return-btn { background: #e17055; color: white; border: none; padding: 8px 15px; border-radius: 8px; cursor: pointer; margin-top: 10px; width: 100%; font-weight: 600; }
-
-        #scannerModal .modal-content { max-height: none; background: #fff; }
-        #reader { width: 100%; min-height: 300px; margin-top: 10px; }
+        
+        .history-btn { background: #0984e3; color: white; border: none; padding: 8px 15px; border-radius: 8px; cursor: pointer; margin-top: 10px; width: 100%; font-weight: 600; text-decoration: none; display: block; text-align: center; box-sizing: border-box; }
 
         @media (min-width: 768px) {
             .categories-container { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); }
@@ -573,8 +571,8 @@ CATALOG_TEMPLATE = '''
         <div class="search-container">
             <i class="fas fa-search"></i>
             <input type="text" id="searchInput" placeholder="Поиск товаров..." oninput="filterCategories()">
-            {% if settings.enable_barcodes %}
-            <i class="fas fa-qrcode" style="cursor:pointer; padding:5px 10px; font-size:1.1rem; color:var(--primary);" onclick="openScanner('search')"></i>
+            {% if settings.use_barcodes %}
+            <i class="fas fa-barcode" style="cursor:pointer; padding: 10px; color: var(--primary);" onclick="startScanner(val => { document.getElementById('searchInput').value = val; filterCategories(); })"></i>
             {% endif %}
         </div>
     </div>
@@ -584,7 +582,7 @@ CATALOG_TEMPLATE = '''
 
     <div class="floating-socials">
         {% if mode == 'pos' and staff_id %}
-        <a href="#" class="social-btn btn-float-assembly" onclick="openAssemblyModal()"><i class="fas fa-tasks"></i></a>
+        <a href="#" class="social-btn btn-float-history" onclick="openStaffHistoryModal()"><i class="fas fa-list-alt"></i></a>
         <a href="#" class="social-btn btn-float-returns" onclick="openReturnsModal()"><i class="fas fa-undo"></i></a>
         {% endif %}
         {% if mode != 'pos' %}
@@ -644,32 +642,22 @@ CATALOG_TEMPLATE = '''
             </div>
         </div>
     </div>
-
-    <div class="modal-overlay" id="assemblyModal" onclick="if(event.target === this) closeAssemblyModal()">
+    
+    <div class="modal-overlay" id="staffHistoryModal" onclick="if(event.target === this) closeStaffHistoryModal()">
         <div class="modal-content">
             <div class="modal-header">
-                <h2>Сборка накладных</h2>
-                <button class="modal-close" onclick="closeAssemblyModal()"><i class="fas fa-times"></i></button>
+                <h2>Мои накладные</h2>
+                <button class="modal-close" onclick="closeStaffHistoryModal()"><i class="fas fa-times"></i></button>
             </div>
-            <div style="margin-bottom:15px;">
-                <input type="date" id="assemblyDateInput" onchange="loadAssemblyOrders()" style="padding:10px; border-radius:8px; border:1px solid #ccc; width:100%;">
+            <div style="margin-bottom: 15px; display:flex; gap:10px;">
+                <input type="date" id="historyDateFilter" style="padding: 10px; border: 1px solid var(--border); border-radius: 8px; flex: 1;" onchange="loadStaffHistory()">
             </div>
-            <div id="assemblyContent" class="returns-list">
+            <div id="staffHistoryContent" class="returns-list">
                 <div style="text-align:center; padding:20px;"><i class="fas fa-spinner fa-spin"></i> Загрузка...</div>
             </div>
         </div>
     </div>
 
-    <div class="modal-overlay" id="scannerModal">
-        <div class="modal-content" style="max-height:90vh;">
-            <div class="modal-header">
-                <h2>Сканер штрихкода</h2>
-                <button class="modal-close" onclick="closeScanner()"><i class="fas fa-times"></i></button>
-            </div>
-            <div id="reader"></div>
-        </div>
-    </div>
-
     <div class="gallery-modal" id="galleryModal">
         <button class="gallery-close" onclick="closeGallery()"><i class="fas fa-times"></i></button>
         <div class="gallery-img-container" id="gallerySwipeArea">
@@ -679,6 +667,14 @@ CATALOG_TEMPLATE = '''
         </div>
         <div class="gallery-dots" id="galleryDots"></div>
     </div>
+    
+    <div class="modal-overlay" id="scannerModal" style="z-index:9999;">
+        <div style="background:#fff; padding:20px; border-radius:12px; width:100%; max-width:400px; text-align:center; position:absolute; top:50%; left:50%; transform:translate(-50%, -50%);">
+            <h3 style="margin-top:0;">Сканирование</h3>
+            <div id="reader" style="width:100%; min-height:300px; margin-bottom:15px;"></div>
+            <button class="btn btn-danger" style="background:#ff7675; color:white; border:none; padding:10px 20px; border-radius:8px; font-weight:bold; cursor:pointer;" onclick="stopScanner()">Отмена</button>
+        </div>
+    </div>
 
     <script>
         const products = {{ products_json|safe }};
@@ -688,7 +684,7 @@ CATALOG_TEMPLATE = '''
         const envId = '{{ env_id }}';
         const mode = '{{ mode }}';
         const staffId = '{{ staff_id }}';
-        const trackInventory = {{ 'true' if settings.track_inventory and settings.system_mode != 'external' else 'false' }};
+        const trackInventory = {{ 'true' if settings.track_inventory else 'false' }};
         const businessType = '{{ settings.business_type }}'; 
         const cFields = {{ settings.customer_fields|tojson }};
         
@@ -696,33 +692,14 @@ CATALOG_TEMPLATE = '''
         let currentGalleryPhotos = [];
         let currentGalleryIndex = 0;
 
-        let html5QrcodeScanner = null;
-
-        function openScanner(target) {
-            document.getElementById('scannerModal').style.display = 'flex';
-            setTimeout(() => document.getElementById('scannerModal').classList.add('active'), 10);
-            html5QrcodeScanner = new Html5QrcodeScanner("reader", { fps: 10, qrbox: {width: 250, height: 250} }, false);
-            html5QrcodeScanner.render((decodedText) => {
-                closeScanner();
-                document.getElementById('searchInput').value = decodedText;
-                filterCategories();
-            }, () => {});
-        }
-
-        function closeScanner() {
-            if(html5QrcodeScanner) { html5QrcodeScanner.clear(); html5QrcodeScanner = null; }
-            const modal = document.getElementById('scannerModal');
-            modal.classList.remove('active');
-            setTimeout(() => modal.style.display = 'none', 300);
-        }
-
         function init() {
             renderCategories();
             updateCartUI();
             
-            const offset = new Date().getTimezoneOffset() * 60000;
-            const localToday = new Date(Date.now() - offset).toISOString().split('T')[0];
-            document.getElementById('assemblyDateInput').value = localToday;
+            let today = new Date();
+            let offset = today.getTimezoneOffset() * 60000;
+            let localToday = new Date(today.getTime() - offset).toISOString().split('T')[0];
+            document.getElementById('historyDateFilter').value = localToday;
         }
 
         function getCartKey(productId, variantIdx) {
@@ -777,11 +754,10 @@ CATALOG_TEMPLATE = '''
             container.innerHTML = '';
 
             const matchedProducts = products.filter(p => {
-                const q = query.toLowerCase();
-                const m1 = p.name.toLowerCase().includes(q) || p.category.toLowerCase().includes(q);
-                const m2 = p.barcode && p.barcode.toLowerCase().includes(q);
-                const m3 = p.variants && p.variants.some(v => v.barcode && v.barcode.toLowerCase().includes(q));
-                return m1 || m2 || m3;
+                if(p.name.toLowerCase().includes(query) || p.category.toLowerCase().includes(query)) return true;
+                if(p.barcode && p.barcode.toLowerCase().includes(query)) return true;
+                if(p.variants && p.variants.some(v => v.barcode && v.barcode.toLowerCase().includes(query))) return true;
+                return false;
             });
 
             if(matchedProducts.length === 0) {
@@ -1259,40 +1235,37 @@ CATALOG_TEMPLATE = '''
                 }
             });
         }
-
-        function openAssemblyModal() {
-            const modal = document.getElementById('assemblyModal');
+        
+        function openStaffHistoryModal() {
+            const modal = document.getElementById('staffHistoryModal');
             modal.style.display = 'flex';
             setTimeout(() => modal.classList.add('active'), 10);
-            loadAssemblyOrders();
+            loadStaffHistory();
         }
-
-        function closeAssemblyModal() {
-            const modal = document.getElementById('assemblyModal');
+        
+        function closeStaffHistoryModal() {
+            const modal = document.getElementById('staffHistoryModal');
             modal.classList.remove('active');
             setTimeout(() => modal.style.display = 'none', 300);
         }
-
-        function loadAssemblyOrders() {
-            const dateVal = document.getElementById('assemblyDateInput').value;
-            fetch(`/${envId}/api/staff_orders/${staffId}?date=${dateVal}`)
+        
+        function loadStaffHistory() {
+            const dateStr = document.getElementById('historyDateFilter').value;
+            fetch(`/${envId}/api/staff_orders/${staffId}?date=${dateStr}`)
             .then(r => r.json())
             .then(data => {
-                const content = document.getElementById('assemblyContent');
+                const content = document.getElementById('staffHistoryContent');
                 content.innerHTML = '';
                 if(data.length === 0) {
-                    content.innerHTML = '<div style="text-align:center; padding:20px;">Нет накладных за эту дату</div>';
+                    content.innerHTML = '<div style="text-align:center; padding:20px;">За этот день нет накладных</div>';
                     return;
                 }
-                
                 data.forEach(order => {
                     content.innerHTML += `
                         <div class="return-order-item" style="margin-bottom:10px;">
-                            <div style="display:flex; justify-content:space-between; align-items:center;">
-                                <div><b>№ ${order.id}</b> <div style="color:#636e72; font-size:0.85rem;">${order.created_at}</div></div>
-                                <a href="/${envId}/assembly/${order.id}" target="_blank" class="process-return-btn" style="text-decoration:none; display:inline-block; width:auto; padding:6px 12px; background:var(--primary);">Перейти к сборке</a>
-                            </div>
-                            <div style="font-size:0.9rem; margin-top:5px;">Покупатель: ${order.customer_name || 'Касса'}</div>
+                            <div><b>№ ${order.id}</b> <span style="float:right; color:#636e72; font-size:0.85rem;">${order.created_at.split(' ')[1]}</span></div>
+                            <div style="font-size:0.9rem; margin-top:5px; margin-bottom:10px;">Сумма: ${order.total_price} ${currency}</div>
+                            <a href="/${envId}/assembly/${order.id}" class="history-btn">Сборка накладной</a>
                         </div>
                     `;
                 });
@@ -1356,150 +1329,31 @@ CATALOG_TEMPLATE = '''
             if (touchendX - touchstartX > 50) prevPhoto();
         });
 
-        init();
-    </script>
-</body>
-</html>
-'''
-
-ASSEMBLY_TEMPLATE = '''
-<!DOCTYPE html>
-<html lang="ru">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>Сборка №{{ order.id }}</title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
-    <style>
-        :root { --bg: #f4f6f8; --surface: #ffffff; --text: #2d3436; --border: #dfe6e9; --primary: #0984e3; --success: #00b894; }
-        * { box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; }
-        body { margin: 0; padding: max(20px, env(safe-area-inset-top)) 20px calc(100px + env(safe-area-inset-bottom)); background: var(--bg); display: flex; flex-direction: column; align-items: center; color: var(--text); }
-        .assembly-box { background: var(--surface); width: 100%; max-width: 900px; padding: 20px; box-shadow: 0 4px 20px rgba(0,0,0,0.05); border-radius: 16px; }
-        .header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; border-bottom: 2px solid var(--border); padding-bottom: 15px; flex-wrap: wrap; gap: 10px; }
-        .header h1 { margin: 0; font-size: 1.5rem; font-weight: 800; }
-        .item-row { display: flex; justify-content: space-between; align-items: center; padding: 15px 0; border-bottom: 1px dashed var(--border); gap: 15px; flex-wrap: wrap; }
-        .item-info { flex: 1; min-width: 200px; }
-        .item-name { font-weight: 600; font-size: 1rem; }
-        .item-meta { font-size: 0.85rem; color: #636e72; margin-top: 4px; }
-        .control-group { display: flex; align-items: center; gap: 15px; background: #fafafa; padding: 8px 12px; border-radius: 12px; border: 1px solid var(--border); }
-        .target-qty { font-weight: 700; color: #d63031; width: 40px; text-align: center; }
-        .qty-controls { display: flex; align-items: center; background: #fff; border-radius: 8px; border: 1px solid var(--border); overflow: hidden; }
-        .qty-controls button { border: none; background: transparent; width: 35px; height: 35px; font-size: 1.2rem; cursor: pointer; color: var(--primary); display: flex; align-items: center; justify-content: center; }
-        .qty-controls button:active { background: #e0e0e0; }
-        .qty-controls input { width: 45px; text-align: center; font-weight: 700; font-size: 1.1rem; border: none; background: transparent; color: var(--success); outline: none; }
-        
-        .action-bar { position: fixed; bottom: 0; left: 0; width: 100%; background: var(--surface); box-shadow: 0 -4px 20px rgba(0,0,0,0.08); padding: 15px 20px calc(15px + env(safe-area-inset-bottom)); display: flex; gap: 15px; z-index: 100; justify-content: center; border-top-left-radius: 20px; border-top-right-radius: 20px; }
-        .action-bar-inner { display: flex; gap: 15px; width: 100%; max-width: 900px; }
-        .btn { flex: 1; padding: 15px 10px; border-radius: 12px; border: none; font-size: 1rem; font-weight: 700; cursor: pointer; color: #fff; display: flex; align-items: center; justify-content: center; gap: 8px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); transition: transform 0.2s; white-space: nowrap; }
-        .btn:active { transform: scale(0.96); }
-        .btn-save { background: var(--success); }
-        .btn-copy { background: var(--primary); }
-    </style>
-</head>
-<body>
-    <div class="assembly-box">
-        <div class="header">
-            <h1>Сборка заказа</h1>
-            <div style="text-align: right;">
-                <div style="font-size: 1.1rem; font-weight: bold;">№ {{ order.id }}</div>
-                <div style="color: #636e72; font-size: 0.9rem;">{{ order.customer_name if order.customer_name else 'Касса' }}</div>
-            </div>
-        </div>
-
-        <div id="itemsContainer">
-            {% for item in order.cart %}
-            {% if item.quantity > 0 %}
-            <div class="item-row" data-ckey="{{ item.c_key }}" data-target="{{ item.quantity }}">
-                <div class="item-info">
-                    <div class="item-name">{{ item.name }}</div>
-                    {% if item.variant_name %}
-                    <div class="item-meta">Вариант: {{ item.variant_name }}</div>
-                    {% endif %}
-                </div>
-                <div class="control-group">
-                    <div style="font-size:0.8rem; color:#636e72; text-align:center;">Нужно<br><span class="target-qty">{{ item.quantity }}</span></div>
-                    <div class="qty-controls">
-                        <button onclick="changeQty(this, -1)"><i class="fas fa-minus"></i></button>
-                        <input type="number" class="assembled-input" value="{{ item.assembled|default(0) }}" min="0" max="{{ item.quantity }}" onchange="validateQty(this)">
-                        <button onclick="changeQty(this, 1)"><i class="fas fa-plus"></i></button>
-                    </div>
-                </div>
-            </div>
-            {% endif %}
-            {% endfor %}
-        </div>
-    </div>
-
-    <div class="action-bar">
-        <div class="action-bar-inner">
-            <button class="btn btn-copy" onclick="copyLink()"><i class="fas fa-link"></i> Копировать ссылку</button>
-            <button class="btn btn-save" onclick="saveAssembly()" id="saveBtn"><i class="fas fa-check-circle"></i> Сохранить сборку</button>
-        </div>
-    </div>
-
-    <script>
-        const envId = '{{ env_id }}';
-        const orderId = '{{ order.id }}';
-
-        function changeQty(btn, change) {
-            const input = btn.parentElement.querySelector('input');
-            const target = parseInt(btn.closest('.item-row').dataset.target);
-            let val = parseInt(input.value) || 0;
-            val += change;
-            if(val < 0) val = 0;
-            if(val > target) val = target;
-            input.value = val;
-        }
-
-        function validateQty(input) {
-            const target = parseInt(input.closest('.item-row').dataset.target);
-            let val = parseInt(input.value);
-            if(isNaN(val) || val < 0) val = 0;
-            if(val > target) val = target;
-            input.value = val;
-        }
-
-        function copyLink() {
-            const link = window.location.href;
-            navigator.clipboard.writeText(link).then(() => {
-                alert('Ссылка на сборку скопирована!');
+        function startScanner(callback) {
+            document.getElementById('scannerModal').style.display = 'block';
+            const html5QrCode = new Html5Qrcode("reader");
+            const config = { fps: 10, qrbox: { width: 250, height: 250 } };
+            html5QrCode.start({ facingMode: "environment" }, config, (text) => {
+                html5QrCode.stop().then(() => {
+                    document.getElementById('scannerModal').style.display = 'none';
+                    callback(text);
+                });
             }).catch(err => {
-                alert('Не удалось скопировать ссылку');
+                console.log(err);
+                alert('Не удалось запустить камеру');
+                document.getElementById('scannerModal').style.display = 'none';
             });
+            window.currentScanner = html5QrCode;
         }
 
-        function saveAssembly() {
-            const btn = document.getElementById('saveBtn');
-            btn.innerHTML = '<i class="fas fa-spinner fa-spin"></i> Сохранение...';
-            btn.disabled = true;
-
-            const rows = document.querySelectorAll('.item-row');
-            let assemblyData = {};
-            rows.forEach(row => {
-                const ckey = row.dataset.ckey;
-                const qty = parseInt(row.querySelector('.assembled-input').value) || 0;
-                assemblyData[ckey] = qty;
-            });
-
-            fetch(`/${envId}/api/assembly/${orderId}`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(assemblyData)
-            })
-            .then(r => r.json())
-            .then(data => {
-                btn.innerHTML = '<i class="fas fa-check-circle"></i> Сохранено';
-                setTimeout(() => {
-                    btn.innerHTML = '<i class="fas fa-check-circle"></i> Сохранить сборку';
-                    btn.disabled = false;
-                }, 2000);
-            })
-            .catch(() => {
-                alert('Ошибка сохранения');
-                btn.innerHTML = '<i class="fas fa-check-circle"></i> Сохранить сборку';
-                btn.disabled = false;
-            });
+        function stopScanner() {
+            if(window.currentScanner) {
+                window.currentScanner.stop().catch(()=>{});
+            }
+            document.getElementById('scannerModal').style.display = 'none';
         }
+
+        init();
     </script>
 </body>
 </html>
@@ -1514,7 +1368,7 @@ ORDER_TEMPLATE = '''
     <title>Накладная №{{ order.id }}</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <style>
-        :root { --bg: #f4f6f8; --surface: #ffffff; --text: #2d3436; --border: #dfe6e9; --wa: #25D366; --print: #1e272e; --primary: #1a1a1a; --info: #0984e3; }
+        :root { --bg: #f4f6f8; --surface: #ffffff; --text: #2d3436; --border: #dfe6e9; --wa: #25D366; --print: #1e272e; --primary: #1a1a1a; }
         * { box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; }
         body { margin: 0; padding: max(20px, env(safe-area-inset-top)) 20px calc(100px + env(safe-area-inset-bottom)); background: var(--bg); display: flex; flex-direction: column; align-items: center; color: var(--text); }
         .invoice-box { background: var(--surface); width: 100%; max-width: 900px; padding: 30px; box-shadow: 0 4px 20px rgba(0,0,0,0.05); border-radius: 16px; }
@@ -1636,6 +1490,7 @@ ORDER_TEMPLATE = '''
                     {% set ppb = item.pieces_per_box|default(1)|int %}
                     {% set boxes = item.quantity // ppb %}
                     {% set remainder = item.quantity % ppb %}
+                    {% set assembled = order.assembled.get(item.c_key, 0) if order.assembled else 0 %}
                     {% if item.quantity > 0 %}
                     <tr>
                         <td>{{ loop.index }}</td>
@@ -1644,9 +1499,7 @@ ORDER_TEMPLATE = '''
                             {% if item.variant_name %}
                             <div style="font-size: 0.85rem; color: #636e72;">Вариант: {{ item.variant_name }}</div>
                             {% endif %}
-                            {% if item.assembled and item.assembled > 0 %}
-                            <div style="font-size:0.8rem; color:var(--info); font-weight:600; margin-top:4px;"><i class="fas fa-box-open"></i> Собрано: {{ item.assembled }} из {{ item.quantity }}</div>
-                            {% endif %}
+                            <div style="font-size: 0.8rem; color: {% if assembled == item.quantity %}#00b894{% else %}#0984e3{% endif %}; margin-top: 4px; font-weight:600;">Собрано: {{ assembled }} / {{ item.quantity }}</div>
                         </td>
                         <td class="img-cell"><img src="{{ item.photo_url }}" alt="img"></td>
                         <td style="text-align: center;">
@@ -1767,6 +1620,134 @@ ORDER_TEMPLATE = '''
 </html>
 '''
 
+ASSEMBLY_TEMPLATE = '''
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
+    <title>Сборка №{{ order.id }}</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
+    <style>
+        :root { --bg: #f4f6f8; --surface: #ffffff; --text: #2d3436; --border: #dfe6e9; --primary: #0984e3; --success: #00b894; }
+        * { box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; }
+        body { margin: 0; padding: max(20px, env(safe-area-inset-top)) 20px calc(100px + env(safe-area-inset-bottom)); background: var(--bg); color: var(--text); }
+        .container { max-width: 800px; margin: 0 auto; }
+        .header { background: var(--surface); padding: 20px; border-radius: 16px; box-shadow: 0 4px 15px rgba(0,0,0,0.05); margin-bottom: 20px; text-align: center; }
+        .header h1 { margin: 0 0 10px 0; font-size: 1.5rem; }
+        .copy-btn { background: var(--primary); color: #fff; border: none; padding: 10px 20px; border-radius: 8px; font-weight: 600; cursor: pointer; display: inline-flex; align-items: center; gap: 8px; }
+        
+        .item-card { background: var(--surface); padding: 15px; border-radius: 12px; margin-bottom: 15px; display: flex; align-items: center; gap: 15px; box-shadow: 0 4px 15px rgba(0,0,0,0.03); flex-wrap: wrap; }
+        .item-img { width: 60px; height: 60px; border-radius: 8px; object-fit: cover; border: 1px solid #eee; flex-shrink: 0; }
+        .item-info { flex: 1; min-width: 200px; }
+        .item-name { font-weight: 600; font-size: 1rem; }
+        .item-variant { font-size: 0.85rem; color: #636e72; margin-top: 2px; }
+        .item-target { font-size: 0.9rem; font-weight: bold; margin-top: 5px; }
+        
+        .assembly-controls { display: flex; align-items: center; background: var(--bg); border-radius: 8px; border: 1px solid var(--border); overflow: hidden; }
+        .assembly-controls button { border: none; background: #f8f9fa; width: 40px; height: 40px; font-size: 1.2rem; cursor: pointer; color: var(--primary); transition: background 0.2s; }
+        .assembly-controls button:active { background: #e0e0e0; }
+        .assembly-controls input { width: 50px; text-align: center; font-weight: 700; font-size: 1rem; border: none; background: transparent; color: var(--primary); outline: none; }
+        .assembly-controls input[type="number"]::-webkit-inner-spin-button, 
+        .assembly-controls input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; }
+        
+        .status-badge { font-size: 0.8rem; padding: 4px 8px; border-radius: 12px; font-weight: 600; }
+        .status-done { background: #d4edda; color: #155724; }
+        .status-pending { background: #fff3cd; color: #856404; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <h1>Сборка накладной № {{ order.id }}</h1>
+            <div style="color: #636e72; margin-bottom: 15px;">{{ order.created_at }}</div>
+            <button class="copy-btn" onclick="copyLink()"><i class="fas fa-link"></i> Скопировать ссылку</button>
+        </div>
+
+        {% for item in order.cart %}
+        {% if item.quantity > 0 %}
+        {% set assembled = order.assembled.get(item.c_key, 0) if order.assembled else 0 %}
+        <div class="item-card" id="card_{{ item.c_key }}">
+            <img src="{{ item.photo_url }}" class="item-img">
+            <div class="item-info">
+                <div class="item-name">{{ item.name }}</div>
+                {% if item.variant_name %}
+                <div class="item-variant">Вариант: {{ item.variant_name }}</div>
+                {% endif %}
+                <div class="item-target">Нужно: {{ item.quantity }} шт.</div>
+                <div style="margin-top: 5px;">
+                    <span id="badge_{{ item.c_key }}" class="status-badge {% if assembled >= item.quantity %}status-done{% else %}status-pending{% endif %}">
+                        {% if assembled >= item.quantity %}Собрано{% else %}В процессе{% endif %}
+                    </span>
+                </div>
+            </div>
+            <div class="assembly-controls">
+                <button onclick="changeQty('{{ item.c_key }}', -1, {{ item.quantity }})"><i class="fas fa-minus"></i></button>
+                <input type="number" id="qty_{{ item.c_key }}" value="{{ assembled }}" onchange="setQty('{{ item.c_key }}', this.value, {{ item.quantity }})">
+                <button onclick="changeQty('{{ item.c_key }}', 1, {{ item.quantity }})"><i class="fas fa-plus"></i></button>
+            </div>
+        </div>
+        {% endif %}
+        {% endfor %}
+    </div>
+
+    <script>
+        const envId = '{{ env_id }}';
+        const orderId = '{{ order.id }}';
+
+        function copyLink() {
+            let dummy = document.createElement('input');
+            document.body.appendChild(dummy);
+            dummy.value = window.location.href;
+            dummy.select();
+            document.execCommand('copy');
+            document.body.removeChild(dummy);
+            alert('Ссылка скопирована!');
+        }
+
+        function updateBackend(cKey, qty, maxQty) {
+            fetch(`/${envId}/api/assembly/${orderId}`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ c_key: cKey, qty: qty })
+            })
+            .then(r => r.json())
+            .then(data => {
+                if(data.success) {
+                    const badge = document.getElementById(`badge_${cKey}`);
+                    if(qty >= maxQty) {
+                        badge.className = 'status-badge status-done';
+                        badge.innerText = 'Собрано';
+                    } else {
+                        badge.className = 'status-badge status-pending';
+                        badge.innerText = 'В процессе';
+                    }
+                }
+            });
+        }
+
+        function changeQty(cKey, diff, maxQty) {
+            let input = document.getElementById(`qty_${cKey}`);
+            let val = parseInt(input.value) || 0;
+            val += diff;
+            if(val < 0) val = 0;
+            if(val > maxQty) val = maxQty;
+            input.value = val;
+            updateBackend(cKey, val, maxQty);
+        }
+
+        function setQty(cKey, val, maxQty) {
+            let num = parseInt(val) || 0;
+            if(num < 0) num = 0;
+            if(num > maxQty) num = maxQty;
+            document.getElementById(`qty_${cKey}`).value = num;
+            updateBackend(cKey, num, maxQty);
+        }
+    </script>
+</body>
+</html>
+'''
+
 ADMIN_TEMPLATE = '''
 <!DOCTYPE html>
 <html lang="ru">
@@ -1809,7 +1790,7 @@ ADMIN_TEMPLATE = '''
         .add-cat-form button { white-space: nowrap; }
 
         .search-bar-admin { position: relative; margin-bottom: 20px; }
-        .search-bar-admin i { position: absolute; left: 15px; top: 50%; transform: translateY(-50%); color: #636e72; }
+        .search-bar-admin i.fa-search { position: absolute; left: 15px; top: 50%; transform: translateY(-50%); color: #636e72; }
         .search-bar-admin input { padding-left: 40px; background: var(--surface); border: none; box-shadow: 0 4px 15px rgba(0,0,0,0.03); }
 
         .category-block { border: 1px solid var(--border); margin-bottom: 15px; border-radius: 12px; overflow: hidden; background: #fff; }
@@ -1863,17 +1844,6 @@ ADMIN_TEMPLATE = '''
 
         .badge { background: var(--danger); color: white; padding: 2px 8px; border-radius: 12px; font-size: 0.8rem; margin-left: 5px; }
 
-        .barcode-wrapper { display: flex; align-items: center; gap: 5px; }
-        .barcode-wrapper input { flex: 1; }
-        .barcode-btn { background: #fafafa; border: 1px solid var(--border); padding: 10px 15px; border-radius: 10px; cursor: pointer; color: var(--primary); }
-
-        .modal-overlay { display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,0.6); z-index: 200; justify-content: center; align-items: center; }
-        .modal-overlay.active { display: flex; }
-        .modal-content { background: var(--surface); width: 90%; max-width: 500px; border-radius: 16px; padding: 20px; position: relative; }
-        .modal-header { display: flex; justify-content: space-between; margin-bottom: 15px; align-items: center; }
-        .modal-header h2 { margin: 0; font-size: 1.2rem; }
-        .modal-close { background: none; border: none; font-size: 1.5rem; cursor: pointer; color: var(--text); }
-
         @media (max-width: 600px) {
             .header-panel { flex-direction: column; align-items: stretch; text-align: center; }
             .product-item { flex-direction: column; align-items: stretch; }
@@ -2046,7 +2016,7 @@ ADMIN_TEMPLATE = '''
                         {% if sys_mode != 'external' %}
                         <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px;">Учет товара:</div>
                         <label><input type="checkbox" name="track_inventory" {% if settings.track_inventory %}checked{% endif %}> Включить остатки на складе</label>
-                        <label style="margin-top:10px; display:block;"><input type="checkbox" name="enable_barcodes" {% if settings.enable_barcodes %}checked{% endif %}> Учет по штрихкодам</label>
+                        <label><input type="checkbox" name="use_barcodes" {% if settings.use_barcodes %}checked{% endif %}> Использовать штрих-коды</label>
                         {% endif %}
 
                         <div style="font-weight: 600; margin-bottom: 5px; border-top: 1px solid var(--border); padding-top: 15px; margin-top: 10px;">Социальные сети:</div>
@@ -2080,10 +2050,7 @@ ADMIN_TEMPLATE = '''
 
         <div class="search-bar-admin">
             <i class="fas fa-search"></i>
-            <input type="text" id="adminSearch" placeholder="Поиск по категориям, товарам, штрихкодам..." oninput="filterAdmin()">
-            {% if settings.enable_barcodes and sys_mode != 'external' %}
-            <i class="fas fa-qrcode" style="cursor:pointer; right:15px; left:auto; color:var(--primary);" onclick="openScanner('adminSearch', filterAdmin)"></i>
-            {% endif %}
+            <input type="text" id="adminSearch" placeholder="Поиск по категориям и товарам..." oninput="filterAdmin()">
         </div>
 
         {% for category in categories %}
@@ -2116,6 +2083,17 @@ ADMIN_TEMPLATE = '''
                                 <label>Название товара</label>
                                 <input type="text" name="name" placeholder="Введите название" required autocomplete="off">
                             </div>
+                            
+                            {% if settings.use_barcodes and sys_mode != 'external' %}
+                            <div class="form-group main-barcode-container">
+                                <label>Штрих-код</label>
+                                <div style="display:flex; gap:5px;">
+                                    <input type="text" name="barcode" placeholder="Штрих-код" class="main-barcode-input">
+                                    <button type="button" class="btn btn-outline" style="padding: 12px;" onclick="startScanner(val => this.previousElementSibling.value = val)"><i class="fas fa-barcode"></i></button>
+                                </div>
+                            </div>
+                            {% endif %}
+                            
                             <div class="form-group main-price-container">
                                 <label>Цена за ед.</label>
                                 <input type="number" name="price" placeholder="Цена" step="0.01" class="main-price-input">
@@ -2148,16 +2126,6 @@ ADMIN_TEMPLATE = '''
                                 <input type="number" name="stock" placeholder="Остаток" class="main-stock-input">
                             </div>
                             {% endif %}
-
-                            {% if settings.enable_barcodes and sys_mode != 'external' %}
-                            <div class="form-group">
-                                <label>Штрихкод</label>
-                                <div class="barcode-wrapper">
-                                    <input type="text" name="barcode" id="bc_add_{{ loop.index }}" placeholder="Штрихкод">
-                                    <button type="button" class="barcode-btn" onclick="openScanner('bc_add_{{ loop.index }}')"><i class="fas fa-qrcode"></i></button>
-                                </div>
-                            </div>
-                            {% endif %}
                         </div>
                         
                         <div class="variants-container" id="variants-container-add-{{ loop.index }}">
@@ -2184,7 +2152,7 @@ ADMIN_TEMPLATE = '''
 
                 {% for product in products %}
                     {% if product.category == category %}
-                    <div class="product-item" data-barcode="{{ product.barcode|default('') }}" data-varbarcodes="{{ product.variants|map(attribute='barcode')|join(',') }}">
+                    <div class="product-item">
                         <div class="product-info">
                             {% if product.photos and product.photos|length > 0 %}
                                 <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product.photos[0] }}" class="product-img">
@@ -2219,10 +2187,6 @@ ADMIN_TEMPLATE = '''
                                         • Остаток по вариантам
                                         {% endif %}
                                     {% endif %}
-
-                                    {% if settings.enable_barcodes and product.barcode and sys_mode != 'external' %}
-                                    • Штрихкод: {{ product.barcode }}
-                                    {% endif %}
                                 </span>
                             </div>
                         </div>
@@ -2247,6 +2211,17 @@ ADMIN_TEMPLATE = '''
                                         <label>Название товара</label>
                                         <input type="text" name="name" value="{{ product.name }}" required autocomplete="off">
                                     </div>
+                                    
+                                    {% if settings.use_barcodes and sys_mode != 'external' %}
+                                    <div class="form-group main-barcode-container" {% if product.variants %}style="display:none;"{% endif %}>
+                                        <label>Штрих-код</label>
+                                        <div style="display:flex; gap:5px;">
+                                            <input type="text" name="barcode" value="{{ product.barcode }}" class="main-barcode-input">
+                                            <button type="button" class="btn btn-outline" style="padding: 12px;" onclick="startScanner(val => this.previousElementSibling.value = val)"><i class="fas fa-barcode"></i></button>
+                                        </div>
+                                    </div>
+                                    {% endif %}
+                                    
                                     <div class="form-group main-price-container" {% if product.has_variant_prices %}style="display:none;"{% endif %}>
                                         <label>Цена за ед.</label>
                                         <input type="number" name="price" value="{{ product.price }}" step="0.01" class="main-price-input" {% if not product.has_variant_prices %}required{% endif %}>
@@ -2279,16 +2254,6 @@ ADMIN_TEMPLATE = '''
                                         <input type="number" name="stock" value="{{ product.stock }}" class="main-stock-input">
                                     </div>
                                     {% endif %}
-
-                                    {% if settings.enable_barcodes and sys_mode != 'external' %}
-                                    <div class="form-group">
-                                        <label>Штрихкод</label>
-                                        <div class="barcode-wrapper">
-                                            <input type="text" name="barcode" id="bc_edit_{{ product.product_id }}" value="{{ product.barcode|default('') }}" placeholder="Штрихкод">
-                                            <button type="button" class="barcode-btn" onclick="openScanner('bc_edit_{{ product.product_id }}')"><i class="fas fa-qrcode"></i></button>
-                                        </div>
-                                    </div>
-                                    {% endif %}
                                 </div>
 
                                 <div class="variants-container" id="variants-container-edit-{{ product.product_id }}">
@@ -2298,12 +2263,20 @@ ADMIN_TEMPLATE = '''
                                     </div>
                                     <div id="variants-list-edit-{{ product.product_id }}">
                                         {% for variant in product.variants %}
-                                        {% set vid = uuid.uuid4().hex %}
                                         <div class="variant-row">
                                             <div class="form-group">
                                                 <label>Название</label>
                                                 <input type="text" name="variant_name[]" value="{{ variant.name }}" placeholder="Цвет, размер" required>
                                             </div>
+                                            {% if settings.use_barcodes and sys_mode != 'external' %}
+                                            <div class="form-group">
+                                                <label>Штрих-код</label>
+                                                <div style="display:flex; gap:5px;">
+                                                    <input type="text" name="variant_barcode[]" value="{{ variant.barcode }}" placeholder="Код">
+                                                    <button type="button" class="btn btn-outline" style="padding: 12px;" onclick="startScanner(val => this.previousElementSibling.value = val)"><i class="fas fa-barcode"></i></button>
+                                                </div>
+                                            </div>
+                                            {% endif %}
                                             <div class="form-group var-price-input" {% if not product.has_variant_prices %}style="display:none;"{% endif %}>
                                                 <label>Цена</label>
                                                 <input type="number" name="variant_price[]" value="{{ variant.price }}" placeholder="Цена за ед." step="0.01" {% if product.has_variant_prices %}required{% endif %}>
@@ -2320,17 +2293,6 @@ ADMIN_TEMPLATE = '''
                                                 <input type="number" name="variant_stock[]" value="{{ variant.stock }}" placeholder="Остаток">
                                             </div>
                                             {% endif %}
-                                            {% if settings.enable_barcodes and sys_mode != 'external' %}
-                                            <div class="form-group">
-                                                <label>Штрихкод</label>
-                                                <div class="barcode-wrapper">
-                                                    <input type="text" name="variant_barcode[]" id="bc_var_{{ vid }}" value="{{ variant.barcode|default('') }}" placeholder="Штрихкод">
-                                                    <button type="button" class="barcode-btn" onclick="openScanner('bc_var_{{ vid }}')"><i class="fas fa-qrcode"></i></button>
-                                                </div>
-                                            </div>
-                                            {% else %}
-                                            <input type="hidden" name="variant_barcode[]" value="{{ variant.barcode|default('') }}">
-                                            {% endif %}
                                             <button type="button" class="remove-variant-btn" onclick="this.parentElement.remove(); updateMainStockVisibility('edit-prod-{{ product.product_id }}')"><i class="fas fa-times-circle"></i></button>
                                         </div>
                                         {% endfor %}
@@ -2357,53 +2319,20 @@ ADMIN_TEMPLATE = '''
         </div>
         {% endfor %}
     </div>
-
-    <div class="modal-overlay" id="scannerModal">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2>Сканер штрихкода</h2>
-                <button class="modal-close" onclick="closeScanner()"><i class="fas fa-times"></i></button>
-            </div>
-            <div id="reader" style="width:100%; min-height:300px;"></div>
+    
+    <div class="modal-overlay" id="scannerModal" style="z-index:9999; display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.6); align-items:center; justify-content:center;">
+        <div style="background:#fff; padding:20px; border-radius:12px; width:100%; max-width:400px; text-align:center;">
+            <h3 style="margin-top:0;">Сканирование</h3>
+            <div id="reader" style="width:100%; min-height:300px; margin-bottom:15px;"></div>
+            <button class="btn btn-danger" onclick="stopScanner()">Отмена</button>
         </div>
     </div>
 
     <script>
         const trackInventory = {{ 'true' if settings.track_inventory and sys_mode != 'external' else 'false' }};
-        const enableBarcodes = {{ 'true' if settings.enable_barcodes and sys_mode != 'external' else 'false' }};
+        const useBarcodes = {{ 'true' if settings.use_barcodes and sys_mode != 'external' else 'false' }};
         const businessType = '{{ settings.business_type }}';
 
-        let html5QrcodeScanner = null;
-        let currentScanTarget = '';
-        let scanCallback = null;
-
-        function openScanner(targetId, callback = null) {
-            currentScanTarget = targetId;
-            scanCallback = callback;
-            document.getElementById('scannerModal').style.display = 'flex';
-            setTimeout(() => document.getElementById('scannerModal').classList.add('active'), 10);
-            
-            html5QrcodeScanner = new Html5QrcodeScanner("reader", { fps: 10, qrbox: {width: 250, height: 250} }, false);
-            html5QrcodeScanner.render(onScanSuccess, onScanFailure);
-        }
-
-        function closeScanner() {
-            if(html5QrcodeScanner) { html5QrcodeScanner.clear(); html5QrcodeScanner = null; }
-            const modal = document.getElementById('scannerModal');
-            modal.classList.remove('active');
-            setTimeout(()=>modal.style.display='none', 300);
-        }
-
-        function onScanSuccess(decodedText, decodedResult) {
-            closeScanner();
-            const el = document.getElementById(currentScanTarget);
-            if(el) {
-                el.value = decodedText;
-                if(scanCallback) scanCallback();
-            }
-        }
-        function onScanFailure(error) {}
-
         function showLoading(form) {
             const btn = form.querySelector('button[type="submit"]');
             btn.innerHTML = '<i class="fas fa-spinner fa-spin"></i> Загрузка...';
@@ -2458,6 +2387,20 @@ ADMIN_TEMPLATE = '''
                     <label>Название</label>
                     <input type="text" name="variant_name[]" placeholder="Цвет, размер" required>
                 </div>
+            `;
+            
+            if (useBarcodes) {
+                html += `
+                <div class="form-group">
+                    <label>Штрих-код</label>
+                    <div style="display:flex; gap:5px;">
+                        <input type="text" name="variant_barcode[]" placeholder="Код">
+                        <button type="button" class="btn btn-outline" style="padding: 12px;" onclick="startScanner(val => this.previousElementSibling.value = val)"><i class="fas fa-barcode"></i></button>
+                    </div>
+                </div>`;
+            }
+            
+            html += `
                 <div class="form-group var-price-input" ${displayStyle}>
                     <label>Цена</label>
                     <input type="number" name="variant_price[]" placeholder="Цена за ед." step="0.01" ${reqAttr}>
@@ -2479,20 +2422,6 @@ ADMIN_TEMPLATE = '''
                     <input type="number" name="variant_stock[]" placeholder="Остаток">
                 </div>`;
             }
-
-            if (enableBarcodes) {
-                let vid = 'vbc_' + Math.floor(Math.random()*1000000);
-                html += `
-                <div class="form-group">
-                    <label>Штрихкод</label>
-                    <div class="barcode-wrapper">
-                        <input type="text" name="variant_barcode[]" id="${vid}" placeholder="Штрихкод">
-                        <button type="button" class="barcode-btn" onclick="openScanner('${vid}')"><i class="fas fa-qrcode"></i></button>
-                    </div>
-                </div>`;
-            } else {
-                html += `<input type="hidden" name="variant_barcode[]" value="">`;
-            }
             
             html += `<button type="button" class="remove-variant-btn" onclick="this.parentElement.remove(); updateMainStockVisibility('${formId}')"><i class="fas fa-times-circle"></i></button>`;
             
@@ -2532,15 +2461,22 @@ ADMIN_TEMPLATE = '''
         }
 
         function updateMainStockVisibility(formId) {
-            if(!trackInventory) return;
             const form = document.getElementById(formId);
             const variants = form.querySelectorAll('.variant-row');
-            const mainStock = form.querySelector('.main-stock-container');
-            if(mainStock) {
-                if(variants.length > 0) {
-                    mainStock.style.display = 'none';
-                } else {
-                    mainStock.style.display = 'flex';
+            
+            if(trackInventory) {
+                const mainStock = form.querySelector('.main-stock-container');
+                if(mainStock) {
+                    if(variants.length > 0) mainStock.style.display = 'none';
+                    else mainStock.style.display = 'flex';
+                }
+            }
+            
+            if(useBarcodes) {
+                const mainBc = form.querySelector('.main-barcode-container');
+                if(mainBc) {
+                    if(variants.length > 0) mainBc.style.display = 'none';
+                    else mainBc.style.display = 'flex';
                 }
             }
         }
@@ -2562,10 +2498,7 @@ ADMIN_TEMPLATE = '''
 
                 products.forEach(prod => {
                     const prodName = prod.querySelector('.product-name').innerText.toLowerCase();
-                    const barcode = prod.dataset.barcode.toLowerCase();
-                    const varbarcodes = prod.dataset.varbarcodes.toLowerCase();
-                    
-                    if (prodName.includes(query) || catMatch || barcode.includes(query) || varbarcodes.includes(query)) {
+                    if (prodName.includes(query) || catMatch) {
                         prod.style.display = 'flex';
                         hasVisibleProduct = true;
                     } else {
@@ -2619,6 +2552,30 @@ ADMIN_TEMPLATE = '''
             }
             document.body.removeChild(textArea);
         }
+
+        function startScanner(callback) {
+            document.getElementById('scannerModal').style.display = 'flex';
+            const html5QrCode = new Html5Qrcode("reader");
+            const config = { fps: 10, qrbox: { width: 250, height: 250 } };
+            html5QrCode.start({ facingMode: "environment" }, config, (text) => {
+                html5QrCode.stop().then(() => {
+                    document.getElementById('scannerModal').style.display = 'none';
+                    callback(text);
+                });
+            }).catch(err => {
+                console.log(err);
+                alert('Не удалось запустить камеру');
+                document.getElementById('scannerModal').style.display = 'none';
+            });
+            window.currentScanner = html5QrCode;
+        }
+
+        function stopScanner() {
+            if(window.currentScanner) {
+                window.currentScanner.stop().catch(()=>{});
+            }
+            document.getElementById('scannerModal').style.display = 'none';
+        }
         
         document.querySelectorAll('.add-product-wrapper').forEach(wrapper => {
             const cb = wrapper.querySelector('input[name="has_variant_prices"]');
@@ -2933,7 +2890,7 @@ INVENTORY_TEMPLATE = '''
         <div id="current" class="tab-content active">
             <div class="search-bar">
                 <i class="fas fa-search"></i>
-                <input type="text" id="searchInput" placeholder="Поиск товара или штрихкода..." oninput="filterTable()">
+                <input type="text" id="searchInput" placeholder="Поиск товара..." oninput="filterTable()">
             </div>
             
             <div class="table-container">
@@ -2942,7 +2899,6 @@ INVENTORY_TEMPLATE = '''
                         <tr>
                             <th>Товар</th>
                             <th>Категория</th>
-                            <th>Штрихкод</th>
                             <th>Остаток</th>
                             <th>Действие (Приход / Списание)</th>
                         </tr>
@@ -2950,10 +2906,9 @@ INVENTORY_TEMPLATE = '''
                     <tbody id="inventoryTable">
                         {% for p in products %}
                             {% if not p.variants %}
-                            <tr class="inv-row" data-barcode="{{ p.barcode|default('') }}">
+                            <tr class="inv-row">
                                 <td class="prod-name"><strong>{{ p.name }}</strong></td>
                                 <td>{{ p.category }}</td>
-                                <td>{{ p.barcode|default('-') }}</td>
                                 <td><strong>{{ p.stock if p.stock != "" else "0" }}</strong></td>
                                 <td>
                                     <div class="action-cell">
@@ -2966,10 +2921,9 @@ INVENTORY_TEMPLATE = '''
                             </tr>
                             {% else %}
                                 {% for v in p.variants %}
-                                <tr class="inv-row" data-barcode="{{ v.barcode|default('') }}">
+                                <tr class="inv-row">
                                     <td class="prod-name"><strong>{{ p.name }}</strong> <span style="color:#636e72;">({{ v.name }})</span></td>
                                     <td>{{ p.category }}</td>
-                                    <td>{{ v.barcode|default('-') }}</td>
                                     <td><strong>{{ v.stock if v.stock != "" else "0" }}</strong></td>
                                     <td>
                                         <div class="action-cell">
@@ -3039,8 +2993,7 @@ INVENTORY_TEMPLATE = '''
             const rows = document.querySelectorAll('.inv-row');
             rows.forEach(row => {
                 const text = row.querySelector('.prod-name').innerText.toLowerCase();
-                const barcode = row.dataset.barcode.toLowerCase();
-                if(text.includes(query) || barcode.includes(query)) row.style.display = 'table-row';
+                if(text.includes(query)) row.style.display = 'table-row';
                 else row.style.display = 'none';
             });
         }
@@ -3121,7 +3074,7 @@ def create_environment():
             "logo_url": DEFAULT_LOGO_URL,
             "whatsapp_number": DEFAULT_WHATSAPP_NUMBER,
             "track_inventory": False,
-            "enable_barcodes": False,
+            "use_barcodes": False,
             "business_type": "mixed",
             "system_mode": "both",
             "customer_fields": {'name': True, 'phone': True, 'city': True, 'address': False, 'zip': False},
@@ -3158,7 +3111,7 @@ def update_env_mode(env_id):
         all_data[env_id]['settings']['system_mode'] = mode
         if mode == 'external':
             all_data[env_id]['settings']['track_inventory'] = False
-            all_data[env_id]['settings']['enable_barcodes'] = False
+            all_data[env_id]['settings']['use_barcodes'] = False
         save_data(all_data)
         flash(f'Режим среды {env_id} обновлен.', 'success')
     return redirect(url_for('admhosto'))
@@ -3269,18 +3222,36 @@ def restore_stock(c_key, pid, vidx, return_qty, products):
 def get_staff_orders(env_id, staff_id):
     data = get_env_data(env_id)
     orders = data.get('orders', {})
-    date_filter = request.args.get('date', '')
+    date_filter = request.args.get('date')
+    staff_orders = [o for o in orders.values() if o.get('staff_id') == staff_id and (o.get('status') == 'pos' or o.get('status') == 'confirmed')]
     
-    staff_orders = []
-    for o in orders.values():
-        if o.get('staff_id') == staff_id and (o.get('status') == 'pos' or o.get('status') == 'confirmed'):
-            if date_filter and not o.get('created_at', '').startswith(date_filter):
-                continue
-            staff_orders.append(o)
-            
+    if date_filter:
+        filtered = []
+        for o in staff_orders:
+            if o.get('created_at', '').startswith(date_filter):
+                filtered.append(o)
+        staff_orders = filtered
+
     staff_orders.sort(key=lambda x: x.get('created_at', ''), reverse=True)
     return jsonify(staff_orders[:50])
 
+@app.route('/<env_id>/api/assembly/<order_id>', methods=['POST'])
+def update_assembly(env_id, order_id):
+    data = get_env_data(env_id)
+    order = data.get('orders', {}).get(order_id)
+    if not order:
+        return jsonify({"success": False, "error": "Order not found"}), 404
+
+    req = request.json
+    c_key = req.get('c_key')
+    qty = int(req.get('qty', 0))
+    if 'assembled' not in order:
+        order['assembled'] = {}
+    order['assembled'][c_key] = qty
+    
+    save_env_data(env_id, data)
+    return jsonify({"success": True})
+
 @app.route('/<env_id>/process_return/<order_id>', methods=['POST'])
 def process_return(env_id, order_id):
     data = get_env_data(env_id)
@@ -3355,7 +3326,6 @@ def create_order(env_id):
             "price": float(item['cart_price']),
             "calculated_price": float(item.get('calculated_price', item['cart_price'])),
             "quantity": int(item['quantity']),
-            "assembled": 0,
             "pieces_per_box": int(item.get('pieces_per_box', 1)) if str(item.get('pieces_per_box', 1)).strip() != "" else 1,
             "variant_name": item.get('variant_name', ''),
             "variant_idx": item.get('variant_idx', -1),
@@ -3378,7 +3348,8 @@ def create_order(env_id):
         "customer_city": customer_city,
         "customer_address": customer_address,
         "customer_zip": customer_zip,
-        "customer_whatsapp": customer_whatsapp
+        "customer_whatsapp": customer_whatsapp,
+        "assembled": {}
     }
 
     if order_status == 'pos' and data['settings'].get('track_inventory', False) and data['settings'].get('system_mode', 'both') != 'external':
@@ -3420,23 +3391,6 @@ def view_assembly(env_id, order_id):
         env_id=env_id
     )
 
-@app.route('/<env_id>/api/assembly/<order_id>', methods=['POST'])
-def save_assembly(env_id, order_id):
-    data = get_env_data(env_id)
-    order = data.get('orders', {}).get(order_id)
-    if not order:
-        return jsonify({"success": False, "error": "Order not found"}), 404
-
-    req_data = request.get_json()
-    
-    for item in order['cart']:
-        ckey = item.get('c_key')
-        if ckey in req_data:
-            item['assembled'] = int(req_data[ckey])
-
-    save_env_data(env_id, data)
-    return jsonify({"success": True})
-
 @app.route('/<env_id>/edit_order/<order_id>', methods=['POST'])
 def edit_order(env_id, order_id):
     data = get_env_data(env_id)
@@ -3599,10 +3553,10 @@ def admin(env_id):
             
             if settings.get('system_mode', 'both') == 'external':
                 settings['track_inventory'] = False
-                settings['enable_barcodes'] = False
+                settings['use_barcodes'] = False
             else:
                 settings['track_inventory'] = 'track_inventory' in request.form
-                settings['enable_barcodes'] = 'enable_barcodes' in request.form
+                settings['use_barcodes'] = 'use_barcodes' in request.form
             
             settings['customer_fields'] = {
                 'name': 'cf_name' in request.form,
@@ -3664,6 +3618,7 @@ def admin(env_id):
 
         elif action == 'add_product':
             name = request.form.get('name', '').strip()
+            barcode = request.form.get('barcode', '').strip()
             price_str = request.form.get('price', '')
             price = float(price_str) if price_str else ""
             
@@ -3679,17 +3634,15 @@ def admin(env_id):
             stock_str = request.form.get('stock', '')
             main_stock = int(stock_str) if stock_str else ""
             
-            barcode = request.form.get('barcode', '').strip()
-            
             description = request.form.get('description', '').strip()
             category = request.form.get('category')
             has_variant_prices = 'has_variant_prices' in request.form
             
             variant_names = request.form.getlist('variant_name[]')
+            variant_barcodes = request.form.getlist('variant_barcode[]')
             variant_prices = request.form.getlist('variant_price[]')
             variant_box_prices = request.form.getlist('variant_box_price[]')
             variant_stocks = request.form.getlist('variant_stock[]')
-            variant_barcodes = request.form.getlist('variant_barcode[]')
             variants = []
             
             for i in range(len(variant_names)):
@@ -3713,10 +3666,10 @@ def admin(env_id):
                         
                     variants.append({
                         "name": v_name, 
+                        "barcode": v_barcode,
                         "price": v_price, 
                         "box_price": v_box_price,
-                        "stock": v_stock,
-                        "barcode": v_barcode
+                        "stock": v_stock
                     })
 
             uploaded_photos = request.files.getlist('photos')[:10]
@@ -3752,12 +3705,12 @@ def admin(env_id):
             new_product = {
                 'product_id': uuid4().hex,
                 'name': name,
+                'barcode': barcode,
                 'price': price,
                 'pieces_per_box': pieces_per_box,
                 'box_price': box_price,
                 'min_order': min_order,
                 'stock': main_stock,
-                'barcode': barcode,
                 'description': description,
                 'category': category,
                 'photos': photos_list,
@@ -3771,6 +3724,7 @@ def admin(env_id):
         elif action == 'edit_product':
             pid = request.form.get('product_id')
             name = request.form.get('name', '').strip()
+            barcode = request.form.get('barcode', '').strip()
             
             price_str = request.form.get('price', '')
             price = float(price_str) if price_str else ""
@@ -3787,16 +3741,14 @@ def admin(env_id):
             stock_str = request.form.get('stock', '')
             main_stock = int(stock_str) if stock_str else ""
             
-            barcode = request.form.get('barcode', '').strip()
-            
             description = request.form.get('description', '').strip()
             has_variant_prices = 'has_variant_prices' in request.form
             
             variant_names = request.form.getlist('variant_name[]')
+            variant_barcodes = request.form.getlist('variant_barcode[]')
             variant_prices = request.form.getlist('variant_price[]')
             variant_box_prices = request.form.getlist('variant_box_price[]')
             variant_stocks = request.form.getlist('variant_stock[]')
-            variant_barcodes = request.form.getlist('variant_barcode[]')
             variants = []
             
             for i in range(len(variant_names)):
@@ -3817,10 +3769,10 @@ def admin(env_id):
                         v_barcode = variant_barcodes[i].strip()
                     variants.append({
                         "name": v_name, 
+                        "barcode": v_barcode,
                         "price": v_price, 
                         "box_price": v_box_price,
-                        "stock": v_stock,
-                        "barcode": v_barcode
+                        "stock": v_stock
                     })
                     
             uploaded_photos = request.files.getlist('photos')[:10]
@@ -3856,12 +3808,12 @@ def admin(env_id):
             for p in products:
                 if p.get('product_id') == pid:
                     p['name'] = name
+                    p['barcode'] = barcode
                     p['price'] = price
                     p['pieces_per_box'] = pieces_per_box
                     p['box_price'] = box_price
                     p['min_order'] = min_order
                     p['stock'] = main_stock
-                    p['barcode'] = barcode
                     p['description'] = description
                     p['variants'] = variants
                     p['has_variant_prices'] = has_variant_prices