made invoice import back to working, mostly
This commit is contained in:
@@ -158,20 +158,21 @@
|
||||
:args [(d/db (d/connect uri)) vendor-code]}))
|
||||
first)
|
||||
matching-client (parse/best-match clients customer-identifier)
|
||||
_ (println "New invoice matches client" matching-client)
|
||||
matching-location (parse/best-location-match matching-client text )
|
||||
_ (println "LOCATION" matching-location)
|
||||
|
||||
[existing-id existing-outstanding-balance existing-status import-status] (->> (d/query
|
||||
(cond-> {:query {:find ['?e '?outstanding-balance '?status '?import-status]
|
||||
(cond-> {:query {:find ['?e '?outstanding-balance '?status '?import-status2]
|
||||
:in ['$ '?invoice-number '?vendor '?client]
|
||||
:where '[[?e :invoice/invoice-number ?invoice-number]
|
||||
[?e :invoice/vendor ?vendor]
|
||||
[?e :invoice/client ?client]
|
||||
[?e :invoice/outstanding-balance ?outstanding-balance]
|
||||
[?e :invoice/status ?status]
|
||||
[?e :invoice/import-status ?import-status]]}
|
||||
[?e :invoice/import-status ?import-status]
|
||||
[?import-status :db/ident ?import-status2]]}
|
||||
:args [(d/db (d/connect uri)) invoice-number matching-vendor (:db/id matching-client)]}))
|
||||
first)]
|
||||
|
||||
(if (= :import-status/imported import-status)
|
||||
result
|
||||
(conj result (remove-nils #:invoice {:invoice/client (:db/id matching-client)
|
||||
@@ -190,7 +191,7 @@
|
||||
))
|
||||
[]
|
||||
imports)]
|
||||
(println transactions)
|
||||
|
||||
@(d/transact (d/connect uri) transactions)
|
||||
))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user