From d008c75a9342c9b5f7acc6e723326ae8a97089a9 Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas@ponas.no>
Date: Tue, 6 Aug 2019 02:42:54 +0200
Subject: [PATCH] Rework price formatting logic

---
 src/templates/event.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/templates/event.js b/src/templates/event.js
index 79dc568..8644574 100644
--- a/src/templates/event.js
+++ b/src/templates/event.js
@@ -12,18 +12,19 @@ moment.locale('nb')
 
 const formatPrices = (regular, student) => {
   let cc = ''
-  if (regular && regular !== 0) {
-    cc += regular
+  if (regular) {
+    cc += regular !== '0' ? regular : ''
   }
-  if (student && student !== 0) {
-    cc += ` / ${student}`
+  if (student) {
+    cc += cc !== '' ? ' / ' : ''
+    cc += student !== '0' ? student : ''
   }
   return cc === '' ? 'Gratis' : cc
 }
 
 const formatOrganizers = organizers => {
   const total = organizers.length
-  const elements = organizers.map((organizer, index) => (
+  return organizers.map((organizer, index) => (
     <>
       {total > 1 && index === total - 1 && <> og </>}
       <span className="event-organizer">
@@ -32,8 +33,6 @@ const formatOrganizers = organizers => {
       {total > 1 && index < total - 2 && <>, </>}
     </>
   ))
-
-  return elements
 }
 
 export const EventTemplate = ({