diff --git a/static/css/deal.css b/static/css/deal.css index 265b129..c5d2937 100644 --- a/static/css/deal.css +++ b/static/css/deal.css @@ -157,27 +157,17 @@ table tfoot { } .barcode-container-table { - margin: 10px 0 -15px -25px; display: flex; white-space: nowrap; - flex-direction: column; - align-items: center; } .barcode-container { - margin: 15px 0 -5px 375px; display: flex; white-space: nowrap; - flex-direction: column; - align-items: center; + justify-content: right; } -.barcode { - font-family: "Libre Barcode 128", cursive; - font-size: 25pt; - transform: scale(1, 1.5); +.barcode-text-bigger-part { + font-size: medium; } -.barcode-text { - margin-top: -10px; -} diff --git a/templates/documents/deal/deal-product-services.html b/templates/documents/deal/deal-product-services.html index e595f09..9e15cb2 100644 --- a/templates/documents/deal/deal-product-services.html +++ b/templates/documents/deal/deal-product-services.html @@ -39,7 +39,7 @@ {% endif %} {% else %} {% if common_product.size %} -
Размер: {{ common_product.size }}
+
Размер: {{ common_product.size }}
{% endif %} {% if common_deal_product.quantity %}
Количество: {{ common_deal_product.quantity }}
@@ -62,12 +62,12 @@
{% if product_data.deal_products[0].product.barcodes|length > 0 %} -
- {{ encode128(product_data.deal_products[0].product.barcodes[0].barcode, "A") }} -
-
- {{ product_data.deal_products[0].product.barcodes[0].barcode }} -
+ {% with barcode=product_data.deal_products[0].product.barcodes[0].barcode %} +

+ ШК: {{ barcode[:-5] }} + {{ barcode[-5:] }} +

+ {% endwith %} {% else %}
{% endif %} @@ -125,18 +125,18 @@
{% if deal_product.product.barcodes|length > 0 %} -
- {{ encode128(deal_product.product.barcodes[0].barcode, "A") }} -
-
- {{ deal_product.product.barcodes[0].barcode }} -
+ {% with barcode=deal_product.product.barcodes[0].barcode %} +
+ {{ barcode[:-5] }} + {{ barcode[-5:] }} +
+ {% endwith %} {% else %}
{% endif %}
- + {% if deal_product.product.size %} {{ deal_product.product.size }} {% else %} diff --git a/templates/documents/deal/deal.html b/templates/documents/deal/deal.html index 795221e..5caae29 100644 --- a/templates/documents/deal/deal.html +++ b/templates/documents/deal/deal.html @@ -8,14 +8,6 @@ Сделка