Update app.py

app.py

@@ -21,7 +21,7 @@ DATA_FILE = 'data.json'
 
 SYNC_FILES = [DATA_FILE]
 
-REPO_ID = "Kgshop/prazdnik" # Assuming this repo is correct for "Мир праздника"
+REPO_ID = "Kgshop/prazdnik"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
@@ -30,7 +30,7 @@ STORE_ADDRESS = "Рынок Джунхай , 6 проход , 49А контей
 CURRENCY_CODE = 'KGS'
 CURRENCY_NAME = 'Кыргызский сом'
 
-WHATSAPP_NUMBER = "996702888188" # Updated WhatsApp number
+WHATSAPP_NUMBER = "996702888188"
 
 DOWNLOAD_RETRIES = 3
 DOWNLOAD_DELAY = 5
@@ -149,21 +149,26 @@ def load_data():
         if 'products' not in data: data['products'] = []
         if 'categories' not in data: data['categories'] = []
         if 'orders' not in data: data['orders'] = {}
-        # Ensure products have 'prices' field for consistency
+
+        if 'categories' in data and data['categories'] and isinstance(data['categories'][0], str):
+            logging.info("Old category format detected. Migrating to new structure.")
+            data['categories'] = [{'name': c, 'subcategories': []} for c in data['categories']]
+
         for product in data['products']:
+             if 'subcategory' not in product:
+                  product['subcategory'] = None
              if 'prices' not in product or not isinstance(product['prices'], list):
-                  if 'price' in product: # Convert old 'price' to new 'prices' structure
+                  if 'price' in product:
                       product['prices'] = [{'type': 'шт', 'value': product.pop('price')}]
                   else:
                       product['prices'] = []
-             # Ensure prices have type and value and value is float
              product['prices'] = [p for p in product['prices'] if isinstance(p, dict) and 'type' in p and 'value' in p]
              for p in product['prices']:
                   try:
                        p['value'] = round(float(p['value']), 2)
                   except (ValueError, TypeError):
-                       p['value'] = 0.0 # Default invalid price to 0
-             if not product['prices']: # Ensure at least one price structure if no valid ones exist
+                       p['value'] = 0.0
+             if not product['prices']:
                   product['prices'] = [{'type': 'шт', 'value': 0.0}]
 
         return data
@@ -184,10 +189,15 @@ def load_data():
             if 'categories' not in data: data['categories'] = []
             if 'orders' not in data: data['orders'] = {}
 
-            # Ensure products have 'prices' field for consistency after download
+            if 'categories' in data and data['categories'] and isinstance(data['categories'][0], str):
+                logging.info("Old category format detected after download. Migrating to new structure.")
+                data['categories'] = [{'name': c, 'subcategories': []} for c in data['categories']]
+
             for product in data['products']:
+                 if 'subcategory' not in product:
+                      product['subcategory'] = None
                  if 'prices' not in product or not isinstance(product['prices'], list):
-                      if 'price' in product: # Convert old 'price' to new 'prices' structure
+                      if 'price' in product:
                           product['prices'] = [{'type': 'шт', 'value': product.pop('price')}]
                       else:
                           product['prices'] = []
@@ -256,12 +266,14 @@ CATALOG_TEMPLATE = '''
             .header { display: flex; justify-content: space-between; align-items: center; padding: 15px 0; border-bottom: 1px solid #e0e0e0; }
             .header h1 { font-size: 1.8rem; font-weight: 600; color: #e3a84f; }
             .store-address { padding: 15px; text-align: center; background-color: #f9f9f9; margin: 20px 0; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.03); font-size: 1rem; color: #666; }
-            .filters-container { margin: 20px 0; display: flex; flex-wrap: wrap; gap: 10px; justify-content: center; }
+            .filters-wrapper { margin: 20px 0; }
+            .filters-container, .sub-filters-container { display: flex; flex-wrap: wrap; gap: 10px; justify-content: center; }
+            .sub-filters-container { margin-top: 15px; padding-top: 15px; border-top: 1px dashed #e0e0e0;}
             .search-container { margin: 20px 0; text-align: center; }
             #search-input { width: 90%; max-width: 600px; padding: 12px 18px; font-size: 1rem; border: 1px solid #e0e0e0; border-radius: 25px; outline: none; box-shadow: 0 2px 5px rgba(0,0,0,0.03); transition: all 0.3s ease; }
             #search-input:focus { border-color: #e3a84f; box-shadow: 0 0 0 3px rgba(227, 168, 79, 0.15); }
-            .category-filter { padding: 8px 16px; border: 1px solid #e0e0e0; border-radius: 20px; background-color: #fff; cursor: pointer; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); font-size: 0.9rem; font-weight: 400; color: #c89345; }
-            .category-filter.active, .category-filter:hover { background-color: #e3a84f; color: white; border-color: #e3a84f; box-shadow: 0 2px 10px rgba(227, 168, 79, 0.2); }
+            .category-filter, .subcategory-filter { padding: 8px 16px; border: 1px solid #e0e0e0; border-radius: 20px; background-color: #fff; cursor: pointer; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); font-size: 0.9rem; font-weight: 400; color: #c89345; }
+            .category-filter.active, .category-filter:hover, .subcategory-filter.active, .subcategory-filter:hover { background-color: #e3a84f; color: white; border-color: #e3a84f; box-shadow: 0 2px 10px rgba(227, 168, 79, 0.2); }
             .products-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 20px; padding: 10px; }
             @media (min-width: 600px) { .products-grid { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); } }
             @media (min-width: 900px) { .products-grid { grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); } }
@@ -328,11 +340,14 @@ CATALOG_TEMPLATE = '''
 
             <div class="store-address">Наш адрес: {{ store_address }}</div>
 
