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

fix

Browse Source
This commit is contained in:
Bryce Covert
2022-02-16 18:44:29 -08:00
parent 21d3d14c1f
commit 38befab81d
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,13 +199,15 @@
:args [(d/db conn) (:db/id payment)]} )))) :args [(d/db conn) (:db/id payment)]} ))))
(:id context)) (:id context))
(audit-transact (audit-transact
(into [{:db/id (:db/id payment) (into (cond-> [{:db/id (:db/id payment)
:payment/status :payment-status/pending} :payment/status :payment-status/pending}
{:db/id transaction-id {:db/id transaction-id
:transaction/approval-status :transaction-approval-status/unapproved} :transaction/approval-status :transaction-approval-status/unapproved}
[:db/retract transaction-id :transaction/payment (:db/id payment)] [:db/retract transaction-id :transaction/payment (:db/id payment)]
[:db/retract transaction-id :transaction/vendor (:db/id (:transaction/vendor transaction))] [:db/retract transaction-id :transaction/vendor (:db/id (:transaction/vendor transaction))]
[:db/retract transaction-id :transaction/location (:transaction/location transaction)]] ]
(:transaction/location transaction)
(conj [:db/retract transaction-id :transaction/location (:transaction/location transaction)]))
(map (fn [a] (map (fn [a]
[:db/retract transaction-id :transaction/accounts (:db/id a)]) [:db/retract transaction-id :transaction/accounts (:db/id a)])

5
src/clj/auto_ap/routes/invoices.clj
View File

@@ -220,7 +220,8 @@
:where [?c :client/bank-accounts ?ba] :where [?c :client/bank-accounts ?ba]
[?ba :bank-account/type :bank-account-type/cash] [?ba :bank-account/type :bank-account-type/cash]
] ]
(d/db conn))] (d/db conn)
client-id)]
#:transaction {:amount (- (:invoice/total invoice)) #:transaction {:amount (- (:invoice/total invoice))
:payment payment-id :payment payment-id
:client (:invoice/client invoice) :client (:invoice/client invoice)
@@ -230,7 +231,7 @@
:raw-id transaction-id :raw-id transaction-id
:vendor (:invoice/vendor invoice) :vendor (:invoice/vendor invoice)
:description-original "Cash payment" :description-original "Cash payment"
:date date :date (to-date date)
:approval-status :transaction-approval-status/approved :approval-status :transaction-approval-status/approved
:accounts [{:transaction-account/account (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"])) :accounts [{:transaction-account/account (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"]))
:transaction-account/location "A" :transaction-account/location "A"