Bc

Running

App Files Files Community

Kgshop commited on 1 day ago

Commit

8dee350

verified ·

1 Parent(s): 717e8e1

Update app.py

Browse files

Files changed (1) hide show

app.py +13 -13

app.py CHANGED Viewed

@@ -737,7 +737,7 @@ CATALOG_TEMPLATE = '''
         const repoId = '{{ repo_id }}';
         const currencyCode = '{{ currency_code }}';
         const orgName = `{{ settings.organization_name }}`.replace(/`/g, '');
-        const enableCart = {{ 'true' if settings.enable_cart else 'false' }};
         const envId = '{{ env_id }}';
         const itemsPerPage = 10;
@@ -1726,7 +1726,7 @@ ORDER_TEMPLATE = '''
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Заказ #{{ order.id }}</title>
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;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>
@@ -1753,35 +1753,35 @@ ORDER_TEMPLATE = '''
     <div class="invoice-box">
         <div class="header">
             <h1>Накладная заказа</h1>
-            <p style="margin-top: 5px; color: #777;">#{{ order.id }} от {{ order.date }}</p>
         </div>
         <div class="info">
-            <p><strong>Покупатель:</strong> {{ order.customer_name }}</p>
-            <p><strong>Телефон:</strong> {{ order.customer_phone }}</p>
-            <p><strong>Продавец:</strong> {{ settings.organization_name }}</p>
         </div>
         <div class="items">
-            {% for pid, item in order.items.items() %}
             <div class="item">
-                {% if item.photo %}
-                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ item.photo }}" alt="{{ item.name }}">
                 {% else %}
                 <img src="https://via.placeholder.com/60x60.png?text=Фото" alt="Нет фото">
                 {% endif %}
                 <div class="item-details">
-                    <div class="item-name">{{ item.name }}</div>
-                    <div class="item-meta">{{ item.qty }} шт. × {{ "%.2f"|format(item.price) }} {{ currency }}</div>
                 </div>
                 <div class="item-sum">
-                    {{ "%.2f"|format(item.qty * item.price) }} {{ currency }}
                 </div>
             </div>
             {% endfor %}
         </div>
         <div class="total">
-            Итого: {{ "%.2f"|format(order.total) }} {{ currency }}
         </div>
         {% if send_link != "#" %}

         const repoId = '{{ repo_id }}';
         const currencyCode = '{{ currency_code }}';
         const orgName = `{{ settings.organization_name }}`.replace(/`/g, '');
+        const enableCart = {{ 'true' if settings.get('enable_cart', False) else 'false' }};
         const envId = '{{ env_id }}';
         const itemsPerPage = 10;
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Заказ #{{ order['id'] }}</title>
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;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="invoice-box">
         <div class="header">
             <h1>Накладная заказа</h1>
+            <p style="margin-top: 5px; color: #777;">#{{ order['id'] }} от {{ order['date'] }}</p>
         </div>
         <div class="info">
+            <p><strong>Покупатель:</strong> {{ order['customer_name'] }}</p>
+            <p><strong>Телефон:</strong> {{ order['customer_phone'] }}</p>
+            <p><strong>Продавец:</strong> {{ settings['organization_name'] }}</p>
         </div>
         <div class="items">
+            {% for pid, item in order['items'].items() %}
             <div class="item">
+                {% if item['photo'] %}
+                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ item['photo'] }}" alt="{{ item['name'] }}">
                 {% else %}
                 <img src="https://via.placeholder.com/60x60.png?text=Фото" alt="Нет фото">
                 {% endif %}
                 <div class="item-details">
+                    <div class="item-name">{{ item['name'] }}</div>
+                    <div class="item-meta">{{ item['qty'] }} шт. × {{ "%.2f"|format(item['price']|float) }} {{ currency }}</div>
                 </div>
                 <div class="item-sum">
+                    {{ "%.2f"|format(item['qty']|int * item['price']|float) }} {{ currency }}
                 </div>
             </div>
             {% endfor %}
         </div>
         <div class="total">
+            Итого: {{ "%.2f"|format(order['total']|float) }} {{ currency }}
         </div>
         {% if send_link != "#" %}