feat: executors and grouping by article in deal document
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -1,7 +1,7 @@
|
||||
<!--#region Header -->
|
||||
<div class="deal-name-id-container">
|
||||
<div class="medium-text bold">
|
||||
Название сделки: {{ deal.name }}
|
||||
Название сделки: {{ data.deal.name }}
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
@@ -9,29 +9,29 @@
|
||||
Дата создания: {{ now().strftime("%d.%m.%Y, %H:%M") }}
|
||||
</div>
|
||||
<div class="medium-text">
|
||||
Текущий статус: {{ current_status_str }}
|
||||
Текущий статус: {{ data.current_status_str }}
|
||||
</div>
|
||||
<div class="medium-text">
|
||||
{% if deal.comment %}
|
||||
Комментарий к сделке: {{ deal.comment }}
|
||||
{% if data.deal.comment %}
|
||||
Комментарий к сделке: {{ data.deal.comment }}
|
||||
{% endif %}
|
||||
</div>
|
||||
<hr/>
|
||||
<!--#endregion -->
|
||||
<!--#region General services -->
|
||||
<div class="large-text bold">
|
||||
Клиент: {{ deal.client.name }}
|
||||
Клиент: {{ data.deal.client.name }}
|
||||
</div>
|
||||
<div class="medium-text bold">
|
||||
Дата отгрузки: {{ last_status.next_status_deadline.strftime("%d.%m.%Y") }}
|
||||
Дата отгрузки: {{ data.last_status.next_status_deadline.strftime("%d.%m.%Y") }}
|
||||
</div>
|
||||
{% if deal.base_marketplace.name %}
|
||||
<div class="medium-text bold">Маркетплейс: {{ deal.base_marketplace.name }}</div>
|
||||
{% if data.deal.base_marketplace.name %}
|
||||
<div class="medium-text bold">Маркетплейс: {{ data.deal.base_marketplace.name }}</div>
|
||||
{% endif %}
|
||||
{% if deal.shipping_warehouse.name %}
|
||||
<div class="medium-text bold">Склад отгрузки: {{ deal.shipping_warehouse.name }}</div>
|
||||
{% if data.deal.shipping_warehouse.name %}
|
||||
<div class="medium-text bold">Склад отгрузки: {{ data.deal.shipping_warehouse.name }}</div>
|
||||
{% endif %}
|
||||
{% if deal.services|length > 0 %}
|
||||
{% if data.deal.services|length > 0 %}
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -43,7 +43,7 @@
|
||||
</tfoot>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for service in deal.services %}
|
||||
{% for service in data.deal.services %}
|
||||
<tr>
|
||||
<td>{{ service.service.name }}</td>
|
||||
<td>{{ '{:,}'.format(service.quantity) }} шт.</td>
|
||||
@@ -53,7 +53,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="medium-text total align-right bold">
|
||||
Итого: {{ general_services_total }} Р
|
||||
Итого: {{ data.general_services_total }} Р
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="medium-text total align-right bold">
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
font-size: 18px;
|
||||
}
|
||||
@top-right {
|
||||
content: "ID:{{ deal.id }}";
|
||||
content: "ID:{{ data.deal.id }}";
|
||||
border: solid black 1px;
|
||||
border-radius: 6px;
|
||||
padding: 12px 2px;
|
||||
@@ -45,7 +45,7 @@
|
||||
<div>
|
||||
<div>
|
||||
{% include "deal/deal-services.html" %}
|
||||
{% for product in deal.products %}
|
||||
{% for product_data in data.products.values() %}
|
||||
{% with index = loop.index %}
|
||||
{% include "deal/deal-product-services.html" %}
|
||||
{% endwith %}
|
||||
|
||||
Reference in New Issue
Block a user