Update app.py

app.py

@@ -235,11 +235,16 @@ 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 'wholesale_tiers' not in product: product['wholesale_tiers'] = []; 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 'wholesale_tiers' not in v: v['wholesale_tiers'] = []; changed = True
 
             for order_id, order in env_data['orders'].items():
                 if 'status' not in order: order['status'] = 'confirmed'; changed = True
@@ -249,6 +254,7 @@ 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 'wholesale_tiers' not in item: item['wholesale_tiers'] = []; changed = True
 
         if changed or not os.path.exists(DATA_FILE):
             try:
@@ -325,10 +331,16 @@ def update_order_totals(order, business_type):
         c_box_price = float(i.get('cart_box_price', 0))
         item_discount = float(i.get('discount', 0))
         
-        if business_type in ['mixed', 'wholesale'] and c_box_price > 0 and ppb > 1 and qty >= ppb:
+        base_price = c_price
+        tiers = i.get('wholesale_tiers', [])
+        
+        if business_type == 'wholesale' and tiers:
+            valid_tiers = [t for t in tiers if qty >= t.get('qty', 0)]
+            if valid_tiers:
+                valid_tiers.sort(key=lambda x: x['qty'], reverse=True)
+                base_price = float(valid_tiers[0]['price'])
+        elif 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, base_price - item_discount)
         item_total = discounted_price * qty
