From 894d5a1b533f8730778669422b348e714e753d80 Mon Sep 17 00:00:00 2001 From: nek0 Date: Wed, 23 Mar 2016 04:45:40 +0100 Subject: [PATCH] fixed total loss prime price --- Handler/Statistics.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Handler/Statistics.hs b/Handler/Statistics.hs index 7c76ee7..24dea95 100644 --- a/Handler/Statistics.hs +++ b/Handler/Statistics.hs @@ -17,6 +17,7 @@ module Handler.Statistics where import Import import Data.List hiding (length) +import Data.Maybe (fromJust) getStatisticsR :: Handler RepJson getStatisticsR = do @@ -36,7 +37,7 @@ getStatisticsR = do archdevils <- runDB $ selectList [UserBalance <. -5000] [] bevs <- runDB $ selectList [] [Asc BeverageId] totalLossPrime <- return $ foldl (\acc (Entity _ bev) -> - let primePrice = (fromIntegral $ fromMaybe 0 (beveragePricePerCrate bev)) / (fromIntegral $ fromMaybe 1 (beveragePerCrate bev)) + let primePrice = if not (isNothing (beveragePricePerCrate bev) && isNothing (beveragePerCrate bev)) then (fromIntegral $ fromJust (beveragePricePerCrate bev)) / (fromIntegral $ fromJust (beveragePerCrate bev)) else 0 in acc + (((fromIntegral $ beverageCorrectedAmount bev) * primePrice) / 100) ) 0 bevs totalLossRetail <- return $ foldl (\acc (Entity _ bev) ->