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

preventing unmatched transacations from re-matching.

Browse Source
This commit is contained in:
Bryce Covert
2021-01-26 17:11:33 -08:00
parent 826dd6709e
commit 8bb286b411
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/clj/auto_ap/graphql/transactions.clj
View File

@@ -309,6 +309,8 @@
db (d/db conn) db (d/db conn)
invoice-clients (set (map (comp :db/id :invoice/client #(d/entity db %)) autopay_invoice_ids)) invoice-clients (set (map (comp :db/id :invoice/client #(d/entity db %)) autopay_invoice_ids))
invoice-amount (reduce + 0.0 (map (comp :invoice/total #(d/entity db %)) autopay_invoice_ids))] invoice-amount (reduce + 0.0 (map (comp :invoice/total #(d/entity db %)) autopay_invoice_ids))]
(when (:transaction/payment transaction)
(throw (ex-info "Transaction already linked" {:validation-error "Transaction already linked"})))
(when (or (> (count invoice-clients) 1) (when (or (> (count invoice-clients) 1)
(not= (:db/id (:transaction/client transaction)) (not= (:db/id (:transaction/client transaction))
(first invoice-clients))) (first invoice-clients)))
@@ -343,6 +345,7 @@
(defn match-transaction-unpaid-invoices [context {:keys [transaction_id unpaid_invoice_ids]} value] (defn match-transaction-unpaid-invoices [context {:keys [transaction_id unpaid_invoice_ids]} value]
(let [_ (assert-power-user (:id context)) (let [_ (assert-power-user (:id context))
transaction (d-transactions/get-by-id transaction_id) transaction (d-transactions/get-by-id transaction_id)
_ (assert-can-see-client (:id context) (:transaction/client transaction) ) _ (assert-can-see-client (:id context) (:transaction/client transaction) )
db (d/db conn) db (d/db conn)
invoice-clients (set (map (comp :db/id :invoice/client #(d/entity db %)) unpaid_invoice_ids)) invoice-clients (set (map (comp :db/id :invoice/client #(d/entity db %)) unpaid_invoice_ids))
@@ -356,13 +359,9 @@
(when-not (dollars= (- (:transaction/amount transaction)) (when-not (dollars= (- (:transaction/amount transaction))
invoice-amount) invoice-amount)
(throw (ex-info "Amounts don't match" {:validation-error "Amounts don't match"}))) (throw (ex-info "Amounts don't match" {:validation-error "Amounts don't match"})))
#_(log/info [#_(select-keys (d/entity db transaction_id) #{:transaction/amount :db/id})] (when (:transaction/payment transaction)
(->> autopay_invoice_ids (throw (ex-info "Transaction already linked" {:validation-error "Transaction already linked"})))
(map (fn [id]
(let [entity (d/entity db id)]
[(-> entity :invoice/vendor :db/id)
(-> entity :db/id)
(-> entity :invoice/total)])))))
(let [payment-tx (import/add-new-payment [(select-keys (d/entity db transaction_id) #{:transaction/amount :transaction/date :db/id})] (let [payment-tx (import/add-new-payment [(select-keys (d/entity db transaction_id) #{:transaction/amount :transaction/date :db/id})]
(map (fn [id] (map (fn [id]
(let [entity (d/entity db id)] (let [entity (d/entity db id)]

2
src/cljs/auto_ap/views/pages/transactions/form.cljs
View File

@@ -384,7 +384,7 @@
(when (when
(and (seq (:potential-autopay-invoices-matches data)) (and (seq (:potential-autopay-invoices-matches data))
#_(not is-already-matched?) (not is-already-matched?)
(or is-admin? is-power-user?)) (or is-admin? is-power-user?))
[tab {:title "Autopay Invoices" :key :autopay-invoices} [tab {:title "Autopay Invoices" :key :autopay-invoices}
[potential-autopay-invoices-matches-box {:potential-autopay-invoices-matches (:potential-autopay-invoices-matches data)}]]) [potential-autopay-invoices-matches-box {:potential-autopay-invoices-matches (:potential-autopay-invoices-matches data)}]])