From da5ba9a99e45ed776eac92eac070772311874cb5 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 29 Jun 2022 17:40:14 -0700 Subject: [PATCH] invoice fix. --- src/clj/auto_ap/routes/exports.clj | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/clj/auto_ap/routes/exports.clj b/src/clj/auto_ap/routes/exports.clj index c737d934..e186ae17 100644 --- a/src/clj/auto_ap/routes/exports.clj +++ b/src/clj/auto_ap/routes/exports.clj @@ -86,30 +86,30 @@ (assert-admin identity) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) "export:invoice"}}] - [(into [] - (map datomic-map->graphql-map) - (d/q '[:find [(pull ?i [:db/id :invoice/total :invoice/outstanding-balance :invoice/invoice-number :invoice/date :invoice/original-id - { :invoice/status [:db/ident] - :invoice/payments - [:invoice-payment/amount - {:invoice-payment/payment [:payment/check-number - :payment/memo - {:payment/bank_account [:bank-account/id :bank-account/name :bank-account/number :bank-account/bank-name :bank-account/bank-code :bank-account/code]}]}] - :invoice/vendor [:vendor/name - :db/id - {:vendor/primary-contact [:contact/name] - :vendor/address [:address/street1 :address/city :address/state :address/zip]}] - :invoice/expense-accounts [:db/id - :invoice-expense-account/amount - :invoice-expense-account/id - :invoice-expense-account/location - {:invoice-expense-account/account - [:db/id :account/numeric-code :account/name]}] - :invoice/client [:client/name :db/id :client/code :client/locations]}]) ...] - :in $ ?c - :where [?i :invoice/client ?c]] - (d/db conn) - [:client/code (query-params "client-code")]))])) + (list (into (list) + (map datomic-map->graphql-map) + (d/q '[:find [(pull ?i [:db/id :invoice/total :invoice/outstanding-balance :invoice/invoice-number :invoice/date :invoice/original-id + { :invoice/status [:db/ident] + :invoice/payments + [:invoice-payment/amount + {:invoice-payment/payment [:payment/check-number + :payment/memo + {:payment/bank_account [:bank-account/id :bank-account/name :bank-account/number :bank-account/bank-name :bank-account/bank-code :bank-account/code]}]}] + :invoice/vendor [:vendor/name + :db/id + {:vendor/primary-contact [:contact/name] + :vendor/address [:address/street1 :address/city :address/state :address/zip]}] + :invoice/expense-accounts [:db/id + :invoice-expense-account/amount + :invoice-expense-account/id + :invoice-expense-account/location + {:invoice-expense-account/account + [:db/id :account/numeric-code :account/name]}] + :invoice/client [:client/name :db/id :client/code :client/locations]}]) ...] + :in $ ?c + :where [?i :invoice/client ?c]] + (d/db conn) + [:client/code (query-params "client-code")]))))) (GET "/payments/export" {:keys [query-params identity]} (assert-admin identity) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) @@ -301,7 +301,7 @@ (assoc :client-name (client->name (str client-id) (:name a))) (dissoc :client-overrides)))))) conj - [] + (list) (:accounts (:data all-accounts))))))) (GET "/transactions/export" {:keys [query-params identity]}