reivilibre/fleabay
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Include postage in price

Browse Source 
Fixes #7.
This commit is contained in:
Olivier 'reivilibre' 2021-01-13 20:53:31 +00:00
parent a6be674580
commit c0a726174e
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fleabay/templates/search.html.j2
View File

@ -2,7 +2,7 @@
{% set page_title = "Fleabay - Home" %} {% set page_title = "Fleabay - Home" %}
{% macro variant_table(axis, value_items) -%} {% macro variant_table(axis, value_items, postage) -%}
<div class="flex-grow-1 d-flex align-items-center"> <div class="flex-grow-1 d-flex align-items-center">
<div class="p-10 m-auto"> <div class="p-10 m-auto">
<table class="table w-full fleabay-table-compact"> <table class="table w-full fleabay-table-compact">
@ -13,7 +13,14 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for variant, (min_price, max_price) in value_items %} {% for variant, (raw_min_price, raw_max_price) in value_items %}
{% if postage is not none %}
{% set min_price = raw_min_price + postage %}
{% set max_price = raw_max_price + postage %}
{% else %}
{% set min_price = raw_min_price %}
{% set max_price = raw_max_price %}
{% endif %}
<tr> <tr>
<th>{{ variant }}</th> <th>{{ variant }}</th>
<td> <td>
@ -51,9 +58,16 @@
</a> </a>
<p class="m-0 mt-5 font-size-12"> <p class="m-0 mt-5 font-size-12">
<span class="font-size-14"> <span class="font-size-14">
£{{ result.min_price // 100 }}.{{ "{:02d}".format(result.min_price % 100) }} {% if result.postage is not none %}
{% if result.min_price != result.max_price %} {% set min_price = result.min_price + result.postage %}
— £{{ result.max_price // 100 }}.{{ "{:02d}".format(result.max_price % 100) }} {% set max_price = result.max_price + result.postage %}
{% else %}
{% set min_price = result.min_price %}
{% set max_price = result.max_price %}
{% endif %}
£{{ min_price // 100 }}.{{ "{:02d}".format((min_price % 100) | int) }}
{% if min_price != max_price %}
— £{{ max_price // 100 }}.{{ "{:02d}".format(max_price % 100) }}
{% endif %} {% endif %}
</span><br> </span><br>
{{ result.condition }}.<br> {{ result.condition }}.<br>
@ -75,19 +89,19 @@
</p> </p>
</div> </div>
</div> </div>
{% if result.href in axes_ranges %} {% if result.id in axes_ranges %}
{% set axis, values = axes_ranges[result.href] %} {% set axis, values = axes_ranges[result.id] %}
{% set value_items = values.items() | list %} {% set value_items = values.items() | list %}
{% set value_len = value_items | length %} {% set value_len = value_items | length %}
{% if values | length > 25 %} {% if values | length > 25 %}
{{ variant_table(axis, value_items[0:value_len // 2]) }} {{ variant_table(axis, value_items[0:value_len // 2], result.postage) }}
{{ variant_table(axis, value_items[value_len // 2:]) }} {{ variant_table(axis, value_items[value_len // 2:], result.postage) }}
{% else %} {% else %}
{{ variant_table(axis, value_items) }} {{ variant_table(axis, value_items, result.postage) }}
{% endif %} {% endif %}
{% elif result.href in axes_errors %} {% elif result.id in axes_errors %}
<div class="p-10 m-auto"> <div class="p-10 m-auto">
{{ axes_errors[result.href] }} ERROR {{ axes_errors[result.id] }}
</div> </div>
{% endif %} {% endif %}
</div> </div>