Update app.py

app.py

@@ -26,10 +26,6 @@ REPO_ID = "Kgshop/esmiratkani"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
-STORE_ADDRESSES = [
-    "Город Алматы , Алатау 1 , блок 4 , бутик 112",
-]
-
 
 CURRENCY_CODE = 'KZT'
 CURRENCY_NAME = 'Казахстанский тенге'
@@ -54,8 +50,8 @@ STATUS_MAPS = {
 
 translations = {
     'ru': {
-        'page_title': "Esmira - ткани и одежда оптом и в розницу",
-        'header_title': "Esmira",
+        'page_title': "s.amir.kz - одежда оптом и в розницу",
+        'header_title': "s.amir.kz",
         'our_addresses': "Наши адреса в г. Алматы",
         'search_placeholder': "Поиск по названию или описанию...",
         'all_filter': "Все",
@@ -68,7 +64,6 @@ translations = {
         'variant_label': "Вариант:",
         'size_label': "Размер:",
         'quantity_label': "Количество:",
-        'quantity_label_meter': "Количество (метры):",
         'confirm_add_to_cart': "Добавить в корзину",
         'your_cart': "Ваша корзина",
         'cart_is_empty': "Ваша корзина пуста.",
@@ -100,18 +95,16 @@ translations = {
         'return_to_catalog': "Вернуться в каталог",
         'order_not_found_error': "Ошибка",
         'order_not_found_message': "Заказ с таким ID не найден.",
-        'whatsapp_confirm_message_1': "Здравствуйте! Хочу подтвердить свой заказ в Esmira:",
+        'whatsapp_confirm_message_1': "Здравствуйте! Хочу подтвердить свой заказ в s.amir.kz:",
         'whatsapp_confirm_message_2': "Номер заказа:",
         'whatsapp_confirm_message_3': "Ссылка на заказ:",
         'whatsapp_confirm_message_4': "Пожалуйста, свяжитесь со мной для уточнения деталей.",
         'product_type': "Тип товара",
-        'tkaniny': "Ткани",
         'odezhda': "Одежда",
-        'price_per_meter': "Цена за метр",
     },
     'kz': {
-        'page_title': "Esmira - маталар мен киімдер көтерме және бөлшек саудада",
-        'header_title': "Esmira",
+        'page_title': "s.amir.kz - киімдер көтерме және бөлшек саудада",
+        'header_title': "s.amir.kz",
         'our_addresses': "Алматы қаласындағы мекенжайларымыз",
         'search_placeholder': "Аты немесе сипаттамасы бойынша іздеу...",
         'all_filter': "Барлығы",
@@ -124,7 +117,6 @@ translations = {
         'variant_label': "Нұсқа:",
         'size_label': "Өлшем:",
         'quantity_label': "Саны:",
-        'quantity_label_meter': "Саны (метр):",
         'confirm_add_to_cart': "Себетке қосу",
         'your_cart': "Сіздің себетіңіз",
         'cart_is_empty': "Сіздің себетіңіз бос.",
@@ -156,14 +148,12 @@ translations = {
         'return_to_catalog': "Каталогқа оралу",
         'order_not_found_error': "Қате",
         'order_not_found_message': "Мұндай ID-мен тапсырыс табылмады.",
-        'whatsapp_confirm_message_1': "Сәлеметсіз бе! Esmira-дағы тапсырысымды растағым келеді:",
+        'whatsapp_confirm_message_1': "Сәлеметсіз бе! s.amir.kz-дағы тапсырысымды растағым келеді:",
         'whatsapp_confirm_message_2': "Тапсырыс нөмірі:",
         'whatsapp_confirm_message_3': "Тапсырысқа сілтеме:",
         'whatsapp_confirm_message_4': "Мәліметтерді нақтылау үшін менімен хабарласуыңызды сұраймын.",
         'product_type': "Тауар түрі",
-        'tkaniny': "Маталар",
         'odezhda': "Киімдер",
-        'price_per_meter': "Метр бағасы",
     }
 }
 
@@ -210,7 +200,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': {'whatsapp_number': '+77073363943'}}, f)
+                                    json.dump({'products': [], 'categories': [], 'orders': {}, 'settings': {'whatsapp_number': '+77073363943', 'store_addresses': ['Город Алматы, Алатау 1, блок 4, бутик 112']}}, 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}")
@@ -274,7 +264,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', 'store_addresses': ['Город Алматы, Алатау 1, блок 4, бутик 112']}}
     try:
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
@@ -285,7 +275,8 @@ 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', 'store_addresses': ['Город Алматы, Алатау 1, блок 4, бутик 112']}
+        if 'store_addresses' not in data['settings']: data['settings']['store_addresses'] = ['Город Алматы, Алатау 1, блок 4, бутик 112']
         return data
     except FileNotFoundError:
         logging.warning(f"Local file {DATA_FILE} not found. Attempting download from HF.")
@@ -303,7 +294,8 @@ 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', 'store_addresses': ['Город Алматы, Алатау 1, блок 4, бутик 112']}
+            if 'store_addresses' not in data['settings']: data['settings']['store_addresses'] = ['Город Алматы, Алатау 1, блок 4, бутик 112']
             return data
         except FileNotFoundError:
              logging.error(f"File {DATA_FILE} still not found even after download reported success. Using default.")
@@ -333,7 +325,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'] = {'whatsapp_number': '+77073363943'}
+        if 'settings' not in data: data['settings'] = {'whatsapp_number': '+77073363943', 'store_addresses': []}
+        if 'store_addresses' not in data['settings']: data['settings']['store_addresses'] = []
 
 
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
@@ -355,22 +348,22 @@ CATALOG_TEMPLATE = '''
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
         <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 href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&family=Montserrat:wght@600;700&display=swap" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.css">
         <style>
             :root {
-                --primary-color: #9A2A47;
-                --primary-dark: #7a2138;
-                --surface-color: #313131;
-                --background-color: #212121;
-                --text-color: #F5F5F5;
-                --text-color-muted: #BDBDBD;
-                --border-color: #424242;
-                --accent-color: #E0E0E0;
+                --primary-color: #000000;
+                --primary-dark: #333333;
+                --surface-color: #f8f9fa;
+                --background-color: #ffffff;
+                --text-color: #212529;
+                --text-color-muted: #6c757d;
+                --border-color: #dee2e6;
+                --accent-color: #000000;
             }
             * { margin: 0; padding: 0; box-sizing: border-box; }
             body { 
-                font-family: 'Georgia', serif; 
+                font-family: 'Roboto', sans-serif; 
                 background: var(--background-color); 
                 color: var(--text-color); 
                 line-height: 1.6; 
@@ -379,67 +372,67 @@ CATALOG_TEMPLATE = '''
             .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(33, 33, 33, 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(255, 255, 255, 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: auto; object-fit: contain; }
-            .header h1 { font-family: 'Cormorant Garamond', serif; font-size: 1.8rem; font-weight: 700; color: var(--accent-color); }
+            .logo-title-container img { height: 50px; width: 50px; object-fit: cover; border-radius: 50%; }
+            .header h1 { font-family: 'Montserrat', sans-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; }
             .lang-switcher a.active { background-color: var(--primary-color); color: white; font-weight: bold; }
             
-            .store-addresses { padding: 20px; text-align: center; background-color: var(--surface-color); border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.5); font-size: 0.95rem; color: var(--text-color-muted); margin: 20px; }
-            .store-addresses h3 { font-family: 'Cormorant Garamond', serif; color: var(--primary-color); font-size: 1.3rem; margin-bottom: 10px; font-weight: 600; display: flex; align-items: center; justify-content: center; gap: 8px; }
+            .store-addresses { padding: 20px; text-align: center; background-color: var(--surface-color); border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.1); font-size: 0.95rem; color: var(--text-color-muted); margin: 20px; }
+            .store-addresses h3 { font-family: 'Montserrat', sans-serif; color: var(--primary-color); font-size: 1.3rem; margin-bottom: 10px; font-weight: 600; display: flex; align-items: center; justify-content: center; gap: 8px; }
             .store-addresses p { margin: 5px 0; }
 
             .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(154, 42, 71, 0.2); }
+            #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: #fff; color: var(--text-color); }
+            #search-input:focus { border-color: var(--primary-color); box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.1); }
             
             .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(154, 42, 71, 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); 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(0, 0, 0, 0.2); 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(154, 42, 71, 0.15); border-color: var(--primary-color); }
+            .product { background: #fff; border-radius: 16px; box-shadow: 0 4px 15px rgba(0, 0, 0, 0.08); 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(0, 0, 0, 0.12); border-color: var(--primary-color); }
             
             .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(--accent-color); }
+            .product h2 { font-family: 'Montserrat', sans-serif; font-size: 1.1rem; font-weight: 600; margin: 0 0 8px 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: var(--text-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(154, 42, 71, 0.4); }
+            .product-button:hover { background-color: var(--primary-dark); box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3); }
             .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(154, 42, 71, 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(0, 0, 0, 0.3); 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; }
             
-            .modal { display: none; position: fixed; z-index: 1001; left: 0; top: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.85); backdrop-filter: blur(8px); overflow-y: auto; }
-            .modal-content { background: var(--surface-color); margin: 5% auto; padding: 25px; border-radius: 16px; width: 95%; max-width: 600px; box-shadow: 0 10px 40px rgba(0,0,0,0.7); animation: slideIn 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94); position: relative; border: 1px solid var(--border-color); }
+            .modal { display: none; position: fixed; z-index: 1001; left: 0; top: 0; width: 100%; height: 100%; background-color: rgba(0,0,0,0.6); backdrop-filter: blur(8px); overflow-y: auto; }
+            .modal-content { background: var(--background-color); margin: 5% auto; padding: 25px; border-radius: 16px; width: 95%; max-width: 600px; box-shadow: 0 10px 40px rgba(0,0,0,0.2); animation: slideIn 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94); position: relative; border: 1px solid var(--border-color); }
             @keyframes slideIn { from { transform: translateY(-40px); opacity: 0; } to { transform: translateY(0); opacity: 1; } }
             
             .close { position: absolute; top: 15px; right: 20px; font-size: 2rem; color: var(--text-color-muted); cursor: pointer; transition: color 0.3s, transform 0.3s; line-height: 1; }
             .close:hover { color: var(--primary-color); transform: rotate(90deg); }
             
