Bc

Running

App Files Files Community

Kgshop commited on about 2 hours ago

Commit

38937dd

verified ·

1 Parent(s): 685de5e

Update app.py

Browse files

Files changed (1) hide show

app.py +13 -13

app.py CHANGED Viewed

@@ -1808,7 +1808,7 @@ ADMIN_ORDERS_TEMPLATE = '''
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>История заказов - {{ settings['organization_name'] }}</title>
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;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>
@@ -1851,29 +1851,29 @@ ADMIN_ORDERS_TEMPLATE = '''
             <div class="order-item">
                 <div class="order-header">
                     <div>
-                        <span class="order-id">Заказ #{{ order['id'] }}</span>
-                        <span class="order-date">{{ order['date'] }}</span>
                     </div>
                     <div style="display: flex; gap: 8px; align-items: center;">
-                        <a href="{{ url_for('order_invoice', env_id=env_id, order_id=order['id']) }}" target="_blank" class="button" style="padding: 6px 12px; font-size: 0.9rem; min-height: 38px;"><i class="fas fa-file-invoice"></i> Накладная</a>
-                        <form method="POST" action="{{ url_for('delete_order', env_id=env_id, order_id=order['id']) }}" style="margin: 0;" onsubmit="return confirm('Вы уверены, что хотите удалить этот заказ из истории?');">
                             <button type="submit" class="button delete-button"><i class="fas fa-trash-alt"></i></button>
                         </form>
                     </div>
                 </div>
                 <div class="customer-info">
-                    <p><strong>Покупатель:</strong> {{ order['customer_name'] }}</p>
-                    <p><strong>Телефон:</strong> <a href="tel:{{ order['customer_phone'] }}">{{ order['customer_phone'] }}</a></p>
                 </div>
                 <div class="order-details">
-                    {% for pid, item in order['items'].items() %}
                     <div class="product-row">
-                        <span>{{ item['name'] }} ({{ item['qty'] }} шт.)</span>
-                        <span>{{ "%.2f"|format(item['price']|float * item['qty']|int) }} {{ currency }}</span>
                     </div>
                     {% endfor %}
                     <div class="order-total">
-                        Итого: {{ "%.2f"|format(order['total']|float) }} {{ currency }}
                     </div>
                 </div>
             </div>
@@ -2163,7 +2163,7 @@ def admin(env_id):
                 elif b_type == 'pdf':
                     b_url = ''
                     pdf_file = request.files.get('block_pdf')
-                    if pdf_file && pdf_file.filename and HF_TOKEN_WRITE:
                         try:
                             ext = os.path.splitext(pdf_file.filename)[1].lower()
                             pdf_filename = f"pdf_{uuid4().hex[:8]}{ext}"
@@ -2531,4 +2531,4 @@ if __name__ == '__main__':
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
     port = int(os.environ.get('PORT', 7860))
-    app.run(debug=False, host='0.0.0.0', port=port)

 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>История заказов - {{ settings.organization_name }}</title>
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@300;400;500;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>
             <div class="order-item">
                 <div class="order-header">
                     <div>
+                        <span class="order-id">Заказ #{{ order.id }}</span>
+                        <span class="order-date">{{ order.date }}</span>
                     </div>
                     <div style="display: flex; gap: 8px; align-items: center;">
+                        <a href="{{ url_for('order_invoice', env_id=env_id, order_id=order.id) }}" target="_blank" class="button" style="padding: 6px 12px; font-size: 0.9rem; min-height: 38px;"><i class="fas fa-file-invoice"></i> Накладная</a>
+                        <form method="POST" action="{{ url_for('delete_order', env_id=env_id, order_id=order.id) }}" style="margin: 0;" onsubmit="return confirm('Вы уверены, что хотите удалить этот заказ из истории?');">
                             <button type="submit" class="button delete-button"><i class="fas fa-trash-alt"></i></button>
                         </form>
                     </div>
                 </div>
                 <div class="customer-info">
+                    <p><strong>Покупатель:</strong> {{ order.customer_name }}</p>
+                    <p><strong>Телефон:</strong> <a href="tel:{{ order.customer_phone }}">{{ order.customer_phone }}</a></p>
                 </div>
                 <div class="order-details">
+                    {% for pid, item in order.items.items() %}
                     <div class="product-row">
+                        <span>{{ item.name }} ({{ item.qty }} шт.)</span>
+                        <span>{{ "%.2f"|format(item.price * item.qty) }} {{ currency }}</span>
                     </div>
                     {% endfor %}
                     <div class="order-total">
+                        Итого: {{ "%.2f"|format(order.total) }} {{ currency }}
                     </div>
                 </div>
             </div>
                 elif b_type == 'pdf':
                     b_url = ''
                     pdf_file = request.files.get('block_pdf')
+                    if pdf_file and pdf_file.filename and HF_TOKEN_WRITE:
                         try:
                             ext = os.path.splitext(pdf_file.filename)[1].lower()
                             pdf_filename = f"pdf_{uuid4().hex[:8]}{ext}"
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
     port = int(os.environ.get('PORT', 7860))
+    app.run(debug=False, host='0.0.0.0', port=port)