notid/integreat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a bunch of filtering fixes.

Browse Source
This commit is contained in:
Bryce Covert
2020-05-20 07:51:07 -07:00
parent 3678997013
commit d30dfb5e34
8 changed files with 125 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/clj/auto_ap/datomic/checks.clj
View File

@@ -77,6 +77,18 @@
:where ['[?e :payment/bank-account ?bank-account-id]]}
:args [(:bank-account-id args)]})
(:amount-gte args)
(merge-query {:query {:in ['?amount-gte]
:where ['[?e :payment/amount ?a]
'[(>= ?a ?amount-gte)]]}
:args [(:amount-gte args)]})
(:amount-lte args)
(merge-query {:query {:in ['?amount-lte]
:where ['[?e :payment/amount ?a]
'[(<= ?a ?amount-lte)]]}
:args [(:amount-lte args)]})
(:amount args)
(merge-query {:query {:in ['?amount]
:where ['[?e :payment/amount ?transaction-amount]

14
src/clj/auto_ap/datomic/invoices.clj
View File

@@ -84,7 +84,19 @@
(merge-query {:query {:in ['?vendor-id]
:where ['[?e :invoice/vendor ?vendor-id]]}
:args [ (:vendor-id args)]})
(:amount-gte args)
(merge-query {:query {:in ['?amount-gte]
:where ['[?e :invoice/total ?total-filter]
'[(>= ?total-filter ?amount-gte)]]}
:args [(:amount-gte args)]})
(:amount-lte args)
(merge-query {:query {:in ['?amount-lte]
:where ['[?e :invoice/total ?total-filter]
'[(<= ?total-filter ?amount-lte)]]}
:args [(:amount-lte args)]})
(seq (:invoice-number-like args))
(merge-query {:query {:in ['?invoice-number-like]
:where ['[?e :invoice/invoice-number ?invoice-number]

4
src/clj/auto_ap/graphql.clj
View File

@@ -398,6 +398,8 @@
:status {:type :invoice_status}
:client_id {:type :id}
:vendor_id {:type :id}
:amount_lte {:type :money}
:amount_gte {:type :money}
:invoice_number_like {:type 'String}
:start {:type 'Int}
:sort {:type '(list :sort_item)}}
@@ -464,6 +466,8 @@
:args {:client_id {:type :id}
:vendor_id {:type :id}
:date_range {:type :date_range}
:amount_lte {:type :money}
:amount_gte {:type :money}
:check_number_like {:type 'String}
:start {:type 'Int}
:sort {:type '(list :sort_item)}}

2
src/clj/auto_ap/graphql/checks.clj
View File

@@ -366,7 +366,7 @@
(defn void-check [context {id :payment_id} value]
(let [check (d-checks/get-by-id id)]
(assert (or (= :payment-status/pending (:payment/status check))
(#{:payment-type/cash} (:payment/type check))))
(#{:payment-type/cash :payment-type/debit} (:payment/type check))))
(assert-can-see-client (:id context) (:db/id (:payment/client check)))
(let [removing-payments (mapcat (fn [x]
(let [invoice (:invoice-payment/invoice x)