-            .modal-content h2 { font-family: 'Cormorant Garamond', serif; margin-top: 0; margin-bottom: 25px; color: var(--primary-color); font-size: 1.8rem; display: flex; align-items: center; gap: 12px;}
+            .modal-content h2 { font-family: 'Montserrat', sans-serif; margin-top: 0; margin-bottom: 25px; color: var(--primary-color); font-size: 1.8rem; display: flex; align-items: center; gap: 12px;}
             
             .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: #fff; padding: 5px; }
+            .cart-item img { width: 65px; height: 65px; object-fit: contain; border-radius: 8px; background-color: #fff; padding: 5px; border: 1px solid var(--border-color); }
             .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); }
@@ -452,10 +445,10 @@ CATALOG_TEMPLATE = '''
             .cart-summary strong { font-size: 1.4rem; color: var(--primary-color); }
             .cart-actions { margin-top: 25px; display: flex; justify-content: space-between; gap: 12px; }
             .cart-actions .product-button { flex-grow: 1; }
-            .clear-cart { background: #444; color: var(--text-color); }
-            .clear-cart:hover { background: #555; }
+            .clear-cart { background: #6c757d; color: #fff; }
+            .clear-cart:hover { background: #5a6268; }
             
-            .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 { 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.2); 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); }
             
@@ -466,7 +459,7 @@ CATALOG_TEMPLATE = '''
         <div class="container">
              <header class="header">
                  <div class="logo-title-container">
