Update app.py

app.py

@@ -235,15 +235,11 @@ def load_data():
                 if 'variants' not in product: product['variants'] =[]; changed = True
                 if 'has_variant_prices' not in product: product['has_variant_prices'] = False; changed = True
                 if 'stock' not in product: product['stock'] = ""; changed = True
-                if 'is_available' not in product: product['is_available'] = True; changed = True
-                if 'volume_prices' not in product: product['volume_prices'] = []; changed = True
                 for v in product['variants']:
                     if 'stock' not in v: v['stock'] = ""; changed = True
                     if 'box_price' not in v: v['box_price'] = ""; changed = True
                     if 'barcode' not in v: v['barcode'] = ""; changed = True
                     if 'pieces_per_box' not in v: v['pieces_per_box'] = product.get('pieces_per_box', ""); changed = True
-                    if 'is_available' not in v: v['is_available'] = True; changed = True
-                    if 'volume_prices' not in v: v['volume_prices'] = []; changed = True
 
             for order_id, order in env_data['orders'].items():
                 if 'status' not in order: order['status'] = 'confirmed'; changed = True
@@ -253,7 +249,6 @@ def load_data():
                 for item in order.get('cart', []):
                     if 'discount' not in item: item['discount'] = 0; changed = True
                     if 'category' not in item: item['category'] = 'Без категории'; changed = True
-                    if 'volume_prices' not in item: item['volume_prices'] = []; changed = True
 
         if changed or not os.path.exists(DATA_FILE):
             try:
@@ -318,14 +313,6 @@ def save_env_data(env_id, env_data):
     all_data[env_id] = env_data
     save_data(all_data)
 
-def get_applicable_price(base_price, volume_prices, qty):
-    if not volume_prices:
-        return base_price
-    for vp in sorted(volume_prices, key=lambda x: x['qty'], reverse=True):
-        if qty >= vp['qty']:
-            return vp['price']
-    return base_price
-
 def update_order_totals(order, business_type):
     total = 0
     global_discount = float(order.get('global_discount', 0))
@@ -337,15 +324,13 @@ def update_order_totals(order, business_type):
         c_price = float(i.get('price', 0))
         c_box_price = float(i.get('cart_box_price', 0))
         item_discount = float(i.get('discount', 0))
-        volume_prices = i.get('volume_prices', [])
         
-        unit = c_price
-        if business_type == 'wholesale' and volume_prices:
-            unit = get_applicable_price(c_price, volume_prices, qty)
-        elif business_type in ['mixed', 'wholesale'] and c_box_price > 0 and ppb > 1 and qty >= ppb:
-            unit = c_box_price / ppb
+        if business_type in ['mixed', 'wholesale'] and c_box_price > 0 and ppb > 1 and qty >= ppb:
+            base_price = c_box_price / ppb
+        else:
+            base_price = c_price
             
-        discounted_price = max(0, unit - item_discount)
+        discounted_price = max(0, base_price - item_discount)
         item_total = discounted_price * qty
         i['calculated_price'] = round(discounted_price, 2)
         total += item_total
