From f935e9a42edfe6039bd32bcc63e6226d2edc43ac Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 22 Apr 2020 07:48:25 -0700 Subject: [PATCH] fixed vendor sorting. --- src/clj/auto_ap/datomic/transactions.clj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/clj/auto_ap/datomic/transactions.clj b/src/clj/auto_ap/datomic/transactions.clj index 83004760..30ef9060 100644 --- a/src/clj/auto_ap/datomic/transactions.clj +++ b/src/clj/auto_ap/datomic/transactions.clj @@ -36,8 +36,11 @@ [(ground "") ?sorter]))] "description-original" ['[?e :transaction/description-original ?sorter]] "date" ['[?e :transaction/date ?sorter]] - "vendor" ['[?e :transaction/vendor ?v] - '[?v :vendor/name ?sorter]] + "vendor" ['(or-join [?e ?sorter] + (and [(missing? $ ?e :transaction/vendor)] + [?e :transaction/description-original ?sorter]) + (and [?e :transaction/vendor ?v] + [?v :vendor/name ?sorter]))] "amount" ['[?e :transaction/amount ?sorter]] "status" ['[?e :transaction/status ?sorter]]} args)