@@ -586,10 +598,10 @@ CATALOG_TEMPLATE = '''
         .category-item span.count { color: var(--text-muted); font-size: 0.8rem; background: var(--bg); padding: 4px 10px; border-radius: 20px; }
         
         .products-container { display: none; padding: 20px; flex-direction: column; gap: 15px; }
-        .product-card { background: var(--surface); border-radius: 16px; padding: 15px; display: flex; flex-direction: column; box-shadow: 0 4px 15px rgba(0,0,0,0.03); width: 100%; gap: 10px; }
+        .product-card { background: var(--surface); border-radius: 16px; padding: 15px; display: flex; flex-direction: column; box-shadow: 0 4px 15px rgba(0,0,0,0.03); width: 100%; gap: 10px; transition: opacity 0.3s, filter 0.3s; }
         .product-main-content { display: flex; width: 100%; gap: 15px; align-items: stretch; }
         .product-img-wrapper { position: relative; width: 100px; height: 100px; flex-shrink: 0; }
-        .product-img { width: 100%; height: 100%; border-radius: 12px; object-fit: cover; cursor: pointer; background: var(--bg); border: 1px solid var(--border); }
+        .product-img { width: 100%; height: 100%; border-radius: 12px; object-fit: cover; cursor: pointer; background: var(--bg); border: 1px solid var(--border); transition: filter 0.3s; }
         .photo-count { position: absolute; bottom: 5px; right: 5px; background: rgba(0,0,0,0.6); color: white; font-size: 0.7rem; padding: 2px 6px; border-radius: 10px; pointer-events: none; }
         .product-info { flex-grow: 1; display: flex; flex-direction: column; min-width: 0; justify-content: flex-start; gap: 4px; }
         .product-title { font-size: 0.95rem; font-weight: 600; line-height: 1.4; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; }
@@ -602,15 +614,18 @@ CATALOG_TEMPLATE = '''
         .quantity-control { display: flex; align-items: center; background: var(--bg); border-radius: 8px; overflow: hidden; border: 1px solid var(--border); }
         .quantity-control button { border: none; background: transparent; width: 32px; height: 32px; font-size: 1.1rem; cursor: pointer; color: var(--primary); display: flex; align-items: center; justify-content: center; transition: background 0.2s; }
         .quantity-control button:active { background: #e0e0e0; }
+        .quantity-control button:disabled { color: #ccc; cursor: not-allowed; }
         .quantity-control input { width: 36px; height: 32px; border: none; text-align: center; background: transparent; font-weight: 600; font-size: 0.95rem; color: var(--primary); outline: none; }
+        .quantity-control input:disabled { color: #ccc; }
         .quantity-control input[type="number"]::-webkit-inner-spin-button, 
         .quantity-control input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; }
         .quantity-control input[type="number"] { -moz-appearance: textfield; }
         .box-btn { background: var(--primary); color: #fff; border: none; border-radius: 8px; padding: 0 10px; height: 32px; font-size: 0.8rem; font-weight: 600; cursor: pointer; transition: opacity 0.2s; }
         .box-btn:active { opacity: 0.8; }
+        .box-btn:disabled { background: #ccc; cursor: not-allowed; }
 
         .variants-list { display: flex; flex-direction: column; gap: 8px; margin-top: 5px; width: 100%; }
-        .variant-item { display: flex; justify-content: space-between; align-items: center; background: var(--bg); padding: 10px; border-radius: 8px; flex-wrap: wrap; gap: 10px; border: 1px solid var(--border); }
+        .variant-item { display: flex; justify-content: space-between; align-items: center; background: var(--bg); padding: 10px; border-radius: 8px; flex-wrap: wrap; gap: 10px; border: 1px solid var(--border); transition: opacity 0.3s; }
         .variant-info { display: flex; flex-direction: column; flex: 1; min-width: 120px; }
         .variant-name { font-weight: 600; font-size: 0.9rem; }
         .variant-price { font-size: 0.85rem; color: var(--primary); font-weight: 500; }
@@ -953,6 +968,10 @@ CATALOG_TEMPLATE = '''
             const imgClick = hasPhotos ? `onclick="openGallery('${p.product_id}')"` : '';
             const descHtml = p.description ? `<div class="product-desc">${p.description}</div>` : '';
             
+            let isMainAvailable = p.is_available !== false;
+            let cardStyle = !isMainAvailable ? 'opacity: 0.6; filter: grayscale(100%);' : '';
+            let mainDisabledAttr = !isMainAvailable ? 'disabled' : '';
+
             let boxInfoHtml = '';
             if (businessType !== 'retail') {
                 if (ppb > 1) boxInfoHtml += `<div class="product-box-info">В упаковке: ${ppb} шт</div>`;
@@ -971,9 +990,18 @@ CATALOG_TEMPLATE = '''
             if (p.variants && p.variants.length > 0) {
                 variantsHtml = `<div class="variants-list">`;
                 p.variants.forEach((v, idx) => {
+                    let vAvailable = v.is_available !== false && isMainAvailable;
+                    let vDisabledAttr = !vAvailable ? 'disabled' : '';
+                    let vStyle = !vAvailable ? 'opacity: 0.6;' : '';
+
                     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>` : '';
+                    if (!vAvailable) {
+                        vStockHtml = `<div class="variant-stock" style="color:#e17055; font-weight:bold;">Нет в наличии</div>`;
+                    }
+
                     let cKey = getCartKey(p.product_id, idx);
                     let qty = cart[cKey] ? cart[cKey].quantity : 0;
                     let vPpb = parseInt(v.pieces_per_box) || ppb;
@@ -982,14 +1010,26 @@ CATALOG_TEMPLATE = '''
                     if (businessType === 'mixed' && vBoxPrice && vPpb > 1) {
                         priceText += `<br><span style="font-size:0.8rem; color:#636e72;">Упаковка: ${vBoxPrice} ${currency}</span>`;
                     }
+                    if (businessType === 'wholesale') {
+                        let tiers = v.wholesale_tiers || [];
+                        if (!p.has_variant_prices) tiers = p.wholesale_tiers || [];
+                        if (tiers.length > 0) {
+                            tiers.sort((a,b) => a.qty - b.qty);
+                            priceText += `<br><div style="font-size:0.8rem; color:#0984e3; margin-top:4px;">`;
+                            tiers.forEach(t => {
+                                priceText += `От ${t.qty} шт: ${t.price} ${currency}<br>`;
+                            });
+                            priceText += `</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>`;
+                        addBoxBtnVariant = `<button class="box-btn" style="height:32px; margin-right:5px;" onclick="updateCart('${p.product_id}', ${vPpb}, null, false, '${cKey}', ${moq})" ${vDisabledAttr}>+ Упаковка</button>`;
                     }
                     
                     variantsHtml += `
-                        <div class="variant-item">
+                        <div class="variant-item" style="${vStyle}">
                             <div class="variant-info">
                                 <span class="variant-name">${v.name}</span>
                                 <span class="variant-price">${priceText}</span>
@@ -998,9 +1038,9 @@ CATALOG_TEMPLATE = '''
                             <div style="display:flex; align-items:center;">
                                 ${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>
+                                    <button onclick="updateCart('${p.product_id}', -1, null, false, '${cKey}', ${moq})" ${vDisabledAttr}><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})" ${vDisabledAttr}>
+                                    <button onclick="updateCart('${p.product_id}', 1, null, false, '${cKey}', ${moq})" ${vDisabledAttr}><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
                                 </div>
                             </div>
                         </div>
@@ -1009,17 +1049,32 @@ CATALOG_TEMPLATE = '''
                 variantsHtml += `</div>`;
             } else {
                 let mStockHtml = showStock && p.stock !== "" && p.stock !== null ? `<div style="font-size:0.8rem; color:#0984e3; margin-top:4px;">Остаток: ${p.stock} шт</div>` : '';
+                if (!isMainAvailable) {
+                    mStockHtml = `<div style="font-size:0.8rem; color:#e17055; margin-top:4px; font-weight:bold;">Нет в наличии</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>`;
+                    addBoxBtn = `<button class="box-btn" onclick="updateCart('${p.product_id}', ${ppb}, null, false, null, ${moq})" ${mainDisabledAttr}>+ Упаковка</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>`;
                 }
+                if (businessType === 'wholesale') {
+                    let tiers = p.wholesale_tiers || [];
+                    if (tiers.length > 0) {
+                        tiers.sort((a,b) => a.qty - b.qty);
+                        priceText += `<br><div style="font-size:0.8rem; color:#0984e3; margin-top:4px;">`;
+                        tiers.forEach(t => {
+                            priceText += `От ${t.qty} шт: ${t.price} ${currency}<br>`;
+                        });
+                        priceText += `</div>`;
+                    }
+                }
 
                 mainControlsHtml = `
                     <div class="product-bottom">
@@ -1030,9 +1085,9 @@ CATALOG_TEMPLATE = '''
                         <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>
+                                <button onclick="updateCart('${p.product_id}', -1, null, false, null, ${moq})" ${mainDisabledAttr}><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})" ${mainDisabledAttr}>
+                                <button onclick="updateCart('${p.product_id}', 1, null, false, null, ${moq})" ${mainDisabledAttr}><i class="fas fa-plus" style="font-size:0.8rem;"></i></button>
                             </div>
                         </div>
                     </div>
@@ -1041,6 +1096,7 @@ CATALOG_TEMPLATE = '''
 
             const div = document.createElement('div');
             div.className = 'product-card';
+            div.style = cardStyle;
             div.innerHTML = `
                 <div class="product-main-content">
                     <div class="product-img-wrapper" ${imgClick}>
@@ -1080,12 +1136,14 @@ CATALOG_TEMPLATE = '''
         function updateCart(productId, change, exactValue = null, fromCartModal = false, cartKeyOverride = null, moq = 1) {
             const p = products.find(x => x.product_id === productId);
             if (!p) return;
+            if (p.is_available === false && change > 0) return;
 
             let cKey = cartKeyOverride !== null ? cartKeyOverride : productId;
             let varIdx = -1;
             
             if (cKey.includes('___')) {
                 varIdx = parseInt(cKey.split('___')[1]);
+                if (p.variants[varIdx] && p.variants[varIdx].is_available === false && change > 0) return;
             }
 
             let pStock = "";
@@ -1104,14 +1162,19 @@ CATALOG_TEMPLATE = '''
                 let price = p.price;
                 let bPrice = p.box_price || 0;
                 let vName = "";
+                let tiers = p.wholesale_tiers || [];
+                
                 if (varIdx !== -1 && p.variants[varIdx]) {
                     if (p.has_variant_prices) {
                         price = p.variants[varIdx].price;
                         bPrice = p.variants[varIdx].box_price || 0;
+                        tiers = p.variants[varIdx].wholesale_tiers || [];
+                    } else {
+                        tiers = p.wholesale_tiers || [];
                     }
                     vName = p.variants[varIdx].name;
                 }
-                cart[cKey] = { ...p, quantity: 0, cart_price: price, cart_box_price: bPrice, pieces_per_box: pPpb, variant_name: vName, variant_idx: varIdx, discount: 0 };
+                cart[cKey] = { ...p, quantity: 0, cart_price: price, cart_box_price: bPrice, pieces_per_box: pPpb, variant_name: vName, variant_idx: varIdx, discount: 0, wholesale_tiers: tiers };
             }
 
             let currentQty = cart[cKey].quantity;
@@ -1177,7 +1240,12 @@ CATALOG_TEMPLATE = '''
             let disc = parseFloat(item.discount) || 0;
             
             let unit = cPrice;
-            if ((businessType === 'mixed' || businessType === 'wholesale') && cBoxPrice > 0 && ppb > 1 && qty >= ppb) {
+            if (businessType === 'wholesale' && item.wholesale_tiers && item.wholesale_tiers.length > 0) {
+                let validTiers = item.wholesale_tiers.filter(t => qty >= t.qty).sort((a, b) => b.qty - a.qty);
+                if (validTiers.length > 0) {
+                    unit = validTiers[0].price;
+                }
+            } else if ((businessType === 'mixed' || businessType === 'wholesale') && cBoxPrice > 0 && ppb > 1 && qty >= ppb) {
                 unit = cBoxPrice / ppb;
             }
             return Math.max(0, unit - disc) * qty;
@@ -2219,8 +2287,7 @@ 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-end; background: #fff; padding: 10px; border-radius: 8px; border: 1px solid var(--border); }
-        .variant-row .form-group { flex: 1 1 30%; min-width: 120px; }
+        .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); }
         .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; }
@@ -2527,11 +2594,25 @@ 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>
-                <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 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">
+                        <input type="hidden" name="direction" value="up">
+                        <input type="hidden" name="category_name" value="{{ category }}">
+                        <button type="submit" class="btn btn-outline" style="padding: 2px 6px;"><i class="fas fa-arrow-up"></i></button>
+                    </form>
+                    <form method="POST" style="margin:0;" onclick="event.stopPropagation();">
+                        <input type="hidden" name="action" value="move_category">
+                        <input type="hidden" name="direction" value="down">
+                        <input type="hidden" name="category_name" value="{{ category }}">
+                        <button type="submit" class="btn btn-outline" style="padding: 2px 6px;"><i class="fas fa-arrow-down"></i></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" style="margin-left:10px;"><i class="fas fa-trash-alt"></i></button>
+                    </form>
+                </div>
             </div>
             <div class="category-content" id="cat-{{ loop.index }}">
                 
@@ -2571,6 +2652,14 @@ ADMIN_TEMPLATE = '''
                                 <label>Название товара</label>
                                 <input type="text" name="name" placeholder="Введите название" required autocomplete="off">
                             </div>
+
+                            <div class="form-group" style="flex:1;">
+                                <label>Наличие</label>
+                                <select name="is_available">
+                                    <option value="1" selected>В наличии</option>
+                                    <option value="0">Нет в наличии</option>
+                                </select>
+                            </div>
                             
                             {% if settings.use_barcodes and sys_mode not in ['external', 'light_external'] %}
                             <div class="form-group main-barcode-container">
@@ -2584,7 +2673,7 @@ ADMIN_TEMPLATE = '''
                             
                             <div class="form-group main-price-container">
                                 <label>Цена за ед.</label>
-                                <input type="number" name="price" placeholder="Цена" step="0.01" class="main-price-input">
+                                <input type="number" name="price" placeholder="Цена" step="0.01" class="main-price-input" required>
                             </div>
                             
                             {% if settings.business_type != 'retail' %}
@@ -2615,6 +2704,14 @@ ADMIN_TEMPLATE = '''
                             </div>
                             {% endif %}
                         </div>
+
+                        {% if settings.business_type == 'wholesale' %}
+                        <div class="form-group main-tiers-container">
+                            <label>Оптовые цены (от кол-ва)</label>
+                            <div id="main-tiers-list-add-{{ loop.index }}"></div>
+                            <button type="button" class="btn btn-outline" style="padding: 5px; font-size:0.8rem; margin-top:5px;" onclick="addTierRow('main-tiers-list-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;">
@@ -2643,17 +2740,20 @@ ADMIN_TEMPLATE = '''
                     <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">
+                                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product.photos[0] }}" class="product-img" style="{% if product.is_available == False %}filter: grayscale(100%);{% endif %}">
                             {% else %}
                                 <div class="product-img" style="display:flex;align-items:center;justify-content:center;color:#ccc;"><i class="fas fa-image"></i></div>
                             {% endif %}
                             <div class="product-details">
-                                <span class="product-name">{{ product.name }}</span>
+                                <span class="product-name" style="{% if product.is_available == False %}color:#b2bec3; text-decoration:line-through;{% endif %}">{{ product.name }}</span>
                                 <div style="font-size:0.8rem; color:#b2bec3;">ID: {{ product.product_id }}</div>
                                 {% if product.description %}
                                 <span class="product-desc">{{ product.description[:50] }}{{ '...' if product.description|length > 50 else '' }}</span>
                                 {% endif %}
                                 <span class="product-meta">
+                                    {% if product.is_available == False %}
+                                        <strong style="color:var(--danger);">Нет в наличии</strong> • 
+                                    {% endif %}
                                     {% if product.has_variant_prices %}
                                         Цена по вариантам
                                     {% else %}
@@ -2679,7 +2779,20 @@ ADMIN_TEMPLATE = '''
                                 </span>
                             </div>
                         </div>
-                        <div class="product-actions">
+                        <div class="product-actions" style="align-items: center;">
+                            <form method="POST" style="margin:0;">
+                                <input type="hidden" name="action" value="move_product">
+                                <input type="hidden" name="direction" value="up">
+                                <input type="hidden" name="product_id" value="{{ product.product_id }}">
+                                <button type="submit" class="btn btn-outline" style="padding: 5px;"><i class="fas fa-arrow-up"></i></button>
+                            </form>
+                            <form method="POST" style="margin:0;">
+                                <input type="hidden" name="action" value="move_product">
+                                <input type="hidden" name="direction" value="down">
+                                <input type="hidden" name="product_id" value="{{ product.product_id }}">
+                                <button type="submit" class="btn btn-outline" style="padding: 5px; margin-right:10px;"><i class="fas fa-arrow-down"></i></button>
+                            </form>
+
                             <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">
@@ -2700,6 +2813,14 @@ ADMIN_TEMPLATE = '''
                                         <label>Название товара</label>
                                         <input type="text" name="name" value="{{ product.name }}" required autocomplete="off">
                                     </div>
+
+                                    <div class="form-group" style="flex:1;">
+                                        <label>Наличие</label>
+                                        <select name="is_available">
+                                            <option value="1" {% if product.is_available != False %}selected{% endif %}>В наличии</option>
+                                            <option value="0" {% if product.is_available == False %}selected{% endif %}>Нет в наличии</option>
+                                        </select>
+                                    </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 %}>
@@ -2745,6 +2866,22 @@ ADMIN_TEMPLATE = '''
                                     {% endif %}
                                 </div>
 
+                                {% if settings.business_type == 'wholesale' %}
+                                <div class="form-group main-tiers-container" {% if product.has_variant_prices %}style="display:none;"{% endif %}>
+                                    <label>Оптовые цены (от кол-ва)</label>
+                                    <div id="main-tiers-list-edit-{{ product.product_id }}">
+                                        {% for tier in product.wholesale_tiers %}
+                                        <div style="display:flex; gap:5px; margin-top:5px;">
+                                            <input type="number" name="main_tier_qty[]" value="{{ tier.qty }}" placeholder="От (шт)" required style="width:80px;">
+                                            <input type="number" name="main_tier_price[]" value="{{ tier.price }}" placeholder="Цена" step="0.01" required>
+                                            <button type="button" onclick="this.parentElement.remove()" style="color:red; border:none; background:none; font-size:1.2rem;">&times;</button>
+                                        </div>
+                                        {% endfor %}
+                                    </div>
+                                    <button type="button" class="btn btn-outline" style="padding: 5px; font-size:0.8rem; margin-top:5px;" onclick="addTierRow('main-tiers-list-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;">
                                         <label style="font-weight:600; font-size:0.9rem;"><i class="fas fa-tags"></i> Варианты товара</label>
@@ -2753,42 +2890,72 @@ ADMIN_TEMPLATE = '''
                                     <div id="variants-list-edit-{{ product.product_id }}">
                                         {% for variant in product.variants %}
                                         <div class="variant-row">
-                                            <div class="form-group">
-                                                <label>Название</label>
-                                                <input type="text" name="variant_name[]" value="{{ variant.name }}" placeholder="Цвет, размер" required>
+                                            <div style="display:flex; flex-direction:column; gap:5px; margin-right: 5px;">
+                                                <button type="button" class="btn btn-outline" style="padding: 2px 5px;" onclick="moveVariant(this, 'up')"><i class="fas fa-arrow-up"></i></button>
+                                                <button type="button" class="btn btn-outline" style="padding: 2px 5px;" onclick="moveVariant(this, 'down')"><i class="fas fa-arrow-down"></i></button>
                                             </div>
-                                            {% 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>
-                                            {% 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 style="flex:1; display:flex; flex-wrap:wrap; gap:10px;">
+                                                <div class="form-group">
+                                                    <label>Наличие</label>
+                                                    <select name="variant_is_available[]">
+                                                        <option value="1" {% if variant.is_available != False %}selected{% endif %}>Да</option>
+                                                        <option value="0" {% if variant.is_available == False %}selected{% endif %}>Нет</option>
+                                                    </select>
                                                 </div>
+                                                <div class="form-group">
+                                                    <label>Название</label>
+                                                    <input type="text" name="variant_name[]" value="{{ variant.name }}" placeholder="Цвет, размер" required>
+                                                </div>
+                                                {% 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>
+                                                {% 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>
+                                                </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 %}
+                                                
+                                                {% if settings.business_type == 'wholesale' %}
+                                                <div class="variant-tiers-container var-price-input" {% if not product.has_variant_prices %}style="display:none;"{% endif %} style="width:100%; margin-top:5px; padding:10px; background:#fafafa; border:1px solid #ddd; border-radius:6px;">
+                                                    <label style="font-size:0.8rem; font-weight:bold;">Оптовые цены варианта</label>
+                                                    <div id="var-tiers-list-edit-{{ product.product_id }}-{{ loop.index0 }}" class="var-tier-list">
+                                                        {% for tier in variant.wholesale_tiers %}
+                                                        <div style="display:flex; gap:5px; margin-top:5px;">
+                                                            <input type="number" name="variant_{{ loop.index0 }}_tier_qty[]" value="{{ tier.qty }}" placeholder="От (шт)" required style="width:80px;">
+                                                            <input type="number" name="variant_{{ loop.index0 }}_tier_price[]" value="{{ tier.price }}" placeholder="Цена" step="0.01" required>
+                                                            <button type="button" onclick="this.parentElement.remove()" style="color:red; border:none; background:none; font-size:1.2rem;">&times;</button>
+                                                        </div>
+                                                        {% endfor %}
+                                                    </div>
+                                                    <button type="button" class="btn btn-outline btn-add-var-tier" style="padding: 4px; font-size:0.75rem; margin-top:5px;" onclick="addTierRow('var-tiers-list-edit-{{ product.product_id }}-{{ loop.index0 }}', 'variant', {{ loop.index0 }})"><i class="fas fa-plus"></i> Добавить оптовую цену</button>
+                                                </div>
+                                                {% endif %}
+
                                             </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>
+                                            <button type="button" class="remove-variant-btn" onclick="const row = this.closest('.variant-row'); const listId = row.parentNode.id; row.remove(); updateMainStockVisibility('edit-prod-{{ product.product_id }}'); updateVariantIndices(listId);"><i class="fas fa-times-circle"></i></button>
                                         </div>
                                         {% endfor %}
                                     </div>
@@ -2889,6 +3056,52 @@ ADMIN_TEMPLATE = '''
             document.getElementById(elId).style.display = 'none';
         }
 
+        function addTierRow(containerId, type, varIndex = 0) {
+            const container = document.getElementById(containerId);
+            const div = document.createElement('div');
+            div.style.display = 'flex'; div.style.gap = '5px'; div.style.marginTop = '5px';
+            let namePrefix = type === 'main' ? 'main' : `variant_${varIndex}`;
+            div.innerHTML = `
+                <input type="number" name="${namePrefix}_tier_qty[]" placeholder="От (шт)" required style="width:80px;">
+                <input type="number" name="${namePrefix}_tier_price[]" placeholder="Цена" step="0.01" required>
+                <button type="button" onclick="this.parentElement.remove()" style="color:red; border:none; background:none; font-size:1.2rem;">&times;</button>
+            `;
+            container.appendChild(div);
+        }
+
+        function updateVariantIndices(listId) {
+            const list = document.getElementById(listId);
+            if (!list) return;
+            const rows = list.querySelectorAll(':scope > .variant-row');
+            rows.forEach((row, index) => {
+                row.querySelectorAll('input[name*="_tier_qty[]"]').forEach(inp => {
+                    inp.name = `variant_${index}_tier_qty[]`;
+                });
+                row.querySelectorAll('input[name*="_tier_price[]"]').forEach(inp => {
+                    inp.name = `variant_${index}_tier_price[]`;
+                });
+                const btn = row.querySelector('.btn-add-var-tier');
+                if (btn) {
+                    const tierList = row.querySelector('.var-tier-list');
+                    if(tierList) {
+                        tierList.id = `var-tiers-list-${listId}-${index}`;
+                        btn.setAttribute('onclick', `addTierRow('${tierList.id}', 'variant', ${index})`);
+                    }
+                }
+            });
+        }
+
+        function moveVariant(btn, direction) {
+            const row = btn.closest('.variant-row');
+            const list = row.parentNode;
+            if (direction === 'up' && row.previousElementSibling) {
+                list.insertBefore(row, row.previousElementSibling);
+            } else if (direction === 'down' && row.nextElementSibling) {
+                list.insertBefore(row.nextElementSibling, row);
+            }
+            updateVariantIndices(list.id);
+        }
+
         function addVariantRow(containerId) {
             const container = document.getElementById(containerId);
             const formBlock = container.closest('form');
@@ -2902,6 +3115,18 @@ ADMIN_TEMPLATE = '''
             let reqAttr = hasVariantPrices ? 'required' : '';
             
             let html = `
+                <div style="display:flex; flex-direction:column; gap:5px; margin-right: 5px;">
+                    <button type="button" class="btn btn-outline" style="padding: 2px 5px;" onclick="moveVariant(this, 'up')"><i class="fas fa-arrow-up"></i></button>
+                    <button type="button" class="btn btn-outline" style="padding: 2px 5px;" onclick="moveVariant(this, 'down')"><i class="fas fa-arrow-down"></i></button>
+                </div>
+                <div style="flex:1; display:flex; flex-wrap:wrap; gap:10px;">
+                <div class="form-group">
+                    <label>Наличие</label>
+                    <select name="variant_is_available[]">
+                        <option value="1" selected>Да</option>
+                        <option value="0">Нет</option>
+                    </select>
+                </div>
                 <div class="form-group">
                     <label>Название</label>
                     <input type="text" name="variant_name[]" placeholder="Цвет, размер" required>
@@ -2938,7 +3163,7 @@ ADMIN_TEMPLATE = '''
                 html += `
                 <div class="form-group var-price-input" ${displayStyle}>
                     <label>Цена уп.</label>
-                    <input type="number" name="variant_box_price[]" placeholder="Опционально" step="0.01">
+<input type="number" name="variant_box_price[]" placeholder="Опционально" step="0.01">
                 </div>`;
             }
             
@@ -2949,11 +3174,21 @@ ADMIN_TEMPLATE = '''
                     <input type="number" name="variant_stock[]" placeholder="Остаток">
                 </div>`;
             }
+
+            if (businessType === 'wholesale') {
+                html += `
+                <div class="variant-tiers-container var-price-input" ${displayStyle} style="width:100%; margin-top:5px; padding:10px; background:#fafafa; border:1px solid #ddd; border-radius:6px;">
+                    <label style="font-size:0.8rem; font-weight:bold;">Оптовые цены варианта</label>
+                    <div class="var-tier-list"></div>
+                    <button type="button" class="btn btn-outline btn-add-var-tier" style="padding: 4px; font-size:0.75rem; margin-top:5px;"><i class="fas fa-plus"></i> Добавить оптовую цену</button>
+                </div>`;
+            }
             
-            html += `<button type="button" class="remove-variant-btn" onclick="this.parentElement.remove(); updateMainStockVisibility('${formId}')"><i class="fas fa-times-circle"></i></button>`;
+            html += `</div><button type="button" class="remove-variant-btn" onclick="const row = this.closest('.variant-row'); const listId = row.parentNode.id; row.remove(); updateMainStockVisibility('${formId}'); updateVariantIndices(listId);"><i class="fas fa-times-circle"></i></button>`;
             
             div.innerHTML = html;
             container.appendChild(div);
+            updateVariantIndices(containerId);
             updateMainStockVisibility(formId);
         }
 
@@ -2962,12 +3197,14 @@ ADMIN_TEMPLATE = '''
             const mainPriceContainer = form.querySelector('.main-price-container');
             const mainPriceInput = form.querySelector('.main-price-input');
             const mainBoxPriceContainer = form.querySelector('.main-box-price-container');
+            const mainTiersContainer = form.querySelector('.main-tiers-container');
             const varPriceInputs = form.querySelectorAll('.var-price-input');
             
             if (cb.checked) {
                 if(mainPriceContainer) mainPriceContainer.style.display = 'none';
                 if(mainPriceInput) mainPriceInput.removeAttribute('required');
                 if(mainBoxPriceContainer) mainBoxPriceContainer.style.display = 'none';
+                if(mainTiersContainer) mainTiersContainer.style.display = 'none';
                 
                 varPriceInputs.forEach(input => {
                     input.style.display = 'flex';
@@ -2978,6 +3215,7 @@ ADMIN_TEMPLATE = '''
                 if(mainPriceContainer) mainPriceContainer.style.display = 'flex';
                 if(mainPriceInput) mainPriceInput.setAttribute('required', 'required');
                 if(mainBoxPriceContainer) mainBoxPriceContainer.style.display = 'flex';
+                if(mainTiersContainer) mainTiersContainer.style.display = 'block';
                 
                 varPriceInputs.forEach(input => {
                     input.style.display = 'none';
@@ -4005,6 +4243,7 @@ def create_order(env_id):
             "variant_name": item.get('variant_name', ''),
             "variant_idx": item.get('variant_idx', -1),
             "discount": float(item.get('discount', 0)),
+            "wholesale_tiers": item.get('wholesale_tiers', []),
             "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+"
         })
@@ -4423,6 +4662,18 @@ def admin(env_id):
                 data['products'] = products
                 save_env_data(env_id, data)
 
+        elif action == 'move_category':
+            cat_name = request.form.get('category_name')
+            direction = request.form.get('direction')
+            if cat_name in categories:
+                idx = categories.index(cat_name)
+                if direction == 'up' and idx > 0:
+                    categories[idx], categories[idx-1] = categories[idx-1], categories[idx]
+                elif direction == 'down' and 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 == 'delete_category':
             cat_name = request.form.get('category_name')
             if cat_name in categories:
@@ -4436,6 +4687,8 @@ def admin(env_id):
         elif action == 'add_product':
             name = request.form.get('name', '').strip()
             barcode = request.form.get('barcode', '').strip()
+            is_available = request.form.get('is_available', '1') == '1'
+            
             price_str = request.form.get('price', '')
             price = float(price_str) if price_str else ""
             
@@ -4455,25 +4708,45 @@ def admin(env_id):
             category = request.form.get('category')
             has_variant_prices = 'has_variant_prices' in request.form
             
+            main_wholesale_tiers = []
+            if not has_variant_prices:
+                mt_qtys = request.form.getlist('main_tier_qty[]')
+                mt_prices = request.form.getlist('main_tier_price[]')
+                for q, p_val in zip(mt_qtys, mt_prices):
+                    if q and p_val:
+                        main_wholesale_tiers.append({'qty': int(q), 'price': float(p_val)})
+
             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_is_availables = request.form.getlist('variant_is_available[]')
+            variants = []
             
             for i in range(len(variant_names)):
                 v_name = variant_names[i].strip()
                 if v_name:
                     v_price = price
                     v_box_price = box_price
+                    v_is_avail = True
+                    if i < len(variant_is_availables):
+                        v_is_avail = variant_is_availables[i] == '1'
+                        
+                    v_wholesale_tiers = []
                     if has_variant_prices:
                         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])
                             
+                        vt_qtys = request.form.getlist(f'variant_{i}_tier_qty[]')
+                        vt_prices = request.form.getlist(f'variant_{i}_tier_price[]')
+                        for q, p_val in zip(vt_qtys, vt_prices):
+                            if q and p_val:
+                                v_wholesale_tiers.append({'qty': int(q), 'price': float(p_val)})
+                            
                     v_stock = ""
                     if i < len(variant_stocks) and variant_stocks[i]:
                         v_stock = int(variant_stocks[i])
@@ -4492,7 +4765,9 @@ def admin(env_id):
                         "price": v_price, 
                         "box_price": v_box_price,
                         "stock": v_stock,
-                        "pieces_per_box": v_ppb
+                        "pieces_per_box": v_ppb,
+                        "is_available": v_is_avail,
+                        "wholesale_tiers": v_wholesale_tiers
                     })
 
             uploaded_photos = request.files.getlist('photos')[:10]
@@ -4538,7 +4813,9 @@ def admin(env_id):
                 'category': category,
                 'photos': photos_list,
                 'variants': variants,
-                'has_variant_prices': has_variant_prices
+                'has_variant_prices': has_variant_prices,
+                'is_available': is_available,
+                'wholesale_tiers': main_wholesale_tiers
             }
             products.append(new_product)
             data['products'] = products
@@ -4548,6 +4825,7 @@ def admin(env_id):
             pid = request.form.get('product_id')
             name = request.form.get('name', '').strip()
             barcode = request.form.get('barcode', '').strip()
+            is_available = request.form.get('is_available', '1') == '1'
             
             price_str = request.form.get('price', '')
             price = float(price_str) if price_str else ""
@@ -4567,6 +4845,14 @@ def admin(env_id):
             description = request.form.get('description', '').strip()
             has_variant_prices = 'has_variant_prices' in request.form
             
+            main_wholesale_tiers = []
+            if not has_variant_prices:
+                mt_qtys = request.form.getlist('main_tier_qty[]')
+                mt_prices = request.form.getlist('main_tier_price[]')
+                for q, p_val in zip(mt_qtys, mt_prices):
+                    if q and p_val:
+                        main_wholesale_tiers.append({'qty': int(q), 'price': float(p_val)})
+            
             remove_photos = request.form.getlist('remove_photos[]')
             
             variant_names = request.form.getlist('variant_name[]')
@@ -4575,18 +4861,31 @@ def admin(env_id):
             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_is_availables = request.form.getlist('variant_is_available[]')
+            variants = []
             
             for i in range(len(variant_names)):
                 v_name = variant_names[i].strip()
                 if v_name:
                     v_price = price
                     v_box_price = box_price
+                    v_is_avail = True
+                    if i < len(variant_is_availables):
+                        v_is_avail = variant_is_availables[i] == '1'
+                        
+                    v_wholesale_tiers = []
                     if has_variant_prices:
                         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])
+                            
+                        vt_qtys = request.form.getlist(f'variant_{i}_tier_qty[]')
+                        vt_prices = request.form.getlist(f'variant_{i}_tier_price[]')
+                        for q, p_val in zip(vt_qtys, vt_prices):
+                            if q and p_val:
+                                v_wholesale_tiers.append({'qty': int(q), 'price': float(p_val)})
+                                
                     v_stock = ""
                     if i < len(variant_stocks) and variant_stocks[i]:
                         v_stock = int(variant_stocks[i])
@@ -4602,7 +4901,9 @@ def admin(env_id):
                         "price": v_price, 
                         "box_price": v_box_price,
                         "stock": v_stock,
-                        "pieces_per_box": v_ppb
+                        "pieces_per_box": v_ppb,
+                        "is_available": v_is_avail,
+                        "wholesale_tiers": v_wholesale_tiers
                     })
                     
             uploaded_photos = request.files.getlist('photos')[:10]
@@ -4647,6 +4948,8 @@ def admin(env_id):
                     p['description'] = description
                     p['variants'] = variants
                     p['has_variant_prices'] = has_variant_prices
+                    p['is_available'] = is_available
+                    p['wholesale_tiers'] = main_wholesale_tiers
                     
                     existing_photos = p.get('photos', [])
                     existing_photos =[ph for ph in existing_photos if ph not in remove_photos]
@@ -4655,6 +4958,38 @@ def admin(env_id):
             data['products'] = products
             save_env_data(env_id, data)
 
+        elif action == 'move_product':
+            pid = request.form.get('product_id')
+            direction = request.form.get('direction')
+            
+            idx = -1
+            for i, p in enumerate(products):
+                if p.get('product_id') == pid:
+                    idx = i
+                    break
+                    
+            if idx != -1:
+                cat = products[idx].get('category')
+                if direction == 'up':
+                    swap_idx = -1
+                    for i in range(idx - 1, -1, -1):
+                        if products[i].get('category') == cat:
+                            swap_idx = i
+                            break
+                    if swap_idx != -1:
+                        products[idx], products[swap_idx] = products[swap_idx], products[idx]
+                elif direction == 'down':
+                    swap_idx = -1
+                    for i in range(idx + 1, len(products)):
+                        if products[i].get('category') == cat:
+                            swap_idx = i
+                            break
+                    if swap_idx != -1:
+                        products[idx], products[swap_idx] = products[swap_idx], products[idx]
+                
+                data['products'] = products
+                save_env_data(env_id, data)
+
         elif action == 'delete_product':
             pid = request.form.get('product_id')
             data['products'] =[p for p in products if p.get('product_id') != pid]