@@ -692,7 +677,6 @@ CATALOG_TEMPLATE = '''
         .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; }
         
         .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; }
-        .unavailable-item { opacity: 0.5; filter: grayscale(1); }
 
         @media (min-width: 768px) {
             .categories-container { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); }
@@ -987,7 +971,6 @@ CATALOG_TEMPLATE = '''
             if (p.variants && p.variants.length > 0) {
                 variantsHtml = `<div class="variants-list">`;
                 p.variants.forEach((v, idx) => {
-                    let vClass = v.is_available === false ? 'unavailable-item' : '';
                     let vPrice = p.has_variant_prices ? v.price : p.price;
                     let vBoxPrice = p.has_variant_prices ? (v.box_price || '') : (p.box_price || '');
                     let vStockHtml = showStock && v.stock !== "" && v.stock !== null ? `<div class="variant-stock">Остаток: ${v.stock} шт</div>` : '';
@@ -1000,39 +983,25 @@ CATALOG_TEMPLATE = '''
                         priceText += `<br><span style="font-size:0.8rem; color:#636e72;">Упаковка: ${vBoxPrice} ${currency}</span>`;
                     }
                     
-                    let vVolHtml = '';
-                    if (businessType === 'wholesale' && v.volume_prices && v.volume_prices.length > 0) {
-                        vVolHtml = `<div style="font-size:0.8rem; color:#636e72; margin-top:2px;">Опт: ` + v.volume_prices.map(vp => `от ${vp.qty} шт - ${vp.price} ${currency}`).join(', ') + `</div>`;
-                    }
-                    
-                    let controlsHtml = '';
-                    if (v.is_available === false) {
-                        controlsHtml = `<span style="color:var(--danger); font-weight:bold; font-size:0.85rem;">Нет в наличии</span>`;
-                    } else {
-                        let addBoxBtnVariant = '';
-                        if (businessType !== 'retail' && vPpb > 1) {
-                            addBoxBtnVariant = `<button class="box-btn" style="height:32px; margin-right:5px;" onclick="updateCart('${p.product_id}', ${vPpb}, null, false, '${cKey}', ${moq})">+ Упаковка</button>`;
-                        }
-                        controlsHtml = `
-                            ${addBoxBtnVariant}
-                            <div class="quantity-control" style="border:none; background:var(--surface);">
-                                <button onclick="updateCart('${p.product_id}', -1, null, false, '${cKey}', ${moq})"><i class="fas fa-minus" style="font-size:0.8rem;"></i></button>
-                                <input type="number" id="qty-${cKey}" value="${qty}" onchange="manualUpdateCart('${cKey}', this.value, ${moq})">
-                                <button onclick="updateCart('${p.product_id}', 1, null, false, '${cKey}', ${moq})"><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
-                            </div>
-                        `;
+                    let addBoxBtnVariant = '';
+                    if (businessType !== 'retail' && vPpb > 1) {
+                        addBoxBtnVariant = `<button class="box-btn" style="height:32px; margin-right:5px;" onclick="updateCart('${p.product_id}', ${vPpb}, null, false, '${cKey}', ${moq})">+ Упаковка</button>`;
                     }
                     
                     variantsHtml += `
-                        <div class="variant-item ${vClass}">
+                        <div class="variant-item">
                             <div class="variant-info">
                                 <span class="variant-name">${v.name}</span>
                                 <span class="variant-price">${priceText}</span>
-                                ${vVolHtml}
                                 ${vStockHtml}
                             </div>
                             <div style="display:flex; align-items:center;">
-                                ${controlsHtml}
+                                ${addBoxBtnVariant}
+                                <div class="quantity-control" style="border:none; background:var(--surface);">
+                                    <button onclick="updateCart('${p.product_id}', -1, null, false, '${cKey}', ${moq})"><i class="fas fa-minus" style="font-size:0.8rem;"></i></button>
+                                    <input type="number" id="qty-${cKey}" value="${qty}" onchange="manualUpdateCart('${cKey}', this.value, ${moq})">
+                                    <button onclick="updateCart('${p.product_id}', 1, null, false, '${cKey}', ${moq})"><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
+                                </div>
                             </div>
                         </div>
                     `;
@@ -1042,58 +1011,36 @@ CATALOG_TEMPLATE = '''
                 let mStockHtml = showStock && p.stock !== "" && p.stock !== null ? `<div style="font-size:0.8rem; color:#0984e3; margin-top:4px;">Остаток: ${p.stock} шт</div>` : '';
                 let qty = cart[p.product_id] ? cart[p.product_id].quantity : 0;
                 
+                let addBoxBtn = '';
+                if (businessType !== 'retail' && ppb > 1) {
+                    addBoxBtn = `<button class="box-btn" onclick="updateCart('${p.product_id}', ${ppb}, null, false, null, ${moq})">+ Упаковка</button>`;
+                }
+                
                 let priceText = `${p.price} ${currency}`;
                 if (businessType === 'mixed' && p.box_price && ppb > 1) {
                     priceText += `<br><span style="font-size:0.8rem; color:#636e72;">Упаковка: ${p.box_price} ${currency}</span>`;
                 }
-                
-                let volHtml = '';
-                if (businessType === 'wholesale' && p.volume_prices && p.volume_prices.length > 0) {
-                    volHtml = `<div style="font-size:0.8rem; color:#636e72; margin-top:4px;">Опт: ` + p.volume_prices.map(vp => `от ${vp.qty} шт - ${vp.price} ${currency}`).join(', ') + `</div>`;
-                }
 
-                if (p.is_available === false) {
-                    mainControlsHtml = `
-                        <div class="product-bottom">
-                            <div style="display:flex; flex-direction:column;">
-                                <div class="product-price">${priceText}</div>
-                                ${volHtml}
-                                ${mStockHtml}
-                            </div>
-                            <div class="controls-wrapper">
-                                <span style="color:var(--danger); font-weight:bold;">Нет в наличии</span>
-                            </div>
+                mainControlsHtml = `
+                    <div class="product-bottom">
+                        <div style="display:flex; flex-direction:column;">
+                            <div class="product-price">${priceText}</div>
+                            ${mStockHtml}
                         </div>
-                    `;
-                } else {
-                    let addBoxBtn = '';
-                    if (businessType !== 'retail' && ppb > 1) {
-                        addBoxBtn = `<button class="box-btn" onclick="updateCart('${p.product_id}', ${ppb}, null, false, null, ${moq})">+ Упаковка</button>`;
-                    }
-                    mainControlsHtml = `
-                        <div class="product-bottom">
-                            <div style="display:flex; flex-direction:column;">
-                                <div class="product-price">${priceText}</div>
-                                ${volHtml}
-                                ${mStockHtml}
-                            </div>
-                            <div class="controls-wrapper">
-                                ${addBoxBtn}
-                                <div class="quantity-control">
-                                    <button onclick="updateCart('${p.product_id}', -1, null, false, null, ${moq})"><i class="fas fa-minus" style="font-size:0.8rem;"></i></button>
-                                    <input type="number" id="qty-${p.product_id}" value="${qty}" onchange="manualUpdateCart('${p.product_id}', this.value, ${moq})">
-                                    <button onclick="updateCart('${p.product_id}', 1, null, false, null, ${moq})"><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
-                                </div>
+                        <div class="controls-wrapper">
+                            ${addBoxBtn}
+                            <div class="quantity-control">
+                                <button onclick="updateCart('${p.product_id}', -1, null, false, null, ${moq})"><i class="fas fa-minus" style="font-size:0.8rem;"></i></button>
+                                <input type="number" id="qty-${p.product_id}" value="${qty}" onchange="manualUpdateCart('${p.product_id}', this.value, ${moq})">
+                                <button onclick="updateCart('${p.product_id}', 1, null, false, null, ${moq})"><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
                             </div>
                         </div>
-                    `;
-                }
+                    </div>
+                `;
             }
 
-            let pClass = p.is_available === false && (!p.variants || p.variants.length === 0) ? 'unavailable-item' : '';
-
             const div = document.createElement('div');
-            div.className = `product-card ${pClass}`;
+            div.className = 'product-card';
             div.innerHTML = `
                 <div class="product-main-content">
                     <div class="product-img-wrapper" ${imgClick}>
@@ -1140,9 +1087,6 @@ CATALOG_TEMPLATE = '''
             if (cKey.includes('___')) {
                 varIdx = parseInt(cKey.split('___')[1]);
             }
-            
-            if (varIdx !== -1 && p.variants[varIdx] && p.variants[varIdx].is_available === false) return;
-            if (varIdx === -1 && p.is_available === false) return;
 
             let pStock = "";
             let pPpb = parseInt(p.pieces_per_box) || 1;
@@ -1160,16 +1104,14 @@ CATALOG_TEMPLATE = '''
                 let price = p.price;
                 let bPrice = p.box_price || 0;
                 let vName = "";
-                let volPrices = p.volume_prices || [];
                 if (varIdx !== -1 && p.variants[varIdx]) {
                     if (p.has_variant_prices) {
                         price = p.variants[varIdx].price;
                         bPrice = p.variants[varIdx].box_price || 0;
                     }
                     vName = p.variants[varIdx].name;
-                    volPrices = p.variants[varIdx].volume_prices || [];
                 }
-                cart[cKey] = { ...p, quantity: 0, cart_price: price, cart_box_price: bPrice, pieces_per_box: pPpb, variant_name: vName, variant_idx: varIdx, discount: 0, volume_prices: volPrices };
+                cart[cKey] = { ...p, quantity: 0, cart_price: price, cart_box_price: bPrice, pieces_per_box: pPpb, variant_name: vName, variant_idx: varIdx, discount: 0 };
             }
 
             let currentQty = cart[cKey].quantity;
@@ -1226,14 +1168,6 @@ CATALOG_TEMPLATE = '''
             const pId = cKey.split('___')[0];
             updateCart(pId, 0, num, true, cKey, moq);
         }
-        
-        function getApplicablePrice(basePrice, volumePrices, qty) {
-            if (!volumePrices || volumePrices.length === 0) return basePrice;
-            for (let i = 0; i < volumePrices.length; i++) {
-                if (qty >= volumePrices[i].qty) return volumePrices[i].price;
-            }
-            return basePrice;
-        }
 
         function calculateItemPrice(item) {
             let ppb = parseInt(item.pieces_per_box) || 1;
@@ -1241,12 +1175,9 @@ CATALOG_TEMPLATE = '''
             let cBoxPrice = parseFloat(item.cart_box_price) || 0;
             let cPrice = parseFloat(item.cart_price) || 0;
             let disc = parseFloat(item.discount) || 0;
-            let volPrices = item.volume_prices || [];
             
             let unit = cPrice;
-            if (businessType === 'wholesale' && volPrices.length > 0) {
-                unit = getApplicablePrice(cPrice, volPrices, qty);
-            } else if ((businessType === 'mixed' || businessType === 'wholesale') && cBoxPrice > 0 && ppb > 1 && qty >= ppb) {
+            if ((businessType === 'mixed' || businessType === 'wholesale') && cBoxPrice > 0 && ppb > 1 && qty >= ppb) {
                 unit = cBoxPrice / ppb;
             }
             return Math.max(0, unit - disc) * qty;
@@ -2274,7 +2205,7 @@ ADMIN_TEMPLATE = '''
         
         .form-group { display: flex; flex-direction: column; gap: 5px; flex: 1; min-width: 150px; }
         .form-group label { font-size: 0.85rem; font-weight: 600; color: #636e72; }
-        .form-row { display: flex; gap: 15px; flex-wrap: wrap; align-items: flex-end; }
+        .form-row { display: flex; gap: 15px; flex-wrap: wrap; }
         
         .file-input-wrapper { position: relative; width: 100%; }
         input[type="file"] { width: 100%; padding: 10px; border: 1px dashed #ccc; border-radius: 10px; background: #fafafa; font-size: 0.9rem; }
@@ -2288,11 +2219,9 @@ ADMIN_TEMPLATE = '''
         .social-item label { display: flex; align-items: center; gap: 5px; width: 150px; cursor: pointer; }
         
         .variants-container { background: #f4f6f9; padding: 15px; border-radius: 10px; border: 1px dashed var(--border); display: flex; flex-direction: column; gap: 10px; }
-        .variant-row { display: flex; flex-wrap: wrap; gap: 10px; align-items: flex-start; background: #fff; padding: 10px; border-radius: 8px; border: 1px solid var(--border); position: relative; }
+        .variant-row { display: flex; flex-wrap: wrap; gap: 10px; align-items: flex-end; background: #fff; padding: 10px; border-radius: 8px; border: 1px solid var(--border); }
         .variant-row .form-group { flex: 1 1 30%; min-width: 120px; }
-        .remove-variant-btn { color: var(--danger); background: none; border: none; font-size: 1.2rem; cursor: pointer; padding: 5px; position: absolute; top: 10px; right: 10px; }
-        .move-variant-btns { position: absolute; top: 10px; right: 40px; display: flex; gap: 5px; }
-        .move-variant-btns button { background: none; border: 1px solid var(--border); border-radius: 4px; cursor: pointer; font-size: 0.8rem; padding: 2px 5px; color: #636e72; }
+        .remove-variant-btn { color: var(--danger); background: none; border: none; font-size: 1.2rem; cursor: pointer; padding: 12px 5px; flex: 0 0 auto; }
 
         .order-item { background: #fff; padding: 15px; border-radius: 10px; border: 1px solid var(--border); margin-bottom: 10px; }
         .order-header { display: flex; justify-content: space-between; font-weight: bold; margin-bottom: 10px; }
@@ -2301,18 +2230,15 @@ ADMIN_TEMPLATE = '''
         .staff-item { display: flex; flex-direction: column; gap: 10px; background: #fff; padding: 15px; border-radius: 10px; border: 1px solid var(--border); margin-bottom: 10px; }
 
         .badge { background: var(--danger); color: white; padding: 2px 8px; border-radius: 12px; font-size: 0.8rem; margin-left: 5px; }
-        .vol-price-row { display: flex; gap: 5px; align-items: center; margin-top: 5px; }
-        .vol-price-row input { padding: 6px; border: 1px solid var(--border); border-radius: 4px; font-size: 0.85rem; width: 80px; }
-        .vol-price-row button { background: var(--danger); color: white; border: none; border-radius: 4px; cursor: pointer; padding: 6px 10px; font-size: 0.8rem; }
-        .unavailable-item { opacity: 0.5; filter: grayscale(1); }
 
         @media (max-width: 600px) {
             .header-panel { flex-direction: column; align-items: stretch; text-align: center; }
             .product-item { flex-direction: column; align-items: stretch; }
             .product-info { width: 100%; }
             .product-actions { align-self: flex-end; }
-            .form-row { flex-direction: column; gap: 10px; align-items: stretch; }
-            .variant-row { flex-direction: column; align-items: stretch; padding-top: 35px; }
+            .form-row { flex-direction: column; gap: 10px; }
+            .variant-row { flex-direction: column; align-items: stretch; }
+            .remove-variant-btn { width: 100%; text-align: right; padding: 5px; }
         }
     </style>
 </head>
@@ -2601,15 +2527,11 @@ ADMIN_TEMPLATE = '''
                     <i class="fas fa-chevron-down" id="icon-cat-{{ loop.index }}" style="color: #636e72;"></i>
                     <span class="cat-title-text"><i class="fas fa-folder-open" style="color:var(--info); margin-right:5px;"></i> {{ category }}</span>
                 </div>
-                <div style="display:flex; gap:5px; align-items:center;">
-                    <form method="POST" style="margin:0;" onclick="event.stopPropagation();"><input type="hidden" name="action" value="move_category_up"><input type="hidden" name="category_name" value="{{ category }}"><button type="submit" class="btn btn-outline" style="padding:2px 6px; font-size:0.8rem;">▲</button></form>
-                    <form method="POST" style="margin:0;" onclick="event.stopPropagation();"><input type="hidden" name="action" value="move_category_down"><input type="hidden" name="category_name" value="{{ category }}"><button type="submit" class="btn btn-outline" style="padding:2px 6px; font-size:0.8rem;">▼</button></form>
-                    <form method="POST" style="margin:0;" onclick="event.stopPropagation();" onsubmit="return confirm('Удалить категорию и все ее товары?');">
-                        <input type="hidden" name="action" value="delete_category">
-                        <input type="hidden" name="category_name" value="{{ category }}">
-                        <button type="submit" class="btn btn-danger"><i class="fas fa-trash-alt"></i></button>
-                    </form>
-                </div>
+                <form method="POST" style="margin:0;" onclick="event.stopPropagation();" onsubmit="return confirm('Удалить категорию и все ее товары?');">
+                    <input type="hidden" name="action" value="delete_category">
+                    <input type="hidden" name="category_name" value="{{ category }}">
+                    <button type="submit" class="btn btn-danger"><i class="fas fa-trash-alt"></i></button>
+                </form>
             </div>
             <div class="category-content" id="cat-{{ loop.index }}">
                 
@@ -2650,11 +2572,6 @@ ADMIN_TEMPLATE = '''
                                 <input type="text" name="name" placeholder="Введите название" required autocomplete="off">
                             </div>
                             
-                            <div class="form-group" style="flex:0;">
-                                <label>&nbsp;</label>
-                                <label style="display:flex; align-items:center; gap:5px; margin-top:10px; cursor:pointer;"><input type="checkbox" name="main_is_available" value="1" checked> В наличии</label>
-                            </div>
-                            
                             {% if settings.use_barcodes and sys_mode not in ['external', 'light_external'] %}
                             <div class="form-group main-barcode-container">
                                 <label>Штрих-код</label>
@@ -2699,14 +2616,6 @@ ADMIN_TEMPLATE = '''
                             {% endif %}
                         </div>
                         
-                        {% if settings.business_type == 'wholesale' %}
-                        <div class="form-group main-vol-prices-container" style="background: #f9f9f9; padding: 10px; border-radius: 8px; border: 1px dashed #ccc; margin-top: 10px;">
-                            <label style="font-size:0.85rem; font-weight:bold; margin-bottom:5px; display:block;">Оптовые цены от количества (только без вариантов)</label>
-                            <div id="main_vol_prices_add_{{ loop.index }}"></div>
-                            <button type="button" class="btn btn-outline" style="padding:5px 10px; font-size:0.8rem; margin-top:5px;" onclick="addVolPriceRow('main_vol_prices_add_{{ loop.index }}', 'main')"><i class="fas fa-plus"></i> Добавить вариант цены</button>
-                        </div>
-                        {% endif %}
-                        
                         <div class="variants-container" id="variants-container-add-{{ loop.index }}">
                             <div style="display:flex; justify-content:space-between; align-items:center;">
                                 <label style="font-weight:600; font-size:0.9rem;"><i class="fas fa-tags"></i> Варианты товара</label>
@@ -2731,7 +2640,7 @@ ADMIN_TEMPLATE = '''
 
                 {% for product in products %}
                     {% if product.category == category %}
-                    <div class="product-item {% if product.is_available == False %}unavailable-item{% endif %}" data-pid="{{ product.product_id }}">
+                    <div class="product-item" data-pid="{{ product.product_id }}">
                         <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">
@@ -2767,16 +2676,10 @@ ADMIN_TEMPLATE = '''
                                         • Остаток по вариантам
                                         {% endif %}
                                     {% endif %}
-                                    
-                                    {% if product.is_available == False %}
-                                    <span style="color:var(--danger); font-weight:bold; margin-left:5px;">(Нет в наличии)</span>
-                                    {% endif %}
                                 </span>
                             </div>
                         </div>
-                        <div class="product-actions" style="align-items:center;">
-                            <form method="POST" style="margin:0;"><input type="hidden" name="action" value="move_product_up"><input type="hidden" name="product_id" value="{{ product.product_id }}"><button type="submit" class="btn btn-outline" style="padding:4px 8px; font-size:0.8rem;">▲</button></form>
-                            <form method="POST" style="margin:0; margin-right:10px;"><input type="hidden" name="action" value="move_product_down"><input type="hidden" name="product_id" value="{{ product.product_id }}"><button type="submit" class="btn btn-outline" style="padding:4px 8px; font-size:0.8rem;">▼</button></form>
+                        <div class="product-actions">
                             <button class="btn btn-warning" onclick="toggleEditProduct('edit-prod-{{ product.product_id }}')"><i class="fas fa-edit"></i></button>
                             <form method="POST" style="margin:0;" onsubmit="return confirm('Удалить товар?');">
                                 <input type="hidden" name="action" value="delete_product">
@@ -2798,11 +2701,6 @@ ADMIN_TEMPLATE = '''
                                         <input type="text" name="name" value="{{ product.name }}" required autocomplete="off">
                                     </div>
                                     
-                                    <div class="form-group" style="flex:0;">
-                                        <label>&nbsp;</label>
-                                        <label style="display:flex; align-items:center; gap:5px; margin-top:10px; cursor:pointer;"><input type="checkbox" name="main_is_available" value="1" {% if product.is_available != False %}checked{% endif %}> В наличии</label>
-                                    </div>
-                                    
                                     {% if settings.use_barcodes and sys_mode not in ['external', 'light_external'] %}
                                     <div class="form-group main-barcode-container" {% if product.variants %}style="display:none;"{% endif %}>
                                         <label>Штрих-код</label>
@@ -2846,22 +2744,6 @@ ADMIN_TEMPLATE = '''
                                     </div>
                                     {% endif %}
                                 </div>
-                                
-                                {% if settings.business_type == 'wholesale' %}
-                                <div class="form-group main-vol-prices-container" {% if product.variants %}style="display:none;"{% else %}style="background: #f9f9f9; padding: 10px; border-radius: 8px; border: 1px dashed #ccc; margin-top: 10px;"{% endif %}>
-                                    <label style="font-size:0.85rem; font-weight:bold; margin-bottom:5px; display:block;">Оптовые цены от количества (только без вариантов)</label>
-                                    <div id="main_vol_prices_edit_{{ product.product_id }}">
-                                        {% for vp in product.volume_prices %}
-                                        <div class="vol-price-row">
-                                            <input type="number" name="main_vol_qty[]" value="{{ vp.qty }}" placeholder="От шт">
-                                            <input type="number" name="main_vol_price[]" value="{{ vp.price }}" placeholder="Цена" step="0.01">
-                                            <button type="button" onclick="this.parentElement.remove()">X</button>
-                                        </div>
-                                        {% endfor %}
-                                    </div>
-                                    <button type="button" class="btn btn-outline" style="padding:5px 10px; font-size:0.8rem; margin-top:5px;" onclick="addVolPriceRow('main_vol_prices_edit_{{ product.product_id }}', 'main')"><i class="fas fa-plus"></i> Добавить вариант цены</button>
-                                </div>
-                                {% endif %}
 
                                 <div class="variants-container" id="variants-container-edit-{{ product.product_id }}">
                                     <div style="display:flex; justify-content:space-between; align-items:center;">
@@ -2870,71 +2752,43 @@ ADMIN_TEMPLATE = '''
                                     </div>
                                     <div id="variants-list-edit-{{ product.product_id }}">
                                         {% for variant in product.variants %}
-                                        {% set vid = uuid4().hex %}
                                         <div class="variant-row">
-                                            <div class="move-variant-btns">
-                                                <button type="button" onclick="moveVariantUp(this)">▲</button>
-                                                <button type="button" onclick="moveVariantDown(this)">▼</button>
+                                            <div class="form-group">
+                                                <label>Название</label>
+                                                <input type="text" name="variant_name[]" value="{{ variant.name }}" placeholder="Цвет, размер" required>
                                             </div>
-                                            <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>
-                                            <input type="hidden" name="variant_id[]" value="{{ vid }}">
-                                            
-                                            <div style="display:flex; width:100%; gap:15px; flex-wrap:wrap; margin-top:15px;">
-                                                <div class="form-group" style="flex:2;">
-                                                    <label>Название</label>
-                                                    <input type="text" name="var_name_{{ vid }}" value="{{ variant.name }}" placeholder="Цвет, размер" required>
-                                                </div>
-                                                <div class="form-group" style="flex:0;">
-                                                    <label>&nbsp;</label>
-                                                    <label style="display:flex; align-items:center; gap:5px; margin-top:10px; cursor:pointer;"><input type="checkbox" name="var_is_available_{{ vid }}" value="1" {% if variant.is_available != False %}checked{% endif %}> В наличии</label>
-                                                </div>
-                                                {% if settings.business_type != 'retail' %}
-                                                <div class="form-group">
-                                                    <label>В уп. (шт)</label>
-                                                    <input type="number" name="var_ppb_{{ vid }}" value="{{ variant.pieces_per_box }}" placeholder="Шт">
-                                                </div>
-                                                {% endif %}
-                                                {% if settings.use_barcodes and sys_mode not in['external', 'light_external'] %}
-                                                <div class="form-group">
-                                                    <label>Штрих-код</label>
-                                                    <div style="display:flex; gap:5px;">
-                                                        <input type="text" name="var_barcode_{{ vid }}" 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="var_price_{{ vid }}" value="{{ variant.price }}" placeholder="Цена за ед." step="0.01" {% if product.has_variant_prices %}required{% endif %}>
-                                                </div>
-                                                {% if settings.business_type == 'mixed' %}
-                                                <div class="form-group var-price-input" {% if not product.has_variant_prices %}style="display:none;"{% endif %}>
-                                                    <label>Цена уп.</label>
-                                                    <input type="number" name="var_box_price_{{ vid }}" value="{{ variant.box_price }}" placeholder="Опционально" step="0.01">
-                                                </div>
-                                                {% endif %}
-                                                {% if settings.track_inventory and sys_mode not in ['external', 'light_external'] %}
-                                                <div class="form-group">
-                                                    <label>Остаток</label>
-                                                    <input type="number" name="var_stock_{{ vid }}" value="{{ variant.stock }}" placeholder="Остаток">
-                                                </div>
-                                                {% endif %}
+                                            {% if settings.business_type != 'retail' %}
+                                            <div class="form-group">
+                                                <label>В уп. (шт)</label>
+                                                <input type="number" name="variant_pieces_per_box[]" value="{{ variant.pieces_per_box }}" placeholder="Шт">
                                             </div>
-                                            {% if settings.business_type == 'wholesale' %}
-                                            <div style="width:100%; border-top:1px dashed #ccc; margin-top:10px; padding-top:10px;">
-                                                <label style="font-size:0.8rem; font-weight:bold;">Оптовые цены от количества:</label>
-                                                <div id="var_vol_prices_{{ vid }}">
-                                                    {% for vp in variant.volume_prices %}
-                                                    <div class="vol-price-row">
-                                                        <input type="number" name="var_vol_qty_{{ vid }}[]" value="{{ vp.qty }}" placeholder="От шт">
-                                                        <input type="number" name="var_vol_price_{{ vid }}[]" value="{{ vp.price }}" placeholder="Цена" step="0.01">
-                                                        <button type="button" onclick="this.parentElement.remove()">X</button>
-                                                    </div>
-                                                    {% endfor %}
+                                            {% endif %}
+                                            {% if settings.use_barcodes and sys_mode not in['external', 'light_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>
-                                                <button type="button" class="btn btn-outline" style="padding:2px 8px; font-size:0.75rem; margin-top:5px;" onclick="addVolPriceRow('var_vol_prices_{{ vid }}', 'var_{{ vid }}')">+ Добавить цену</button>
                                             </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 %}>
+                                            </div>
+                                            {% if settings.business_type == 'mixed' %}
+                                            <div class="form-group var-price-input" {% if not product.has_variant_prices %}style="display:none;"{% endif %}>
+                                                <label>Цена уп.</label>
+                                                <input type="number" name="variant_box_price[]" value="{{ variant.box_price }}" placeholder="Опционально" step="0.01">
+                                            </div>
+                                            {% endif %}
+                                            {% if settings.track_inventory and sys_mode not in ['external', 'light_external'] %}
+                                            <div class="form-group">
+                                                <label>Остаток</label>
+                                                <input type="number" name="variant_stock[]" value="{{ variant.stock }}" placeholder="Остаток">
+                                            </div>
+                                            {% 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 %}
                                     </div>
@@ -3035,40 +2889,12 @@ ADMIN_TEMPLATE = '''
             document.getElementById(elId).style.display = 'none';
         }
 
-        function moveVariantUp(btn) {
-            const row = btn.closest('.variant-row');
-            if (row.previousElementSibling && row.previousElementSibling.classList.contains('variant-row')) {
-                row.parentNode.insertBefore(row, row.previousElementSibling);
-            }
-        }
-
-        function moveVariantDown(btn) {
-            const row = btn.closest('.variant-row');
-            if (row.nextElementSibling && row.nextElementSibling.classList.contains('variant-row')) {
-                row.parentNode.insertBefore(row.nextElementSibling, row);
-            }
-        }
-
-        function addVolPriceRow(containerId, prefix) {
-            const container = document.getElementById(containerId);
-            const div = document.createElement('div');
-            div.className = 'vol-price-row';
-            let nameQty = prefix === 'main' ? 'main_vol_qty[]' : `var_vol_qty_${prefix.replace('var_', '')}[]`;
-            let namePrice = prefix === 'main' ? 'main_vol_price[]' : `var_vol_price_${prefix.replace('var_', '')}[]`;
-            div.innerHTML = `<input type="number" name="${nameQty}" placeholder="От шт">
-                             <input type="number" name="${namePrice}" placeholder="Цена" step="0.01">
-                             <button type="button" onclick="this.parentElement.remove()">X</button>`;
-            container.appendChild(div);
-        }
-
         function addVariantRow(containerId) {
             const container = document.getElementById(containerId);
             const formBlock = container.closest('form');
             const formId = formBlock.parentElement.id;
             const hasVariantPrices = formBlock.querySelector('input[name="has_variant_prices"]').checked;
             
-            const vid = Math.random().toString(36).substr(2, 9);
-            
             const div = document.createElement('div');
             div.className = 'variant-row';
             
@@ -3076,28 +2902,17 @@ ADMIN_TEMPLATE = '''
             let reqAttr = hasVariantPrices ? 'required' : '';
             
             let html = `
-                <div class="move-variant-btns">
-                    <button type="button" onclick="moveVariantUp(this)">▲</button>
-                    <button type="button" onclick="moveVariantDown(this)">▼</button>
+                <div class="form-group">
+                    <label>Название</label>
+                    <input type="text" name="variant_name[]" placeholder="Цвет, размер" required>
                 </div>
-                <button type="button" class="remove-variant-btn" onclick="this.parentElement.remove(); updateMainStockVisibility('${formId}')"><i class="fas fa-times-circle"></i></button>
-                <input type="hidden" name="variant_id[]" value="${vid}">
-                <div style="display:flex; width:100%; gap:15px; flex-wrap:wrap; margin-top:15px;">
-                    <div class="form-group" style="flex:2;">
-                        <label>Название</label>
-                        <input type="text" name="var_name_${vid}" placeholder="Цвет, размер" required>
-                    </div>
-                    <div class="form-group" style="flex:0;">
-                        <label>&nbsp;</label>
-                        <label style="display:flex; align-items:center; gap:5px; margin-top:10px; cursor:pointer;"><input type="checkbox" name="var_is_available_${vid}" value="1" checked> В наличии</label>
-                    </div>
             `;
             
             if (businessType !== 'retail') {
                 html += `
                 <div class="form-group">
                     <label>В уп. (шт)</label>
-                    <input type="number" name="var_ppb_${vid}" placeholder="Шт">
+                    <input type="number" name="variant_pieces_per_box[]" placeholder="Шт">
                 </div>`;
             }
             
@@ -3106,7 +2921,7 @@ ADMIN_TEMPLATE = '''
                 <div class="form-group">
                     <label>Штрих-код</label>
                     <div style="display:flex; gap:5px;">
-                        <input type="text" name="var_barcode_${vid}" placeholder="Код">
+                        <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>`;
@@ -3115,7 +2930,7 @@ ADMIN_TEMPLATE = '''
             html += `
                 <div class="form-group var-price-input" ${displayStyle}>
                     <label>Цена</label>
-                    <input type="number" name="var_price_${vid}" placeholder="Цена за ед." step="0.01" ${reqAttr}>
+                    <input type="number" name="variant_price[]" placeholder="Цена за ед." step="0.01" ${reqAttr}>
                 </div>
             `;
             
@@ -3123,7 +2938,7 @@ ADMIN_TEMPLATE = '''
                 html += `
                 <div class="form-group var-price-input" ${displayStyle}>
                     <label>Цена уп.</label>
-                    <input type="number" name="var_box_price_${vid}" placeholder="Опционально" step="0.01">
+                    <input type="number" name="variant_box_price[]" placeholder="Опционально" step="0.01">
                 </div>`;
             }
             
@@ -3131,21 +2946,11 @@ ADMIN_TEMPLATE = '''
                 html += `
                 <div class="form-group">
                     <label>Остаток</label>
-                    <input type="number" name="var_stock_${vid}" placeholder="Остаток">
+                    <input type="number" name="variant_stock[]" placeholder="Остаток">
                 </div>`;
             }
             
-            html += `</div>`;
-            
-            if (businessType === 'wholesale') {
-                html += `
-                <div style="width:100%; border-top:1px dashed #ccc; margin-top:10px; padding-top:10px;">
-                    <label style="font-size:0.8rem; font-weight:bold;">Оптовые цены от количества:</label>
-                    <div id="var_vol_prices_${vid}"></div>
-                    <button type="button" class="btn btn-outline" style="padding:2px 8px; font-size:0.75rem; margin-top:5px;" onclick="addVolPriceRow('var_vol_prices_${vid}', 'var_${vid}')">+ Добавить цену</button>
-                </div>
-                `;
-            }
+            html += `<button type="button" class="remove-variant-btn" onclick="this.parentElement.remove(); updateMainStockVisibility('${formId}')"><i class="fas fa-times-circle"></i></button>`;
             
             div.innerHTML = html;
             container.appendChild(div);
@@ -3166,8 +2971,8 @@ ADMIN_TEMPLATE = '''
                 
                 varPriceInputs.forEach(input => {
                     input.style.display = 'flex';
-                    const inp = input.querySelector('input[type="number"]');
-                    if(inp && inp.name && inp.name.includes('var_price_')) inp.setAttribute('required', 'required');
+                    const inp = input.querySelector('input[name="variant_price[]"]');
+                    if(inp) inp.setAttribute('required', 'required');
                 });
             } else {
                 if(mainPriceContainer) mainPriceContainer.style.display = 'flex';
@@ -3176,8 +2981,8 @@ ADMIN_TEMPLATE = '''
                 
                 varPriceInputs.forEach(input => {
                     input.style.display = 'none';
-                    const inp = input.querySelector('input[type="number"]');
-                    if(inp && inp.name && inp.name.includes('var_price_')) inp.removeAttribute('required');
+                    const inp = input.querySelector('input[name="variant_price[]"]');
+                    if(inp) inp.removeAttribute('required');
                 });
             }
         }
@@ -3201,14 +3006,6 @@ ADMIN_TEMPLATE = '''
                     else mainBc.style.display = 'flex';
                 }
             }