-            <div class="filters-container">
-                <button class="category-filter active" data-category="all">Все категории</button>
-                {% for category in categories %}
-                <button class="category-filter" data-category="{{ category }}">{{ category }}</button>
-                {% endfor %}
+            <div class="filters-wrapper">
+                <div class="filters-container">
+                    <button class="category-filter active" data-category="all">Все категории</button>
+                    {% for category in categories %}
+                    <button class="category-filter" data-category="{{ category.name }}">{{ category.name }}</button>
+                    {% endfor %}
+                </div>
+                <div class="sub-filters-container" id="sub-filters-container"></div>
             </div>
 
             <div class="search-container">
@@ -344,7 +359,8 @@ CATALOG_TEMPLATE = '''
                 <div class="product"
                      data-name="{{ product['name']|lower }}"
                      data-description="{{ product.get('description', '')|lower }}"
-                     data-category="{{ product.get('category', 'Без категории') }}">
+                     data-category="{{ product.get('category', 'Без категории') }}"
+                     data-subcategory="{{ product.get('subcategory', '')|lower if product.get('subcategory') else '' }}">
                      {% if product.get('is_top', False) %}
                         <span class="top-product-indicator"><i class="fas fa-star"></i> Топ</span>
                      {% endif %}
@@ -437,11 +453,13 @@ CATALOG_TEMPLATE = '''
         <script src="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.js"></script>
         <script>
             const products = {{ products|tojson }};
+            const categoriesData = {{ categories|tojson }};
             const repoId = '{{ repo_id }}';
             const currencyCode = '{{ currency_code }}';
             let selectedProductIndex = null;
             let cart = JSON.parse(localStorage.getItem('mekaCart') || '[]');
