Update app.py

app.py

@@ -1,5 +1,6 @@
+# --- START OF FILE app.py ---
 
-from flask import Flask, render_template_string, request, redirect, url_for, session, send_file, flash
+from flask import Flask, render_template_string, request, redirect, url_for, session, send_file, flash, jsonify
 import json
 import os
 import logging
@@ -10,7 +11,8 @@ from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError, HfHubHTTPError
 from werkzeug.utils import secure_filename
 from dotenv import load_dotenv
-import requests # Added for more specific network error handling
+import requests
+import base64 # Added for encoding order data
 
 load_dotenv()
 
@@ -31,14 +33,13 @@ CURRENCY_CODE = 'KGS'
 CURRENCY_NAME = 'Кыргызский сом (с)'
 
 DOWNLOAD_RETRIES = 3
-DOWNLOAD_DELAY = 5 # seconds
+DOWNLOAD_DELAY = 5
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
 def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWNLOAD_DELAY):
-    if not HF_TOKEN_READ and not HF_TOKEN_WRITE: # Allow read with write token too
+    if not HF_TOKEN_READ and not HF_TOKEN_WRITE:
         logging.warning("HF_TOKEN_READ/HF_TOKEN_WRITE not set. Download might fail for private repos.")
-        # Continue attempt without token for public repos
 
     token_to_use = HF_TOKEN_READ if HF_TOKEN_READ else HF_TOKEN_WRITE
 
@@ -59,22 +60,22 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN
                     local_dir=".",
                     local_dir_use_symlinks=False,
                     force_download=True,
-                    resume_download=False # Force fresh download each attempt
+                    resume_download=False
                 )
                 logging.info(f"Successfully downloaded {file_name} to {local_path}.")
                 success = True
-                break # Exit retry loop on success
+                break
             except RepositoryNotFoundError:
                  logging.error(f"Repository {REPO_ID} not found. Download cancelled for all files.")
-                 return False # No point retrying if repo doesn't exist
+                 return False
             except HfHubHTTPError as e:
                 if e.response.status_code == 404:
                     logging.warning(f"File {file_name} not found in repo {REPO_ID} (404). Skipping this file.")
-                    success = False # Mark as failed for this specific file, but don't stop others
-                    break # No point retrying a 404
+                    success = False
+                    break
                 else:
                     logging.error(f"HTTP error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...")
-            except requests.exceptions.RequestException as e: # Catch network errors
+            except requests.exceptions.RequestException as e:
                  logging.error(f"Network error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...")
             except Exception as e:
                  logging.error(f"Unexpected error downloading {file_name} (Attempt {attempt + 1}): {e}. Retrying in {delay}s...", exc_info=True)
@@ -84,7 +85,7 @@ def download_db_from_hf(specific_file=None, retries=DOWNLOAD_RETRIES, delay=DOWN
 
         if not success:
             logging.error(f"Failed to download {file_name} after {retries + 1} attempts.")
-            all_successful = False # Mark overall download as failed if any file fails
+            all_successful = False
 
     logging.info(f"Download process finished. Overall success: {all_successful}")
     return all_successful
@@ -97,7 +98,7 @@ def load_data():
         logging.info(f"Local data loaded successfully from {DATA_FILE}")
         if not isinstance(data, dict):
              logging.warning(f"Local {DATA_FILE} is not a dictionary. Attempting download.")
-             raise FileNotFoundError # Treat as missing to trigger download
+             raise FileNotFoundError
         if 'products' not in data: data['products'] = []
         if 'categories' not in data: data['categories'] = []
         return data
@@ -106,10 +107,8 @@ def load_data():
     except json.JSONDecodeError:
         logging.error(f"Error decoding JSON in local {DATA_FILE}. File might be corrupt. Attempting download.")
 
-    # Proceed to download only if local loading failed
     if download_db_from_hf(specific_file=DATA_FILE):
         try:
-            # Try loading the newly downloaded file
             with open(DATA_FILE, 'r', encoding='utf-8') as file:
                 data = json.load(file)
             logging.info(f"Data loaded successfully from {DATA_FILE} after download.")
@@ -130,11 +129,10 @@ def load_data():
             return default_data
     else:
         logging.error(f"Failed to download {DATA_FILE} from HF after retries. Using empty default data structure.")
-        return default_data # Return empty structure in memory
+        return default_data
 
 def save_data(data):
     try:
-        # Ensure the structure is valid before saving
         if not isinstance(data, dict):
             logging.error("Attempted to save invalid data structure (not a dict). Aborting save.")
             return
@@ -160,10 +158,8 @@ def load_users():
     except json.JSONDecodeError:
         logging.error(f"Error decoding JSON in local {USERS_FILE}. File might be corrupt. Attempting download.")
 
-    # Proceed to download only if local loading failed
     if download_db_from_hf(specific_file=USERS_FILE):
         try:
-             # Try loading the newly downloaded file
             with open(USERS_FILE, 'r', encoding='utf-8') as file:
                 users = json.load(file)
             logging.info(f"Users loaded successfully from {USERS_FILE} after download.")
@@ -179,7 +175,7 @@ def load_users():
             return default_users
     else:
         logging.error(f"Failed to download {USERS_FILE} from HF after retries. Using empty default user structure.")
-        return default_users # Return empty structure in memory
+        return default_users
 
 def save_users(users):
     try:
@@ -733,46 +729,44 @@ def catalog():
                     alert("Корзина пуста! Добавьте товары перед заказом.");
                     return;
                 }
