From 889df8caf04de5f10a9e623bab3e502e9573159d Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 3 Sep 2015 23:32:39 +0200
Subject: Give the payments count to the client

---
 src/server/Model/Json/Number.hs          | 15 +++++++++++++++
 src/server/Model/Message/Translations.hs |  2 +-
 src/server/Model/Payment.hs              |  9 +++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/server/Model/Json/Number.hs

(limited to 'src/server/Model')

diff --git a/src/server/Model/Json/Number.hs b/src/server/Model/Json/Number.hs
new file mode 100644
index 0000000..52c9da8
--- /dev/null
+++ b/src/server/Model/Json/Number.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Model.Json.Number
+  ( Number(..)
+  ) where
+
+import Data.Aeson
+import GHC.Generics
+
+data Number = Number
+  { number :: Int
+  } deriving (Show, Generic)
+
+instance FromJSON Number
+instance ToJSON Number
diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs
index 9b9aafd..6c569fd 100644
--- a/src/server/Model/Message/Translations.hs
+++ b/src/server/Model/Message/Translations.hs
@@ -72,7 +72,7 @@ m l SignInMailTitle =
 m l HiMail =
   case l of
     English -> "Hi {1},"
-    French  -> "Bonjour {1},"
+    French  -> "Salut {1},"
 
 m l SignInLinkMail =
   case l of
diff --git a/src/server/Model/Payment.hs b/src/server/Model/Payment.hs
index 300f6b8..db1f36f 100644
--- a/src/server/Model/Payment.hs
+++ b/src/server/Model/Payment.hs
@@ -4,6 +4,7 @@ module Model.Payment
   , paymentKeyToText
   , deleteOwnPayment
   , getTotalPayments
+  , getPaymentsCount
   ) where
 
 import Data.Text (Text)
@@ -82,3 +83,11 @@ getTotalPayment (_, Nothing) = Nothing
 
 unValueTuple :: (Value a, Value b) -> (a, b)
 unValueTuple (Value a, Value b) = (a, b)
+
+getPaymentsCount :: Persist Int
+getPaymentsCount =
+  unValue . head <$>
+    (select $
+    from $ \payment -> do
+      where_ (isNothing (payment ^. PaymentDeletedAt))
+      return countRows) :: Persist Int
-- 
cgit v1.2.3