invoice fix.

This commit is contained in:
2022-06-29 17:40:14 -07:00
parent a122c45b03
commit da5ba9a99e

View File

@@ -86,30 +86,30 @@
(assert-admin identity) (assert-admin identity)
(statsd/time! [(str "export.time") {:tags #{(client-tag query-params) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
"export:invoice"}}] "export:invoice"}}]
[(into [] (list (into (list)
(map datomic-map->graphql-map) (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 (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/status [:db/ident]
:invoice/payments :invoice/payments
[:invoice-payment/amount [:invoice-payment/amount
{:invoice-payment/payment [:payment/check-number {:invoice-payment/payment [:payment/check-number
:payment/memo :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]}]}] {: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 :invoice/vendor [:vendor/name
:db/id :db/id
{:vendor/primary-contact [:contact/name] {:vendor/primary-contact [:contact/name]
:vendor/address [:address/street1 :address/city :address/state :address/zip]}] :vendor/address [:address/street1 :address/city :address/state :address/zip]}]
:invoice/expense-accounts [:db/id :invoice/expense-accounts [:db/id
:invoice-expense-account/amount :invoice-expense-account/amount
:invoice-expense-account/id :invoice-expense-account/id
:invoice-expense-account/location :invoice-expense-account/location
{:invoice-expense-account/account {:invoice-expense-account/account
[:db/id :account/numeric-code :account/name]}] [:db/id :account/numeric-code :account/name]}]
:invoice/client [:client/name :db/id :client/code :client/locations]}]) ...] :invoice/client [:client/name :db/id :client/code :client/locations]}]) ...]
:in $ ?c :in $ ?c
:where [?i :invoice/client ?c]] :where [?i :invoice/client ?c]]
(d/db conn) (d/db conn)
[:client/code (query-params "client-code")]))])) [:client/code (query-params "client-code")])))))
(GET "/payments/export" {:keys [query-params identity]} (GET "/payments/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/time! [(str "export.time") {:tags #{(client-tag query-params) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
@@ -301,7 +301,7 @@
(assoc :client-name (client->name (str client-id) (:name a))) (assoc :client-name (client->name (str client-id) (:name a)))
(dissoc :client-overrides)))))) (dissoc :client-overrides))))))
conj conj
[] (list)
(:accounts (:data all-accounts))))))) (:accounts (:data all-accounts)))))))
(GET "/transactions/export" {:keys [query-params identity]} (GET "/transactions/export" {:keys [query-params identity]}