fakz9/Fulfillment-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: inline styles to classes

Browse Source
This commit is contained in:
AlexSserb
2024-09-12 00:52:00 +04:00
parent 15bb43e89d
commit 03aba9649a
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/billing.py
View File

@@ -149,16 +149,16 @@ class BillingService(BaseService):
services.append(
CreateBillingRequestValue(
name=f'[{product.product.name}] - {service.service.name}',
price=to_locale_number(service.price),
amount=to_locale_number(product.quantity)
price=service.price,
amount=product.quantity
)
)
for service in deal.services:
services.append(
CreateBillingRequestValue(
name=f'{service.service.name}',
price=to_locale_number(service.price),
amount=to_locale_number(service.quantity)
price=service.price,
amount=service.quantity
)
)

39
templates/documents/bill-of-payment.html
View File

@@ -35,8 +35,6 @@
margin-top: 8px;
display: flex;
justify-content: space-between;
/*flex-direction: column;*/
/*text-align: right;*/
}
.footer-block {
@@ -80,8 +78,6 @@
td, th {
padding: 16px 13px;
/*word-wrap: unset;*/
}
td:first-child, th:first-child {
@@ -96,10 +92,21 @@
text-align: left;
}
td:first-child {
white-space: normal;
word-wrap: break-word;
}
td:not(:first-child), th:not(:first-child) {
text-align: right;
}
td:not(:first-child) {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
img {
width: 170px;
margin-bottom: 15px;
@@ -109,10 +116,6 @@
border-top: 2px solid black;
}
.footer-right {
text-align: right;
}
.footer-line-right {
font-size: medium;
font-weight: bolder;
@@ -166,23 +169,13 @@
<tbody>
{% for service in services %}
<tr>
<td
style=" white-space: normal; word-wrap: break-word;"
>{{ service.name }}
</td>
<td style=" white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; ">{{ service.amount }} шт.</td>
<td style=" white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; ">{{ service.price }} ₽</td>
<td style=" white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis; ">{{ '{:,}'.format(service.price * service.amount).replace(',', ' ') }}dshfghfghfghfg ₽</td>
<td>{{ service.name }}</td>
<td>{{ '{:,}'.format(service.amount) }} шт.</td>
<td>{{ '{:,}'.format(service.price).replace(',', ' ') }} ₽</td>
<td>{{ '{:,}'.format(service.price * service.amount).replace(',', ' ') }} ₽</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="footer">
@@ -195,8 +188,6 @@
</div>
<div class="footer-words">
<div class="footer-line-right">{{ deal_price_words }}</div>
</div>
</div>
</div>