From 8146fdc186358af2028f06a3694db22e1a2ee543 Mon Sep 17 00:00:00 2001
From: TonyFord <tonyford@strategy-investor.de>
Date: Wed, 10 Jun 2020 15:46:35 +0200
Subject: [PATCH] bug fix import order into form
---
_includes/form.html | 1 +
_includes/overview.html | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/_includes/form.html b/_includes/form.html
index 408b8c3..436c308 100644
--- a/_includes/form.html
+++ b/_includes/form.html
@@ -54,6 +54,7 @@
<select id="{{ fields[0] }}" class="order-form form-control" onchange="createYml()">
{% for v in fvalues %}
<optgroup label="{{ v[0] }}">{% assign ps=v[1] | map: 'price-sources' | clean %}
+ <option value="{{ v[0] }}">{{ v[0] }}</option>
{% for w in ps %}
{% for y in w[1] %}
<option value="{{ v[0] }},{{ w[0] }},{{ y[0] }}" title="">{{ w[0] }},{{ y[0] }}</option>
diff --git a/_includes/overview.html b/_includes/overview.html
index d9feff0..d7f29d4 100644
--- a/_includes/overview.html
+++ b/_includes/overview.html
@@ -58,9 +58,9 @@
<div><small>{{ o.description }}</small></div>
</div>
{% capture priceref %}{{ o.price-reference | split: ',' | join: '-' }}{% endcapture %}
- {% capture price_ex %}{{ site.data.price-sources[priceref].price | plus: 0.00001 | round: 4 }}{% endcapture %}
+ {% capture price_ex %}{% if site.data.price-sources[priceref] %}{{ site.data.price-sources[priceref].price | plus: 0.00001 | round: 4 }}{% else %}1{% endif %}{% endcapture %}
{% capture price %}{% if price_ex != "" %}{{price_ex}}{% else %}{{ o.price-source }}{% endif %}{% endcapture %}
- <div class="orderlist-price"><font class="faircoin-price">{{ o.price-per-unit | divided_by: price | round:1 | decimals }} FAIR</font><br>{% if min-size > 0 %}{{ min-size }}..{% endif %}{{ max-size }} {{ o.unit }}<br>( {{ o.price-per-unit | decimals }} {{ site.data.price-sources[priceref].currency }} / {{ o.unit }} )<br>( {{ price }} {{ site.data.price-sources[priceref].currency }} / FAIR )<br><i>{% if price_ex != "" %}<a href="{{ site.data.price-sources[o.price-source].www }}">{{ o.price-source | replace: '-','/' }}</a>{% else %}fixed price{% endif %}</i>
+ <div class="orderlist-price"><font class="faircoin-price">{{ o.price-per-unit | divided_by: price | round:1 | decimals }} FAIR</font><br>{% if min-size > 0 %}{{ min-size }}..{% endif %}{{ max-size }} {{ o.unit }}{% if site.data.price-sources[priceref] %}<br>( {{ o.price-per-unit | decimals }} {{ site.data.price-sources[priceref].currency }} / {{ o.unit }} )<br>( {{ price }} {{ site.data.price-sources[priceref].currency }} / FAIR )<br><i>{% if price_ex != "" %}<a href="{{ site.data.price-sources[o.price-source].www }}">{{ o.price-source | replace: '-','/' }}</a>{% else %}fixed price{% endif %}</i>{% endif %}
</div>
</div>
--
GitLab