-                    <img src="https://huggingface.co/spaces/esmira-tkani/admin/resolve/main/Screenshot_20251225-134859.png" alt="Esmira Logo">
+                    <img src="https://huggingface.co/spaces/esmira-tkani/admin/resolve/main/Screenshot_20260208-120337.png" alt="s.amir.kz Logo">
                     <h1>{{ _['header_title'] }}</h1>
                 </div>
                 <div class="lang-switcher">
@@ -488,14 +481,6 @@ CATALOG_TEMPLATE = '''
             </div>
 
             <div class="filters-wrapper">
-                 <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="tkaniny">{{ _['tkaniny'] }}</button>
-                        <button class="filter-btn type-filter" data-type="odezhda">{{ _['odezhda'] }}</button>
-                    </div>
-                </div>
                 <div>
                     <span class="filter-label">{{ _['category'] }}:</span>
                     <div class="filters-container">
@@ -514,7 +499,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('product_type', 'tkaniny') }}">
+                     data-type="{{ product.get('product_type', 'odezhda') }}">
                     <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] }}"
@@ -564,7 +549,7 @@ CATALOG_TEMPLATE = '''
                     <select id="variantSelect" class="variant-select"></select>
                 </div>
 
-                <div id="size-section" style="display: none;">
+                <div id="size-section">
                     <label for="sizeSelect">{{ _['size_label'] }}</label>
                     <select id="sizeSelect" class="size-select"></select>
                 </div>
