admin

Sleeping

App Files Files Community

Kgshop commited on Oct 19, 2025

Commit

9bfdf79

verified ·

1 Parent(s): cc0bbcd

Update app.py

Browse files

Files changed (1) hide show

app.py +115 -4

app.py CHANGED Viewed

@@ -1,6 +1,4 @@
 from flask import Flask, render_template_string, request, redirect, url_for, send_file, flash, jsonify
 import json
 import os
@@ -24,7 +22,7 @@ DATA_FILE = 'data.json'
 SYNC_FILES = [DATA_FILE]
-REPO_ID = "Kgshop/Mobilmir" # Assuming the Hugging Face repo ID remains the same for dataset storage
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
@@ -36,6 +34,13 @@ CURRENCY_NAME = 'Казахстанский тенге'
 DOWNLOAD_RETRIES = 3
 DOWNLOAD_DELAY = 5
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -1020,6 +1025,23 @@ ADMIN_TEMPLATE = '''
             .status-indicator.in-stock { background-color: #c6f6d5; color: #2f855a; }
             .status-indicator.out-of-stock { background-color: #fed7d7; color: #c53030; }
             .status-indicator.top-product { background-color: #feebc8; color: #9c4221; margin-left: 5px;}
         </style>
     </head>
     <body>
@@ -1054,6 +1076,68 @@ ADMIN_TEMPLATE = '''
                  <p style="font-size: 0.85rem; color: #a0aec0;">Резервное копирование происходит автоматически каждые 30 минут, а также после каждого сохранения данных. Используйте эти кнопки для немедленной синхронизации.</p>
             </div>
             <div class="flex-container">
                  <div class="flex-item">
                      <div class="section">
@@ -1431,6 +1515,7 @@ def admin():
     data = load_data()
     products = data.get('products', [])
     categories = data.get('categories', [])
     needs_save = False
     for product in products:
@@ -1451,7 +1536,30 @@ def admin():
         logging.info(f"Admin action received: {action}")
         try:
-            if action == 'add_category':
                 category_name = request.form.get('category_name', '').strip()
                 if category_name and category_name not in categories:
                     categories.append(category_name)
@@ -1744,11 +1852,14 @@ def admin():
     current_data = load_data()
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
     display_categories = sorted(current_data.get('categories', []))
     return render_template_string(
         ADMIN_TEMPLATE,
         products=display_products,
         categories=display_categories,
         repo_id=REPO_ID,
         currency_code=CURRENCY_CODE
     )

 from flask import Flask, render_template_string, request, redirect, url_for, send_file, flash, jsonify
 import json
 import os
 SYNC_FILES = [DATA_FILE]
+REPO_ID = "Kgshop/Mobilmir"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 DOWNLOAD_RETRIES = 3
 DOWNLOAD_DELAY = 5
