Merge branch 'dev' into feature/workd

This commit is contained in:
Paul Trowbridge 2019-03-27 13:26:59 -04:00
commit 2483efdfc7

View File

@ -1,7 +1,7 @@
SELECT
iterdef->>'user' "user",
(iterdef->>'stamp')::timestamptz "stamp",
iterdef->>'mesasage' "comment",
iterdef->>'type' "type",
round(SUM(fb_val_loc * r_rate)::numeric,2) sales,
jsonb_pretty(iterdef) def
FROM
@ -11,7 +11,7 @@ WHERE
GROUP BY
iterdef->>'user',
iterdef->>'stamp',
iterdef->>'message',
iterdef->>'type',
iterdef
ORDER BY
"stamp" DESC