diff --git a/Handler/SupplierActions.hs b/Handler/SupplierActions.hs index b574dfe..d434483 100755 --- a/Handler/SupplierActions.hs +++ b/Handler/SupplierActions.hs @@ -30,36 +30,35 @@ getSupplierDigestR sId = do bevs <- runDB $ selectList [BeverageSupplier ==. (Just sId)] [Asc BeverageIdent] digests <- return $ map genBevDigest bevs w <- return $ [whamlet|$newline always -
- #{supplierIdent sup}_{MsgArtNr} + | _{MsgName} + | _{MsgVolume} + | _{MsgCrateCount} + | _{MsgPricePerCrate} + | _{MsgTotalValue} + $forall dig <- digests + $if bdCrates dig /= 0 | ||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
_{MsgArtNr} - | _{MsgName} - | _{MsgVolume} - | _{MsgCrateCount} - | _{MsgPricePerCrate} - | _{MsgTotalValue} - $forall dig <- digests - $if bdCrates dig /= 0 - | ||||||||||||||||||
#{fromMaybe "" $ beverageArtNr $ bdBev dig} - | #{beverageIdent $ bdBev dig} - | #{formatIntVolume $ beverageMl $ bdBev dig} - | #{T.pack $ show $ bdCrates dig} - | #{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master} - | #{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master} - | _{MsgTotalCrates} - | #{T.pack $ show $ sum $ map bdCrates digests} - | _{MsgBuyValue} - | #{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master} + | #{fromMaybe "" $ beverageArtNr $ bdBev dig} + | #{beverageIdent $ bdBev dig} + | #{formatIntVolume $ beverageMl $ bdBev dig} + | #{T.pack $ show $ bdCrates dig} + | #{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master} + | #{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master} + | _{MsgTotalCrates} + | #{T.pack $ show $ sum $ map bdCrates digests} + | _{MsgBuyValue} + | #{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master} |] tableLayout w Nothing -> do |