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

Merge branch 'master' into try-tailwind

Browse Source
This commit is contained in:
Bryce
2023-05-31 16:59:00 -07:00
parent 65f2d2c4ff 91d2bcbf9e
commit fad492e26d
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/clj/auto_ap/jobs/ntg.clj
View File

@@ -168,7 +168,7 @@
:content
first
Double/parseDouble)
invoice {:db/id (random-tempid)
invoice {:db/id (random-tempid )
:invoice/vendor :vendor/cintas
:invoice/import-status :import-status/imported
:invoice/status :invoice-status/unpaid
@@ -268,7 +268,8 @@
(mark-error k)
[]))))
(into []))]
(audit-transact transaction {:user/name "sysco importer" :user/role "admin"})
(doseq [t transaction]
(audit-transact [t] {:user/name "sysco importer" :user/role "admin"}))
(log/info ::success
:count (count transaction)
:sample (take 3 transaction)))

2
src/clj/auto_ap/jobs/sysco.clj
View File

@@ -87,7 +87,7 @@
[{:client/location-matches [:location-match/location :location-match/matches]}
:client/default-location
:client/locations]
matching-client)
(:db/id matching-client))
location-hint
location-hint )
:date (coerce/to-date date)

2
src/clj/auto_ap/parse.clj
View File

@@ -124,7 +124,7 @@
(defn exact-match
([clients invoice-client-name]
(->> clients
(filter (fn [{:keys [:client/matches :client/name] :as client :or {matches []}}]
(filter (fn [{:keys [:client/matches :client/location-matches :client/locations :client/name] :as client :or {matches []}}]
(seq
(filter (fn [m]
(and

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

@@ -136,8 +136,8 @@
(defn import->invoice [{:keys [invoice-number source-url customer-identifier account-number total date vendor-code text full-text client-override vendor-override location-override import-status]}]
(let [matching-client (cond
account-number (d-clients/exact-match account-number)
customer-identifier (d-clients/best-match customer-identifier)
account-number (:db/id (d-clients/exact-match account-number))
customer-identifier (:db/id (d-clients/best-match customer-identifier))
client-override (Long/parseLong client-override))
matching-vendor (match-vendor vendor-code vendor-override)