nek0/yammat
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added feature of total crates

Browse source
This commit is contained in:
nek0 2015-10-11 21:44:46 +02:00
parent 8375041ad7
commit ee72c2eaa9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Handler/SupplierActions.hs
View file

@ -27,7 +27,7 @@ getSupplierDigestR sId = do
case mSup of case mSup of
Just sup -> do Just sup -> do
master <- getYesod master <- getYesod
bevs <- runDB $ selectList [BeverageSupplier ==. (Just sId)] [Desc BeverageIdent] bevs <- runDB $ selectList [BeverageSupplier ==. (Just sId)] [Asc BeverageIdent]
digests <- return $ map genBevDigest bevs digests <- return $ map genBevDigest bevs
w <- return $ [whamlet|$newline always w <- return $ [whamlet|$newline always
<body> <body>
@ -56,7 +56,9 @@ getSupplierDigestR sId = do
<td>#{T.pack $ show $ bdCrates dig} <td>#{T.pack $ show $ bdCrates dig}
<td>#{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master} <td>#{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master}
<td>#{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master} <td>#{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master}
<td colspan="5">_{MsgBuyValue} <td colspan="3">_{MsgTotalCrates}
<td>#{T.pack $ show $ sum $ map bdCrates digests}
<td>_{MsgBuyValue}
<td>#{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master} <td>#{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master}
|] |]
tableLayout w tableLayout w

1
messages/de.msg
View file

@ -139,3 +139,4 @@ PricePerCrate: Preis Pro Kasten
CrateCount: AnzahlKästen CrateCount: AnzahlKästen
BuyValue: Zahlbetrag BuyValue: Zahlbetrag
CustomerId: Kundennummer CustomerId: Kundennummer
TotalCrates: Gesamtanzahl Kästen