@@ -681,21 +666,12 @@ CATALOG_TEMPLATE = '''
 
                 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";
-                    quantityLabel.textContent = translations['quantity_label'];
-                } else {
-                    document.getElementById('size-section').style.display = 'none';
-                    quantityInput.type = "number";
-                    quantityInput.step = "0.1";
-                    quantityInput.min = "0.1";
-                    quantityInput.value = "1.0";
-                    quantityLabel.textContent = translations['quantity_label_meter'];
-                }
+                setupSelect('sizeSelect', product.sizes, s => s.name);
+                quantityInput.type = "number";
+                quantityInput.step = "1";
+                quantityInput.min = "1";
+                quantityInput.value = "1";
+                quantityLabel.textContent = translations['quantity_label'];
                 
                 document.getElementById('quantityModal').style.display = 'block';
                 document.body.style.overflow = 'hidden';
@@ -718,14 +694,12 @@ CATALOG_TEMPLATE = '''
                 let selectedSize = null;
                 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.sizes || product.sizes.length === 0) {
+                    alert("Ошибка: Размеры для этой одежды не найдены.");
+                    return;
                 }
+                selectedSize = product.sizes[sizeIndex];
+                cartItemId += `-${selectedSize.name}`;
 
                 if (isNaN(quantity) || quantity <= 0) {
                     alert("Пожалуйста, укажите корректное количество.");
@@ -857,7 +831,6 @@ CATALOG_TEMPLATE = '''
             function filterProducts() {
                 const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
                 const activeCategory = document.querySelector('.category-filter.active').dataset.category;
-                const activeType = document.querySelector('.type-filter.active').dataset.type;
                 const grid = document.getElementById('products-grid');
                 let visibleProducts = 0;
 
@@ -868,13 +841,11 @@ CATALOG_TEMPLATE = '''
                     const name = productElement.dataset.name;
                     const description = productElement.dataset.description;
                     const category = productElement.dataset.category;
-                    const type = productElement.dataset.type;
 
                     const matchesSearch = !searchTerm || name.includes(searchTerm) || description.includes(searchTerm);
                     const matchesCategory = activeCategory === 'all' || category === activeCategory;
-                    const matchesType = activeType === 'all' || type === activeType;
 
-                    if (matchesSearch && matchesCategory && matchesType) {
+                    if (matchesSearch && matchesCategory) {
                         productElement.style.display = 'flex';
                         visibleProducts++;
                     } else {
@@ -941,7 +912,7 @@ CATALOG_TEMPLATE = '''
 
 PRODUCT_DETAIL_TEMPLATE = '''
     <div style="padding: 10px;">
-        <h2 style="font-family: 'Cormorant Garamond', serif; font-size: 2rem; font-weight: 700; margin-bottom: 20px; text-align: center; color: var(--primary-color);">{{ product['name'] }}</h2>
+        <h2 style="font-family: 'Montserrat', sans-serif; font-size: 2rem; font-weight: 700; margin-bottom: 20px; text-align: center; color: var(--primary-color);">{{ product['name'] }}</h2>
         <div class="swiper-container" style="max-width: 450px; margin: 0 auto 25px; border-radius: 12px; overflow: hidden; border: 1px solid var(--border-color);">
             <div class="swiper-wrapper">
                 {% if product.get('photos') and product['photos']|length > 0 %}
@@ -968,13 +939,12 @@ PRODUCT_DETAIL_TEMPLATE = '''
         </div>
 
         <div style="font-size: 1rem; line-height: 1.7; padding: 0 10px;">
-            <p><strong>{{ _['product_type'] }}:</strong> {{ _[product.get('product_type', 'tkaniny')] }}</p>
+            <p><strong>{{ _['product_type'] }}:</strong> {{ _[product.get('product_type', 'odezhda')] }}</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;">
@@ -1014,37 +984,37 @@ ORDER_TEMPLATE = '''
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ _['order_page_title'] }}{{ order.id }} - Esmira</title>
+    <title>{{ _['order_page_title'] }}{{ order.id }} - s.amir.kz</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 href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&family=Montserrat:wght@600;700&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: #9A2A47; 
-            --primary-dark: #7a2138;
-            --surface-color: #313131;
-            --background-color: #212121;
-            --text-color: #F5F5F5;
-            --text-color-muted: #BDBDBD;
-            --border-color: #424242;
+            --primary-color: #000000;
+            --primary-dark: #333333;
+            --surface-color: #ffffff;
+            --background-color: #f8f9fa;
+            --text-color: #212529;
+            --text-color-muted: #6c757d;
+            --border-color: #dee2e6;
         }