+STATUS_MAP_RU = {
+    "new": "Новый",
+    "accepted": "Принят",
+    "prepared": "Собран",
+    "shipped": "Отправлен"
+}
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
             .status-indicator.in-stock { background-color: #c6f6d5; color: #2f855a; }
             .status-indicator.out-of-stock { background-color: #fed7d7; color: #c53030; }
             .status-indicator.top-product { background-color: #feebc8; color: #9c4221; margin-left: 5px;}
+            /* Order Specific Status Styles */
+            .status-indicator.new { background-color: #fefcbf; color: #744210; }
+            .status-indicator.accepted { background-color: #b3e5fc; color: #0277bd; }
+            .status-indicator.prepared { background-color: #c6f6d5; color: #2f855a; }
+            .status-indicator.shipped { background-color: #a7f3d0; color: #065f46; }
+            .order-details-content { padding: 10px 0 0 0; }
+            .order-item-detail { display: flex; gap: 15px; padding: 8px 0; border-top: 1px dashed #E0E7FF; font-size: 0.9rem; align-items: center; }
+            .order-item-detail:first-child { border-top: none; }
+            .order-item-detail img { width: 40px; height: 40px; object-fit: contain; border-radius: 4px; }
+            .order-item-name { flex-grow: 1; }
+            .order-item-qty-price { width: 150px; text-align: right; flex-shrink: 0; }
+            .order-total-summary { font-size: 1.1rem; font-weight: 600; margin-top: 15px; padding-top: 10px; border-top: 1px solid #4F46E5; text-align: right; }
+            .order-status-form { display: flex; gap: 10px; align-items: center; margin-top: 15px; padding-top: 15px; border-top: 1px dashed #E0E7FF; flex-wrap: wrap; }
+            .order-status-form select { max-width: 200px; margin-top: 0; flex-grow: 1;}
+            .order-status-form .button { margin-top: 0; flex-grow: 0; }
         </style>
     </head>
     <body>
                  <p style="font-size: 0.85rem; color: #a0aec0;">Резервное копирование происходит автоматически каждые 30 минут, а также после каждого сохранения данных. Используйте эти кнопки для немедленной синхронизации.</p>
             </div>
+            <div class="section">
+                <h2><i class="fas fa-history"></i> История заказов (Предполагается Алматинское время)</h2>
+                {% if orders %}
+                    {% set sorted_orders = orders | sort(attribute='created_at', reverse=true) %}
+                    {% for order in sorted_orders %}
+                        {% set current_status = order.get('status', 'new') %}
+                        {% set total_items = order.cart | sum(attribute='quantity') %}
+                        <details style="margin-bottom: 10px;">
+                            <summary style="display: flex; justify-content: space-between; align-items: center; padding: 15px 20px;">
+                                <span>
+                                    Заказ №{{ order.id }}
+                                    <span class="status-indicator {{ current_status }}">{{ status_map_ru.get(current_status, current_status) }}</span>
+                                </span>
+                                <span style="font-size: 0.9rem; color: #4d333f; flex-shrink: 0;">
+                                    Дата: {{ order.created_at }} | Итого: {{ "%.2f"|format(order.total_price) }} {{ currency_code }} ({{ total_items }} шт.)
+                                </span>
+                            </summary>
+                            <div class="form-content">
+                                <h3>Состав заказа:</h3>
+                                <div class="order-details-content">
+                                    {% for item in order.cart %}
+                                        {% set item_price = item.price * item.quantity %}
+                                        <div class="order-item-detail">
+                                            <img src="{{ item.photo_url }}" alt="{{ item.name }}">
+                                            <div class="order-item-name">
+                                                <strong>{{ item.name }}</strong>
+                                                {% if item.color != 'N/A' %}<p style="margin: 0; color: #a0aec0;">Цвет: {{ item.color }}</p>{% endif %}
+                                            </div>
+                                            <div class="order-item-qty-price">
+                                                {{ item.quantity }} × {{ "%.2f"|format(item.price) }} {{ currency_code }} = <strong>{{ "%.2f"|format(item_price) }} {{ currency_code }}</strong>
+                                            </div>
+                                        </div>
+                                    {% endfor %}
+                                </div>
+                                <div class="order-total-summary">
+                                    Общая сумма: {{ "%.2f"|format(order.total_price) }} {{ currency_code }}
+                                </div>
+                                <div class="order-status-form">
+                                    <form method="POST" style="display: flex; gap: 10px; width: 100%; align-items: center; flex-wrap: wrap;">
+                                        <input type="hidden" name="action" value="update_order_status">
+                                        <input type="hidden" name="order_id" value="{{ order.id }}">
+                                        <label for="status_{{ order.id }}" style="margin: 0; display: inline; font-size: 0.9rem;">Изменить статус:</label>
+                                        <select name="new_status" id="status_{{ order.id }}" style="max-width: 200px; margin: 0;">
+                                            {% for status_key, status_value in status_map_ru.items() %}
+                                                <option value="{{ status_key }}" {% if current_status == status_key %}selected{% endif %}>{{ status_value }}</option>
+                                            {% endfor %}
+                                        </select>
+                                        <button type="submit" class="button"><i class="fas fa-check"></i> Сохранить</button>
+                                         <a href="{{ url_for('view_order', order_id=order.id) }}" target="_blank" class="button" style="background-color: #6366F1;"><i class="fas fa-eye"></i> Просмотр</a>
+                                    </form>
+                                </div>
+                            </div>
+                        </details>
+                    {% endfor %}
+                {% else %}
+                    <p>Активных заказов нет.</p>
+                {% endif %}
+            </div>
             <div class="flex-container">
                  <div class="flex-item">
                      <div class="section">
     data = load_data()
     products = data.get('products', [])
     categories = data.get('categories', [])
+    orders = data.get('orders', {})
     needs_save = False
     for product in products:
         logging.info(f"Admin action received: {action}")
         try:
+            if action == 'update_order_status':
+                order_id = request.form.get('order_id')
+                new_status = request.form.get('new_status')
+                if order_id in data['orders']:
+                    order = data['orders'][order_id]
+                    valid_statuses = list(STATUS_MAP_RU.keys())
+                    if new_status in valid_statuses:
+                        old_status_key = order.get('status', 'new')
+                        order['status'] = new_status
+                        data['orders'][order_id] = order
+                        save_data(data)
+                        logging.info(f"Order {order_id} status updated from {old_status_key} to {new_status}")
+                        flash(f"Статус заказа №{order_id} успешно изменен на '{STATUS_MAP_RU.get(new_status)}'.", 'success')
+                    else:
+                        flash(f"Неверный статус: {new_status}", 'error')
+                else:
+                    flash(f"Заказ №{order_id} не найден.", 'error')
+                return redirect(url_for('admin'))
+            elif action == 'add_category':
                 category_name = request.form.get('category_name', '').strip()
                 if category_name and category_name not in categories:
                     categories.append(category_name)
     current_data = load_data()
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
     display_categories = sorted(current_data.get('categories', []))
+    display_orders = list(current_data.get('orders', {}).values())
     return render_template_string(
         ADMIN_TEMPLATE,
         products=display_products,
         categories=display_categories,
+        orders=display_orders,
+        status_map_ru=STATUS_MAP_RU,
         repo_id=REPO_ID,
         currency_code=CURRENCY_CODE
     )