Update app.py

app.py

@@ -28,7 +28,6 @@ HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
 STORE_ADDRESSES = [
     "Город Алматы , Алатау 1 , блок 4 , бутик 112",
-    
 ]
 
 
@@ -55,8 +54,8 @@ STATUS_MAPS = {
 
 translations = {
     'ru': {
-        'page_title': "SHAIK парфюм оптом и в розницу - Каталог",
-        'header_title': "SHAIK Parfum",
+        'page_title': "Esmira - Каталог тканей и одежды",
+        'header_title': "Esmira",
         'our_addresses': "Наши адреса в г. Алматы",
         'search_placeholder': "Поиск по названию или описанию...",
         'all_filter': "Все",
@@ -68,7 +67,8 @@ translations = {
         'product_load_error': "Не удалось загрузить информацию о товаре.",
         'specify_details': "Укажите детали",
         'variant_label': "Вариант:",
-        'quantity_label': "Количество:",
+        'size_label': "Размер:",
+        'quantity_label': "Количество (в метрах для тканей):",
         'confirm_add_to_cart': "Добавить в корзину",
         'your_cart': "Ваша корзина",
         'cart_is_empty': "Ваша корзина пуста.",
@@ -76,6 +76,7 @@ translations = {
         'clear_cart_button': "Очистить",
         'formulate_order_button': "Оформить заказ",
         'cart_item_variant': "Вариант",
+        'cart_item_size': "Размер",
         'remove_item_title': "Удалить товар",
         'clear_cart_confirm': "Вы уверены, что хотите очистить корзину?",
         'cart_is_empty_alert': "Корзина пуста!",
@@ -83,10 +84,12 @@ translations = {
         'add_to_cart_notification': "добавлен в корзину!",
         'no_products_found': "По вашему запросу товары не найдены.",
         'category': "Категория",
-        'brand': "Бренд",
+        'product_type': "Тип товара",
+        'fabrics': "Ткани",
+        'clothing': "Одежда",
         'no_category': "Без категории",
-        'no_brand': "Без бренда",
         'available_variants': "Доступные варианты:",
+        'available_sizes': "Доступные размеры:",
         'description': "Описание:",
         'no_description': "Описание отсутствует.",
         'order_page_title': "Заказ №",
@@ -100,14 +103,14 @@ translations = {
         'return_to_catalog': "Вернуться в каталог",
         'order_not_found_error': "Ошибка",
         'order_not_found_message': "Заказ с таким ID не найден.",
-        'whatsapp_confirm_message_1': "Здравствуйте! Хочу подтвердить свой заказ на SHAIK парфюм:",
+        'whatsapp_confirm_message_1': "Здравствуйте! Хочу подтвердить свой заказ в Esmira:",
         'whatsapp_confirm_message_2': "Номер заказа:",
         'whatsapp_confirm_message_3': "Ссылка на заказ:",
         'whatsapp_confirm_message_4': "Пожалуйста, свяжитесь со мной для уточнения деталей.",
     },
     'kz': {
-        'page_title': "SHAIK парфюмериясы көтерме және бөлшек саудада - Каталог",
-        'header_title': "SHAIK Parfum",
+        'page_title': "Esmira - Маталар мен киімдер каталогы",
+        'header_title': "Esmira",
         'our_addresses': "Алматы қаласындағы мекенжайларымыз",
         'search_placeholder': "Аты немесе сипаттамасы бойынша іздеу...",
         'all_filter': "Барлығы",
@@ -119,7 +122,8 @@ translations = {
         'product_load_error': "Тауар туралы ақпаратты жүктеу мүмкін болмады.",
         'specify_details': "Мәліметтерді көрсетіңіз",
         'variant_label': "Нұсқа:",
-        'quantity_label': "Саны:",
+        'size_label': "Өлшем:",
+        'quantity_label': "Саны (маталар үшін метрмен):",
         'confirm_add_to_cart': "Себетке қосу",
         'your_cart': "Сіздің себетіңіз",
         'cart_is_empty': "Сіздің себетіңіз бос.",
@@ -127,6 +131,7 @@ translations = {
         'clear_cart_button': "Тазарту",
         'formulate_order_button': "Тапсырыс беру",
         'cart_item_variant': "Нұсқа",
+        'cart_item_size': "Өлшем",
         'remove_item_title': "Тауарды жою",
         'clear_cart_confirm': "Себетті тазалағыңыз келетініне сенімдісіз бе?",
         'cart_is_empty_alert': "Себет бос!",
@@ -134,10 +139,12 @@ translations = {
         'add_to_cart_notification': "себетке қосылды!",
         'no_products_found': "Сіздің сұранысыңыз бойынша тауарлар табылмады.",
         'category': "Санат",
-        'brand': "Бренд",
+        'product_type': "Тауар түрі",
+        'fabrics': "Маталар",
+        'clothing': "Киім",
         'no_category': "Санатсыз",
-        'no_brand': "Брендсіз",
         'available_variants': "Қолжетімді нұсқалар:",
+        'available_sizes': "Қолжетімді өлшемдер:",
         'description': "Сипаттама:",
         'no_description': "Сипаттама жоқ.",
         'order_page_title': "Тапсырыс №",
@@ -151,7 +158,7 @@ translations = {
         'return_to_catalog': "Каталогқа оралу",
         'order_not_found_error': "Қате",
         'order_not_found_message': "Мұндай ID-мен тапсырыс табылмады.",
-        'whatsapp_confirm_message_1': "Сәлеметсіз бе! SHAIK парфюмериясына берген тапсырысымды растағым келеді:",
+        'whatsapp_confirm_message_1': "Сәлеметсіз бе! Esmira-дағы тапсырысымды растағым келеді:",
         'whatsapp_confirm_message_2': "Тапсырыс нөмірі:",
         'whatsapp_confirm_message_3': "Тапсырысқа сілтеме:",
         'whatsapp_confirm_message_4': "Мәліметтерді нақтылау үшін менімен хабарласуыңызды сұраймын.",
@@ -201,7 +208,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': [], 'brands': [], 'orders': {}}, f)
+                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'settings': {}}, 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}")
@@ -265,7 +272,7 @@ def periodic_backup():
 
 
 def load_data():
-    default_data = {'products': [], 'categories': [], 'brands': [], 'orders': {}}
+    default_data = {'products': [], 'categories': [], 'orders': {}, 'settings': {'whatsapp_number': '77073363943'}}
     try:
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
@@ -275,8 +282,8 @@ def load_data():
              raise FileNotFoundError
         if 'products' not in data: data['products'] = []
         if 'categories' not in data: data['categories'] = []
-        if 'brands' not in data: data['brands'] = []
         if 'orders' not in data: data['orders'] = {}
+        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.")
@@ -293,8 +300,8 @@ def load_data():
                  return default_data
             if 'products' not in data: data['products'] = []
             if 'categories' not in data: data['categories'] = []
-            if 'brands' not in data: data['brands'] = []
             if 'orders' not in data: data['orders'] = {}
+            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.")
@@ -323,8 +330,8 @@ def save_data(data):
             return
         if 'products' not in data: data['products'] = []
         if 'categories' not in data: data['categories'] = []
-        if 'brands' not in data: data['brands'] = []
         if 'orders' not in data: data['orders'] = {}
+        if 'settings' not in data: data['settings'] = {}
 
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
@@ -349,29 +356,29 @@ CATALOG_TEMPLATE = '''
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.css">
         <style>
             :root {
-                --primary-color: #FF3B30; 
-                --primary-dark: #D9322A;
-                --surface-color: #1A1A1A;
-                --background-color: #121212;
+                --primary-color: #B22222;
+                --primary-dark: #8B0000;
+                --surface-color: #2b2b2b;
+                --background-color: #1c1c1c;
                 --text-color: #F5F5F5;
-                --text-color-muted: #999;
-                --border-color: #333333;
+                --text-color-muted: #a0a0a0;
+                --border-color: #444;
                 --success-color: #28a745;
             }
             * { 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(18, 18, 18, 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(28, 28, 28, 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; box-shadow: 0 0 10px rgba(255, 59, 48, 0.5); }
+            .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); }
             
             .lang-switcher { display: flex; gap: 5px; background-color: var(--surface-color); padding: 5px; border-radius: 50px; }
@@ -384,20 +391,20 @@ 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(255, 59, 48, 0.2); }
+            #search-input:focus { border-color: var(--primary-color); box-shadow: 0 0 0 4px rgba(178, 34, 34, 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; }
-            .category-filter, .brand-filter { 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; }
-            .category-filter.active, .brand-filter.active, .category-filter:hover, .brand-filter:hover { background-color: var(--primary-color); color: #fff; border-color: var(--primary-color); font-weight: 500; box-shadow: 0 2px 8px rgba(255, 59, 48, 0.3); transform: translateY(-2px); }
+            .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); }
 
             .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(255, 59, 48, 0.15); border-color: var(--primary-color); }
+            .product:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(178, 34, 34, 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 img { max-width: 100%; max-height: 100%; object-fit: contain; transition: transform 0.3s ease; }
@@ -410,10 +417,10 @@ CATALOG_TEMPLATE = '''
             .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(255, 59, 48, 0.4); }
+            .product-button:hover { background-color: var(--primary-dark); box-shadow: 0 4px 10px rgba(178, 34, 34, 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(255, 59, 48, 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(178, 34, 34, 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 +443,7 @@ CATALOG_TEMPLATE = '''
             .cart-item-remove { background:none; border:none; color:#FF453A; cursor:pointer; font-size: 1.5rem; line-height: 1; transition: color 0.2s; }
             .cart-item-remove:hover { color: #ff0000; }
             
-            .quantity-input, .variant-select { width: 100%; padding: 12px; border: 1px solid var(--border-color); border-radius: 8px; font-size: 1rem; margin-top: 8px; margin-bottom: 20px; box-sizing: border-box; background-color: var(--background-color); color: var(--text-color); }
+            .quantity-input, .variant-select, .size-select { width: 100%; padding: 12px; border: 1px solid var(--border-color); border-radius: 8px; font-size: 1rem; margin-top: 8px; margin-bottom: 20px; box-sizing: border-box; background-color: var(--background-color); color: var(--text-color); }
 
             .cart-summary { margin-top: 25px; text-align: right; border-top: 1px solid var(--border-color); padding-top: 20px; }
             .cart-summary strong { font-size: 1.4rem; color: var(--primary-color); }
@@ -448,22 +455,16 @@ 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, #FF3B30, #D9322A); 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); }
+            .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; }
-            #whatsapp-modal { display: none; position: fixed; bottom: 85px; left: 20px; background-color: var(--surface-color); border-radius: 12px; box-shadow: 0 5px 20px rgba(0,0,0,0.6); z-index: 1001; overflow: hidden; border: 1px solid var(--border-color); animation: fadeIn 0.3s; }
-            @keyframes fadeIn { from { opacity: 0; transform: translateY(10px); } to { opacity: 1; transform: translateY(0); } }
-            #whatsapp-modal a { display: flex; align-items: center; gap: 15px; padding: 15px 20px; text-decoration: none; color: var(--text-color); transition: background-color 0.2s; }
-            #whatsapp-modal a:first-child { border-bottom: 1px solid var(--border-color); }
-            #whatsapp-modal a:hover { background-color: rgba(255,255,255,0.05); }
-            #whatsapp-modal i { color: #25D366; font-size: 1.6rem; }
         </style>
     </head>
     <body>
         <div class="container">
              <header class="header">
                  <div class="logo-title-container">
-                    <img src="https://huggingface.co/spaces/Shaik-parfume/app/resolve/main/icon.png" alt="SHAIK Logo">
+                    <img src="https://huggingface.co/spaces/esmira-tkani/admin/resolve/main/Screenshot_20251225-134859.png" alt="Esmira Logo">
                     <h1>{{ _['header_title'] }}</h1>
                 </div>
                 <div class="lang-switcher">
@@ -486,25 +487,22 @@ CATALOG_TEMPLATE = '''
 
             <div class="filters-wrapper">
                 <div>
-                    <span class="filter-label">{{ _['category'] }}:</span>
+                    <span class="filter-label">{{ _['product_type'] }}:</span>
                     <div class="filters-container">
-                        <button class="category-filter active" data-category="all">{{ _['all_filter'] }}</button>
-                        {% for category in categories %}
-                        <button class="category-filter" data-category="{{ category }}">{{ category }}</button>
-                        {% endfor %}
+                        <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>
                     </div>
                 </div>
-                {% if brands %}
                 <div>
-                    <span class="filter-label">{{ _['brand'] }}:</span>
+                    <span class="filter-label">{{ _['category'] }}:</span>
                     <div class="filters-container">
-                        <button class="brand-filter active" data-brand="all">{{ _['all_filter'] }}</button>
-                        {% for brand in brands %}
-                        <button class="brand-filter" data-brand="{{ brand }}">{{ brand }}</button>
+                        <button class="filter-btn category-filter active" data-category="all">{{ _['all_filter'] }}</button>
+                        {% for category in categories %}
+                        <button class="filter-btn category-filter" data-category="{{ category }}">{{ category }}</button>
                         {% endfor %}
                     </div>
                 </div>
-                {% endif %}
             </div>
 
 
@@ -514,7 +512,7 @@ CATALOG_TEMPLATE = '''
                      data-name="{{ product['name']|lower }}"
                      data-description="{{ product.get('description', '')|lower }}"
                      data-category="{{ product.get('category', _['no_category']) }}"
-                     data-brand="{{ product.get('brand', _['no_brand']) }}">
+                     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 %}
@@ -561,11 +559,17 @@ CATALOG_TEMPLATE = '''
             <div class="modal-content">
                 <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="size-selection-area" 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="1" value="1">
+                <input type="number" id="quantityInput" class="quantity-input" min="0.1" step="0.1" value="1">
                 
                 <button class="product-button" onclick="confirmAddToCart()"><i class="fas fa-check"></i> {{ _['confirm_add_to_cart'] }}</button>
             </div>
@@ -595,17 +599,7 @@ CATALOG_TEMPLATE = '''
            <span id="cart-count">0</span>
         </button>
 
-        <button id="whatsapp-fab" class="fab" onclick="toggleWhatsAppModal()"><i class="fab fa-whatsapp"></i></button>
-        <div id="whatsapp-modal">
-            <a href="https://api.whatsapp.com/send?phone=77762021169" target="_blank" rel="noopener noreferrer">
-                <i class="fab fa-whatsapp"></i>
-                <span>WhatsApp 1</span>
-            </a>
-            <a href="https://api.whatsapp.com/send?phone=77711094111" target="_blank" rel="noopener noreferrer">
-                <i class="fab fa-whatsapp"></i>
-                <span>WhatsApp 2</span>
-            </a>
-        </div>
+        <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>
 
         <div id="notification-placeholder"></div>
 
@@ -615,7 +609,7 @@ CATALOG_TEMPLATE = '''
             const repoId = '{{ repo_id }}';
             const currencyCode = '{{ currency_code }}';
             let selectedProductIndex = null;
-            let cart = JSON.parse(localStorage.getItem('shaikCart') || '[]');
+            let cart = JSON.parse(localStorage.getItem('esmiraCart') || '[]');
             const langCode = '{{ lang_code }}';
             const translations = {{ _|tojson }};
 
@@ -632,11 +626,6 @@ CATALOG_TEMPLATE = '''
                     document.body.style.overflow = 'auto';
                 }
             }
-            
-            function toggleWhatsAppModal() {
-                const modal = document.getElementById('whatsapp-modal');
-                modal.style.display = modal.style.display === 'block' ? 'none' : 'block';
-            }
 
             function loadProductDetails(index) {
                 const modalContent = document.getElementById('modalContent');
@@ -663,19 +652,19 @@ CATALOG_TEMPLATE = '''
                 });
             }
 
-            function setupVariantSelect(variants) {
-                const select = document.getElementById('variantSelect');
+            function setupOptionSelect(selectId, options, textFormatter) {
+                const select = document.getElementById(selectId);
                 select.innerHTML = '';
-                if (variants && variants.length > 0) {
-                    variants.forEach((variant, index) => {
-                         const option = document.createElement('option');
-                         option.value = index;
-                         option.text = `${variant.name} - ${variant.price.toFixed(2)} ${currencyCode}`;
-                         select.appendChild(option);
+                if (options && options.length > 0) {
+                    options.forEach((option, index) => {
+                         const opt = document.createElement('option');
+                         opt.value = index;
+                         opt.text = textFormatter(option);
+                         select.appendChild(opt);
                     });
-                    select.style.display = 'block';
+                    select.parentElement.style.display = 'block';
                 } else {
-                    select.style.display = 'none';
+                    select.parentElement.style.display = 'none';
                 }
             }
 
@@ -684,8 +673,24 @@ CATALOG_TEMPLATE = '''
                 const product = products[index];
                 if (!product) return;
 
-                setupVariantSelect(product.variants);
-                document.getElementById('quantityInput').value = 1;
+                setupOptionSelect('variantSelect', product.variants, v => `${v.name} - ${v.price.toFixed(2)} ${currencyCode}`);
+                
+                const sizeArea = document.getElementById('size-selection-area');
+                const quantityInput = document.getElementById('quantityInput');
+
+                if (product.type === 'Одежда') {
+                    setupOptionSelect('sizeSelect', product.sizes, s => s.name);
+                    sizeArea.style.display = 'block';
+                    quantityInput.step = "1";
+                    quantityInput.min = "1";
+                    quantityInput.value = 1;
+                } else {
+                    sizeArea.style.display = 'none';
+                    quantityInput.step = "0.1";
+                    quantityInput.min = "0.1";
+                    quantityInput.value = 1;
+                }
+                
                 document.getElementById('quantityModal').style.display = 'block';
                 document.body.style.overflow = 'hidden';
             }
@@ -693,23 +698,38 @@ CATALOG_TEMPLATE = '''
             function confirmAddToCart() {
                 if (selectedProductIndex === null) return;
 
-                const quantity = parseInt(document.getElementById('quantityInput').value);
-                const variantIndex = document.getElementById('variantSelect').value;
+                const quantityInput = document.getElementById('quantityInput');
                 const product = products[selectedProductIndex];
-                
-                if (!product || !product.variants || product.variants.length === 0) {
-                    alert("Ошибка: Варианты для этого товара не найдены.");
+
+                const quantity = product.type === 'Ткани' ? parseFloat(quantityInput.value) : parseInt(quantityInput.value);
+
+                if (isNaN(quantity) || quantity <= 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("Ошибка: Размеры для этого товара не найдены.");
+                        return;
+                    }
+                }
 
-                if (isNaN(quantity) || quantity <= 0) {
-                    alert("Пожалуйста, укажите корректное количество.");
+                if (!product || !selectedVariant) {
+                    alert("Ошибка: Варианты для этого товара не найдены.");
                     return;
                 }
 
-                const cartItemId = `${product.id}-${selectedVariant.name}`;
+                const cartItemId = `${product.id}-${selectedVariant.name}${sizeName ? '-' + sizeName : ''}`;
                 const existingItem = cart.find(item => item.id === cartItemId);
 
                 if (existingItem) {
@@ -721,21 +741,22 @@ CATALOG_TEMPLATE = '''
                         name: product.name,
                         price: selectedVariant.price,
                         variantName: selectedVariant.name,
+                        sizeName: sizeName,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : null,
                         quantity: quantity
                     });
                 }
 
-                localStorage.setItem('shaikCart', JSON.stringify(cart));
+                localStorage.setItem('esmiraCart', JSON.stringify(cart));
                 closeModal('quantityModal');
                 updateCartButton();
-                showNotification(`${product.name} (${selectedVariant.name}) ${translations['add_to_cart_notification']}`);
+                showNotification(`${product.name} ${translations['add_to_cart_notification']}`);
             }
 
             function updateCartButton() {
                  const cartCountElement = document.getElementById('cart-count');
                  const cartButton = document.getElementById('cart-button');
-                 const totalItems = cart.reduce((sum, item) => sum + item.quantity, 0);
+                 const totalItems = cart.length;
 
                  if (totalItems > 0) {
                      cartCountElement.textContent = totalItems;
@@ -759,13 +780,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>`;
+                        if (item.sizeName) {
+                            details += `<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>
-                                    <p class="cart-item-price">${translations['cart_item_variant']}: ${item.variantName}</p>
-                                    <p class="cart-item-price">${item.price.toFixed(2)} ${currencyCode} × ${item.quantity}</p>
+                                    ${details}
                                 </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>
@@ -779,7 +805,7 @@ CATALOG_TEMPLATE = '''
 
              function removeFromCart(itemId) {
                 cart = cart.filter(item => item.id !== itemId);
-                localStorage.setItem('shaikCart', JSON.stringify(cart));
+                localStorage.setItem('esmiraCart', JSON.stringify(cart));
                 openCartModal();
                 updateCartButton();
              }
@@ -787,7 +813,7 @@ CATALOG_TEMPLATE = '''
             function clearCart() {
                 if (confirm(translations['clear_cart_confirm'])) {
                     cart = [];
-                    localStorage.removeItem('shaikCart');
+                    localStorage.removeItem('esmiraCart');
                     openCartModal();
                     updateCartButton();
                 }
@@ -809,7 +835,7 @@ CATALOG_TEMPLATE = '''
                 .then(response => response.json())
                 .then(data => {
                     if (data.order_id) {
-                        localStorage.removeItem('shaikCart');
+                        localStorage.removeItem('esmiraCart');
                         cart = [];
                         updateCartButton();
                         closeModal('cartModal');
@@ -828,8 +854,7 @@ CATALOG_TEMPLATE = '''
             function filterProducts() {
                 const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
                 const activeCategory = document.querySelector('.category-filter.active').dataset.category;
-                const activeBrandEl = document.querySelector('.brand-filter.active');
-                const activeBrand = activeBrandEl ? activeBrandEl.dataset.brand : 'all';
+                const activeType = document.querySelector('.type-filter.active').dataset.type;
                 const grid = document.getElementById('products-grid');
                 let visibleProducts = 0;
 
@@ -840,13 +865,13 @@ CATALOG_TEMPLATE = '''
                     const name = productElement.dataset.name;
                     const description = productElement.dataset.description;
                     const category = productElement.dataset.category;
-                    const brand = productElement.dataset.brand;
+                    const type = productElement.dataset.type;
 
                     const matchesSearch = !searchTerm || name.includes(searchTerm) || description.includes(searchTerm);
                     const matchesCategory = activeCategory === 'all' || category === activeCategory;
-                    const matchesBrand = activeBrand === 'all' || brand === activeBrand;
+                    const matchesType = activeType === 'all' || type === activeType;
 
-                    if (matchesSearch && matchesCategory && matchesBrand) {
+                    if (matchesSearch && matchesCategory && matchesType) {
                         productElement.style.display = 'flex';
                         visibleProducts++;
                     } else {
@@ -871,9 +896,9 @@ CATALOG_TEMPLATE = '''
                          filterProducts();
                      });
                  });
-                 document.querySelectorAll('.brand-filter').forEach(filter => {
+                 document.querySelectorAll('.type-filter').forEach(filter => {
                      filter.addEventListener('click', function() {
-                         document.querySelector('.brand-filter.active').classList.remove('active');
+                         document.querySelector('.type-filter.active').classList.remove('active');
                          this.classList.add('active');
                          filterProducts();
                      });
@@ -903,11 +928,6 @@ CATALOG_TEMPLATE = '''
                     if (event.target.classList.contains('modal')) {
                         closeModal(event.target.id);
                     }
-                    const waModal = document.getElementById('whatsapp-modal');
-                    const waFab = document.getElementById('whatsapp-fab');
-                    if (waModal.style.display === 'block' && !waModal.contains(event.target) && event.target !== waFab && !waFab.contains(event.target)) {
-                        waModal.style.display = 'none';
-                    }
                 });
 
                 window.addEventListener('keydown', function(event) {
@@ -951,8 +971,8 @@ 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>{{ _['category'] }}:</strong> {{ product.get('category', _['no_category']) }}</p>
-            <p><strong>{{ _['brand'] }}:</strong> {{ product.get('brand', _['no_brand']) }}</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 }}
@@ -967,6 +987,16 @@ 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>
+            {% 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;">
@@ -983,20 +1013,20 @@ ORDER_TEMPLATE = '''
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ _['order_page_title'] }}{{ order.id }} - SHAIK парфюм</title>
+    <title>{{ _['order_page_title'] }}{{ order.id }} - Esmira</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Cormorant+Garamond:wght@400;600;700&family=Georgia&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     <style>
         :root {
-            --primary-color: #FF3B30; 
-            --primary-dark: #D9322A;
-            --surface-color: #1A1A1A;
-            --background-color: #121212;
+            --primary-color: #B22222;
+            --primary-dark: #8B0000;
+            --surface-color: #2b2b2b;
+            --background-color: #1c1c1c;
             --text-color: #F5F5F5;
-            --text-color-muted: #999;
-            --border-color: #333333;
+            --text-color-muted: #a0a0a0;
+            --border-color: #444;
         }
         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); }
@@ -1013,7 +1043,7 @@ ORDER_TEMPLATE = '''
         .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(255, 59, 48, 0.05); padding: 20px; border-radius: 12px; border: 1px solid 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 p { margin-bottom: 8px; font-size: 1rem; }
         .customer-info strong { color: var(--text-color); }
         .actions { margin-top: 30px; text-align: center; }
@@ -1038,6 +1068,9 @@ ORDER_TEMPLATE = '''
                         <div class="item-details">
                             <strong>{{ item.name }}</strong>
                             <span>{{ _['cart_item_variant'] }}: {{ item.variantName }}</span>
+                            {% if item.sizeName %}
+                            <span>{{ _['cart_item_size'] }}: {{ item.sizeName }}</span>
+                            {% endif %}
                             <span>{{ "%.2f"|format(item.price) }} {{ currency_code }} × {{ item.quantity }}</span>
                         </div>
                         <div class="item-total">
@@ -1067,7 +1100,7 @@ ORDER_TEMPLATE = '''
                 function sendOrderViaWhatsApp() {
                     const orderId = '{{ order.id }}';
                     const orderUrl = `{{ request.url }}`;
-                    const whatsappNumber = "77762021169";
+                    const whatsappNumber = "{{ whatsapp_number }}";
 
                     let message = `{{ _['whatsapp_confirm_message_1'] }}%0A%0A`;
                     message += `*{{ _['whatsapp_confirm_message_2'] }}* ${orderId}%0A`;
@@ -1095,20 +1128,20 @@ ADMIN_TEMPLATE = '''
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Админ-панель - SHAIK парфюм</title>
+        <title>Админ-панель - Esmira</title>
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link href="https://fonts.googleapis.com/css2?family=Cormorant+Garamond:wght@600&family=Georgia&display=swap" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
         <style>
             :root {
-                --primary-color: #FF3B30; 
-                --primary-dark: #D9322A;
-                --surface-color: #1A1A1A;
-                --background-color: #121212;
+                --primary-color: #B22222;
+                --primary-dark: #8B0000;
+                --surface-color: #2b2b2b;
+                --background-color: #1c1c1c;
                 --text-color: #F5F5F5;
-                --text-color-muted: #999;
-                --border-color: #333333;
+                --text-color-muted: #a0a0a0;
+                --border-color: #444;
                 --success-bg: #113d21;
                 --success-text: #6ee791;
                 --error-bg: #4d0a0a;
@@ -1127,7 +1160,7 @@ ADMIN_TEMPLATE = '''
             
             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(255, 59, 48, 0.2); }
+            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); }
             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); }
@@ -1145,11 +1178,11 @@ ADMIN_TEMPLATE = '''
             .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; }
             
-            .variant-input-group { display: flex; align-items: center; gap: 10px; margin-bottom: 8px; }
-            .variant-input-group input { flex-grow: 1; margin: 0; }
-            .remove-variant-btn { background-color: #8B0000; color: white; padding: 6px 10px; font-size: 0.8rem; margin: 0; border-radius: 6px; }
-            .add-variant-btn { background-color: #1c4532; color: var(--text-color); margin-top: 8px;}
-            .add-variant-btn:hover { background-color: #22543d; }
+            .input-group { display: flex; align-items: center; gap: 10px; margin-bottom: 8px; }
+            .input-group input { flex-grow: 1; margin: 0; }
+            .remove-btn { background-color: #8B0000; color: white; padding: 6px 10px; font-size: 0.8rem; margin: 0; border-radius: 6px; }
+            .add-btn { background-color: #1c4532; color: var(--text-color); margin-top: 8px;}
+            .add-btn:hover { background-color: #22543d; }
 
             .message { padding: 12px 18px; border-radius: 8px; margin-bottom: 20px; font-size: 0.95rem; border: 1px solid;}
             .message.success { background-color: var(--success-bg); color: var(--success-text); border-color: var(--success-text);}
@@ -1177,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/Shaik-parfume/app/resolve/main/icon.png" alt="SHAIK Logo" style="height: 45px; width: 45px; border-radius: 50%;">
-                    <h1><i class="fas fa-tools"></i> Админ-панель</h1>
+                    <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>
                 </div>
                 <a href="{{ url_for('catalog', lang_code='ru') }}" class="button"><i class="fas fa-store"></i> Перейти в каталог</a>
             </div>
@@ -1192,6 +1225,17 @@ 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 %}
@@ -1231,86 +1275,55 @@ ADMIN_TEMPLATE = '''
                 {% endif %}
             </div>
 
-
-            <div class="flex-container">
-                 <div class="flex-item">
-                     <div class="section">
-                         <h2><i class="fas fa-tags"></i> Категории</h2>
-                          <details>
-                              <summary><i class="fas fa-plus-circle"></i> Добавить новую категорию</summary>
-                              <div style="padding: 15px;">
-                                  <form method="POST">
-                                      <input type="hidden" name="action" value="add_category">
-                                      <label for="add_category_name">Название новой категории:</label>
-                                      <input type="text" id="add_category_name" name="category_name" required>
-                                      <button type="submit"><i class="fas fa-plus"></i> Добавить</button>
-                                  </form>
-                              </div>
-                          </details>
-                         <h3>Существующие категории:</h3>
-                         {% if categories %}
-                         <div class="item-list">
-                             {% for category in categories %}
-                             <div class="item" style="display: flex; justify-content: space-between; align-items: center; padding: 10px;">
-                                 <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: 6px 12px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
-                                 </form>
-                             </div>
-                             {% endfor %}
-                         </div>
-                         {% else %}
-                         <p>Категорий пока нет.</p>
-                         {% endif %}
-                     </div>
-                 </div>
-
-                 <div class="flex-item">
-                     <div class="section">
-                         <h2><i class="fas fa-copyright"></i> Бренды</h2>
-                          <details>
-                              <summary><i class="fas fa-plus-circle"></i> Добавить новый бренд</summary>
-                              <div style="padding: 15px;">
-                                  <form method="POST">
-                                      <input type="hidden" name="action" value="add_brand">
-                                      <label for="add_brand_name">Название нового бренда:</label>
-                                      <input type="text" id="add_brand_name" name="brand_name" required>
-                                      <button type="submit"><i class="fas fa-plus"></i> Добавить</button>
-                                  </form>
-                              </div>
-                          </details>
-                         <h3>Существующие бренды:</h3>
-                         {% if brands %}
-                         <div class="item-list">
-                             {% for brand in brands %}
-                             <div class="item" style="display: flex; justify-content: space-between; align-items: center; padding: 10px;">
-                                 <span>{{ brand }}</span>
-                                 <form method="POST" style="margin: 0;" onsubmit="return confirm('Удалить бренд \'{{ brand }}\'?');">
-                                     <input type="hidden" name="action" value="delete_brand">
-                                     <input type="hidden" name="brand_name" value="{{ brand }}">
-                                     <button type="submit" class="delete-button" style="padding: 6px 12px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
-                                 </form>
-                             </div>
-                             {% endfor %}
-                         </div>
-                         {% else %}
-                         <p>Брендов пока нет.</p>
-                         {% endif %}
+            <div class="section">
+                 <h2><i class="fas fa-tags"></i> Категории</h2>
+                  <details>
+                      <summary><i class="fas fa-plus-circle"></i> Добавить новую категорию</summary>
+                      <div style="padding: 15px;">
+                          <form method="POST">
+                              <input type="hidden" name="action" value="add_category">
+                              <label for="add_category_name">Название новой категории:</label>
+                              <input type="text" id="add_category_name" name="category_name" required>
+                              <button type="submit"><i class="fas fa-plus"></i> Добавить</button>
+                          </form>
+                      </div>
+                  </details>
+                 <h3>Существующие категории:</h3>
+                 {% if categories %}
+                 <div class="item-list">
+                     {% for category in categories %}
+                     <div class="item" style="display: flex; justify-content: space-between; align-items: center; padding: 10px;">
+                         <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: 6px 12px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
+                         </form>
                      </div>
+                     {% endfor %}
                  </div>
+                 {% else %}
+                 <p>Категорий пока нет.</p>
+                 {% endif %}
             </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">
+                         <form method="POST" enctype="multipart/form-data" id="addProductForm">
                              <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>
                              
@@ -1322,26 +1335,29 @@ ADMIN_TEMPLATE = '''
                                  {% endfor %}
                              </select>
                              
-                             <label for="add_brand">Бренд:</label>
-                             <select id="add_brand" name="brand">
-                                 <option value="Без бренда">Без бренда</option>
-                                 {% for brand in brands %}
-                                 <option value="{{ brand }}">{{ brand }}</option>
-                                 {% endfor %}
-                             </select>
-
                              <label for="add_photos">Фотографии (до 10 шт.):</label>
                              <input type="file" id="add_photos" name="photos" accept="image/*" multiple>
                              
                              <h4>Варианты и цены *:</h4>
                              <div id="add-variants-container">
-                                 <div class="variant-input-group">
-                                     <input type="text" name="variant_names" placeholder="Название варианта (напр. 100ml)" required>
+                                 <div class="input-group">
+                                     <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-variant-btn" onclick="removeVariantInput(this)"><i class="fas fa-times"></i></button>
+                                     <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                                  </div>
                              </div>
-                             <button type="button" class="button add-variant-btn" onclick="addVariantInput('add-variants-container')"><i class="fas fa-plus"></i> Добавить вариант</button>
+                             <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">
@@ -1373,8 +1389,8 @@ ADMIN_TEMPLATE = '''
                                     {{ 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>
                                 <p style="font-size: 0.9rem; color: var(--text-color-muted);"><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
-                                <p style="font-size: 0.9rem; color: var(--text-color-muted);"><strong>Бренд:</strong> {{ product.get('brand', 'Без бренда') }}</p>
                             </div>
                         </div>
 
@@ -1394,6 +1410,13 @@ ADMIN_TEMPLATE = '''
                                 <input type="hidden" name="product_id" value="{{ product.id }}">
                                 <label>Название *:</label>
                                 <input type="text" name="name" value="{{ product['name'] }}" required>
+                                
+                                <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>
+
                                 <label>Описание:</label>
                                 <textarea name="description" rows="4">{{ product.get('description', '') }}</textarea>
                                 
@@ -1404,14 +1427,6 @@ ADMIN_TEMPLATE = '''
                                     <option value="{{ category }}" {% if product.get('category') == category %}selected{% endif %}>{{ category }}</option>
                                     {% endfor %}
                                 </select>
-
-                                <label>Бренд:</label>
-                                <select name="brand">
-                                    <option value="Без бренда" {% if product.get('brand', 'Без бренда') == 'Без бренда' %}selected{% endif %}>Без бренда</option>
-                                    {% for brand in brands %}
-                                    <option value="{{ brand }}" {% if product.get('brand') == brand %}selected{% endif %}>{{ brand }}</option>
-                                    {% endfor %}
-                                </select>
                                 
                                 <label>Текущие фотографии (отметьте для удаления):</label>
                                 <div class="photo-preview-edit">
@@ -1433,14 +1448,33 @@ ADMIN_TEMPLATE = '''
                                 <h4>Варианты и цены *:</h4>
                                 <div id="edit-variants-container-{{ product.id }}">
                                     {% for variant in product.get('variants', []) %}
-                                    <div class="variant-input-group">
+                                    <div class="input-group">
                                         <input type="text" name="variant_names" value="{{ variant.name }}" required>
                                         <input type="number" name="variant_prices" step="0.01" min="0" value="{{ variant.price }}" required>
-                                        <button type="button" class="remove-variant-btn" onclick="removeVariantInput(this)"><i class="fas fa-times"></i></button>
+                                        <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                                     </div>
                                     {% endfor %}
                                 </div>
-                                <button type="button" class="button add-variant-btn" onclick="addVariantInput('edit-variants-container-{{ product.id }}')"><i class="fas fa-plus"></i> Добавить вариант</button>
+                                <button type="button" class="button add-btn" onclick="addVariantInput('edit-variants-container-{{ product.id }}')"><i class="fas fa-plus"></i> Добавить вариант</button>
+
+                                <div id="edit-{{ product.id }}-sizes-section" style="display: {% if product.type == 'Одежда' %}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>
+                                        </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 %}>
@@ -1474,23 +1508,43 @@ 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 = 'variant-input-group';
+                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-variant-btn" onclick="removeVariantInput(this)"><i class="fas fa-times"></i></button>
+                    <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
+                `;
+                container.appendChild(newInputGroup);
+            }
+            
+            function addSizeInput(containerId) {
+                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>
                 `;
                 container.appendChild(newInputGroup);
             }
 
-            function removeVariantInput(button) {
-                const group = button.closest('.variant-input-group');
+            function removeInputGroup(button, requireOne = true) {
+                const group = button.closest('.input-group');
                 const container = group.parentNode;
-                if (container.children.length > 1) {
+                if (!requireOne || container.children.length > 1) {
                     group.remove();
                 } else {
                     alert("Должен быть хотя бы один вариант.");
@@ -1520,7 +1574,7 @@ def catalog(lang_code):
     data = load_data()
     all_products = data.get('products', [])
     categories = sorted(data.get('categories', []))
-    brands = sorted(data.get('brands', []))
+    settings = data.get('settings', {})
 
     products_in_stock = [p for p in all_products if p.get('variants')]
     
@@ -1533,12 +1587,12 @@ def catalog(lang_code):
         CATALOG_TEMPLATE,
         products=products_sorted,
         categories=categories,
-        brands=brands,
         repo_id=REPO_ID,
         store_addresses=STORE_ADDRESSES,
         currency_code=CURRENCY_CODE,
         lang_code=g.lang_code,
-        _=g.translations
+        _=g.translations,
+        settings=settings
     )
 
 @app.route('/<lang_code>/product/<int:index>')
@@ -1589,7 +1643,7 @@ def create_order():
 
         try:
             price = float(item['price'])
-            quantity = int(item['quantity'])
+            quantity = float(item['quantity'])
             if price < 0 or quantity <= 0: raise ValueError("Invalid price/qty")
 
             total_price += price * quantity
@@ -1601,6 +1655,7 @@ def create_order():
                 "price": price,
                 "quantity": quantity,
                 "variantName": item.get('variantName', 'N/A'),
+                "sizeName": item.get('sizeName'),
                 "photo": photo_name,
                 "photo_url": photo_url
             })
@@ -1631,13 +1686,16 @@ def create_order():
 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')
     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)
+    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)
 
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
     data = load_data()
     if 'orders' not in data: data['orders'] = {}
+    if 'settings' not in data: data['settings'] = {}
     
     needs_save = False
     for p in data.get('products', []):
@@ -1650,7 +1708,13 @@ def admin():
     if request.method == 'POST':
         action = request.form.get('action')
         try:
-            if action == 'update_order_status':
+            if action == 'update_settings':
+                whatsapp_number = request.form.get('whatsapp_number', '').strip().replace('+', '')
+                data['settings']['whatsapp_number'] = whatsapp_number
+                save_data(data)
+                flash('Настройки сохранены.', 'success')
+
+            elif action == 'update_order_status':
                 order_id = request.form.get('order_id')
                 new_status = request.form.get('new_status')
                 if order_id in data['orders'] and new_status in STATUS_MAPS['ru']:
@@ -1681,31 +1745,12 @@ def admin():
                 else:
                     flash("Категория не найдена.", 'error')
 
-            elif action == 'add_brand':
-                brand_name = request.form.get('brand_name', '').strip()
-                if brand_name and brand_name not in data['brands']:
-                    data['brands'].append(brand_name)
-                    save_data(data)
-                    flash(f"Бренд '{brand_name}' добавлен.", 'success')
-                else:
-                    flash("Ошибка: Бренд пуст или уже существует.", 'error')
-
-            elif action == 'delete_brand':
-                brand_to_delete = request.form.get('brand_name')
-                if brand_to_delete in data['brands']:
-                    data['brands'].remove(brand_to_delete)
-                    for product in data['products']:
-                        if product.get('brand') == brand_to_delete:
-                            product['brand'] = 'Без бренда'
-                    save_data(data)
-                    flash(f"Бренд '{brand_to_delete}' удален.", 'success')
-                else:
-                    flash("Бренд не найден.", 'error')
-
             elif action == 'add_product' or action == 'edit_product':
                 name = request.form.get('name', '').strip()
-                if not name:
-                    flash("Название товара обязательно.", 'error')
+                product_type = request.form.get('type')
+
+                if not name or not product_type:
+                    flash("Название и тип товара обязательны.", 'error')
                     return redirect(url_for('admin'))
 
                 variant_names = [v.strip() for v in request.form.getlist('variant_names') if v.strip()]
@@ -1725,13 +1770,22 @@ def admin():
                     flash("Неверный формат цены в вариантах.", 'error')
                     return redirect(url_for('admin'))
 
+                sizes = []
+                if product_type == 'Одежда':
+                    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'),
-                    'brand': request.form.get('brand'),
                     'is_top': 'is_top' in request.form,
-                    'variants': variants
+                    'variants': variants,
+                    'sizes': sizes if product_type == 'Одежда' else []
                 }
 
                 newly_uploaded_photos = []
@@ -1829,8 +1883,8 @@ def admin():
         ADMIN_TEMPLATE,
         products=sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower()),
         categories=sorted(current_data.get('categories', [])),
-        brands=sorted(current_data.get('brands', [])),
         orders=list(current_data.get('orders', {}).values()),
+        settings=current_data.get('settings', {}),
         status_map_ru=STATUS_MAPS['ru'],
         repo_id=REPO_ID,
         store_addresses=STORE_ADDRESSES,