-        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); }
-        h1, h2 { font-family: 'Cormorant Garamond', serif; color: var(--primary-color); }
+        body { font-family: 'Roboto', sans-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.1); border: 1px solid var(--border-color); }
+        h1, h2 { font-family: 'Montserrat', sans-serif; color: var(--primary-color); }
         h1 { text-align: center; margin-bottom: 25px; font-size: 2.2rem; font-weight: 700; }
         h2 { margin-top: 30px; margin-bottom: 15px; font-size: 1.6rem; border-bottom: 1px solid var(--border-color); padding-bottom: 8px; display: flex; align-items: center; gap: 10px; }
         .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: #fff; 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 var(--border-color);}
         .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(154, 42, 71, 0.05); padding: 20px; border-radius: 12px; border: 1px solid var(--primary-color);}
+        .customer-info { margin-top: 30px; background-color: #f8f9fa; padding: 20px; border-radius: 12px; border: 1px solid var(--border-color);}
         .customer-info p { margin-bottom: 8px; font-size: 1rem; }
         .customer-info strong { color: var(--text-color); }
         .actions { margin-top: 30px; text-align: center; }
@@ -1129,50 +1099,50 @@ ADMIN_TEMPLATE = '''
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Админ-панель - Esmira</title>
+        <title>Админ-панель - s.amir.kz</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 href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&family=Montserrat:wght@600&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: #9A2A47;
-                --primary-dark: #7a2138;
-                --surface-color: #313131;
-                --background-color: #212121;
-                --text-color: #F5F5F5;
-                --text-color-muted: #BDBDBD;
-                --border-color: #424242;
-                --success-bg: #113d21;
-                --success-text: #6ee791;
-                --error-bg: #4d0a0a;
-                --error-text: #ff8f8f;
-                --warning-bg: #4a3a09;
-                --warning-text: #ffd56b;
+                --primary-color: #000000;
+                --primary-dark: #333333;
+                --surface-color: #ffffff;
+                --background-color: #f4f7f6;
+                --text-color: #212529;
+                --text-color-muted: #6c757d;
+                --border-color: #dee2e6;
+                --success-bg: #d4edda;
+                --success-text: #155724;
+                --error-bg: #f8d7da;
+                --error-text: #721c24;
+                --warning-bg: #fff3cd;
+                --warning-text: #856404;
             }
-            body { font-family: 'Georgia', serif; background-color: var(--background-color); color: var(--text-color); padding: 15px; line-height: 1.5; }
-            .container { max-width: 1200px; margin: 0 auto; background-color: var(--surface-color); padding: 25px; border-radius: 12px; box-shadow: 0 4px 15px rgba(0,0,0,0.5); border: 1px solid var(--border-color); }
+            body { font-family: 'Roboto', sans-serif; background-color: var(--background-color); color: var(--text-color); padding: 15px; line-height: 1.5; }
+            .container { max-width: 1200px; margin: 0 auto; background-color: var(--surface-color); padding: 25px; border-radius: 12px; box-shadow: 0 4px 15px rgba(0,0,0,0.08); border: 1px solid var(--border-color); }
             .header { padding-bottom: 20px; margin-bottom: 25px; border-bottom: 1px solid var(--border-color); display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 15px;}
-            h1, h2, h3, h4 { font-family: 'Cormorant Garamond', serif; font-weight: 600; color: var(--primary-color); margin:0 0 15px 0;}
+            h1, h2, h3, h4 { font-family: 'Montserrat', sans-serif; font-weight: 600; color: var(--primary-color); margin:0 0 15px 0;}
             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: #292929; border: 1px solid var(--border-color); border-radius: 8px; }
+            .section { margin-bottom: 30px; padding: 20px; background-color: #fff; 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(154, 42, 71, 0.2); }
+            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: #fff; color: var(--text-color); }
+            input:focus, textarea:focus, select:focus { border-color: var(--primary-color); outline: none; box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.1); }
             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="file"] { padding: 8px; background-color: #f8f9fa; 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); }
             
             button, .button { padding: 9px 18px; border: none; border-radius: 50px; background-color: var(--primary-color); color: #fff; font-weight: 500; cursor: pointer; transition: all 0.2s ease; margin-top: 15px; font-size: 0.9rem; display: inline-flex; align-items: center; gap: 6px; text-decoration: none; line-height: 1.2; text-transform: uppercase; letter-spacing: 0.5px; }
             button:hover, .button:hover { background-color: var(--primary-dark); transform: translateY(-1px); }
-            .delete-button { background-color: #8B0000; color: white; }
-            .delete-button:hover { background-color: #6e0000; }
+            .delete-button { background-color: #dc3545; color: white; }
+            .delete-button:hover { background-color: #c82333; }
             
             .item-list { display: grid; gap: 15px; }
-            .item { background: var(--surface-color); padding: 15px; border-radius: 8px; border: 1px solid var(--border-color); }
+            .item { background: #f8f9fa; 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; background-color: #fff;}
             .photo-preview-edit { display: flex; flex-wrap: wrap; gap: 10px; margin-top: 5px; }
@@ -1181,21 +1151,21 @@ ADMIN_TEMPLATE = '''
             
             .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; }
