🔀 Merge branch 'show-additional-drink-info' (PR #139)

chaosdorf · Oct 21, 2023 · c4701a6 · c4701a6
2 parents 006d89b + 4149811
commit c4701a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -8,7 +8,7 @@ def get_revision
 
   def show_amount(price)
     return 'n/a' if price.blank?
-    sprintf('%.2f EUR', price)
+    sprintf('%.2f €', price)
   end
 
   def link_to_drink_if_exists(drink)

diff --git a/app/views/drinks/_drink.html.haml b/app/views/drinks/_drink.html.haml
@@ -10,3 +10,15 @@
         = image_tag drink.logo(:medium), alt: drink.name, class: drink.active? ? "" : "disabled", size: 100
       .card-footer
         = show_amount drink.price
+        %br
+        - if drink.bottle_size?
+          = drink.price / drink.bottle_size
+          €/L
+        - else
+
+        %br
+        - if drink.caffeine && !drink.caffeine.zero? && drink.bottle_size && !drink.bottle_size.zero?
+          = sprintf('%.2f', (drink.caffeine * (drink.bottle_size / 0.1) / drink.price))
+          mg caffeine/€
+        - else
+          no caffeine