Update app.py

app.py

@@ -54,12 +54,11 @@ STATUS_MAPS = {
 
 translations = {
     'ru': {
-        'page_title': "Esmira - Каталог тканей и одежды",
+        'page_title': "Esmira - ткани и одежда оптом и в розницу",
         'header_title': "Esmira",
         'our_addresses': "Наши адреса в г. Алматы",
         'search_placeholder': "Поиск по названию или описанию...",
         'all_filter': "Все",
-        'top_product': "Топ",
         'add_to_cart_button': "В корзину",
         'from_price': "от",
         'no_products_yet': "Товары пока не добавлены.",
@@ -68,7 +67,8 @@ translations = {
         'specify_details': "Укажите детали",
         'variant_label': "Вариант:",
         'size_label': "Размер:",
-        'quantity_label': "Количество (в метрах для тканей):",
+        'quantity_label': "Количество:",
+        'quantity_label_meter': "Количество (метры):",
         'confirm_add_to_cart': "Добавить в корзину",
         'your_cart': "Ваша корзина",
         'cart_is_empty': "Ваша корзина пуста.",
@@ -84,9 +84,6 @@ translations = {
         'add_to_cart_notification': "добавлен в корзину!",
         'no_products_found': "По вашему запросу товары не найдены.",
         'category': "Категория",
-        'product_type': "Тип товара",
-        'fabrics': "Ткани",
-        'clothing': "Одежда",
         'no_category': "Без категории",
         'available_variants': "Доступные варианты:",
         'available_sizes': "Доступные размеры:",
@@ -107,14 +104,17 @@ translations = {
         'whatsapp_confirm_message_2': "Номер заказа:",
         'whatsapp_confirm_message_3': "Ссылка на заказ:",
         'whatsapp_confirm_message_4': "Пожалуйста, свяжитесь со мной для уточнения деталей.",
+        'product_type': "Тип товара",
+        'tkaniny': "Ткани",
+        'odezhda': "Одежда",
+        'price_per_meter': "Цена за метр",
     },
     'kz': {
-        'page_title': "Esmira - Маталар мен киімдер каталогы",
+        'page_title': "Esmira - маталар мен киімдер көтерме және бөлшек саудада",
         'header_title': "Esmira",
         'our_addresses': "Алматы қаласындағы мекенжайларымыз",
         'search_placeholder': "Аты немесе сипаттамасы бойынша іздеу...",
         'all_filter': "Барлығы",
-        'top_product': "Топ",
         'add_to_cart_button': "Себетке салу",
         'from_price': "-ден бастап",
         'no_products_yet': "Тауарлар әлі қосылмаған.",
@@ -123,7 +123,8 @@ translations = {
         'specify_details': "Мәліметтерді көрсетіңіз",
         'variant_label': "Нұсқа:",
         'size_label': "Өлшем:",
-        'quantity_label': "Саны (маталар үшін метрмен):",
+        'quantity_label': "Саны:",
+        'quantity_label_meter': "Саны (метр):",
         'confirm_add_to_cart': "Себетке қосу",
         'your_cart': "Сіздің себетіңіз",
         'cart_is_empty': "Сіздің себетіңіз бос.",
@@ -139,9 +140,6 @@ translations = {
         'add_to_cart_notification': "себетке қосылды!",
         'no_products_found': "Сіздің сұранысыңыз бойынша тауарлар табылмады.",
         'category': "Санат",
-        'product_type': "Тауар түрі",
-        'fabrics': "Маталар",
-        'clothing': "Киім",
         'no_category': "Санатсыз",
         'available_variants': "Қолжетімді нұсқалар:",
         'available_sizes': "Қолжетімді өлшемдер:",
@@ -162,6 +160,10 @@ translations = {
         'whatsapp_confirm_message_2': "Тапсырыс нөмірі:",
         'whatsapp_confirm_message_3': "Тапсырысқа сілтеме:",
         'whatsapp_confirm_message_4': "Мәліметтерді нақтылау үшін менімен хабарласуыңызды сұраймын.",
+        'product_type': "Тауар түрі",
+        'tkaniny': "Маталар",
+        'odezhda': "Киімдер",
+        'price_per_meter': "Метр бағасы",
     }
 }
 
@@ -208,7 +210,7 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN
                         try:
                             if file_name == DATA_FILE:
                                 with open(file_name, 'w', encoding='utf-8') as f:
-                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'settings': {}}, f)
+                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'settings': {'whatsapp_number': '+77073363943'}}, f)
                                 logging.info(f"Created empty local file {file_name} because it was not found on HF.")
                         except Exception as create_e:
                             logging.error(f"Failed to create empty local file {file_name}: {create_e}")
@@ -272,7 +274,7 @@ def periodic_backup():
 
 
 def load_data():
-    default_data = {'products': [], 'categories': [], 'orders': {}, 'settings': {'whatsapp_number': '77073363943'}}
+    default_data = {'products': [], 'categories': [], 'orders': {}, 'settings': {'whatsapp_number': '+77073363943'}}
     try:
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
@@ -283,7 +285,7 @@ def load_data():
         if 'products' not in data: data['products'] = []
         if 'categories' not in data: data['categories'] = []
         if 'orders' not in data: data['orders'] = {}
-        if 'settings' not in data: data['settings'] = {'whatsapp_number': '77073363943'}
+        if 'settings' not in data: data['settings'] = {'whatsapp_number': '+77073363943'}
         return data
     except FileNotFoundError:
         logging.warning(f"Local file {DATA_FILE} not found. Attempting download from HF.")
@@ -301,7 +303,7 @@ def load_data():
             if 'products' not in data: data['products'] = []
             if 'categories' not in data: data['categories'] = []
             if 'orders' not in data: data['orders'] = {}
-            if 'settings' not in data: data['settings'] = {'whatsapp_number': '77073363943'}
+            if 'settings' not in data: data['settings'] = {'whatsapp_number': '+77073363943'}
             return data
         except FileNotFoundError:
              logging.error(f"File {DATA_FILE} still not found even after download reported success. Using default.")
@@ -331,7 +333,8 @@ def save_data(data):
         if 'products' not in data: data['products'] = []
         if 'categories' not in data: data['categories'] = []
         if 'orders' not in data: data['orders'] = {}
-        if 'settings' not in data: data['settings'] = {}
+        if 'settings' not in data: data['settings'] = {'whatsapp_number': '+77073363943'}
+
 
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
@@ -356,30 +359,30 @@ CATALOG_TEMPLATE = '''
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.css">
         <style>
             :root {
-                --primary-color: #B22222;
-                --primary-dark: #8B0000;
-                --surface-color: #2b2b2b;
-                --background-color: #1c1c1c;
+                --primary-color: #9A2A47;
+                --primary-dark: #7a2138;
+                --surface-color: #313131;
+                --background-color: #212121;
                 --text-color: #F5F5F5;
-                --text-color-muted: #a0a0a0;
-                --border-color: #444;
-                --success-color: #28a745;
+                --text-color-muted: #BDBDBD;
+                --border-color: #424242;
+                --accent-color: #E0E0E0;
             }
             * { margin: 0; padding: 0; box-sizing: border-box; }
-            body {
-                font-family: 'Georgia', serif;
-                background: var(--background-color);
-                color: var(--text-color);
-                line-height: 1.6;
-                transition: background-color 0.3s;
+            body { 
+                font-family: 'Georgia', serif; 
+                background: var(--background-color); 
+                color: var(--text-color); 
+                line-height: 1.6; 
+                transition: background-color 0.3s; 
             }
             .container { max-width: 100%; margin: 0 auto; padding: 0; }
             .content-area { padding: 20px; }
 
-            .header { display: flex; justify-content: space-between; align-items: center; padding: 15px 20px; background: rgba(28, 28, 28, 0.8); backdrop-filter: blur(10px); border-bottom: 1px solid var(--border-color); position: sticky; top: 0; z-index: 1000; }
+            .header { display: flex; justify-content: space-between; align-items: center; padding: 15px 20px; background: rgba(33, 33, 33, 0.8); backdrop-filter: blur(10px); border-bottom: 1px solid var(--border-color); position: sticky; top: 0; z-index: 1000; }
             .logo-title-container { display: flex; align-items: center; gap: 15px; }
-            .logo-title-container img { height: 45px; width: 45px; border-radius: 50%; object-fit: cover; }
-            .header h1 { font-family: 'Cormorant Garamond', serif; font-size: 1.8rem; font-weight: 700; color: var(--text-color); }
+            .logo-title-container img { height: 45px; width: auto; object-fit: contain; }
+            .header h1 { font-family: 'Cormorant Garamond', serif; font-size: 1.8rem; font-weight: 700; color: var(--accent-color); }
             
             .lang-switcher { display: flex; gap: 5px; background-color: var(--surface-color); padding: 5px; border-radius: 50px; }
             .lang-switcher a { color: var(--text-color-muted); text-decoration: none; font-size: 0.9rem; padding: 5px 10px; border-radius: 50px; transition: all 0.3s; }
@@ -391,36 +394,36 @@ CATALOG_TEMPLATE = '''
 
             .search-container { padding: 0 20px 20px; }
             #search-input { width: 100%; padding: 12px 20px; font-size: 1rem; border: 1px solid var(--border-color); border-radius: 50px; outline: none; transition: all 0.3s; background-color: var(--surface-color); color: var(--text-color); }
-            #search-input:focus { border-color: var(--primary-color); box-shadow: 0 0 0 4px rgba(178, 34, 34, 0.2); }
+            #search-input:focus { border-color: var(--primary-color); box-shadow: 0 0 0 4px rgba(154, 42, 71, 0.2); }
             
             .filters-wrapper { margin: 0 20px 20px; display: flex; flex-direction: column; gap: 15px; }
             .filters-container { display: flex; overflow-x: auto; gap: 10px; padding-bottom: 10px; scrollbar-width: none; -ms-overflow-style: none; }
             .filters-container::-webkit-scrollbar { display: none; }
             .filter-label { font-size: 0.9rem; color: var(--text-color-muted); margin-left: 5px; }
             .filter-btn { padding: 8px 18px; border: 1px solid var(--border-color); border-radius: 50px; background-color: transparent; cursor: pointer; transition: all 0.3s ease; font-size: 0.9rem; font-weight: 400; color: var(--text-color-muted); white-space: nowrap; }
-            .filter-btn.active, .filter-btn:hover { background-color: var(--primary-color); color: #fff; border-color: var(--primary-color); font-weight: 500; box-shadow: 0 2px 8px rgba(178, 34, 34, 0.3); transform: translateY(-2px); }
+            .filter-btn.active, .filter-btn:hover { background-color: var(--primary-color); color: #fff; border-color: var(--primary-color); font-weight: 500; box-shadow: 0 2px 8px rgba(154, 42, 71, 0.3); transform: translateY(-2px); }
 
             .products-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 15px; padding: 0 20px 120px; }
             @media (min-width: 600px) { .products-grid { grid-template-columns: repeat(auto-fill, minmax(190px, 1fr)); gap: 20px; } }
 
             .product { background: var(--surface-color); border-radius: 16px; box-shadow: 0 4px 15px rgba(0, 0, 0, 0.4); transition: all 0.3s ease; overflow: hidden; display: flex; flex-direction: column; height: 100%; position: relative; border: 1px solid var(--border-color); }
-            .product:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(178, 34, 34, 0.15); border-color: var(--primary-color); }
+            .product:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(154, 42, 71, 0.15); border-color: var(--primary-color); }
             
-            .product-image { width: 100%; aspect-ratio: 1 / 1; background-color: #000; display: flex; justify-content: center; align-items: center; padding: 10px; }
+            .product-image { width: 100%; aspect-ratio: 1 / 1; background-color: #fff; display: flex; justify-content: center; align-items: center; padding: 10px; }
             .product-image img { max-width: 100%; max-height: 100%; object-fit: contain; transition: transform 0.3s ease; }
             .product:hover .product-image img { transform: scale(1.05); }
             .product-info { padding: 15px; flex-grow: 1; display: flex; flex-direction: column; text-align: center; }
-            .product h2 { font-family: 'Cormorant Garamond', serif; font-size: 1.2rem; font-weight: 600; margin: 0 0 8px 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: var(--text-color); }
+            .product h2 { font-family: 'Cormorant Garamond', serif; font-size: 1.2rem; font-weight: 600; margin: 0 0 8px 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: var(--accent-color); }
             .product-price { font-size: 1.2rem; color: var(--primary-color); font-weight: 700; margin: 5px 0; }
             .product-price .from-text { font-size: 0.8rem; color: var(--text-color-muted); font-weight: 400; }
             .product-description { display: none; }
             .product-actions { padding: 0 15px 15px; }
             
             .product-button { display: inline-flex; align-items: center; justify-content: center; width: 100%; padding: 10px; border: none; border-radius: 50px; background-color: var(--primary-color); color: #fff; font-size: 0.9rem; font-weight: 500; cursor: pointer; transition: all 0.3s ease; text-decoration: none; text-transform: uppercase; letter-spacing: 0.5px; }
-            .product-button:hover { background-color: var(--primary-dark); box-shadow: 0 4px 10px rgba(178, 34, 34, 0.4); }
+            .product-button:hover { background-color: var(--primary-dark); box-shadow: 0 4px 10px rgba(154, 42, 71, 0.4); }
             .product-button i { margin-right: 8px; }
 
-            .fab { position: fixed; background-color: var(--primary-color); color: #fff; border: none; border-radius: 50%; width: 55px; height: 55px; font-size: 1.5rem; cursor: pointer; display: flex; align-items: center; justify-content: center; box-shadow: 0 4px 15px rgba(178, 34, 34, 0.4); z-index: 1000; transition: transform 0.2s ease; }
+            .fab { position: fixed; background-color: var(--primary-color); color: #fff; border: none; border-radius: 50%; width: 55px; height: 55px; font-size: 1.5rem; cursor: pointer; display: flex; align-items: center; justify-content: center; box-shadow: 0 4px 15px rgba(154, 42, 71, 0.4); z-index: 1000; transition: transform 0.2s ease; }
             .fab:hover { transform: scale(1.1); }
             #cart-button { bottom: 20px; right: 20px; display: none; }
             #cart-button span { position: absolute; top: -2px; right: -2px; background-color: #dc3545; color: white; border-radius: 50%; padding: 3px 7px; font-size: 0.75rem; font-weight: bold; min-width: 22px; text-align: center; }
@@ -436,7 +439,7 @@ CATALOG_TEMPLATE = '''
             
             .cart-item { display: grid; grid-template-columns: 65px 1fr auto 25px; gap: 15px; align-items: center; padding: 15px 0; border-bottom: 1px solid var(--border-color); }
             .cart-item:last-child { border-bottom: none; }
-            .cart-item img { width: 65px; height: 65px; object-fit: contain; border-radius: 8px; background-color: #000; padding: 5px; }
+            .cart-item img { width: 65px; height: 65px; object-fit: contain; border-radius: 8px; background-color: #fff; padding: 5px; }
             .cart-item-details strong { display: block; margin-bottom: 4px; font-size: 1.05rem; }
             .cart-item-price { font-size: 0.9rem; color: var(--text-color-muted); }
             .cart-item-total { font-weight: bold; text-align: right; font-size: 1rem; color: var(--primary-color); }
@@ -455,7 +458,6 @@ CATALOG_TEMPLATE = '''
             .notification { position: fixed; bottom: 80px; left: 50%; transform: translateX(-50%); background-color: var(--primary-color); color: #fff; padding: 12px 25px; border-radius: 50px; box-shadow: 0 4px 15px rgba(0,0,0,0.5); z-index: 1002; opacity: 0; transition: all 0.5s cubic-bezier(0.25, 0.46, 0.45, 0.94); font-size: 0.95rem; font-weight: 500; }
             .notification.show { opacity: 1; bottom: 90px; }
             .no-results-message { grid-column: 1 / -1; text-align: center; padding: 50px; font-size: 1.2rem; color: var(--text-color-muted); }
-            .top-product-indicator { position: absolute; top: 10px; right: 10px; background: linear-gradient(135deg, #B22222, #8B0000); color: #fff; padding: 3px 8px; font-size: 0.7rem; border-radius: 50px; font-weight: bold; z-index: 10; display: flex; align-items: center; gap: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.5); }
             
             #whatsapp-fab { bottom: 20px; left: 20px; background-color: #25D366; color: white; }
         </style>
@@ -486,12 +488,12 @@ CATALOG_TEMPLATE = '''
             </div>
 
             <div class="filters-wrapper">
-                <div>
+                 <div>
                     <span class="filter-label">{{ _['product_type'] }}:</span>
                     <div class="filters-container">
                         <button class="filter-btn type-filter active" data-type="all">{{ _['all_filter'] }}</button>
-                        <button class="filter-btn type-filter" data-type="Ткани">{{ _['fabrics'] }}</button>
-                        <button class="filter-btn type-filter" data-type="Одежда">{{ _['clothing'] }}</button>
+                        <button class="filter-btn type-filter" data-type="tkaniny">{{ _['tkaniny'] }}</button>
+                        <button class="filter-btn type-filter" data-type="odezhda">{{ _['odezhda'] }}</button>
                     </div>
                 </div>
                 <div>
@@ -512,10 +514,7 @@ CATALOG_TEMPLATE = '''
                      data-name="{{ product['name']|lower }}"
                      data-description="{{ product.get('description', '')|lower }}"
                      data-category="{{ product.get('category', _['no_category']) }}"
-                     data-type="{{ product.get('type') }}">
-                     {% if product.get('is_top', False) %}
-                        <span class="top-product-indicator"><i class="fas fa-star fa-xs"></i> {{ _['top_product'] }}</span>
-                     {% endif %}
+                     data-type="{{ product.get('product_type', 'tkaniny') }}">
                     <div class="product-image" onclick="openModal({{ loop.index0 }})" style="cursor: pointer;">
                         {% if product.get('photos') and product['photos']|length > 0 %}
                             <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photos'][0] }}"
@@ -560,16 +559,18 @@ CATALOG_TEMPLATE = '''
                 <span class="close" onclick="closeModal('quantityModal')" aria-label="Закрыть">&times;</span>
                 <h2>{{ _['specify_details'] }}</h2>
                 
-                <label for="variantSelect">{{ _['variant_label'] }}</label>
-                <select id="variantSelect" class="variant-select"></select>
+                <div id="variant-section">
+                    <label for="variantSelect">{{ _['variant_label'] }}</label>
+                    <select id="variantSelect" class="variant-select"></select>
+                </div>
 
-                <div id="size-selection-area" style="display: none;">
+                <div id="size-section" style="display: none;">
                     <label for="sizeSelect">{{ _['size_label'] }}</label>
                     <select id="sizeSelect" class="size-select"></select>
                 </div>
-
-                <label for="quantityInput">{{ _['quantity_label'] }}</label>
-                <input type="number" id="quantityInput" class="quantity-input" min="0.1" step="0.1" value="1">
+                
+                <label for="quantityInput" id="quantity-label">{{ _['quantity_label'] }}</label>
+                <input type="number" id="quantityInput" class="quantity-input" min="1" value="1" step="1">
                 
                 <button class="product-button" onclick="confirmAddToCart()"><i class="fas fa-check"></i> {{ _['confirm_add_to_cart'] }}</button>
             </div>
@@ -599,7 +600,9 @@ CATALOG_TEMPLATE = '''
            <span id="cart-count">0</span>
         </button>
 
-        <a id="whatsapp-fab" class="fab" href="https://api.whatsapp.com/send?phone={{ settings.whatsapp_number }}" target="_blank" rel="noopener noreferrer"><i class="fab fa-whatsapp"></i></a>
+        <a href="https://api.whatsapp.com/send?phone={{ whatsapp_number }}" target="_blank" rel="noopener noreferrer" id="whatsapp-fab" class="fab">
+            <i class="fab fa-whatsapp"></i>
+        </a>
 
         <div id="notification-placeholder"></div>
 
@@ -609,7 +612,7 @@ CATALOG_TEMPLATE = '''
             const repoId = '{{ repo_id }}';
             const currencyCode = '{{ currency_code }}';
             let selectedProductIndex = null;
-            let cart = JSON.parse(localStorage.getItem('esmiraCart') || '[]');
+            let cart = JSON.parse(localStorage.getItem('esmiracart') || '[]');
             const langCode = '{{ lang_code }}';
             const translations = {{ _|tojson }};
 
@@ -651,16 +654,16 @@ CATALOG_TEMPLATE = '''
                     autoplay: { delay: 4000, disableOnInteraction: true },
                 });
             }
-
-            function setupOptionSelect(selectId, options, textFormatter) {
+            
+            function setupSelect(selectId, items, displayFunc) {
                 const select = document.getElementById(selectId);
                 select.innerHTML = '';
-                if (options && options.length > 0) {
-                    options.forEach((option, index) => {
-                         const opt = document.createElement('option');
-                         opt.value = index;
-                         opt.text = textFormatter(option);
-                         select.appendChild(opt);
+                 if (items && items.length > 0) {
+                    items.forEach((item, index) => {
+                         const option = document.createElement('option');
+                         option.value = index;
+                         option.text = displayFunc(item);
+                         select.appendChild(option);
                     });
                     select.parentElement.style.display = 'block';
                 } else {
@@ -672,23 +675,26 @@ CATALOG_TEMPLATE = '''
                 selectedProductIndex = index;
                 const product = products[index];
                 if (!product) return;
-
-                setupOptionSelect('variantSelect', product.variants, v => `${v.name} - ${v.price.toFixed(2)} ${currencyCode}`);
                 
-                const sizeArea = document.getElementById('size-selection-area');
                 const quantityInput = document.getElementById('quantityInput');
+                const quantityLabel = document.getElementById('quantity-label');
 
-                if (product.type === 'Одежда') {
-                    setupOptionSelect('sizeSelect', product.sizes, s => s.name);
-                    sizeArea.style.display = 'block';
+                setupSelect('variantSelect', product.variants, v => `${v.name} - ${v.price.toFixed(2)} ${currencyCode}`);
+                
+                if(product.product_type === 'odezhda') {
+                    setupSelect('sizeSelect', product.sizes, s => s.name);
+                    quantityInput.type = "number";
                     quantityInput.step = "1";
                     quantityInput.min = "1";
-                    quantityInput.value = 1;
+                    quantityInput.value = "1";
+                    quantityLabel.textContent = translations['quantity_label'];
                 } else {
-                    sizeArea.style.display = 'none';
+                    document.getElementById('size-section').style.display = 'none';
+                    quantityInput.type = "number";
                     quantityInput.step = "0.1";
                     quantityInput.min = "0.1";
-                    quantityInput.value = 1;
+                    quantityInput.value = "1.0";
+                    quantityLabel.textContent = translations['quantity_label_meter'];
                 }
                 
                 document.getElementById('quantityModal').style.display = 'block';
@@ -698,38 +704,34 @@ CATALOG_TEMPLATE = '''
             function confirmAddToCart() {
                 if (selectedProductIndex === null) return;
 
-                const quantityInput = document.getElementById('quantityInput');
                 const product = products[selectedProductIndex];
-
-                const quantity = product.type === 'Ткани' ? parseFloat(quantityInput.value) : parseInt(quantityInput.value);
-
-                if (isNaN(quantity) || quantity <= 0) {
-                    alert("Пожалуйста, укажите корректное количество.");
+                const quantity = parseFloat(document.getElementById('quantityInput').value);
+                const variantIndex = document.getElementById('variantSelect').value;
+                const sizeIndex = document.getElementById('sizeSelect').value;
+                
+                if (!product || !product.variants || product.variants.length === 0) {
+                    alert("Ошибка: Варианты для этого товара не найдены.");
                     return;
                 }
                 
-                const variantIndex = document.getElementById('variantSelect').value;
                 const selectedVariant = product.variants[variantIndex];
-                
                 let selectedSize = null;
-                let sizeName = null;
-                if (product.type === 'Одежда') {
-                    const sizeIndex = document.getElementById('sizeSelect').value;
-                    if(product.sizes && product.sizes.length > 0) {
-                        selectedSize = product.sizes[sizeIndex];
-                        sizeName = selectedSize.name;
-                    } else {
-                        alert("Ошибка: Размеры для этого товара не найдены.");
+                let cartItemId = `${product.id}-${selectedVariant.name}`;
+                
+                if (product.product_type === 'odezhda') {
+                    if (!product.sizes || product.sizes.length === 0) {
+                        alert("Ошибка: Размеры для этой одежды не найдены.");
                         return;
                     }
+                    selectedSize = product.sizes[sizeIndex];
+                    cartItemId += `-${selectedSize.name}`;
                 }
 
-                if (!product || !selectedVariant) {
-                    alert("Ошибка: Варианты для этого товара не найдены.");
+                if (isNaN(quantity) || quantity <= 0) {
+                    alert("Пожалуйста, укажите корректное количество.");
                     return;
                 }
 
-                const cartItemId = `${product.id}-${selectedVariant.name}${sizeName ? '-' + sizeName : ''}`;
                 const existingItem = cart.find(item => item.id === cartItemId);
 
                 if (existingItem) {
@@ -741,13 +743,14 @@ CATALOG_TEMPLATE = '''
                         name: product.name,
                         price: selectedVariant.price,
                         variantName: selectedVariant.name,
-                        sizeName: sizeName,
+                        sizeName: selectedSize ? selectedSize.name : null,
+                        productType: product.product_type,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : null,
                         quantity: quantity
                     });
                 }
 
-                localStorage.setItem('esmiraCart', JSON.stringify(cart));
+                localStorage.setItem('esmiracart', JSON.stringify(cart));
                 closeModal('quantityModal');
                 updateCartButton();
                 showNotification(`${product.name} ${translations['add_to_cart_notification']}`);
@@ -780,18 +783,18 @@ CATALOG_TEMPLATE = '''
                         total += itemTotal;
                         const photoUrl = item.photo ? `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${item.photo}` : 'https://via.placeholder.com/65x65.png?text=N/A';
                         
-                        let details = `<p class="cart-item-price">${translations['cart_item_variant']}: ${item.variantName}</p>`;
+                        let detailsHtml = `<p class="cart-item-price">${translations['cart_item_variant']}: ${item.variantName}</p>`;
                         if (item.sizeName) {
-                            details += `<p class="cart-item-price">${translations['cart_item_size']}: ${item.sizeName}</p>`;
+                            detailsHtml += `<p class="cart-item-price">${translations['cart_item_size']}: ${item.sizeName}</p>`;
                         }
-                        details += `<p class="cart-item-price">${item.price.toFixed(2)} ${currencyCode} × ${item.quantity}</p>`;
-
+                        
                         return `
                             <div class="cart-item">
                                 <img src="${photoUrl}" alt="${item.name}">
                                 <div class="cart-item-details">
                                     <strong>${item.name}</strong>
-                                    ${details}
+                                    ${detailsHtml}
+                                    <p class="cart-item-price">${item.price.toFixed(2)} ${currencyCode} × ${item.quantity}</p>
                                 </div>
                                 <span class="cart-item-total">${itemTotal.toFixed(2)}</span>
                                 <button class="cart-item-remove" onclick="removeFromCart('${item.id}')" title="${translations['remove_item_title']}">&times;</button>
@@ -805,7 +808,7 @@ CATALOG_TEMPLATE = '''
 
              function removeFromCart(itemId) {
                 cart = cart.filter(item => item.id !== itemId);
-                localStorage.setItem('esmiraCart', JSON.stringify(cart));
+                localStorage.setItem('esmiracart', JSON.stringify(cart));
                 openCartModal();
                 updateCartButton();
              }
@@ -813,7 +816,7 @@ CATALOG_TEMPLATE = '''
             function clearCart() {
                 if (confirm(translations['clear_cart_confirm'])) {
                     cart = [];
-                    localStorage.removeItem('esmiraCart');
+                    localStorage.removeItem('esmiracart');
                     openCartModal();
                     updateCartButton();
                 }
@@ -835,7 +838,7 @@ CATALOG_TEMPLATE = '''
                 .then(response => response.json())
                 .then(data => {
                     if (data.order_id) {
-                        localStorage.removeItem('esmiraCart');
+                        localStorage.removeItem('esmiracart');
                         cart = [];
                         updateCartButton();
                         closeModal('cartModal');
@@ -889,16 +892,10 @@ CATALOG_TEMPLATE = '''
 
              function setupFilters() {
                  document.getElementById('search-input').addEventListener('input', filterProducts);
-                 document.querySelectorAll('.category-filter').forEach(filter => {
+                 document.querySelectorAll('.filter-btn').forEach(filter => {
                      filter.addEventListener('click', function() {
-                         document.querySelector('.category-filter.active').classList.remove('active');
-                         this.classList.add('active');
-                         filterProducts();
-                     });
-                 });
-                 document.querySelectorAll('.type-filter').forEach(filter => {
-                     filter.addEventListener('click', function() {
-                         document.querySelector('.type-filter.active').classList.remove('active');
+                         const filterGroupClass = this.classList.contains('category-filter') ? '.category-filter.active' : '.type-filter.active';
+                         document.querySelector(filterGroupClass).classList.remove('active');
                          this.classList.add('active');
                          filterProducts();
                      });
@@ -949,7 +946,7 @@ PRODUCT_DETAIL_TEMPLATE = '''
             <div class="swiper-wrapper">
                 {% if product.get('photos') and product['photos']|length > 0 %}
                     {% for photo in product['photos'] %}
-                    <div class="swiper-slide" style="display: flex; justify-content: center; align-items: center; padding: 10px; background-color: #000;">
+                    <div class="swiper-slide" style="display: flex; justify-content: center; align-items: center; padding: 10px; background-color: #fff;">
                          <div class="swiper-zoom-container">
                              <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ photo }}"
                                   alt="{{ product['name'] }} - фото {{ loop.index }}"
@@ -971,11 +968,13 @@ PRODUCT_DETAIL_TEMPLATE = '''
         </div>
 
         <div style="font-size: 1rem; line-height: 1.7; padding: 0 10px;">
-            <p><strong>{{ _['product_type'] }}:</strong> {{ product.get('type') }}</p>
+            <p><strong>{{ _['product_type'] }}:</strong> {{ _[product.get('product_type', 'tkaniny')] }}</p>
             <p><strong>{{ _['category'] }}:</strong> {{ product.get('category', _['no_category']) }}</p>
+
             {% if product.get('variants') and product.variants|length > 0 %}
                 <p style="font-size: 1.4rem; font-weight: bold; color: var(--primary-color); margin: 15px 0;">
                     {{ _['from_price'] }} {{ "%.2f"|format(product.variants|map(attribute='price')|min) }} {{ currency_code }}
+                    {% if product.product_type == 'tkaniny' %} / {{ _['price_per_meter']|lower }} {% endif %}
                 </p>
                 <p><strong>{{ _['available_variants'] }}</strong></p>
                 <ul style="list-style: none; padding-left: 0;">
@@ -987,16 +986,18 @@ PRODUCT_DETAIL_TEMPLATE = '''
                 {% endfor %}
                 </ul>
             {% endif %}
-            {% if product.type == 'Одежда' and product.get('sizes') and product.sizes|length > 0 %}
-                 <p style="margin-top: 15px;"><strong>{{ _['available_sizes'] }}</strong></p>
-                 <ul style="list-style: none; padding-left: 0;">
-                 {% for size in product.sizes %}
-                     <li style="padding: 5px 0; border-bottom: 1px solid var(--border-color);">
-                         - {{ size.name }}
-                     </li>
-                 {% endfor %}
-                 </ul>
+
+            {% if product.product_type == 'odezhda' and product.get('sizes') and product.sizes|length > 0 %}
+                <p style="margin-top: 15px;"><strong>{{ _['available_sizes'] }}</strong></p>
+                <ul style="list-style: none; padding-left: 0;">
+                {% for size in product.sizes %}
+                    <li style="padding: 5px 0; border-bottom: 1px solid var(--border-color);">
+                        - {{ size.name }}
+                    </li>
+                {% endfor %}
+                </ul>
             {% endif %}
+
             <p style="margin-top: 20px;"><strong>{{ _['description'] }}:</strong><br> {{ product.get('description', _['no_description'])|replace('\\n', '<br>')|safe }}</p>
         </div>
         <div style="padding: 20px 10px 10px; text-align: center;">
@@ -1020,13 +1021,13 @@ ORDER_TEMPLATE = '''
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <style>
         :root {
-            --primary-color: #B22222;
-            --primary-dark: #8B0000;
-            --surface-color: #2b2b2b;
-            --background-color: #1c1c1c;
+            --primary-color: #9A2A47; 
+            --primary-dark: #7a2138;
+            --surface-color: #313131;
+            --background-color: #212121;
             --text-color: #F5F5F5;
-            --text-color-muted: #a0a0a0;
-            --border-color: #444;
+            --text-color-muted: #BDBDBD;
+            --border-color: #424242;
         }
         body { font-family: 'Georgia', serif; background: var(--background-color); color: var(--text-color); line-height: 1.6; padding: 15px; }
         .container { max-width: 800px; margin: 20px auto; padding: 30px; background: var(--surface-color); border-radius: 16px; box-shadow: 0 4px 20px rgba(0, 0, 0, 0.6); border: 1px solid var(--border-color); }
@@ -1036,14 +1037,14 @@ ORDER_TEMPLATE = '''
         .order-meta { font-size: 0.9rem; color: var(--text-color-muted); margin-bottom: 20px; text-align: center; }
         .order-item { display: grid; grid-template-columns: 60px 1fr auto; gap: 15px; align-items: center; padding: 15px 0; border-bottom: 1px solid var(--border-color); }
         .order-item:last-child { border-bottom: none; }
-        .order-item img { width: 60px; height: 60px; object-fit: contain; border-radius: 8px; background-color: #000; padding: 5px; border: 1px solid #444;}
+        .order-item img { width: 60px; height: 60px; object-fit: contain; border-radius: 8px; background-color: #fff; padding: 5px; border: 1px solid #444;}
         .item-details strong { display: block; margin-bottom: 4px; font-size: 1.05rem; color: var(--text-color);}
         .item-details span { font-size: 0.9rem; color: var(--text-color-muted); display: block;}
         .item-total { font-weight: bold; text-align: right; font-size: 1.1rem; color: var(--primary-color);}
         .order-summary { margin-top: 30px; padding-top: 20px; border-top: 2px solid var(--primary-color); text-align: right; }
         .order-summary p { margin-bottom: 10px; font-size: 1.1rem; }
         .order-summary strong { font-size: 1.5rem; color: var(--primary-color); }
-        .customer-info { margin-top: 30px; background-color: rgba(178, 34, 34, 0.05); padding: 20px; border-radius: 12px; border: 1px solid var(--primary-color);}
+        .customer-info { margin-top: 30px; background-color: rgba(154, 42, 71, 0.05); padding: 20px; border-radius: 12px; border: 1px solid var(--primary-color);}
         .customer-info p { margin-bottom: 8px; font-size: 1rem; }
         .customer-info strong { color: var(--text-color); }
         .actions { margin-top: 30px; text-align: center; }
@@ -1100,7 +1101,7 @@ ORDER_TEMPLATE = '''
                 function sendOrderViaWhatsApp() {
                     const orderId = '{{ order.id }}';
                     const orderUrl = `{{ request.url }}`;
-                    const whatsappNumber = "{{ whatsapp_number }}";
+                    const whatsappNumber = "{{ whatsapp_number }}".replace(/\D/g, '');
 
                     let message = `{{ _['whatsapp_confirm_message_1'] }}%0A%0A`;
                     message += `*{{ _['whatsapp_confirm_message_2'] }}* ${orderId}%0A`;
@@ -1135,13 +1136,13 @@ ADMIN_TEMPLATE = '''
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
         <style>
             :root {
-                --primary-color: #B22222;
-                --primary-dark: #8B0000;
-                --surface-color: #2b2b2b;
-                --background-color: #1c1c1c;
+                --primary-color: #9A2A47;
+                --primary-dark: #7a2138;
+                --surface-color: #313131;
+                --background-color: #212121;
                 --text-color: #F5F5F5;
-                --text-color-muted: #a0a0a0;
-                --border-color: #444;
+                --text-color-muted: #BDBDBD;
+                --border-color: #424242;
                 --success-bg: #113d21;
                 --success-text: #6ee791;
                 --error-bg: #4d0a0a;
@@ -1156,11 +1157,11 @@ ADMIN_TEMPLATE = '''
             h1 { font-size: 2rem; }
             h2 { font-size: 1.6rem; margin-top: 30px; display: flex; align-items: center; gap: 10px; padding-bottom: 8px; border-bottom: 1px solid var(--border-color);}
             h3 { font-size: 1.2rem; color: var(--text-color); margin-top: 20px;}
-            .section { margin-bottom: 30px; padding: 20px; background-color: #151515; border: 1px solid var(--border-color); border-radius: 8px; }
+            .section { margin-bottom: 30px; padding: 20px; background-color: #292929; border: 1px solid var(--border-color); border-radius: 8px; }
             
             label { font-weight: 500; margin-top: 12px; display: block; color: var(--text-color); font-size: 0.9rem;}
             input[type="text"], input[type="number"], input[type="password"], input[type="tel"], textarea, select { width: 100%; padding: 10px 12px; margin-top: 6px; border: 1px solid var(--border-color); border-radius: 6px; font-size: 0.95rem; box-sizing: border-box; transition: border-color 0.3s ease; background-color: var(--background-color); color: var(--text-color); }
-            input:focus, textarea:focus, select:focus { border-color: var(--primary-color); outline: none; box-shadow: 0 0 0 3px rgba(178, 34, 34, 0.2); }
+            input:focus, textarea:focus, select:focus { border-color: var(--primary-color); outline: none; box-shadow: 0 0 0 3px rgba(154, 42, 71, 0.2); }
             textarea { min-height: 90px; resize: vertical; }
             input[type="file"] { padding: 8px; background-color: #222; cursor: pointer; border: 1px solid var(--border-color); border-radius: 6px; }
             input[type="checkbox"] { transform: scale(1.2); margin-right: 8px; vertical-align: middle; accent-color: var(--primary-color); }
@@ -1173,7 +1174,7 @@ ADMIN_TEMPLATE = '''
             .item-list { display: grid; gap: 15px; }
             .item { background: var(--surface-color); padding: 15px; border-radius: 8px; border: 1px solid var(--border-color); }
             .item-actions { margin-top: 15px; display: flex; gap: 10px; flex-wrap: wrap; align-items: center; }
-            .photo-preview img, .photo-edit-item img { width: 60px; height: 60px; border-radius: 6px; margin: 5px 5px 0 0; border: 1px solid var(--border-color); object-fit: cover;}
+            .photo-preview img, .photo-edit-item img { width: 60px; height: 60px; border-radius: 6px; margin: 5px 5px 0 0; border: 1px solid var(--border-color); object-fit: cover; background-color: #fff;}
             .photo-preview-edit { display: flex; flex-wrap: wrap; gap: 10px; margin-top: 5px; }
             .photo-edit-item { position: relative; }
             .photo-edit-item input[type="checkbox"] { position: absolute; top: 0px; right: 0px; transform: scale(1.3); accent-color: #ff453a; cursor: pointer; }
@@ -1189,13 +1190,12 @@ ADMIN_TEMPLATE = '''
             .message.error { background-color: var(--error-bg); color: var(--error-text); border-color: var(--error-text);}
             .message.warning { background-color: var(--warning-bg); color: var(--warning-text); border-color: var(--warning-text); }
             .status-indicator { display: inline-block; padding: 3px 9px; border-radius: 50px; font-size: 0.75rem; font-weight: 500; margin-left: 5px; vertical-align: middle; }
-            .status-indicator.top-product { background-color: #9c4221; color: #fff3c4; }
             .status-indicator.new { background-color: #e65100; color: #ffe0b2; }
             .status-indicator.accepted { background-color: #0277bd; color: #b3e5fc; }
             .status-indicator.prepared { background-color: #2f855a; color: #c6f6d5; }
             .status-indicator.shipped { background-color: #065f46; color: #a7f3d0; }
             
-            details { background-color: #151515; border: 1px solid var(--border-color); border-radius: 8px; margin-bottom: 10px; }
+            details { background-color: #292929; border: 1px solid var(--border-color); border-radius: 8px; margin-bottom: 10px; }
             details > summary { cursor: pointer; font-weight: 500; color: var(--text-color); display: flex; justify-content: space-between; align-items: center; padding: 15px 20px; list-style: none; position: relative; }
             details[open] > summary { border-bottom: 1px solid var(--border-color); }
             .order-details-content { padding: 15px 20px; }
@@ -1210,8 +1210,8 @@ ADMIN_TEMPLATE = '''
         <div class="container">
             <div class="header">
                 <div class="logo-title-container" style="display: flex; align-items: center; gap: 15px;">
-                    <img src="https://huggingface.co/spaces/esmira-tkani/admin/resolve/main/Screenshot_20251225-134859.png" alt="Esmira Logo" style="height: 45px; width: 45px; border-radius: 50%;">
-                    <h1><i class="fas fa-tools"></i> Админ-панель Esmira</h1>
+                    <img src="https://huggingface.co/spaces/esmira-tkani/admin/resolve/main/Screenshot_20251225-134859.png" alt="Esmira Logo" style="height: 45px; width: auto;">
+                    <h1><i class="fas fa-tools"></i> Админ-панель</h1>
                 </div>
                 <a href="{{ url_for('catalog', lang_code='ru') }}" class="button"><i class="fas fa-store"></i> Перейти в каталог</a>
             </div>
@@ -1225,17 +1225,6 @@ ADMIN_TEMPLATE = '''
                 {% endif %}
             {% endwith %}
 
-            <div class="section">
-                 <h2><i class="fas fa-cogs"></i> Настройки</h2>
-                 <form method="POST">
-                     <input type="hidden" name="action" value="update_settings">
-                     <label for="whatsapp_number">Номер WhatsApp для заказов:</label>
-                     <input type="tel" id="whatsapp_number" name="whatsapp_number" value="{{ settings.get('whatsapp_number', '') }}" placeholder="77073363943">
-                     <button type="submit"><i class="fas fa-save"></i> Сохранить настройки</button>
-                 </form>
-            </div>
-
-
             <div class="section">
                 <h2><i class="fas fa-history"></i> История заказов</h2>
                 {% if orders %}
@@ -1276,6 +1265,23 @@ ADMIN_TEMPLATE = '''
             </div>
 
             <div class="section">
+                 <h2><i class="fas fa-cog"></i> Настройки магазина</h2>
+                 <form method="POST">
+                     <input type="hidden" name="action" value="update_settings">
+                     <label for="whatsapp_number">Номер WhatsApp для заказов:</label>
+                     <input type="tel" id="whatsapp_number" name="whatsapp_number" value="{{ settings.get('whatsapp_number', '') }}" required>
+                     <button type="submit"><i class="fas fa-save"></i> Сохранить настройки</button>
+                 </form>
+                 <p style="margin-top: 20px;"><strong>Текущие адреса в г. Алматы:</strong></p>
+                 <ul style="padding-left: 20px;">
+                    {% for address in store_addresses %}
+                        <li>{{ address }}</li>
+                    {% endfor %}
+                 </ul>
+                 <p style="margin-top: 10px;"><strong>Валюта:</strong> {{ currency_name }} ({{ currency_code }})</p>
+            </div>
+
+             <div class="section">
                  <h2><i class="fas fa-tags"></i> Категории</h2>
                   <details>
                       <summary><i class="fas fa-plus-circle"></i> Добавить новую категорию</summary>
@@ -1305,27 +1311,25 @@ ADMIN_TEMPLATE = '''
                  {% else %}
                  <p>Категорий пока нет.</p>
                  {% endif %}
-            </div>
-
-
+             </div>
+             
             <div class="section">
                 <h2><i class="fas fa-box-open"></i> Товары</h2>
                  <details>
                      <summary><i class="fas fa-plus-circle"></i> Добавить новый товар</summary>
                      <div style="padding: 15px;">
-                         <form method="POST" enctype="multipart/form-data" id="addProductForm">
+                         <form method="POST" enctype="multipart/form-data" id="add-product-form">
                              <input type="hidden" name="action" value="add_product">
                              <label for="add_name">Название товара *:</label>
                              <input type="text" id="add_name" name="name" required>
-
-                             <label for="add_type">Тип товара *:</label>
-                             <select id="add_type" name="type" required onchange="toggleSizeInputs('add')">
-                                 <option value="Ткани">Ткани</option>
-                                 <option value="Одежда">Одежда</option>
-                             </select>
-
                              <label for="add_description">Описание:</label>
                              <textarea id="add_description" name="description" rows="4"></textarea>
+
+                             <label for="add_product_type">Тип товара *:</label>
+                             <select id="add_product_type" name="product_type" onchange="toggleProductFields('add')" required>
+                                 <option value="tkaniny">Ткани</option>
+                                 <option value="odezhda">Одежда</option>
+                             </select>
                              
                              <label for="add_category">Категория:</label>
                              <select id="add_category" name="category">
@@ -1346,24 +1350,20 @@ ADMIN_TEMPLATE = '''
                                      <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                                  </div>
                              </div>
-                             <button type="button" class="button add-btn" onclick="addVariantInput('add-variants-container')"><i class="fas fa-plus"></i> Добавить вариант</button>
-
-                             <div id="add-sizes-section" style="display: none;">
-                                <h4>Размеры *:</h4>
-                                <div id="add-sizes-container">
-                                    <div class="input-group">
-                                        <input type="text" name="size_names" placeholder="Название размера (напр. S, M, 42)">
-                                    <button type="button" class="remove-btn" onclick="removeInputGroup(this, false)"><i class="fas fa-times"></i></button>
-                                    </div>
-                                </div>
-                                <button type="button" class="button add-btn" onclick="addSizeInput('add-sizes-container')"><i class="fas fa-plus"></i> Добавить размер</button>
-                            </div>
-
-                             <div style="margin-top: 20px;">
-                                 <input type="checkbox" id="add_is_top" name="is_top">
-                                 <label for="add_is_top">Топ товар</label>
+                             <button type="button" class="button add-btn" onclick="addInputGroup('add-variants-container', 'variant')"><i class="fas fa-plus"></i> Добавить вариант</button>
+                             
+                             <div id="add-sizes-section" style="display:none; margin-top:20px;">
+                                 <h4>Размеры *:</h4>
+                                 <div id="add-sizes-container">
+                                     <div class="input-group">
+                                         <input type="text" name="size_names" placeholder="Название размера (напр. S, 42-44)">
+                                         <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
+                                     </div>
+                                 </div>
+                                 <button type="button" class="button add-btn" onclick="addInputGroup('add-sizes-container', 'size')"><i class="fas fa-plus"></i> Добавить размер</button>
                              </div>
-                             <br>
+                             
+                             <br><br>
                              <button type="submit"><i class="fas fa-save"></i> Добавить товар</button>
                          </form>
                      </div>
@@ -1385,11 +1385,8 @@ ADMIN_TEMPLATE = '''
                                 {% endif %}
                             </div>
                             <div style="flex-grow: 1;">
-                                <h3 style="margin-top: 0; margin-bottom: 5px;">
-                                    {{ product['name'] }}
-                                     {% if product.get('is_top', False) %}<span class="status-indicator top-product"><i class="fas fa-star fa-xs"></i> Топ</span>{% endif %}
-                                </h3>
-                                <p style="font-size: 0.9rem; color: var(--text-color-muted);"><strong>Тип:</strong> {{ product.get('type') }}</p>
+                                <h3 style="margin-top: 0; margin-bottom: 5px;">{{ product['name'] }}</h3>
+                                <p style="font-size: 0.9rem; color: var(--text-color-muted);"><strong>Тип:</strong> {{ 'Ткани' if product.get('product_type') == 'tkaniny' else 'Одежда' }}</p>
                                 <p style="font-size: 0.9rem; color: var(--text-color-muted);"><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
                             </div>
                         </div>
@@ -1410,16 +1407,15 @@ ADMIN_TEMPLATE = '''
                                 <input type="hidden" name="product_id" value="{{ product.id }}">
                                 <label>Название *:</label>
                                 <input type="text" name="name" value="{{ product['name'] }}" required>
+                                <label>Описание:</label>
+                                <textarea name="description" rows="4">{{ product.get('description', '') }}</textarea>
                                 
                                 <label>Тип товара *:</label>
-                                <select name="type" required onchange="toggleSizeInputs('edit-{{ product.id }}')">
-                                    <option value="Ткани" {% if product.get('type') == 'Ткани' %}selected{% endif %}>Ткани</option>
-                                    <option value="Одежда" {% if product.get('type') == 'Одежда' %}selected{% endif %}>Одежда</option>
+                                <select name="product_type" onchange="toggleProductFields('edit-{{ product.id }}')" required>
+                                    <option value="tkaniny" {% if product.get('product_type') == 'tkaniny' %}selected{% endif %}>Ткани</option>
+                                    <option value="odezhda" {% if product.get('product_type') == 'odezhda' %}selected{% endif %}>Одежда</option>
                                 </select>
 
-                                <label>Описание:</label>
-                                <textarea name="description" rows="4">{{ product.get('description', '') }}</textarea>
-                                
                                 <label>Категория:</label>
                                 <select name="category">
                                     <option value="Без категории" {% if product.get('category', 'Без категории') == 'Без категории' %}selected{% endif %}>Без категории</option>
@@ -1455,32 +1451,22 @@ ADMIN_TEMPLATE = '''
                                     </div>
                                     {% endfor %}
                                 </div>
-                                <button type="button" class="button add-btn" onclick="addVariantInput('edit-variants-container-{{ product.id }}')"><i class="fas fa-plus"></i> Добавить вариант</button>
+                                <button type="button" class="button add-btn" onclick="addInputGroup('edit-variants-container-{{ product.id }}', 'variant')"><i class="fas fa-plus"></i> Добавить вариант</button>
 
-                                <div id="edit-{{ product.id }}-sizes-section" style="display: {% if product.type == 'Одежда' %}block{% else %}none{% endif %};">
+                                <div id="edit-{{ product.id }}-sizes-section" style="margin-top:20px; display: {% if product.get('product_type') == 'odezhda' %}block{% else %}none{% endif %};">
                                     <h4>Размеры *:</h4>
                                     <div id="edit-sizes-container-{{ product.id }}">
                                         {% for size in product.get('sizes', []) %}
                                         <div class="input-group">
-                                            <input type="text" name="size_names" value="{{ size.name }}">
-                                            <button type="button" class="remove-btn" onclick="removeInputGroup(this, false)"><i class="fas fa-times"></i></button>
+                                            <input type="text" name="size_names" value="{{ size.name }}" >
+                                            <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                                         </div>
                                         {% endfor %}
-                                        {% if product.get('sizes', []) | length == 0 %}
-                                        <div class="input-group">
-                                            <input type="text" name="size_names" placeholder="Название размера (напр. S, M, 42)">
-                                            <button type="button" class="remove-btn" onclick="removeInputGroup(this, false)"><i class="fas fa-times"></i></button>
-                                        </div>
-                                        {% endif %}
                                     </div>
-                                    <button type="button" class="button add-btn" onclick="addSizeInput('edit-sizes-container-{{ product.id }}')"><i class="fas fa-plus"></i> Добавить размер</button>
-                                </div>
-
-                                <div style="margin-top: 20px;">
-                                     <input type="checkbox" id="edit_is_top_{{ product.id }}" name="is_top" {% if product.get('is_top', False) %}checked{% endif %}>
-                                     <label for="edit_is_top_{{ product.id }}">Топ товар</label>
+                                    <button type="button" class="button add-btn" onclick="addInputGroup('edit-sizes-container-{{ product.id }}', 'size')"><i class="fas fa-plus"></i> Добавить размер</button>
                                 </div>
-                                <br>
+                                
+                                <br><br>
                                 <button type="submit"><i class="fas fa-save"></i> Сохранить изменения</button>
                             </form>
                         </div>
@@ -1491,16 +1477,6 @@ ADMIN_TEMPLATE = '''
                 <p>Товаров пока нет.</p>
                 {% endif %}
             </div>
-             <div class="section">
-                 <h2><i class="fas fa-info-circle"></i> Инфо о магазине</h2>
-                 <p><strong>Адреса в г. Алматы:</strong></p>
-                 <ul style="padding-left: 20px;">
-                    {% for address in store_addresses %}
-                        <li>{{ address }}</li>
-                    {% endfor %}
-                 </ul>
-                 <p style="margin-top: 10px;"><strong>Валюта:</strong> {{ currency_name }} ({{ currency_code }})</p>
-             </div>
         </div>
 
         <script>
@@ -1508,48 +1484,70 @@ ADMIN_TEMPLATE = '''
                 const form = document.getElementById(formId);
                 form.style.display = form.style.display === 'none' ? 'block' : 'none';
             }
-            
-            function toggleSizeInputs(formPrefix) {
-                const typeSelect = document.querySelector(`#${formPrefix}_type, #edit-form-${formPrefix.split('-')[1]} select[name='type']`);
-                const sizesSection = document.getElementById(`${formPrefix}-sizes-section`);
-                if (typeSelect && sizesSection) {
-                    sizesSection.style.display = typeSelect.value === 'Одежда' ? 'block' : 'none';
-                }
-            }
 
-
-            function addVariantInput(containerId) {
-                const container = document.getElementById(containerId);
-                const newInputGroup = document.createElement('div');
-                newInputGroup.className = 'input-group';
-                newInputGroup.innerHTML = `
-                    <input type="text" name="variant_names" placeholder="Название варианта" required>
-                    <input type="number" name="variant_prices" step="0.01" min="0" placeholder="Цена" required>
-                    <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
-                `;
-                container.appendChild(newInputGroup);
-            }
-            
-            function addSizeInput(containerId) {
+            function addInputGroup(containerId, type) {
                 const container = document.getElementById(containerId);
                 const newInputGroup = document.createElement('div');
                 newInputGroup.className = 'input-group';
-                newInputGroup.innerHTML = `
-                    <input type="text" name="size_names" placeholder="Название размера">
-                    <button type="button" class="remove-btn" onclick="removeInputGroup(this, false)"><i class="fas fa-times"></i></button>
-                `;
+                if (type === 'variant') {
+                    newInputGroup.innerHTML = `
+                        <input type="text" name="variant_names" placeholder="Название варианта" required>
+                        <input type="number" name="variant_prices" step="0.01" min="0" placeholder="Цена" required>
+                        <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
+                    `;
+                } else { // size
+                    newInputGroup.innerHTML = `
+                        <input type="text" name="size_names" placeholder="Название размера">
+                        <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
+                    `;
+                }
                 container.appendChild(newInputGroup);
             }
 
-            function removeInputGroup(button, requireOne = true) {
+            function removeInputGroup(button) {
                 const group = button.closest('.input-group');
                 const container = group.parentNode;
-                if (!requireOne || container.children.length > 1) {
+                if (container.children.length > 1) {
                     group.remove();
                 } else {
-                    alert("Должен быть хотя бы один вариант.");
+                    alert("Должен быть хотя бы один элемент.");
                 }
             }
+            
+            function toggleProductFields(prefix) {
+                const productType = document.querySelector(`[name="product_type"]`).value;
+                const sizesSection = document.getElementById(`${prefix}-sizes-section`);
+                const sizeInputs = sizesSection.querySelectorAll('input[name="size_names"]');
+                
+                if (productType === 'odezhda') {
+                    sizesSection.style.display = 'block';
+                    if (sizesSection.querySelector('.input-group') === null) {
+                         addInputGroup(`${prefix}-sizes-container`, 'size')
+                    }
+                    sizeInputs.forEach(input => input.required = true);
+                } else {
+                    sizesSection.style.display = 'none';
+                    sizeInputs.forEach(input => input.required = false);
+                }
+            }
+            document.addEventListener('DOMContentLoaded', function() {
+                document.querySelectorAll('form[id^="edit-form-"]').forEach(form => {
+                     const id = form.id.replace('edit-form-', '');
+                     const select = form.querySelector('select[name="product_type"]');
+                     if(select) {
+                        const productType = select.value;
+                        const sizesSection = document.getElementById(`edit-${id}-sizes-section`);
+                        const sizeInputs = sizesSection.querySelectorAll('input[name="size_names"]');
+                        if (productType === 'odezhda') {
+                           sizesSection.style.display = 'block';
+                           sizeInputs.forEach(input => input.required = true);
+                        } else {
+                           sizesSection.style.display = 'none';
+                           sizeInputs.forEach(input => input.required = false);
+                        }
+                     }
+                });
+            });
         </script>
     </body>
     </html>
@@ -1575,13 +1573,15 @@ def catalog(lang_code):
     all_products = data.get('products', [])
     categories = sorted(data.get('categories', []))
     settings = data.get('settings', {})
+    whatsapp_number = settings.get('whatsapp_number', '+77073363943').replace(' ', '').replace('+', '')
+
 
     products_in_stock = [p for p in all_products if p.get('variants')]
     
     for p in products_in_stock:
         p['variants'] = sorted(p.get('variants', []), key=lambda v: v.get('price', 0))
 
-    products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
+    products_sorted = sorted(products_in_stock, key=lambda p: p.get('name', '').lower())
 
     return render_template_string(
         CATALOG_TEMPLATE,
@@ -1592,7 +1592,7 @@ def catalog(lang_code):
         currency_code=CURRENCY_CODE,
         lang_code=g.lang_code,
         _=g.translations,
-        settings=settings
+        whatsapp_number=whatsapp_number
     )
 
 @app.route('/<lang_code>/product/<int:index>')
@@ -1604,7 +1604,7 @@ def product_detail(lang_code, index):
     for p in products_in_stock:
         p['variants'] = sorted(p.get('variants', []), key=lambda v: v.get('price', 0))
     
-    products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
+    products_sorted = sorted(products_in_stock, key=lambda p: p.get('name', '').lower())
 
     try:
         product = products_sorted[index]
@@ -1687,7 +1687,7 @@ def view_order(lang_code, order_id):
     data = load_data()
     order = data.get('orders', {}).get(order_id)
     settings = data.get('settings', {})
-    whatsapp_number = settings.get('whatsapp_number', '77073363943')
+    whatsapp_number = settings.get('whatsapp_number', '+77073363943')
     status_map = STATUS_MAPS.get(lang_code, STATUS_MAPS['ru'])
     return render_template_string(ORDER_TEMPLATE, order=order, status_map=status_map, currency_code=CURRENCY_CODE, lang_code=g.lang_code, _=g.translations, whatsapp_number=whatsapp_number)
 
@@ -1695,7 +1695,8 @@ def view_order(lang_code, order_id):
 def admin():
     data = load_data()
     if 'orders' not in data: data['orders'] = {}
-    if 'settings' not in data: data['settings'] = {}
+    if 'settings' not in data: data['settings'] = {'whatsapp_number': '+77073363943'}
+
     
     needs_save = False
     for p in data.get('products', []):
@@ -1709,10 +1710,13 @@ def admin():
         action = request.form.get('action')
         try:
             if action == 'update_settings':
-                whatsapp_number = request.form.get('whatsapp_number', '').strip().replace('+', '')
-                data['settings']['whatsapp_number'] = whatsapp_number
-                save_data(data)
-                flash('Настройки сохранены.', 'success')
+                new_whatsapp = request.form.get('whatsapp_number', '').strip()
+                if new_whatsapp:
+                    data['settings']['whatsapp_number'] = new_whatsapp
+                    save_data(data)
+                    flash('Настройки успешно обновлены.', 'success')
+                else:
+                    flash('Номер WhatsApp не может быть пустым.', 'error')
 
             elif action == 'update_order_status':
                 order_id = request.form.get('order_id')
@@ -1747,10 +1751,8 @@ def admin():
 
             elif action == 'add_product' or action == 'edit_product':
                 name = request.form.get('name', '').strip()
-                product_type = request.form.get('type')
-
-                if not name or not product_type:
-                    flash("Название и тип товара обязательны.", 'error')
+                if not name:
+                    flash("Название товара обязательно.", 'error')
                     return redirect(url_for('admin'))
 
                 variant_names = [v.strip() for v in request.form.getlist('variant_names') if v.strip()]
@@ -1770,22 +1772,23 @@ def admin():
                     flash("Неверный формат цены в вариантах.", 'error')
                     return redirect(url_for('admin'))
 
+                product_type = request.form.get('product_type')
                 sizes = []
-                if product_type == 'Одежда':
+                if product_type == 'odezhda':
                     size_names = [s.strip() for s in request.form.getlist('size_names') if s.strip()]
                     if not size_names:
                         flash("Для одежды необходимо указать хотя бы один размер.", 'error')
                         return redirect(url_for('admin'))
                     sizes = [{'name': s_name} for s_name in size_names]
 
+
                 product_data = {
                     'name': name,
-                    'type': product_type,
                     'description': request.form.get('description', '').strip(),
                     'category': request.form.get('category'),
-                    'is_top': 'is_top' in request.form,
+                    'product_type': product_type,
                     'variants': variants,
-                    'sizes': sizes if product_type == 'Одежда' else []
+                    'sizes': sizes
                 }
 
                 newly_uploaded_photos = []