Update app.py

app.py

@@ -780,10 +780,13 @@ ORDER_TEMPLATE = '''
                     </tr>
                 </thead>
                 <tbody>
+                    {% set raw_total = 0 %}
                     {% for item in order.cart %}
                     {% set ppb = item.pieces_per_box|default(1)|int %}
                     {% set boxes = item.quantity // ppb %}
                     {% set remainder = item.quantity % ppb %}
+                    {% set item_sum = item.price * item.quantity %}
+                    {% set raw_total = raw_total + item_sum %}
                     <tr>
                         <td>{{ loop.index }}</td>
                         <td style="text-align: left; font-weight: 500;">{{ item.name }}</td>
@@ -817,12 +820,24 @@ ORDER_TEMPLATE = '''
                             </div>
                         </td>
                         <td>{{ item.price }}</td>
-                        <td>{{ item.price * item.quantity }}</td>
+                        <td>{{ item_sum }}</td>
                     </tr>
                     {% endfor %}
+                    
+                    {% set discount = order.discount|default(0)|float %}
+                    {% if discount > 0 %}
+                    <tr class="total-row" style="background:transparent;">
+                        <td colspan="5" style="text-align: right; padding-right: 20px; font-weight:600; color:#636e72;">Сумма:</td>
+                        <td style="font-weight:600; color:#636e72;">{{ raw_total }} {{ currency_code }}</td>
+                    </tr>
+                    <tr class="total-row" style="background:transparent;">
+                        <td colspan="5" style="text-align: right; padding-right: 20px; font-weight:600; color:#ff7675;">Скидка:</td>
+                        <td style="font-weight:600; color:#ff7675;">-{{ discount }} {{ currency_code }}</td>
+                    </tr>
+                    {% endif %}
                     <tr class="total-row">
-                        <td colspan="5" style="text-align: right; padding-right: 20px;">Итого:</td>
-                        <td>{{ order.total_price }} {{ currency_code }}</td>
+                        <td colspan="5" style="text-align: right; padding-right: 20px;">К оплате:</td>
+                        <td style="color:var(--wa);">{{ order.total_price }} {{ currency_code }}</td>
                     </tr>
                 </tbody>
             </table>
@@ -963,6 +978,11 @@ ADMIN_TEMPLATE = '''
         
         .file-input-wrapper { position: relative; width: 100%; }
         input[type="file"] { width: 100%; padding: 10px; border: 1px dashed #ccc; border-radius: 10px; background: #fafafa; font-size: 0.9rem; }
+
+        .orders-table { width: 100%; border-collapse: collapse; min-width: 800px; text-align: left; }
+        .orders-table th { padding: 12px; background: #fafafa; border-bottom: 2px solid var(--border); color: #636e72; font-size: 0.85rem; text-transform: uppercase; }
+        .orders-table td { padding: 12px; border-bottom: 1px solid var(--border); vertical-align: middle; }
+        .orders-table tr:hover { background: #fafafa; }
         
         @media (max-width: 600px) {
             .header-panel { flex-direction: column; align-items: stretch; text-align: center; }
@@ -989,6 +1009,52 @@ ADMIN_TEMPLATE = '''
              </form>
         </div>
 