+            .remove-btn { background-color: #dc3545; color: white; padding: 6px 10px; font-size: 0.8rem; margin: 0; border-radius: 6px; }
+            .add-btn { background-color: #28a745; color: #fff; margin-top: 8px;}
+            .add-btn:hover { background-color: #218838; }
 
             .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);}
             .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.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; }
+            .status-indicator { display: inline-block; padding: 3px 9px; border-radius: 50px; font-size: 0.75rem; font-weight: 500; margin-left: 5px; vertical-align: middle; color: #fff;}
+            .status-indicator.new { background-color: #fd7e14; }
+            .status-indicator.accepted { background-color: #007bff; }
+            .status-indicator.prepared { background-color: #28a745; }
+            .status-indicator.shipped { background-color: #17a2b8; }
             
-            details { background-color: #292929; border: 1px solid var(--border-color); border-radius: 8px; margin-bottom: 10px; }
+            details { background-color: #fff; 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,7 +1180,7 @@ 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: auto;">
+                    <img src="https://huggingface.co/spaces/esmira-tkani/admin/resolve/main/Screenshot_20260208-120337.png" alt="s.amir.kz Logo" style="height: 50px; width: 50px; border-radius: 50%;">
                     <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>
@@ -1253,7 +1223,7 @@ ADMIN_TEMPLATE = '''
                                             {% endfor %}
                                         </select>
                                         <button type="submit" class="button" style="margin-top:0;"><i class="fas fa-check"></i> Сохранить</button>
-                                         <a href="{{ url_for('view_order', lang_code='ru', order_id=order.id) }}" target="_blank" class="button" style="background-color: #444; color: white; margin-top:0;"><i class="fas fa-eye"></i> Просмотр</a>
+                                         <a href="{{ url_for('view_order', lang_code='ru', order_id=order.id) }}" target="_blank" class="button" style="background-color: #6c757d; color: white; margin-top:0;"><i class="fas fa-eye"></i> Просмотр</a>
                                     </form>
                                 </div>
                             </div>
@@ -1270,14 +1240,12 @@ ADMIN_TEMPLATE = '''
                      <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>
+                     
+                     <label for="store_addresses">Адреса магазинов (каждый с новой строки):</label>
+                     <textarea id="store_addresses" name="store_addresses" rows="4">{{ settings.get('store_addresses', [])|join('\n') }}</textarea>
+
                      <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>
 
@@ -1324,12 +1292,6 @@ ADMIN_TEMPLATE = '''
                              <input type="text" id="add_name" name="name" required>
                              <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">
@@ -1352,11 +1314,11 @@ ADMIN_TEMPLATE = '''
                              </div>
                              <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;">
+                             <div id="add-sizes-section" style="margin-top:20px;">
                                  <h4>Размеры *:</h4>
                                  <div id="add-sizes-container">
                                      <div class="input-group">
-                                         <input type="text" name="size_names" placeholder="Название размера (напр. S, 42-44)">
+                                         <input type="text" name="size_names" placeholder="Название размера (напр. S, 42-44)" required>
                                          <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                                      </div>
                                  </div>
@@ -1386,7 +1348,7 @@ ADMIN_TEMPLATE = '''
                             </div>
                             <div style="flex-grow: 1;">
                                 <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> {{ _['odezhda'] }}</p>
                                 <p style="font-size: 0.9rem; color: var(--text-color-muted);"><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
                             </div>
                         </div>
@@ -1409,12 +1371,6 @@ ADMIN_TEMPLATE = '''
                                 <input type="text" name="name" value="{{ product['name'] }}" required>
                                 <label>Описание:</label>
                                 <textarea name="description" rows="4">{{ product.get('description', '') }}</textarea>
-                                
-                                <label>Тип товара *:</label>
-                                <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>
                                 <select name="category">
@@ -1453,12 +1409,12 @@ ADMIN_TEMPLATE = '''
                                 </div>
                                 <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="margin-top:20px; display: {% if product.get('product_type') == 'odezhda' %}block{% else %}none{% endif %};">
+                                <div id="edit-{{ product.id }}-sizes-section" style="margin-top:20px;">
                                     <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 }}" >
+                                            <input type="text" name="size_names" value="{{ size.name }}" required>
                                             <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                                         </div>
                                         {% endfor %}
@@ -1497,7 +1453,7 @@ ADMIN_TEMPLATE = '''
                     `;
                 } else { // size
                     newInputGroup.innerHTML = `
-                        <input type="text" name="size_names" placeholder="Название размера">
+                        <input type="text" name="size_names" placeholder="Название размера" required>
                         <button type="button" class="remove-btn" onclick="removeInputGroup(this)"><i class="fas fa-times"></i></button>
                     `;
                 }
@@ -1513,41 +1469,6 @@ ADMIN_TEMPLATE = '''
                     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>
@@ -1574,6 +1495,7 @@ def catalog(lang_code):
     categories = sorted(data.get('categories', []))
     settings = data.get('settings', {})
     whatsapp_number = settings.get('whatsapp_number', '+77073363943').replace(' ', '').replace('+', '')
+    store_addresses = settings.get('store_addresses', [])
 
 
     products_in_stock = [p for p in all_products if p.get('variants')]
@@ -1588,7 +1510,7 @@ def catalog(lang_code):
         products=products_sorted,
         categories=categories,
         repo_id=REPO_ID,
-        store_addresses=STORE_ADDRESSES,
+        store_addresses=store_addresses,
         currency_code=CURRENCY_CODE,
         lang_code=g.lang_code,
         _=g.translations,
@@ -1695,7 +1617,7 @@ 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'] = {'whatsapp_number': '+77073363943'}
+    if 'settings' not in data: data['settings'] = {'whatsapp_number': '+77073363943', 'store_addresses': []}
 
     
     needs_save = False
@@ -1713,10 +1635,16 @@ def admin():
                 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')
+                
+                addresses_text = request.form.get('store_addresses', '')
+                address_list = [addr.strip() for addr in addresses_text.splitlines() if addr.strip()]
+                data['settings']['store_addresses'] = address_list
+                
+                save_data(data)
+                flash('Настройки успешно обновлены.', 'success')
+
 
             elif action == 'update_order_status':
                 order_id = request.form.get('order_id')
@@ -1772,21 +1700,18 @@ def admin():
                     flash("Неверный формат цены в вариантах.", 'error')
                     return redirect(url_for('admin'))
 
-                product_type = request.form.get('product_type')
-                sizes = []
-                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]
+                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,
                     'description': request.form.get('description', '').strip(),
                     'category': request.form.get('category'),
-                    'product_type': product_type,
+                    'product_type': 'odezhda',
                     'variants': variants,
                     'sizes': sizes
                 }
@@ -1890,7 +1815,6 @@ def admin():
         settings=current_data.get('settings', {}),
         status_map_ru=STATUS_MAPS['ru'],
         repo_id=REPO_ID,
-        store_addresses=STORE_ADDRESSES,
         currency_code=CURRENCY_CODE,
         currency_name=CURRENCY_NAME
     )
@@ -1903,3 +1827,4 @@ if __name__ == '__main__':
         threading.Thread(target=periodic_backup, daemon=True).start()
     port = int(os.environ.get('PORT', 7860))
     app.run(debug=False, host='0.0.0.0', port=port)
+