From d5b2bfedbc8c34afcef342a30469baa3b6721f2d Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 24 May 2021 02:18:34 +0200 Subject: [PATCH] re-layouting tables --- .../part/templates/part/order_prices.html | 141 +++++++++--------- 1 file changed, 70 insertions(+), 71 deletions(-) diff --git a/InvenTree/part/templates/part/order_prices.html b/InvenTree/part/templates/part/order_prices.html index 5bbd5d22ef..299bc82468 100644 --- a/InvenTree/part/templates/part/order_prices.html +++ b/InvenTree/part/templates/part/order_prices.html @@ -1,6 +1,7 @@ {% extends "part/part_base.html" %} {% load static %} {% load i18n %} +{% load crispy_forms_tags %} {% load inventree_extras %} {% block menubar %} @@ -12,96 +13,94 @@ {% endblock %} {% block details %} +{% settings_value "INVENTREE_DEFAULT_CURRENCY" as currency %} -
- {% csrf_token %} - {% load crispy_forms_tags %} - {% crispy form %} -
- +{% crispy form %} +
+

{% trans "Pricing ranges" %}

+ {% if part.supplier_count > 0 %} -

{% trans 'Supplier Pricing' %}

-
{% if min_total_buy_price %} - - - - - - {% if quantity > 1 %} - - - - - - {% endif %} + + + + + + + {% if quantity > 1 %} + + + + + + + {% endif %} {% else %} - - - + + + {% endif %} -
{% trans 'Unit Cost' %}Min: {% include "price.html" with price=min_unit_buy_price %}Max: {% include "price.html" with price=max_unit_buy_price %}
{% trans 'Total Cost' %}Min: {% include "price.html" with price=min_total_buy_price %}Max: {% include "price.html" with price=max_total_buy_price %}
{% trans 'Supplier Pricing' %}{% trans 'Unit Cost' %}Min: {% include "price.html" with price=min_unit_buy_price %}Max: {% include "price.html" with price=max_unit_buy_price %}
{% trans 'Total Cost' %}Min: {% include "price.html" with price=min_total_buy_price %}Max: {% include "price.html" with price=max_total_buy_price %}
- {% trans 'No supplier pricing available' %} -
+ {% trans 'No supplier pricing available' %} +
{% endif %} {% if part.bom_count > 0 %} -

{% trans 'BOM Pricing' %}

- {% if min_total_bom_price %} - - - - - - {% if quantity > 1 %} - - - - - - {% endif %} - {% if part.has_complete_bom_pricing == False %} - - - - {% endif %} + + + + + + + {% if quantity > 1 %} + + + + + + + {% endif %} + {% if part.has_complete_bom_pricing == False %} + + + + {% endif %} {% else %} - - - + + + {% endif %} -
{% trans 'Unit Cost' %}Min: {% include "price.html" with price=min_unit_bom_price %}Max: {% include "price.html" with price=max_unit_bom_price %}
{% trans 'Total Cost' %}Min: {% include "price.html" with price=min_total_bom_price %}Max: {% include "price.html" with price=max_total_bom_price %}
- {% trans 'Note: BOM pricing is incomplete for this part' %} -
{% trans 'BOM Pricing' %}{% trans 'Unit Cost' %}Min: {% include "price.html" with price=min_unit_bom_price %}Max: {% include "price.html" with price=max_unit_bom_price %}
{% trans 'Total Cost' %}Min: {% include "price.html" with price=min_total_bom_price %}Max: {% include "price.html" with price=max_total_bom_price %}
+ {% trans 'Note: BOM pricing is incomplete for this part' %} +
- {% trans 'No BOM pricing available' %} -
+ {% trans 'No BOM pricing available' %} +
{% endif %} {% if total_part_price %} -

{% trans 'Sale Price' %}

- - - - - - - - - -
{% trans 'Unit Cost' %}{% include "price.html" with price=unit_part_price %}
{% trans 'Total Cost' %}{% include "price.html" with price=total_part_price %}
+ + {% trans 'Sale Price' %} + {% trans 'Unit Cost' %} + {% include "price.html" with price=unit_part_price %} + + + + {% trans 'Total Cost' %} + {% include "price.html" with price=total_part_price %} + {% endif %} + - {% if min_unit_buy_price or min_unit_bom_price %} - {% else %} -
- {% trans 'No pricing information is available for this part.' %} -
- {% endif %} -
+{% if min_unit_buy_price or min_unit_bom_price %} +{% else %} +
+ {% trans 'No pricing information is available for this part.' %} +
+{% endif %} +
{% if price_history %} +

{% trans 'Stock Pricing' %}

{% if price_history|length > 1 %}