filtering down to just active invoices/etc.
This commit is contained in:
@@ -80,7 +80,7 @@
|
||||
:else
|
||||
q)))
|
||||
|
||||
(defn base-graphql [{:keys [company-id vendor-id check-number bank-account-id status amount id]}]
|
||||
(defn base-graphql [{:keys [company-id vendor-id check-number bank-account-id status amount id statuses]}]
|
||||
|
||||
(cond-> base-query
|
||||
(limited-companies id) (helpers/merge-where [:in :company-id (limited-companies id)])
|
||||
@@ -89,7 +89,8 @@
|
||||
(not (nil? vendor-id)) (helpers/merge-where [:= :vendor-id vendor-id])
|
||||
(not (nil? check-number)) (helpers/merge-where [:= :check-number check-number])
|
||||
(not (nil? status)) (helpers/merge-where [:= :status status])
|
||||
(not (nil? amount)) (helpers/merge-where [:= :amount amount])))
|
||||
(not (nil? amount)) (helpers/merge-where [:= :amount amount])
|
||||
(seq statuses ) (helpers/merge-where [:in :status statuses])))
|
||||
|
||||
(defn get-graphql [{:keys [start sort-by asc id limit] :as args :or {limit 20}}]
|
||||
(query
|
||||
|
||||
@@ -142,9 +142,10 @@
|
||||
|
||||
|
||||
|
||||
(defn base-graphql [{:keys [imported company-id status id]}]
|
||||
(defn base-graphql [{:keys [imported company-id status id statuses]}]
|
||||
(cond-> base-query
|
||||
(limited-companies id) (helpers/merge-where [:in :company-id (limited-companies id)])
|
||||
(seq statuses ) (helpers/merge-where [:in :status statuses])
|
||||
(not (nil? imported)) (helpers/merge-where [:= :imported imported])
|
||||
(not (nil? status)) (helpers/merge-where [:= :status status])
|
||||
(not (nil? company-id)) (helpers/merge-where [:= :company-id company-id])))
|
||||
@@ -152,6 +153,7 @@
|
||||
(defn get-graphql [{:keys [start sort-by asc limit] :as args :or {limit 20}}]
|
||||
(query
|
||||
(cond-> (base-graphql args)
|
||||
|
||||
true (add-sort-by sort-by asc)
|
||||
true (assoc :limit limit)
|
||||
start (assoc :offset start))))
|
||||
|
||||
Reference in New Issue
Block a user