fixes
This commit is contained in:
@@ -44,23 +44,16 @@
|
||||
client-id
|
||||
vendor-id)))
|
||||
|
||||
(defn get-1099-companies [user {:keys [client-id] :as args}]
|
||||
(let [clients (->> (dc/q '[:find ?c
|
||||
:in $ ?user
|
||||
:where [?c :client/code]
|
||||
[(iol-ion.query/can-see-client? ?user ?c)]]
|
||||
(dc/db conn) user)
|
||||
(map first)
|
||||
set)
|
||||
(defn get-1099-companies [user {:keys [clients] :as args}]
|
||||
(let [
|
||||
results (cond
|
||||
(and client-id
|
||||
(can-see-client? user client-id))
|
||||
clients
|
||||
(dc/q '[:find
|
||||
(pull ?c [:client/code :db/id])
|
||||
(pull ?v vendor-read)
|
||||
(sum ?a)
|
||||
:with ?d
|
||||
:in $ ?c vendor-read
|
||||
:in $ [?c ...] vendor-read
|
||||
:where
|
||||
[?p :payment/client ?c]
|
||||
[?p :payment/date ?d ]
|
||||
@@ -70,7 +63,7 @@
|
||||
[?p :payment/amount ?a]
|
||||
[?p :payment/vendor ?v]]
|
||||
(dc/db conn)
|
||||
client-id
|
||||
(set (map :db/id clients))
|
||||
vendor-read)
|
||||
|
||||
(is-admin? user)
|
||||
|
||||
@@ -45,10 +45,10 @@
|
||||
"status" ['[?e :plaid-item/status ?sort-status]]}
|
||||
args)
|
||||
|
||||
(limited-clients (:id args))
|
||||
(:clients args)
|
||||
(merge-query {:query {:in ['[?xx ...]]
|
||||
:where ['[?e :plaid-item/client ?xx]]}
|
||||
:args [ (set (map :db/id (limited-clients (:id args))))]})
|
||||
:args [ (set (map :db/id (:clients args)))]})
|
||||
|
||||
(:client-id args)
|
||||
(merge-query {:query {:in '[?client-id]
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
[auto-ap.time :as atime]
|
||||
[bidi.bidi :as bidi]
|
||||
[config.core :refer [env]]
|
||||
[datomic.api :as dc]))
|
||||
[datomic.api :as dc]
|
||||
[com.brunobonacci.mulog :as mu]))
|
||||
|
||||
(def grid-page {:id "report-table"
|
||||
:nav (com/company-aside-nav)
|
||||
|
||||
Reference in New Issue
Block a user