Update app.py

app.py

@@ -508,13 +508,6 @@ MAIN_HTML = '''
         .settings-link-box { display: flex; gap: 8px; align-items: center; width: 100%; }
         .settings-link-input { flex: 1; padding: 10px; border: 1px solid var(--border); border-radius: 8px; font-size: 0.85rem; background: var(--bg); outline: none; color: var(--text-main); }
         
-        .cart-float { display: none; position: fixed; bottom: 24px; right: 24px; background: var(--text-main); color: white; padding: 14px 24px; border-radius: 30px; box-shadow: 0 4px 12px rgba(0,0,0,0.2); cursor: pointer; z-index: 100; font-weight: 600; align-items: center; gap: 8px; transition: transform 0.2s; }
-        .cart-float:active { transform: scale(0.95); }
-        
-        .invoice-table { width: 100%; border-collapse: collapse; margin-bottom: 16px; }
-        .invoice-table th, .invoice-table td { padding: 10px; border-bottom: 1px solid var(--border); text-align: left; font-size:0.9rem; }
-        .invoice-total { font-size: 1.2rem; font-weight: 700; text-align: right; }
-
         @media (min-width: 768px) {
             body { padding: 24px; }
             .top-actions { max-width: 400px; }
@@ -629,10 +622,6 @@ MAIN_HTML = '''
         </div>
     </div>
 
-    <div class="cart-float" id="cart_btn" onclick="openCart()">
-        Корзина (<span id="cart_count">0</span>)
-    </div>
-
     <div id="imageZoomModal" class="modal-overlay" onclick="closeModal('imageZoomModal')" style="z-index:2000; align-items:center;">
         <img id="zoomedImage" style="max-width:90%; max-height:90%; object-fit:contain; border-radius:8px;">
     </div>
@@ -743,24 +732,6 @@ MAIN_HTML = '''
         </div>
     </div>
 
-    <div id="cartModal" class="modal-overlay">
-        <div class="modal-content">
-            <button class="close-modal" onclick="closeModal('cartModal')">×</button>
-            <h2>Корзина</h2>
-            <div id="cart_items" style="margin-bottom:16px; margin-top:16px;"></div>
-            <button id="checkout_btn" class="btn btn-success" style="width:100%;" onclick="submitCart()">Оформить накладную</button>
-        </div>
-    </div>
-
-    <div id="invoiceModal" class="modal-overlay">
-        <div class="modal-content">
-            <button class="close-modal" onclick="closeInvoice()">×</button>
-            <h2 style="text-align:center; margin-bottom:16px;">Накладная</h2>
-            <div id="invoice_content"></div>
-            <button class="btn btn-primary" style="width:100%; margin-top:20px;" onclick="closeInvoice()">Готово</button>
-        </div>
-    </div>
-
     <form id="delForm" method="POST" style="display:none;" onsubmit="return showLoader(this)">
         <input type="hidden" name="action" value="delete">
         <input type="hidden" name="index" id="del_index">
@@ -773,7 +744,6 @@ MAIN_HTML = '''
         const hostUrl = "{{ request.host_url }}";
         const currentEmp = {{ emp|tojson }};
         let activeLoc = 'all';
-        let cart = [];
         let searchTimeout;
 
         function showLoader(formElement) {
@@ -968,13 +938,9 @@ MAIN_HTML = '''
                                 <div class="product-actions">
                                     ${varHtml}
                                     <div style="display:flex; gap:6px; align-items:center; width:100%;">
-                                        <input type="number" id="amt_${pIdx}" class="qty-input" value="1" min="1">
-                                        <button class="btn btn-success" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="addToCart(${pIdx}, false, 'retail')">В корз (Розн)</button>
-                                        <button class="btn btn-primary" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="addToCart(${pIdx}, false, 'wholesale')">В корз (Опт)</button>
-                                    </div>
-                                    <div style="display:flex; gap:6px; width:100%; margin-top:2px;">
-                                        <button class="btn btn-success" style="padding:8px 6px; font-size:0.75rem; flex:1; background:#059669;" onclick="addToCart(${pIdx}, true, 'retail')">Коробка (Розн)</button>
-                                        <button class="btn btn-primary" style="padding:8px 6px; font-size:0.75rem; flex:1; background:#4338ca;" onclick="addToCart(${pIdx}, true, 'wholesale')">Коробка (Опт)</button>
+                                        <input type="number" id="amt_${pIdx}" class="qty-input" value="1" min="1" style="flex:1;">
+                                        <button class="btn btn-danger" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="directSell(${pIdx}, 'retail')">Списать (Розн)</button>
+                                        <button class="btn btn-danger" style="padding:8px 6px; font-size:0.75rem; flex:1;" onclick="directSell(${pIdx}, 'wholesale')">Списать (Опт)</button>
                                     </div>
                             `;
                             if (role === 'admin') {
@@ -1086,149 +1052,65 @@ MAIN_HTML = '''
             }
         }
 