-
+            let activeCategory = 'all';
+            let activeSubcategory = 'all';
 
             function openModal(index) {
                 loadProductDetails(index);
@@ -547,7 +565,7 @@ CATALOG_TEMPLATE = '''
                      priceTypeSelect.style.display = 'none';
                      if(priceTypeLabel) priceTypeLabel.style.display = 'none';
                      alert("Для этого товара нет доступных цен.");
-                     return; // Cannot add to cart if no price is available
+                     return;
                  }
 
 
@@ -568,7 +586,7 @@ CATALOG_TEMPLATE = '''
                 const color = colorSelect.style.display !== 'none' && colorSelect.value ? colorSelect.value : 'N/A';
                 const priceTypeSelect = document.getElementById('priceTypeSelect');
                 const selectedPriceOption = priceTypeSelect.options[priceTypeSelect.selectedIndex];
-                const priceType = selectedPriceOption ? selectedPriceOption.value : 'шт'; // Default to 'шт' if no price type selected
+                const priceType = selectedPriceOption ? selectedPriceOption.value : 'шт';
                 const priceValue = selectedPriceOption ? parseFloat(selectedPriceOption.dataset.priceValue) : null;
 
 
@@ -589,7 +607,7 @@ CATALOG_TEMPLATE = '''
                     return;
                  }
 
-                const cartItemId = `${product.name}-${priceType}-${color}`; // Unique ID includes price type and color
+                const cartItemId = `${product.name}-${priceType}-${color}`;
                 const existingItemIndex = cart.findIndex(item => item.id === cartItemId);
 
                 if (existingItemIndex > -1) {
@@ -598,8 +616,8 @@ CATALOG_TEMPLATE = '''
                     cart.push({
                         id: cartItemId,
                         name: product.name,
-                        price_type: priceType, // Store the selected price type
-                        price_value: priceValue, // Store the actual price value
+                        price_type: priceType,
+                        price_value: priceValue,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : null,
                         quantity: quantity,
                         color: color
@@ -641,13 +659,13 @@ CATALOG_TEMPLATE = '''
                     cartTotalElement.textContent = '0.00';
                 } else {
                     cartContent.innerHTML = cart.map(item => {
-                        const itemTotal = item.price_value * item.quantity; // Use price_value
+                        const itemTotal = item.price_value * item.quantity;
                         total += itemTotal;
                         const photoUrl = item.photo
                             ? `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${item.photo}`
                             : 'https://via.placeholder.com/60x60.png?text=N/A';
                         const colorText = item.color && item.color !== 'N/A' ? ` (Цвет: ${item.color})` : '';
-                         const priceTypeText = item.price_type ? `/${item.price_type}` : ''; // Show price type
+                         const priceTypeText = item.price_type ? `/${item.price_type}` : '';
 
                         return `
                             <div class="cart-item">
@@ -733,8 +751,6 @@ CATALOG_TEMPLATE = '''
 
             function filterProducts() {
                 const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
-                const activeCategoryButton = document.querySelector('.category-filter.active');
-                const activeCategory = activeCategoryButton ? activeCategoryButton.dataset.category : 'all';
                 const grid = document.getElementById('products-grid');
                 let visibleProducts = 0;
 
@@ -745,11 +761,13 @@ CATALOG_TEMPLATE = '''
                     const name = productElement.getAttribute('data-name');
                     const description = productElement.getAttribute('data-description');
                     const category = productElement.getAttribute('data-category');
+                    const subcategory = productElement.getAttribute('data-subcategory');
 
                     const matchesSearch = !searchTerm || name.includes(searchTerm) || description.includes(searchTerm);
                     const matchesCategory = activeCategory === 'all' || category === activeCategory;
+                    const matchesSubcategory = activeSubcategory === 'all' || subcategory === activeSubcategory;
 
-                    if (matchesSearch && matchesCategory) {
+                    if (matchesSearch && matchesCategory && matchesSubcategory) {
                         productElement.style.display = 'flex';
                         visibleProducts++;
                     } else {
@@ -769,6 +787,38 @@ CATALOG_TEMPLATE = '''
                      grid.appendChild(p);
                  }
             }
+             
+            function renderSubcategories() {
+                const subFiltersContainer = document.getElementById('sub-filters-container');
+                subFiltersContainer.innerHTML = '';
+
+                if (activeCategory === 'all') {
+                    subFiltersContainer.style.display = 'none';
+                    return;
+                }
+
+                const categoryData = categoriesData.find(c => c.name === activeCategory);
+                if (categoryData && categoryData.subcategories && categoryData.subcategories.length > 0) {
+                    subFiltersContainer.style.display = 'flex';
+
+                    let buttonsHTML = `<button class="subcategory-filter active" data-subcategory="all">Все в "${activeCategory}"</button>`;
+                    categoryData.subcategories.forEach(sub => {
+                        buttonsHTML += `<button class="subcategory-filter" data-subcategory="${sub.toLowerCase()}">${sub}</button>`;
+                    });
+                    subFiltersContainer.innerHTML = buttonsHTML;
+
+                    subFiltersContainer.querySelectorAll('.subcategory-filter').forEach(subFilter => {
+                        subFilter.addEventListener('click', function() {
+                            subFiltersContainer.querySelectorAll('.subcategory-filter').forEach(f => f.classList.remove('active'));
+                            this.classList.add('active');
+                            activeSubcategory = this.dataset.subcategory;
+                            filterProducts();
+                        });
+                    });
+                } else {
+                    subFiltersContainer.style.display = 'none';
+                }
+            }
 
              function setupFilters() {
                  const searchInput = document.getElementById('search-input');
@@ -780,6 +830,9 @@ CATALOG_TEMPLATE = '''
                      filter.addEventListener('click', function() {
                          categoryFilters.forEach(f => f.classList.remove('active'));
                          this.classList.add('active');
+                         activeCategory = this.dataset.category;
+                         activeSubcategory = 'all';
+                         renderSubcategories();
                          filterProducts();
                      });
                  });
@@ -869,7 +922,7 @@ PRODUCT_DETAIL_TEMPLATE = '''
         </div>
 
         <div style="margin-top: 20px; font-size: 1rem; line-height: 1.7; color: #333;">
-            <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
+            <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}{% if product.get('subcategory') %} / {{ product.get('subcategory') }}{% endif %}</p>
             <p style="font-size: 1.2rem; font-weight: bold; color: #c89345; margin-bottom: 10px;"><strong>Цена:</strong></p>
              <div class="price-list" style="text-align: left;">
                  {% if product.get('prices') %}
@@ -889,9 +942,8 @@ PRODUCT_DETAIL_TEMPLATE = '''
         </div>
     </div>
     <style>
-        /* Add Swiper Modal Specific Styles if needed */
          #productModal .swiper-button-next, #productModal .swiper-button-prev {
-             color: #e3a84f; /* Ensure modal navigation buttons match new color */
+             color: #e3a84f;
          }
     </style>
 '''
@@ -976,7 +1028,7 @@ ORDER_TEMPLATE = '''
                 function sendOrderViaWhatsApp() {
                     const orderId = '{{ order.id }}';
                     const orderUrl = `{{ request.url }}`;
-                    const whatsappNumber = "{{ whatsapp_number }}"; // Use variable
+                    const whatsappNumber = "{{ whatsapp_number }}";
 
                     let message = `Здравствуйте! Хочу подтвердить свой заказ на сайте "Мир праздника":%0A%0A`;
                     message += `*Номер заказа:* ${orderId}%0A`;
@@ -1015,6 +1067,7 @@ ADMIN_TEMPLATE = '''
             h1 { font-size: 1.8rem; }
             h2 { font-size: 1.5rem; margin-top: 30px; display: flex; align-items: center; gap: 8px; }
             h3 { font-size: 1.2rem; color: #c89345; margin-top: 20px; }
+            h4 { font-size: 1.1rem; color: #333; margin-top: 20px; }
             .section { margin-bottom: 30px; padding: 20px; background-color: #f9f9f9; border: 1px solid #e0e0e0; border-radius: 8px; }
             form { margin-bottom: 20px; }
             label { font-weight: 500; margin-top: 10px; display: block; color: #666; font-size: 0.9rem;}
@@ -1039,8 +1092,8 @@ ADMIN_TEMPLATE = '''
             .item strong { color: #333; }
             .item .description { font-size: 0.85rem; color: #999; max-height: 60px; overflow: hidden; text-overflow: ellipsis; }
             .item-actions { margin-top: 15px; display: flex; gap: 10px; flex-wrap: wrap; align-items: center; }
-            .item-actions button:not(.delete-button) { background-color: #e3a84f; } /* Use primary for non-delete */
-            .item-actions button:not(.delete-button):hover { background-color: #c89345; } /* Use darker primary for hover */
+            .item-actions button:not(.delete-button) { background-color: #e3a84f; }
+            .item-actions button:not(.delete-button):hover { background-color: #c89345; }
             .edit-form-container { margin-top: 15px; padding: 20px; background: #fffcf5; border: 1px dashed #e0e0e0; border-radius: 6px; display: none; }
             details { background-color: #f9f9f9; border: 1px solid #e0e0e0; border-radius: 8px; margin-bottom: 20px; }
             details > summary { cursor: pointer; font-weight: 600; color: #c89345; display: block; padding: 15px; border-bottom: 1px solid #e0e0e0; list-style: none; position: relative; }
@@ -1050,10 +1103,9 @@ ADMIN_TEMPLATE = '''
             details .form-content { padding: 20px; }
             .color-input-group, .price-input-group { display: flex; align-items: center; gap: 10px; margin-bottom: 8px; }
             .color-input-group input, .price-input-group input { flex-grow: 1; margin: 0; }
-             .price-input-group input[type="text"] { width: 100px; flex-grow: 0; } /* Type input fixed width */
-             .price-input-group input[type="number"] { flex-grow: 1; } /* Value input takes rest */
-             .price-input-group label { margin-top: 0; width: auto; display: inline-block; font-weight: normal; color: #333;} /* Labels within group */
-
+             .price-input-group input[type="text"] { width: 100px; flex-grow: 0; }
+             .price-input-group input[type="number"] { flex-grow: 1; }
+             .price-input-group label { margin-top: 0; width: auto; display: inline-block; font-weight: normal; color: #333;}
             .remove-color-btn, .remove-price-btn { background-color: #dc3545; padding: 6px 10px; font-size: 0.8rem; margin-top: 0; line-height: 1; }
             .remove-color-btn:hover, .remove-price-btn:hover { background-color: #c82333; }
             .add-color-btn, .add-price-btn { background-color: #f0c38b; color: #c89345; border: 1px solid #e0e0e0; }
@@ -1072,8 +1124,10 @@ ADMIN_TEMPLATE = '''
             .status-indicator.in-stock { background-color: #d4edda; color: #155724; }
             .status-indicator.out-of-stock { background-color: #f8d7da; color: #721c24; }
             .status-indicator.top-product { background-color: #fff3cd; color: #856404; margin-left: 5px;}
-             .admin-price-list { margin-top: 5px; }
-             .admin-price-item { font-size: 0.85rem; color: #333; display: block; margin-bottom: 3px;}
+            .admin-price-list { margin-top: 5px; }
+            .admin-price-item { font-size: 0.85rem; color: #333; display: block; margin-bottom: 3px;}
+            .subcategory-list { list-style-type: none; padding-left: 20px; margin-top: 10px; }
+            .subcategory-item { background: #f0f0f0; padding: 5px 10px; border-radius: 4px; margin-bottom: 5px; display: flex; justify-content: space-between; align-items: center; font-size: 0.9rem; }
         </style>
     </head>
     <body>
@@ -1111,7 +1165,7 @@ ADMIN_TEMPLATE = '''
                      <div class="section">
                          <h2><i class="fas fa-tags"></i> Управление категориями</h2>
                           <details>
-                              <summary><i class="fas fa-plus-circle"></i> Добавить новую категорию</summary>
+                              <summary><i class="fas fa-plus-circle"></i> Добавить новую основную категорию</summary>
                               <div class="form-content">
                                   <form method="POST">
                                       <input type="hidden" name="action" value="add_category">
@@ -1126,13 +1180,40 @@ ADMIN_TEMPLATE = '''
                          {% if categories %}
                          <div class="item-list">
                              {% for category in categories %}
-                             <div class="item" style="display: flex; justify-content: space-between; align-items: center;">
-                                 <span>{{ category }}</span>
-                                 <form method="POST" style="margin: 0;" onsubmit="return confirm('Вы уверены, что хотите удалить категорию \'{{ category }}\'? Товары этой категории будут помечены как \'Без категории\'.');">
-                                     <input type="hidden" name="action" value="delete_category">
-                                     <input type="hidden" name="category_name" value="{{ category }}">
-                                     <button type="submit" class="delete-button" style="padding: 5px 10px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
-                                 </form>
+                             <div class="item">
+                                <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
+                                    <strong>{{ category.name }}</strong>
+                                    <form method="POST" style="margin: 0;" onsubmit="return confirm('Вы уверены, что хотите удалить категорию \'{{ category.name }}\' и все ее подкатегории?');">
+                                        <input type="hidden" name="action" value="delete_category">
+                                        <input type="hidden" name="category_name" value="{{ category.name }}">
+                                        <button type="submit" class="delete-button" style="padding: 5px 10px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
+                                    </form>
+                                </div>
+                                <hr style="border: 0; border-top: 1px solid #f0f0f0; margin: 10px 0;">
+                                <h4>Подкатегории:</h4>
+                                {% if category.subcategories %}
+                                    <ul class="subcategory-list">
+                                        {% for sub in category.subcategories %}
+                                        <li class="subcategory-item">
+                                            <span>{{ sub }}</span>
+                                            <form method="POST" style="margin:0;" onsubmit="return confirm('Удалить подкатегорию \'{{ sub }}\'?');">
+                                                <input type="hidden" name="action" value="delete_subcategory">
+                                                <input type="hidden" name="parent_category" value="{{ category.name }}">
+                                                <input type="hidden" name="subcategory_name" value="{{ sub }}">
+                                                <button type="submit" class="delete-button" style="padding: 3px 8px; font-size:0.7rem; margin:0;"><i class="fas fa-times"></i></button>
+                                            </form>
+                                        </li>
+                                        {% endfor %}
+                                    </ul>
+                                {% else %}
+                                    <p style="font-size: 0.9rem; color: #999;">Подкатегорий нет.</p>
+                                {% endif %}
+                                <form method="POST" style="margin-top: 15px; display: flex; gap: 10px; align-items: center;">
+                                    <input type="hidden" name="action" value="add_subcategory">
+                                    <input type="hidden" name="parent_category" value="{{ category.name }}">
+                                    <input type="text" name="subcategory_name" placeholder="Новая подкатегория" required style="margin:0; flex-grow: 1;">
+                                    <button type="submit" class="add-button" style="margin:0; padding: 8px 12px;"><i class="fas fa-plus"></i></button>
+                                </form>
                              </div>
                              {% endfor %}
                          </div>
@@ -1176,13 +1257,20 @@ ADMIN_TEMPLATE = '''
 
                              <label for="add_description" style="margin-top: 15px;">Описание:</label>
                              <textarea id="add_description" name="description" rows="4"></textarea>
+                             
                              <label for="add_category">Категория:</label>
-                             <select id="add_category" name="category">
+                             <select id="add_category" name="category" onchange="updateSubcategoryDropdown('add', this.value)">
                                  <option value="Без категории">Без категории</option>
                                  {% for category in categories %}
-                                 <option value="{{ category }}">{{ category }}</option>
+                                 <option value="{{ category.name }}">{{ category.name }}</option>
                                  {% endfor %}
                              </select>
+                             
+                             <label for="add_subcategory">Подкатегория:</label>
+                             <select id="add_subcategory" name="subcategory">
+                                 <option value="none">-- Сначала выберите категорию --</option>
+                             </select>
+
                              <label for="add_photos">Фотографии (до 10 шт.):</label>
                              <input type="file" id="add_photos" name="photos" accept="image/*" multiple>
                              <label>Цвета/Варианты (оставьте пустым, если нет):</label>
@@ -1235,7 +1323,7 @@ ADMIN_TEMPLATE = '''
                                         <span class="status-indicator top-product"><i class="fas fa-star"></i> Топ</span>
                                      {% endif %}
                                 </h3>
-                                <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
+                                <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}{% if product.get('subcategory') %} / {{ product.get('subcategory') }}{% endif %}</p>
                                 <p><strong>Цены:</strong></p>
                                 <div class="admin-price-list">
                                     {% if product.get('prices') %}
@@ -1301,13 +1389,20 @@ ADMIN_TEMPLATE = '''
 
                                 <label style="margin-top: 15px;">Описание:</label>
                                 <textarea name="description" rows="4">{{ product.get('description', '') }}</textarea>
+                                
                                 <label>Категория:</label>
-                                <select name="category">
+                                <select name="category" onchange="updateSubcategoryDropdown('edit_{{ loop.index0 }}', this.value, '{{ product.get('subcategory') }}')">
                                     <option value="Без категории" {% if product.get('category', 'Без категории') == 'Без категории' %}selected{% endif %}>Без категории</option>
                                     {% for category in categories %}
-                                    <option value="{{ category }}" {% if product.get('category') == category %}selected{% endif %}>{{ category }}</option>
+                                    <option value="{{ category.name }}" {% if product.get('category') == category.name %}selected{% endif %}>{{ category.name }}</option>
                                     {% endfor %}
                                 </select>
+
+                                <label>Подкатегория:</label>
+                                <select id="edit_{{ loop.index0 }}_subcategory" name="subcategory">
+                                    <option value="none">-- Сначала выберите категорию --</option>
+                                </select>
+                                
                                 <label>Заменить фотографии (выберите новые файлы, до 10 шт.):</label>
                                 <input type="file" name="photos" accept="image/*" multiple>
                                  {% if product.get('photos') %}
@@ -1362,10 +1457,42 @@ ADMIN_TEMPLATE = '''
         </div>
 
         <script>
+            const categoriesData = {{ categories|tojson }};
+            
             function toggleEditForm(formId) {
                 const formContainer = document.getElementById(formId);
                 if (formContainer) {
-                    formContainer.style.display = formContainer.style.display === 'none' || formContainer.style.display === '' ? 'block' : 'none';
+                    const isDisplayed = formContainer.style.display === 'block';
+                    formContainer.style.display = isDisplayed ? 'none' : 'block';
+                    if (!isDisplayed) {
+                        const catSelect = formContainer.querySelector('select[name="category"]');
+                        if (catSelect) {
+                           const currentProductSub = catSelect.getAttribute('data-current-subcategory');
+                           updateSubcategoryDropdown(catSelect.onchange.toString().match(/'(edit_[\d]+)'/)[1], catSelect.value, currentProductSub);
+                        }
+                    }
+                }
+            }
+
+            function updateSubcategoryDropdown(formIdPrefix, selectedCategory, currentSubcategory = null) {
+                const subcatSelect = document.getElementById(`${formIdPrefix}_subcategory`);
+                if (!subcatSelect) return;
+                
+                subcatSelect.innerHTML = ''; 
+
+                const categoryData = categoriesData.find(c => c.name === selectedCategory);
+
+                if (categoryData && categoryData.subcategories && categoryData.subcategories.length > 0) {
+                    subcatSelect.disabled = false;
+                    let optionsHtml = '<option value="none">-- Выберите подкатегорию --</option>';
+                    categoryData.subcategories.forEach(sub => {
+                        const isSelected = sub === currentSubcategory ? 'selected' : '';
+                        optionsHtml += `<option value="${sub}" ${isSelected}>${sub}</option>`;
+                    });
+                    subcatSelect.innerHTML = optionsHtml;
+                } else {
+                    subcatSelect.innerHTML = '<option value="none">-- Нет подкатегорий --</option>';
+                    subcatSelect.disabled = true;
                 }
             }
 
@@ -1391,10 +1518,6 @@ ADMIN_TEMPLATE = '''
                 if (group) {
                     const container = group.parentNode;
                     group.remove();
-                    // Optional: Add a placeholder if the last input is removed
-                    // if (container && container.children.length === 0) {
-                    //      addColorInput(container.id);
-                    // }
                 } else {
                      console.warn("Could not find parent .color-input-group for remove button");
                 }
@@ -1424,7 +1547,6 @@ ADMIN_TEMPLATE = '''
                 const group = button.closest('.price-input-group');
                 if (group) {
                     const container = group.parentNode;
-                    // Prevent removing the last price input
                      if (container.children.length <= 1) {
                         alert("Должен быть указан хотя бы один вариант цены.");
                         return;
@@ -1435,14 +1557,21 @@ ADMIN_TEMPLATE = '''
                 }
             }
 
-            // Initial add price input if none exist on load for Add form
             document.addEventListener('DOMContentLoaded', () => {
                  const addPriceInputsDiv = document.getElementById('add-price-inputs');
                  if(addPriceInputsDiv && addPriceInputsDiv.children.length === 0) {
                      addPriceInput('add-price-inputs');
                  }
-            });
 
+                 document.querySelectorAll('.edit-form-container').forEach((formContainer, index) => {
+                    const catSelect = formContainer.querySelector('select[name="category"]');
+                    const productSubcategory = "{{ products[" + index + "].get('subcategory', '') }}";
+                    if (catSelect) {
+                        const formIdPrefix = `edit_${index}`;
+                        updateSubcategoryDropdown(formIdPrefix, catSelect.value, productSubcategory);
+                    }
+                 });
+            });
         </script>
     </body>
     </html>
@@ -1453,7 +1582,7 @@ ADMIN_TEMPLATE = '''
 def catalog():
     data = load_data()
     all_products = data.get('products', [])
-    categories = sorted(data.get('categories', []))
+    categories = sorted(data.get('categories', []), key=lambda x: x['name'])
 
     products_in_stock = [p for p in all_products if p.get('in_stock', True)]
     products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
@@ -1500,7 +1629,6 @@ def create_order():
     total_price = 0
     processed_cart = []
     for item in cart_items:
-        # Expect price_value, price_type, quantity, name, color, photo
         if not all(k in item for k in ('name', 'price_value', 'quantity', 'price_type')):
             logging.error(f"Invalid cart item structure received: {item}")
             return jsonify({"error": "Неверный формат товара в корзине."}), 400
@@ -1587,9 +1715,9 @@ def admin():
         try:
             if action == 'add_category':
                 category_name = request.form.get('category_name', '').strip()
-                if category_name and category_name not in categories:
-                    categories.append(category_name)
-                    data['categories'] = categories
+                if category_name and not any(c['name'] == category_name for c in categories):
+                    categories.append({'name': category_name, 'subcategories': []})
+                    data['categories'] = sorted(categories, key=lambda x: x['name'])
                     save_data(data)
                     logging.info(f"Category '{category_name}' added.")
                     flash(f"Категория '{category_name}' успешно добавлена.", 'success')
@@ -1600,14 +1728,33 @@ def admin():
                      logging.warning(f"Category '{category_name}' already exists.")
                      flash(f"Категория '{category_name}' уже существует.", 'error')
 
+            elif action == 'add_subcategory':
+                parent_category_name = request.form.get('parent_category')
+                subcategory_name = request.form.get('subcategory_name', '').strip()
+                parent_cat = next((c for c in categories if c['name'] == parent_category_name), None)
+
+                if parent_cat and subcategory_name and subcategory_name not in parent_cat['subcategories']:
+                    parent_cat['subcategories'].append(subcategory_name)
+                    parent_cat['subcategories'].sort()
+                    save_data(data)
+                    flash(f"Подкатегория '{subcategory_name}' добавлена в '{parent_category_name}'.", 'success')
+                elif not parent_cat:
+                    flash(f"Родительская категория '{parent_category_name}' не найдена.", 'error')
+                elif not subcategory_name:
+                    flash("Название подкатегории не может быть пустым.", 'error')
+                else:
+                    flash(f"Подкатегория '{subcategory_name}' уже существует в '{parent_category_name}'.", 'error')
+
             elif action == 'delete_category':
                 category_to_delete = request.form.get('category_name')
-                if category_to_delete and category_to_delete in categories:
-                    categories.remove(category_to_delete)
+                original_len = len(categories)
+                categories = [c for c in categories if c['name'] != category_to_delete]
+                if len(categories) < original_len:
                     updated_count = 0
                     for product in products:
                         if product.get('category') == category_to_delete:
                             product['category'] = 'Без категории'
+                            product['subcategory'] = None
                             updated_count += 1
                     data['categories'] = categories
                     data['products'] = products
@@ -1615,13 +1762,30 @@ def admin():
                     logging.info(f"Category '{category_to_delete}' deleted. Updated products: {updated_count}.")
                     flash(f"Категория '{category_to_delete}' удалена. {updated_count} товаров обновлено.", 'success')
                 else:
-                    logging.warning(f"Attempted to delete non-existent or empty category: {category_to_delete}")
                     flash(f"Не удалось удалить категорию '{category_to_delete}'.", 'error')
 
+            elif action == 'delete_subcategory':
+                parent_category_name = request.form.get('parent_category')
+                subcategory_to_delete = request.form.get('subcategory_name')
+                parent_cat = next((c for c in categories if c['name'] == parent_category_name), None)
+
+                if parent_cat and subcategory_to_delete in parent_cat['subcategories']:
+                    parent_cat['subcategories'].remove(subcategory_to_delete)
+                    updated_count = 0
+                    for product in products:
+                        if product.get('category') == parent_category_name and product.get('subcategory') == subcategory_to_delete:
+                            product['subcategory'] = None
+                            updated_count += 1
+                    save_data(data)
+                    flash(f"Подкатегория '{subcategory_to_delete}' удалена. {updated_count} товаров обновлено.", 'success')
+                else:
+                    flash(f"Не удалось удалить подкатегорию '{subcategory_to_delete}'.", 'error')
+
             elif action == 'add_product':
                 name = request.form.get('name', '').strip()
                 description = request.form.get('description', '').strip()
                 category = request.form.get('category')
+                subcategory = request.form.get('subcategory')
                 photos_files = request.files.getlist('photos')
                 colors = [c.strip() for c in request.form.getlist('colors') if c.strip()]
                 in_stock = 'in_stock' in request.form
@@ -1635,7 +1799,7 @@ def admin():
                     type_str = type_str.strip()
                     value_str = value_str.strip().replace(',', '.')
                     if not type_str or not value_str:
-                        continue # Skip empty pairs
+                        continue
 
                     try:
                         price_value = round(float(value_str), 2)
@@ -1645,7 +1809,6 @@ def admin():
                     except ValueError:
                          logging.warning(f"Skipping invalid price value '{value_str}' for type '{type_str}' during add product.")
 
-
                 if not name:
                     flash("Название товара обязательно.", 'error')
                     return redirect(url_for('admin'))
@@ -1710,7 +1873,8 @@ def admin():
 
                 new_product = {
                     'name': name, 'prices': prices, 'description': description,
-                    'category': category if category in categories else 'Без категории',
+                    'category': category if any(c['name'] == category for c in categories) else 'Без категории',
+                    'subcategory': subcategory if subcategory and subcategory != 'none' else None,
                     'photos': photos_list, 'colors': colors,
                     'in_stock': in_stock, 'is_top': is_top
                 }
@@ -1741,7 +1905,9 @@ def admin():
                 product_to_edit['name'] = request.form.get('name', product_to_edit['name']).strip()
                 product_to_edit['description'] = request.form.get('description', product_to_edit.get('description', '')).strip()
                 category = request.form.get('category')
-                product_to_edit['category'] = category if category in categories else 'Без категории'
+                subcategory = request.form.get('subcategory')
+                product_to_edit['category'] = category if any(c['name'] == category for c in categories) else 'Без категории'
+                product_to_edit['subcategory'] = subcategory if subcategory and subcategory != 'none' else None
                 product_to_edit['colors'] = [c.strip() for c in request.form.getlist('colors') if c.strip()]
                 product_to_edit['in_stock'] = 'in_stock' in request.form
                 product_to_edit['is_top'] = 'is_top' in request.form
@@ -1754,7 +1920,7 @@ def admin():
                     type_str = type_str.strip()
                     value_str = value_str.strip().replace(',', '.')
                     if not type_str or not value_str:
-                         continue # Skip empty pairs
+                         continue
 
                     try:
                         price_value = round(float(value_str), 2)
@@ -1904,7 +2070,7 @@ def admin():
 
     current_data = load_data()
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
-    display_categories = sorted(current_data.get('categories', []))
+    display_categories = sorted(current_data.get('categories', []), key=lambda x: x.get('name', ''))
 
     return render_template_string(
         ADMIN_TEMPLATE,
@@ -1956,4 +2122,3 @@ if __name__ == '__main__':
     port = int(os.environ.get('PORT', 7860))
     logging.info(f"Starting Flask app on host 0.0.0.0 and port {port}")
     app.run(debug=False, host='0.0.0.0', port=port)
-