-            
-            if(businessType === 'wholesale') {
-                const mainVol = form.querySelector('.main-vol-prices-container');
-                if(mainVol) {
-                    if(variants.length > 0) mainVol.style.display = 'none';
-                    else mainVol.style.display = 'block';
-                }
-            }
         }
 
         function filterAdmin() {
@@ -3634,8 +3431,8 @@ REPORTS_TEMPLATE = '''
                     <tr>
                         <td style="font-weight:500;">${d}</td>
                         <td>${data[d].orders}</td>
-                        
-</tr>
+                        <td>${Math.round(data[d].sum).toLocaleString()}</td>
+                    </tr>
                 `;
             });
         }
@@ -4208,7 +4005,6 @@ def create_order(env_id):
             "variant_name": item.get('variant_name', ''),
             "variant_idx": item.get('variant_idx', -1),
             "discount": float(item.get('discount', 0)),
-            "volume_prices": item.get('volume_prices', []),
             "category": product_dict.get(item.get('product_id'), 'Без категории'),
             "photo_url": f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{item['photos'][0]}" if item.get('photos') else "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSIjZjBmMHcwIi8+PC9zdmc+"
         })
@@ -4588,24 +4384,6 @@ def admin(env_id):
             data['settings'] = settings
             save_env_data(env_id, data)
 
-        elif action == 'move_category_up':
-            cat_name = request.form.get('category_name')
-            if cat_name in categories:
-                idx = categories.index(cat_name)
-                if idx > 0:
-                    categories[idx], categories[idx-1] = categories[idx-1], categories[idx]
-                    data['categories'] = categories
-                    save_env_data(env_id, data)
-                    
-        elif action == 'move_category_down':
-            cat_name = request.form.get('category_name')
-            if cat_name in categories:
-                idx = categories.index(cat_name)
-                if idx < len(categories) - 1:
-                    categories[idx], categories[idx+1] = categories[idx+1], categories[idx]
-                    data['categories'] = categories
-                    save_env_data(env_id, data)
-
         elif action == 'add_category':
             cat_name = request.form.get('category_name', '').strip()
             if cat_name and cat_name not in categories:
@@ -4655,30 +4433,6 @@ def admin(env_id):
                     del data['category_photos'][cat_name]
                 save_env_data(env_id, data)
 
-        elif action == 'move_product_up':
-            pid = request.form.get('product_id')
-            for i, p in enumerate(products):
-                if p.get('product_id') == pid:
-                    for j in range(i-1, -1, -1):
-                        if products[j].get('category') == p.get('category'):
-                            products[i], products[j] = products[j], products[i]
-                            break
-                    break
-            data['products'] = products
-            save_env_data(env_id, data)
-
-        elif action == 'move_product_down':
-            pid = request.form.get('product_id')
-            for i, p in enumerate(products):
-                if p.get('product_id') == pid:
-                    for j in range(i+1, len(products)):
-                        if products[j].get('category') == p.get('category'):
-                            products[i], products[j] = products[j], products[i]
-                            break
-                    break
-            data['products'] = products
-            save_env_data(env_id, data)
-
         elif action == 'add_product':
             name = request.form.get('name', '').strip()
             barcode = request.form.get('barcode', '').strip()
@@ -4697,59 +4451,48 @@ def admin(env_id):
             stock_str = request.form.get('stock', '')
             main_stock = int(stock_str) if stock_str else ""
             
-            main_is_available = request.form.get('main_is_available') == '1'
-            
             description = request.form.get('description', '').strip()
             category = request.form.get('category')
             has_variant_prices = 'has_variant_prices' in request.form
             
-            main_vol_qtys = request.form.getlist('main_vol_qty[]')
-            main_vol_prices = request.form.getlist('main_vol_price[]')
-            main_volume_prices = []
-            for mq, mp in zip(main_vol_qtys, main_vol_prices):
-                if mq.strip() and mp.strip():
-                    main_volume_prices.append({"qty": int(mq), "price": float(mp)})
+            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_ppbs = request.form.getlist('variant_pieces_per_box[]')
+            variants =[]
             
-            variant_ids = request.form.getlist('variant_id[]')
-            variants = []
-            for vid in variant_ids:
-                v_name = request.form.get(f'var_name_{vid}', '').strip()
+            for i in range(len(variant_names)):
+                v_name = variant_names[i].strip()
                 if v_name:
-                    v_is_avail = request.form.get(f'var_is_available_{vid}') == '1'
                     v_price = price
                     v_box_price = box_price
                     if has_variant_prices:
-                        v_p_str = request.form.get(f'var_price_{vid}', '')
-                        if v_p_str: v_price = float(v_p_str)
-                        v_bp_str = request.form.get(f'var_box_price_{vid}', '')
-                        if v_bp_str: v_box_price = float(v_bp_str)
-                        
+                        if i < len(variant_prices) and variant_prices[i]:
+                            v_price = float(variant_prices[i])
+                        if i < len(variant_box_prices) and variant_box_prices[i]:
+                            v_box_price = float(variant_box_prices[i])
+                            
                     v_stock = ""
-                    v_s_str = request.form.get(f'var_stock_{vid}', '')
-                    if v_s_str: v_stock = int(v_s_str)
+                    if i < len(variant_stocks) and variant_stocks[i]:
+                        v_stock = int(variant_stocks[i])
                         
-                    v_barcode = request.form.get(f'var_barcode_{vid}', '').strip()
+                    v_barcode = ""
+                    if i < len(variant_barcodes) and variant_barcodes[i]:
+                        v_barcode = variant_barcodes[i].strip()
                         
                     v_ppb = pieces_per_box
-                    v_ppb_str = request.form.get(f'var_ppb_{vid}', '')
-                    if v_ppb_str: v_ppb = int(v_ppb_str)
-                    
-                    v_vol_qtys = request.form.getlist(f'var_vol_qty_{vid}[]')
-                    v_vol_prices = request.form.getlist(f'var_vol_price_{vid}[]')
-                    v_volume_prices = []
-                    for vq, vp in zip(v_vol_qtys, v_vol_prices):
-                        if vq.strip() and vp.strip():
-                            v_volume_prices.append({"qty": int(vq), "price": float(vp)})
-                            
+                    if i < len(variant_ppbs) and variant_ppbs[i]:
+                        v_ppb = int(variant_ppbs[i])
+                        
                     variants.append({
                         "name": v_name, 
                         "barcode": v_barcode,
                         "price": v_price, 
                         "box_price": v_box_price,
                         "stock": v_stock,
-                        "pieces_per_box": v_ppb,
-                        "is_available": v_is_avail,
-                        "volume_prices": v_volume_prices
+                        "pieces_per_box": v_ppb
                     })
 
             uploaded_photos = request.files.getlist('photos')[:10]
@@ -4791,8 +4534,6 @@ def admin(env_id):
                 'box_price': box_price,
                 'min_order': min_order,
                 'stock': main_stock,
-                'is_available': main_is_available,
-                'volume_prices': main_volume_prices,
                 'description': description,
                 'category': category,
                 'photos': photos_list,
@@ -4823,60 +4564,45 @@ def admin(env_id):
             stock_str = request.form.get('stock', '')
             main_stock = int(stock_str) if stock_str else ""
             
-            main_is_available = request.form.get('main_is_available') == '1'
-            
             description = request.form.get('description', '').strip()
             has_variant_prices = 'has_variant_prices' in request.form
             
-            main_vol_qtys = request.form.getlist('main_vol_qty[]')
-            main_vol_prices = request.form.getlist('main_vol_price[]')
-            main_volume_prices = []
-            for mq, mp in zip(main_vol_qtys, main_vol_prices):
-                if mq.strip() and mp.strip():
-                    main_volume_prices.append({"qty": int(mq), "price": float(mp)})
-            
             remove_photos = request.form.getlist('remove_photos[]')
             
-            variant_ids = request.form.getlist('variant_id[]')
-            variants = []
-            for vid in variant_ids:
-                v_name = request.form.get(f'var_name_{vid}', '').strip()
+            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_ppbs = request.form.getlist('variant_pieces_per_box[]')
+            variants =[]
+            
+            for i in range(len(variant_names)):
+                v_name = variant_names[i].strip()
                 if v_name:
-                    v_is_avail = request.form.get(f'var_is_available_{vid}') == '1'
                     v_price = price
                     v_box_price = box_price
                     if has_variant_prices:
-                        v_p_str = request.form.get(f'var_price_{vid}', '')
-                        if v_p_str: v_price = float(v_p_str)
-                        v_bp_str = request.form.get(f'var_box_price_{vid}', '')
-                        if v_bp_str: v_box_price = float(v_bp_str)
-                        
+                        if i < len(variant_prices) and variant_prices[i]:
+                            v_price = float(variant_prices[i])
+                        if i < len(variant_box_prices) and variant_box_prices[i]:
+                            v_box_price = float(variant_box_prices[i])
                     v_stock = ""
-                    v_s_str = request.form.get(f'var_stock_{vid}', '')
-                    if v_s_str: v_stock = int(v_s_str)
-                        
-                    v_barcode = request.form.get(f'var_barcode_{vid}', '').strip()
-                        
+                    if i < len(variant_stocks) and variant_stocks[i]:
+                        v_stock = int(variant_stocks[i])
+                    v_barcode = ""
+                    if i < len(variant_barcodes) and variant_barcodes[i]:
+                        v_barcode = variant_barcodes[i].strip()
                     v_ppb = pieces_per_box
-                    v_ppb_str = request.form.get(f'var_ppb_{vid}', '')
-                    if v_ppb_str: v_ppb = int(v_ppb_str)
-                    
-                    v_vol_qtys = request.form.getlist(f'var_vol_qty_{vid}[]')
-                    v_vol_prices = request.form.getlist(f'var_vol_price_{vid}[]')
-                    v_volume_prices = []
-                    for vq, vp in zip(v_vol_qtys, v_vol_prices):
-                        if vq.strip() and vp.strip():
-                            v_volume_prices.append({"qty": int(vq), "price": float(vp)})
-                            
+                    if i < len(variant_ppbs) and variant_ppbs[i]:
+                        v_ppb = int(variant_ppbs[i])
                     variants.append({
                         "name": v_name, 
                         "barcode": v_barcode,
                         "price": v_price, 
                         "box_price": v_box_price,
                         "stock": v_stock,
-                        "pieces_per_box": v_ppb,
-                        "is_available": v_is_avail,
-                        "volume_prices": v_volume_prices
+                        "pieces_per_box": v_ppb
                     })
                     
             uploaded_photos = request.files.getlist('photos')[:10]
@@ -4918,8 +4644,6 @@ def admin(env_id):
                     p['box_price'] = box_price
                     p['min_order'] = min_order
                     p['stock'] = main_stock
-                    p['is_available'] = main_is_available
-                    p['volume_prices'] = main_volume_prices
                     p['description'] = description
                     p['variants'] = variants
                     p['has_variant_prices'] = has_variant_prices