Merge pull request #1645 from matmair/pricing-reformat

Pricing reformat
This commit is contained in:
Oliver 2021-06-17 22:36:07 +10:00 committed by GitHub
commit 8766c80233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,7 +15,16 @@
{% block details %} {% block details %}
{% default_currency as currency %} {% default_currency as currency %}
{% crispy form %} <form method="post" class="form-horizontal">
{% csrf_token %}
<div class="row">
<div class="col-sm-9">{{ form|crispy }}</div>
<div class="col-sm-3">
<input type="submit" value="{% trans 'Calculate' %}" class="btn btn-primary btn-block">
</div>
</div>
</form>
<hr>
<div class="row"><div class="col col-md-6"> <div class="row"><div class="col col-md-6">
<h4>{% trans "Pricing ranges" %}</h4> <h4>{% trans "Pricing ranges" %}</h4>
@ -110,8 +119,8 @@
{% if price_history %} {% if price_history %}
<hr> <hr>
<h4>{% trans 'Stock Pricing' %}<i class="fas fa-info-circle" title="Shows the prices of stock for this part <h4>{% trans 'Stock Pricing' %}<i class="fas fa-info-circle" title="Shows the purchase prices of stock for this part.
the part single price shown is the current price for that supplier part"></i></h4> The part single price is the current purchase price for that supplier part."></i></h4>
{% if price_history|length > 1 %} {% if price_history|length > 1 %}
<div style="max-width: 99%; min-height: 300px"> <div style="max-width: 99%; min-height: 300px">
<canvas id="StockPriceChart"></canvas> <canvas id="StockPriceChart"></canvas>
@ -157,7 +166,8 @@ the part single price shown is the current price for that supplier part"></i></h
{% for line in price_history %}{{ line.price_diff|stringformat:".2f" }},{% endfor %} {% for line in price_history %}{{ line.price_diff|stringformat:".2f" }},{% endfor %}
], ],
borderWidth: 1, borderWidth: 1,
type: 'line' type: 'line',
hidden: true,
}, },
{ {
label: '{% blocktrans %}Part Single Price - {{currency}}{% endblocktrans %}', label: '{% blocktrans %}Part Single Price - {{currency}}{% endblocktrans %}',
@ -168,7 +178,8 @@ the part single price shown is the current price for that supplier part"></i></h
{% for line in price_history %}{{ line.price_part|stringformat:".2f" }},{% endfor %} {% for line in price_history %}{{ line.price_part|stringformat:".2f" }},{% endfor %}
], ],
borderWidth: 1, borderWidth: 1,
type: 'line' type: 'line',
hidden: true,
}, },
{% endif %} {% endif %}
{ {