From a5d08b1b9f330590d30030ed336b9c26a2f76da9 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Tue, 28 Jul 2015 22:56:03 +0200
Subject: [PATCH] made extra charge for paying cash configurable

---
 Handler/Buy.hs           | 2 +-
 Settings.hs              | 4 ++++
 config/settings.yml      | 1 +
 templates/buyCash.hamlet | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Handler/Buy.hs b/Handler/Buy.hs
index 01c114c..f37d5f1 100644
--- a/Handler/Buy.hs
+++ b/Handler/Buy.hs
@@ -94,7 +94,7 @@ postBuyCashR bId = do
           case quant > beverageAmount bev of
             False -> do
               master <- getYesod
-              price <- return $ quant * (beveragePrice bev + 50)
+              price <- return $ quant * (beveragePrice bev + (appCashCharge $ appSettings master))
               runDB $ update bId [BeverageAmount -=. quant]
               updateCashier price "Barzahlung"
               checkAlert bId
diff --git a/Settings.hs b/Settings.hs
index 4bb6f98..4d466d1 100644
--- a/Settings.hs
+++ b/Settings.hs
@@ -55,6 +55,9 @@ data AppSettings = AppSettings
     , appEmail 	                :: Text
     -- ^ notification address
     , appCurrency               :: Text
+    -- ^ Currency character
+    , appCashCharge             :: Int
+    -- ^ Extra charge for paying in cash in cents
     }
 
 instance FromJSON AppSettings where
@@ -82,6 +85,7 @@ instance FromJSON AppSettings where
         appAnalytics              <- o .:? "analytics"
         appEmail                  <- o .: "email"
         appCurrency               <- o .: "currency"
+        appCashCharge             <- o .: "cash_charge"
 
         return AppSettings {..}
 
diff --git a/config/settings.yml b/config/settings.yml
index 2027495..5f7ed13 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -28,3 +28,4 @@ database:
 #analytics: UA-YOURCODE
 email: "nek0@momen"
 currency: "€"
+cash_charge: 50
diff --git a/templates/buyCash.hamlet b/templates/buyCash.hamlet
index 43b3353..5201ae4 100644
--- a/templates/buyCash.hamlet
+++ b/templates/buyCash.hamlet
@@ -5,7 +5,7 @@ $doctype 5
 <p>
   <ul>
     <li>
-      _{MsgPricePerUnit (beveragePrice bev + 50) (appCurrency $ appSettings master)}
+      _{MsgPricePerUnit (beveragePrice bev + (appCashCharge $ appSettings master)) (appCurrency $ appSettings master)}
     <li>
       _{MsgVolume}: #{formatIntVolume (beverageMl bev)}