ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Release 5.0 (devel -> main) #25

Merged
ChaoticByte merged 7 commits from devel into main 2022-05-16 11:53:52 +00:00
Conversation 4 Commits 7 Files changed 14 +4 -3
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d792a7658c - Show all commits

3
application/app/templates/order.html
View file

@ -1,6 +1,7 @@
{% extends "baseLayout.html" %} {% extends "baseLayout.html" %}
{% load i18n %} {% load i18n %}
{% load l10n %}
{% block title %} {% block title %}
{% translate "Drinks - Order" %} {% translate "Drinks - Order" %}
@ -31,7 +32,7 @@
<div class="row"> <div class="row">
<div class="column">{% translate "Price per Item" %} ({{ currency_suffix }}):</div> <div class="column">{% translate "Price per Item" %} ({{ currency_suffix }}):</div>
<div class="column" id="pricePerDrink" data-drink-price="{{ drink.price }}">{{ drink.price }}</div> <div class="column" id="pricePerDrink" data-drink-price="{% localize off %}{{ drink.price }}{% endlocalize %}">{{ drink.price }}</div>
</div> </div>
{% if not drink.binary_availability %} {% if not drink.binary_availability %}

2
static/css/main.css
View file

@ -58,7 +58,7 @@ main {
align-items: center; align-items: center;
flex-grow: 1; flex-grow: 1;
width: 100%; width: 100%;
margin-top: 2rem; margin-top: 5vh;
} }
.userPanel { .userPanel {
display: flex; display: flex;

2
static/js/order.js
View file

@ -14,7 +14,7 @@ document.addEventListener("DOMContentLoaded", () => {
// calculate & display sum // calculate & display sum
let order_price_per_drink = parseFloat(document.getElementById("pricePerDrink").dataset.drinkPrice.replace(",", ".")); let order_price_per_drink = parseFloat(document.getElementById("pricePerDrink").dataset.drinkPrice);
function calculate_and_display_sum() { function calculate_and_display_sum() {