-        function addToCart(pIdx, isBox, pType) {
+        async function directSell(pIdx, pType) {
             let p = data.products[pIdx];
+            let amt = parseInt(document.getElementById('amt_'+pIdx).value);
             let vSelect = document.getElementById('var_'+pIdx);
             let vIdx = (vSelect && vSelect.value !== '') ? parseInt(vSelect.value) : -1;
             
-            let amt = isBox ? parseInt(p.box_qty || 1) : parseInt(document.getElementById('amt_'+pIdx).value);
-            
-            let validLocs = (activeLoc === 'all') 
-                ? ((role === 'employee' && currentEmp && currentEmp.shop_id) 
-                    ? [currentEmp.shop_id, ...data.settings.warehouses.map(w=>w.id)]
-                    : [...data.settings.warehouses.map(w=>w.id), ...data.settings.shops.map(s=>s.id)])
-                : [activeLoc];
-                
-            let getLocStock = (stocksObj) => {
-                let s = 0;
-                for (let l of validLocs) {
-                    if (stocksObj && stocksObj[l]) s += parseInt(stocksObj[l]);
-                }
-                return s;
-            };
+            if(amt <= 0 || isNaN(amt)) return alert('Неверное количество');
+            if(activeLoc === 'all') return alert('Выберите локацию для списания');
             
-            let stock = (vIdx !== -1) ? getLocStock(p.variants[vIdx].stocks) : getLocStock(p.stocks);
+            let stock = 0;
+            if (vIdx !== -1) {
+                stock = parseInt(p.variants[vIdx].stocks[activeLoc] || 0);
+            } else {
+                stock = parseInt(p.stocks[activeLoc] || 0);
+            }
             
-            if(amt <= 0 || isNaN(amt)) return alert('Неверное количество');
-            if(activeLoc !== 'all' && amt > stock) return alert('Превышен остаток');
+            if(amt > stock) return alert('Превышен остаток');
             
             let basePrice = pType === 'wholesale' ? parseInt(p.price_wholesale) : parseInt(p.price_retail);
             if (role !== 'public') {
-                if (pType === 'wholesale') {
-                    let customPriceInput = document.getElementById('price_whl_' + pIdx);
-                    if (customPriceInput) basePrice = parseInt(customPriceInput.value) || basePrice;
-                } else {
-                    let customPriceInput = document.getElementById('price_ret_' + pIdx);
-                    if (customPriceInput) basePrice = parseInt(customPriceInput.value) || basePrice;
-                }
+                let customPriceInput = document.getElementById(pType === 'wholesale' ? 'price_whl_' + pIdx : 'price_ret_' + pIdx);
+                if (customPriceInput) basePrice = parseInt(customPriceInput.value) || basePrice;
             }
             
             let vName = '';
             let vPrice = 0;
             if (vIdx !== -1) {
-                let variant = p.variants[vIdx];
-                vName = ' (' + variant.name + ')';
-                vPrice = parseInt(variant.price) || 0;
+                vName = ' (' + p.variants[vIdx].name + ')';
+                vPrice = parseInt(p.variants[vIdx].price) || 0;
             }
             
             let finalPrice = basePrice + vPrice;
             let finalName = p.name + vName + (pType === 'wholesale' ? ' [Опт]' : ' [Розн]');
             
-            let existing = cart.find(i => i.pIndex === pIdx && i.vIndex === vIdx && i.loc === activeLoc && i.pName === finalName && i.price === finalPrice);
-            let cartTotalForProduct = cart.filter(i => i.pIndex === pIdx && i.vIndex === vIdx && i.loc === activeLoc).reduce((s, i) => s + i.amt, 0);
+            if (!confirm(`Списать ${amt} шт. товара "${finalName}"?`)) return;
             
-            if(activeLoc !== 'all' && (cartTotalForProduct + amt > stock)) return alert('Превышен остаток в корзине');
+            let singleItemCart = [{
+                pIndex: pIdx,
+                vIndex: vIdx,
+                pName: finalName,
+                price: finalPrice,
+                amt: amt,
+                loc: activeLoc
+            }];
             
-            if(existing) {
-                existing.amt += amt;
-            } else {
-                cart.push({pIndex: pIdx, vIndex: vIdx, pName: finalName, price: finalPrice, amt: amt, loc: activeLoc});
-            }
-            updateCartUI();
-        }
-
-        function updateCartUI() {
-            let totalItems = cart.reduce((sum, item) => sum + item.amt, 0);
-            const btn = document.getElementById('cart_btn');
-            document.getElementById('cart_count').innerText = totalItems;
-            btn.style.display = totalItems > 0 ? 'flex' : 'none';
-        }
-
-        function openCart() {
-            let html = '';
-            let total = 0;
-            cart.forEach((c, i) => {
-                let sum = c.amt * c.price;
-                total += sum;
-                html += `<div style="display:flex; justify-content:space-between; align-items:center; border-bottom:1px solid var(--border); padding:10px 0;">
-                    <div>
-                        <div style="font-weight:600;">${c.pName}</div>
-                        <div style="font-size:0.85rem; color:var(--text-muted);">${c.amt} шт x ${c.price} ₸</div>
-                    </div>
-                    <div style="display:flex; align-items:center; gap:12px;">
-                        <span style="font-weight:700;">${sum} ₸</span>
-                        <button style="border:none; background:var(--danger); color:white; border-radius:6px; padding:6px 10px; cursor:pointer; font-weight:700;" onclick="removeFromCart(${i})">×</button>
-                    </div>
-                </div>`;
-            });
-            html += `<div style="text-align:right; font-size:1.2rem; font-weight:700; margin-top:16px;">Итого: ${total} ₸</div>`;
-            document.getElementById('cart_items').innerHTML = html;
-            openModal('cartModal');
-        }
-
-        function removeFromCart(idx) {
-            cart.splice(idx, 1);
-            updateCartUI();
-            if(cart.length === 0) {
-                closeModal('cartModal');
-            } else {
-                openCart();
-            }
-        }
-
-        async function submitCart() {
-            if (cart.length === 0) return;
-            const btn = document.getElementById('checkout_btn');
-            if (btn.disabled) return;
-            btn.disabled = true;
             document.getElementById('loader').style.display = 'flex';
-            
             let fd = new FormData();
             fd.append('action', 'checkout');
-            fd.append('cart', JSON.stringify(cart));
+            fd.append('cart', JSON.stringify(singleItemCart));
             
             try {
                 await fetch(window.location.href, {method: 'POST', body: fd});
-                
-                let dateStr = new Date().toLocaleString('ru-RU');
-                let html = `<p style="color:var(--text-muted); margin-bottom:16px;">Дата: ${dateStr}</p>
-                <table class="invoice-table">
-                    <tr><th>Товар</th><th>Кол.</th><th>Сумма</th></tr>`;
-                let total = 0;
-                cart.forEach(c => {
-                    let sum = c.amt * c.price;
-                    total += sum;
-                    html += `<tr><td>${c.pName}</td><td>${c.amt}</td><td>${sum} ₸</td></tr>`;
-                });
-                html += `</table><div class="invoice-total">Итого к оплате: ${total} ₸</div>`;
-                
-                document.getElementById('invoice_content').innerHTML = html;
-                closeModal('cartModal');
-                openModal('invoiceModal');
-                cart = [];
-                updateCartUI();
+                window.location.reload();
             } catch (e) {
-                alert('Ошибка при оформлении');
-            } finally {
+                alert('Ошибка при списании');
                 document.getElementById('loader').style.display = 'none';
-                btn.disabled = false;
             }
         }
 
-        function closeInvoice() {
-            window.location.reload();
-        }
-
         function openTransfer(pIdx) {
             let p = data.products[pIdx];
             let vSelect = document.getElementById('var_' + pIdx);
@@ -1308,7 +1190,9 @@ MAIN_HTML = '''
             locSelect.innerHTML = [...data.settings.warehouses, ...data.settings.shops].map(l => `<option value="${l.id}">${l.name}</option>`).join('');
             
             let lastLoc = localStorage.getItem('lastFormLoc');
-            if (lastLoc && locSelect.querySelector(`option[value="${lastLoc}"]`)) {
+            if (activeLoc !== 'all' && locSelect.querySelector(`option[value="${activeLoc}"]`)) {
+                locSelect.value = activeLoc;
+            } else if (lastLoc && locSelect.querySelector(`option[value="${lastLoc}"]`)) {
                 locSelect.value = lastLoc;
             }
             
@@ -1320,7 +1204,7 @@ MAIN_HTML = '''
             document.getElementById('edit_variants_container').innerHTML = '';
             if (p.variants && p.variants.length > 0) {
                 p.variants.forEach(v => {
-                    addVariantField('edit_variants_container', v.name, v.price, 0);
+                    addVariantField('edit_variants_container', v.name, v.price, '');
                 });
             }