-                let total = 0;
-                let orderText = "🛍️ *Новый Заказ от Soola Cosmetics* 🛍️%0A";
-                orderText += "----------------------------------------%0A";
-                orderText += "*Детали заказа:*%0A";
-                orderText += "----------------------------------------%0A";
-                cart.forEach((item, index) => {
-                    const itemTotal = item.price * item.quantity;
-                    total += itemTotal;
-                    const colorText = item.color !== 'N/A' ? ` (${item.color})` : '';
-                    orderText += `${index + 1}. *${item.name}*${colorText}%0A`;
-                    orderText += `   Кол-во: ${item.quantity}%0A`;
-                    orderText += `   Цена: ${item.price.toFixed(2)} ${currencyCode}%0A`;
-                    orderText += `   *Сумма: ${itemTotal.toFixed(2)} ${currencyCode}*%0A%0A`;
-                });
-                orderText += "----------------------------------------%0A";
-                orderText += `*ИТОГО: ${total.toFixed(2)} ${currencyCode}*%0A`;
-                orderText += "----------------------------------------%0A";
-
-                if (userInfo && userInfo.login) {
-                     orderText += "*Данные клиента:*%0A";
-                     orderText += `Имя: ${userInfo.first_name || ''} ${userInfo.last_name || ''}%0A`;
-                     orderText += `Логин: ${userInfo.login}%0A`;
-                     if (userInfo.phone) {
-                         orderText += `Телефон: ${userInfo.phone}%0A`;
-                     }
-                     orderText += `Страна: ${userInfo.country || 'Не указана'}%0A`;
-                     orderText += `Город: ${userInfo.city || 'Не указан'}%0A`;
-                } else {
-                     orderText += "*Клиент не авторизован*%0A";
-                }
-                orderText += "----------------------------------------%0A";
 
-                const now = new Date();
-                const dateTimeString = now.toLocaleString('ru-RU', { dateStyle: 'short', timeStyle: 'short' });
-                orderText += `Дата заказа: ${dateTimeString}%0A`;
-                orderText += `_Сформировано автоматически_`;
+                try {
+                    const cartJson = JSON.stringify(cart);
+                    const encodedCart = btoa(unescape(encodeURIComponent(cartJson))); // Base64 encode
+
+                    if (encodedCart.length > 1800) { // Basic check for URL length limits
+                         alert("Ошибка: Корзина слишком большая для создания ссылки. Пожалуйста, свяжитесь с нами напрямую.");
+                         return;
+                    }
+
+                    const orderViewUrl = `${window.location.origin}/order_view/${encodedCart}`;
 
-                const whatsappNumber = "996997703090";
-                const whatsappUrl = `https://api.whatsapp.com/send?phone=${whatsappNumber}&text=${orderText}`; // No need to encodeURIComponent here if already done piece by piece
-                window.open(whatsappUrl, '_blank');
+                    let messageText = "🛍️ *Новый Заказ Soola Cosmetics* 🛍️%0A";
+                    messageText += "----------------------------------------%0A";
+                    messageText += "*Пожалуйста, посмотрите детали заказа по ссылке ниже:*%0A";
+                    messageText += encodeURIComponent(orderViewUrl) + "%0A"; // URL encode the link itself for safety
+                    messageText += "----------------------------------------%0A";
+
+                    if (userInfo && userInfo.login) {
+                         messageText += "*Клиент:*%0A";
+                         messageText += `${userInfo.first_name || ''} ${userInfo.last_name || ''} (${userInfo.login})%0A`;
+                    } else {
+                         messageText += "*Клиент не авторизован*%0A";
+                    }
+                    messageText += "----------------------------------------%0A";
+                     const now = new Date();
+                     const dateTimeString = now.toLocaleString('ru-RU', { dateStyle: 'short', timeStyle: 'short' });
+                     messageText += `Дата запроса: ${dateTimeString}`;
+
+                    const whatsappNumber = "996997703090";
+                    const whatsappUrl = `https://api.whatsapp.com/send?phone=${whatsappNumber}&text=${messageText}`;
+
+                    window.open(whatsappUrl, '_blank');
+
+                } catch (e) {
+                    console.error("Error creating WhatsApp order link:", e);
+                    alert("Произошла ошибка при формировании ссылки для заказа. Пожалуйста, попробуйте еще раз или свяжитесь с нами.");
+                }
             }
 
 