+        <div class="card">
+            <h2><i class="fas fa-file-invoice-dollar"></i> История накладных</h2>
+            <div style="overflow-x: auto;">
+                <table class="orders-table">
+                    <tr>
+                        <th>ID / Дата</th>
+                        <th>Клиент</th>
+                        <th>Сумма</th>
+                        <th>Скидка</th>
+                        <th>К оплате</th>
+                        <th>Действия</th>
+                    </tr>
+                    {% for order in orders.values()|sort(attribute='created_at', reverse=True) %}
+                    {% set raw_total = 0 %}
+                    {% for item in order.cart %}
+                        {% set raw_total = raw_total + (item.price|float * item.quantity|int) %}
+                    {% endfor %}
+                    <tr>
+                        <td>
+                            <a href="/order/{{ order.id }}" target="_blank" style="color:var(--info); font-weight:bold; text-decoration:none;">{{ order.id }}</a><br>
+                            <span style="font-size:0.8rem; color:#636e72;">{{ order.created_at }}</span>
+                        </td>
+                        <td style="font-size:0.9rem;">
+                            {{ order.customer_name }}<br>
+                            <i class="fas fa-phone" style="font-size:0.7rem; color:#999;"></i> {{ order.customer_phone }}<br>
+                            <i class="fas fa-map-marker-alt" style="font-size:0.7rem; color:#999;"></i> {{ order.customer_city }}
+                        </td>
+                        <td style="font-weight:600;">{{ raw_total }} {{ currency_code }}</td>
+                        <td>
+                            <form method="POST" style="display:flex; gap:5px; margin:0; align-items:center;">
+                                <input type="hidden" name="action" value="apply_discount">
+                                <input type="hidden" name="order_id" value="{{ order.id }}">
+                                <input type="number" name="discount_amount" value="{{ order.discount|default(0) }}" min="0" step="0.01" style="width:80px; padding:6px; font-size:0.9rem;">
+                                <button type="submit" class="btn btn-warning" style="padding:6px 10px;" title="Применить скидку"><i class="fas fa-check"></i></button>
+                            </form>
+                        </td>
+                        <td style="font-weight:800; color:var(--success);">{{ order.total_price }} {{ currency_code }}</td>
+                        <td>
+                            <a href="/order/{{ order.id }}" class="btn btn-primary" style="padding:6px 10px;" target="_blank"><i class="fas fa-eye"></i></a>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+
         <div class="card">
             <h2>Управление категориями</h2>
             <form method="POST" class="add-cat-form">
@@ -1210,6 +1276,7 @@ def create_order():
         "id": order_id,
         "created_at": datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
         "cart": processed_cart,
+        "discount": 0,
         "total_price": total_price,
         "customer_name": customer_name,
         "customer_phone": customer_phone,
@@ -1264,7 +1331,9 @@ def edit_order(order_id):
                     order['cart'].remove(item)
             break
 
-    order['total_price'] = sum(float(i['price']) * int(i['quantity']) for i in order['cart'])
+    cart_total = sum(float(i['price']) * int(i['quantity']) for i in order['cart'])
+    discount = order.get('discount', 0)
+    order['total_price'] = max(0, cart_total - discount)
     save_data(data)
     
     return jsonify({"success": True, "total_price": order['total_price']})
@@ -1274,11 +1343,23 @@ def admin():
     data = load_data()
     products = data.get('products', [])
     categories = data.get('categories', [])
+    orders = data.get('orders', {})
 
     if request.method == 'POST':
         action = request.form.get('action')
 
-        if action == 'add_category':
+        if action == 'apply_discount':
+            order_id = request.form.get('order_id')
+            discount_val = float(request.form.get('discount_amount', 0))
+            if order_id in orders:
+                order = orders[order_id]
+                order['discount'] = discount_val
+                cart_total = sum(float(i['price']) * int(i['quantity']) for i in order['cart'])
+                order['total_price'] = max(0, cart_total - discount_val)
+                data['orders'] = orders
+                save_data(data)
+
+        elif action == 'add_category':
             cat_name = request.form.get('category_name', '').strip()
             if cat_name and cat_name not in categories:
                 categories.append(cat_name)
@@ -1401,6 +1482,7 @@ def admin():
         ADMIN_TEMPLATE,
         products=products,
         categories=categories,
+        orders=orders,
         repo_id=REPO_ID,
         currency_code=CURRENCY_CODE
     )
@@ -1423,4 +1505,4 @@ if __name__ == '__main__':
         threading.Thread(target=periodic_backup, daemon=True).start()
 
     port = int(os.environ.get('PORT', 7860))
-    app.run(host='0.0.0.0', port=port)
+    app.run(host='0.0.0.0', port=port)