@@ -951,6 +945,137 @@ def product_detail(index):
         currency_code=CURRENCY_CODE
     )
 
+ORDER_VIEW_TEMPLATE = '''
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Детали Заказа - Soola Cosmetics</title>
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;600&display=swap" rel="stylesheet">
+    <style>
+        body { font-family: 'Poppins', sans-serif; background: #f0f9f4; color: #2d332f; line-height: 1.6; padding: 20px; }
+        .container { max-width: 800px; margin: 20px auto; background: #fff; padding: 30px; border-radius: 10px; box-shadow: 0 3px 15px rgba(0,0,0,0.1); }
+        h1 { color: #1C6758; text-align: center; margin-bottom: 25px; font-size: 1.8rem; font-weight: 600; }
+        h2 { color: #164B41; margin-top: 30px; margin-bottom: 15px; font-size: 1.3rem; border-bottom: 1px solid #d1e7dd; padding-bottom: 8px; }
+        .order-item { display: flex; gap: 15px; align-items: center; padding: 15px 0; border-bottom: 1px solid #e1f0e9; }
+        .order-item:last-child { border-bottom: none; }
+        .order-item img { width: 70px; height: 70px; object-fit: contain; border-radius: 8px; background-color: #fff; padding: 5px; border: 1px solid #e1f0e9; flex-shrink: 0;}
+        .item-details { flex-grow: 1; }
+        .item-details strong { display: block; font-size: 1.1rem; color: #2d332f; margin-bottom: 5px; }
+        .item-meta { font-size: 0.9rem; color: #5e6e68; }
+        .item-total { font-weight: bold; text-align: right; font-size: 1rem; color: #1C6758; }
+        .summary { margin-top: 30px; padding-top: 20px; border-top: 2px solid #1C6758; text-align: right; }
+        .summary p { margin: 8px 0; font-size: 1.1rem; }
+        .summary strong { font-size: 1.3rem; color: #1C6758; }
+        .customer-info { margin-top: 20px; background-color: #f8fcfb; padding: 15px; border-radius: 8px; border: 1px solid #d1e7dd; font-size: 0.95rem; }
+        .customer-info p { margin: 4px 0; }
+        .footer-note { text-align: center; margin-top: 30px; font-size: 0.85rem; color: #7a8d85; }
+        .error-message { color: #721c24; background-color: #f8d7da; border: 1px solid #f5c6cb; padding: 15px; border-radius: 8px; text-align: center; font-weight: 500; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Детали Заказа</h1>
+
+        {% if error %}
+            <p class="error-message">{{ error }}</p>
+        {% else %}
+            {% if cart_items %}
+                <h2>Товары в заказе</h2>
+                {% for item in cart_items %}
+                <div class="order-item">
+                    <img src="{{ item.photo_url }}" alt="{{ item.name }}">
+                    <div class="item-details">
+                        <strong>{{ item.name }}{{ item.color_text }}</strong>
+                        <p class="item-meta">Цена: {{ "%.2f"|format(item.price) }} {{ currency_code }}</p>
+                        <p class="item-meta">Количество: {{ item.quantity }}</p>
+                    </div>
+                    <div class="item-total">{{ "%.2f"|format(item.item_total) }} {{ currency_code }}</div>
+                </div>
+                {% endfor %}
+
+                <div class="summary">
+                    <p><strong>Общая сумма заказа: {{ "%.2f"|format(total_price) }} {{ currency_code }}</strong></p>
+                </div>
+
+                {% if user_info %}
+                <div class="customer-info">
+                    <h2>Информация о клиенте</h2>
+                    <p><strong>Имя:</strong> {{ user_info.get('first_name', '') }} {{ user_info.get('last_name', '') }}</p>
+                    <p><strong>Логин:</strong> {{ user_info.get('login', 'N/A') }}</p>
+                    <p><strong>Телефон:</strong> {{ user_info.get('phone', 'Не указан') }}</p>
+                    <p><strong>Страна:</strong> {{ user_info.get('country', 'Не указана') }}</p>
+                    <p><strong>Город:</strong> {{ user_info.get('city', 'Не указан') }}</p>
+                </div>
+                {% endif %}
+
+            {% else %}
+                <p style="text-align: center; padding: 30px;">Не удалось загрузить детали заказа или корзина пуста.</p>
+            {% endif %}
+            <p class="footer-note">Заказ сформирован: {{ generation_time }}</p>
+        {% endif %}
+    </div>
+</body>
+</html>
+'''
+
+@app.route('/order_view/<encoded_cart>')
+def order_view(encoded_cart):
+    cart_items_processed = []
+    total_price = 0
+    error_message = None
+    user_info_data = session.get('user_info') # Get user info from session
+
+    try:
+        decoded_bytes = base64.urlsafe_b64decode(encoded_cart + '=' * (-len(encoded_cart) % 4))
+        cart_json = decoded_bytes.decode('utf-8')
+        cart_items = json.loads(cart_json)
+
+        if not isinstance(cart_items, list):
+            raise ValueError("Decoded data is not a list")
+
+        for item in cart_items:
+            if not isinstance(item, dict) or 'name' not in item or 'price' not in item or 'quantity' not in item:
+                 logging.warning(f"Skipping invalid item in decoded cart: {item}")
+                 continue
+
+            item_total = float(item['price']) * int(item['quantity'])
+            total_price += item_total
+            photo_url = (f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/photos/{item['photo']}"
+                         if item.get('photo') else "https://via.placeholder.com/70x70.png?text=N/A")
+            color_text = f" (Цвет: {item['color']})" if item.get('color') and item['color'] != 'N/A' else ''
+
+            cart_items_processed.append({
+                'name': item['name'],
+                'price': float(item['price']),
+                'quantity': int(item['quantity']),
+                'photo_url': photo_url,
+                'color_text': color_text,
+                'item_total': item_total
+            })
+
+    except (base64.binascii.Error, UnicodeDecodeError, json.JSONDecodeError, ValueError, TypeError) as e:
+        logging.error(f"Error decoding or processing order data from URL: {e}", exc_info=True)
+        error_message = "Не удалось расшифровать или обработать данные заказа. Ссылка может быть повреждена или неверна."
+    except Exception as e:
+        logging.error(f"Unexpected error processing order view: {e}", exc_info=True)
+        error_message = "Произошла непредвиденная ошибка при отображении заказа."
+
+    generation_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+
+    return render_template_string(
+        ORDER_VIEW_TEMPLATE,
+        cart_items=cart_items_processed,
+        total_price=total_price,
+        currency_code=CURRENCY_CODE,
+        repo_id=REPO_ID,
+        error=error_message,
+        user_info=user_info_data,
+        generation_time=generation_time
+    )
+
+
 LOGIN_TEMPLATE = '''
 <!DOCTYPE html>
 <html lang="ru">
@@ -1464,7 +1589,8 @@ ADMIN_TEMPLATE = '''
                 if (group) {
                     const container = group.parentNode;
                     group.remove();
-                    if (container && container.children.length === 0) {
+                    // Add a new empty input if the last one was removed, except for the add form
+                    if (container && container.children.length === 0 && !container.id.startsWith('add-color-inputs')) {
                          const placeholderGroup = document.createElement('div');
                          placeholderGroup.className = 'color-input-group';
                          placeholderGroup.innerHTML = `
@@ -1484,10 +1610,8 @@ ADMIN_TEMPLATE = '''
 
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
-    # Load data and users *before* processing POST to have the current state
     data = load_data()
     users = load_users()
-    # Ensure products and categories are lists/dicts even if load failed
     products = data.get('products', [])
     categories = data.get('categories', [])
 
@@ -1501,7 +1625,7 @@ def admin():
                 if category_name and category_name not in categories:
                     categories.append(category_name)
                     categories.sort()
-                    data['categories'] = categories # Update the main data dict
+                    data['categories'] = categories
                     save_data(data)
                     logging.info(f"Category '{category_name}' added.")
                     flash(f"Категория '{category_name}' ус��ешно добавлена.", 'success')
@@ -1521,8 +1645,8 @@ def admin():
                         if product.get('category') == category_to_delete:
                             product['category'] = 'Без категории'
                             updated_count += 1
-                    data['categories'] = categories # Update the main data dict
-                    data['products'] = products # Update the main data dict
+                    data['categories'] = categories
+                    data['products'] = products
                     save_data(data)
                     logging.info(f"Category '{category_to_delete}' deleted. Updated products: {updated_count}.")
                     flash(f"Категория '{category_to_delete}' удалена.", 'success')
@@ -1566,7 +1690,6 @@ def admin():
                         if photo and photo.filename:
                             try:
                                 ext = os.path.splitext(photo.filename)[1].lower()
-                                # Basic check for common image extensions
                                 if ext not in ['.jpg', '.jpeg', '.png', '.gif', '.webp']:
                                      logging.warning(f"Skipping non-image file upload: {photo.filename}")
                                      flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning")
@@ -1591,14 +1714,12 @@ def admin():
                             except Exception as e:
                                 logging.error(f"Error uploading photo {photo.filename} to HF: {e}", exc_info=True)
                                 flash(f"Ошибка при загрузке фото {photo.filename}.", 'error')
-                                # Optionally remove temp file if it exists after error
                                 if os.path.exists(temp_path):
                                     try: os.remove(temp_path)
                                     except OSError: pass
                         elif photo and not photo.filename:
                              logging.warning("Received an empty photo file object when adding product.")
                     try:
-                         # Check if directory exists and is empty before removing
                          if os.path.exists(uploads_dir) and not os.listdir(uploads_dir):
                              os.rmdir(uploads_dir)
                     except OSError as e:
@@ -1611,7 +1732,7 @@ def admin():
                     'in_stock': in_stock, 'is_top': is_top
                 }
                 products.append(new_product)
-                data['products'] = products # Update the main data dict
+                data['products'] = products
                 save_data(data)
                 logging.info(f"Product '{name}' added.")
                 flash(f"Товар '{name}' успешно добавлен.", 'success')
@@ -1624,7 +1745,6 @@ def admin():
 
                 try:
                     index = int(index_str)
-                    # Use the 'products' list loaded at the start of the function
                     if not (0 <= index < len(products)):
                         raise IndexError("Product index out of range")
                     product_to_edit = products[index]
@@ -1719,9 +1839,8 @@ def admin():
                     elif uploaded_count == 0 and any(f.filename for f in photos_files):
                          flash("Не удалось загрузить новые фотографии.", "error")
 
-                # Update the product in the main list
                 products[index] = product_to_edit
-                data['products'] = products # Update the main data dict
+                data['products'] = products
                 save_data(data)
                 logging.info(f"Product '{original_name}' (index {index}) updated to '{product_to_edit['name']}'.")
                 flash(f"Товар '{product_to_edit['name']}' успешно обновлен.", 'success')
@@ -1733,7 +1852,6 @@ def admin():
                     return redirect(url_for('admin'))
                 try:
                     index = int(index_str)
-                     # Use the 'products' list loaded at the start of the function
                     if not (0 <= index < len(products)): raise IndexError("Product index out of range")
                     deleted_product = products.pop(index)
                     product_name = deleted_product.get('name', 'N/A')
@@ -1755,7 +1873,7 @@ def admin():
                              logging.error(f"Error deleting photos {photos_to_delete} for product '{product_name}' from HF: {e}", exc_info=True)
                              flash(f"Не удалось удалить фото для товара '{product_name}' с сервера.", "warning")
 
-                    data['products'] = products # Update the main data dict
+                    data['products'] = products
                     save_data(data)
                     logging.info(f"Product '{product_name}' (original index {index}) deleted.")
                     flash(f"Товар '{product_name}' удален.", 'success')
@@ -1811,9 +1929,6 @@ def admin():
              flash(f"Произошла внутренняя ошибка при выполнении действия '{action}'. Подробности в логе сервера.", 'error')
              return redirect(url_for('admin'))
 
-    # GET request or after POST redirect
-    # Reload data and users again in case they were modified by POST and saved
-    # This ensures the template always shows the latest state after an action
     current_data = load_data()
     current_users = load_users()
     display_products = current_data.get('products', [])
@@ -1854,7 +1969,6 @@ def force_download():
     return redirect(url_for('admin'))
 
 if __name__ == '__main__':
-    # Initial load on startup
     load_data()
     load_users()
 
@@ -1867,7 +1981,6 @@ if __name__ == '__main__':
 
     port = int(os.environ.get('PORT', 7860))
     logging.info(f"Starting Flask app on host 0.0.0.0 and port {port}")
-    # Use waitress or gunicorn in production instead of development server
-    # For simplicity, using Flask's dev server here
     app.run(debug=False, host='0.0.0.0', port=port)
 
+# --- END OF FILE app.py ---