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

Quality of life improvements with client login

Browse Source
This commit is contained in:
Bryce Covert
2020-07-30 08:44:44 -07:00
parent 6df080cc3f
commit 98f0d40313
13 changed files with 210 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,8 +39,6 @@
(if-let [id (:db/id (or (clients client-code)
(clients client)))]
(do
(println "FOUND CLIENT" (or (clients client-code)
(clients client)))
(when (not ((set (:client/locations (or (clients client-code)
(clients client))))
default-location))
@@ -78,8 +76,8 @@
(defn parse-account-numeric-code [i]
(try
(when-let [account-numeric-code (:account-numeric-code i)]
(d-accounts/get-account-by-numeric-code-and-sets (Integer/parseInt account-numeric-code)
["default"]))
(:db/id (d-accounts/get-account-by-numeric-code-and-sets (Integer/parseInt account-numeric-code)
["default"])))
(catch Exception e
(throw (Exception. (str "Could not parse expense account from value '" (:account-numeric-code i) "'") e)))))
@@ -481,12 +479,7 @@
{{:keys [excel-rows]} :edn-params user :identity}
(assert-admin user)
(let [parsed-invoice-rows (parse-invoice-rows excel-rows)
existing-rows (->> (d-invoices/get-graphql {:count Integer/MAX_VALUE})
first
(filter (fn [i] (not= :invoice-status/voided (:invoice/status i))))
(map (fn [{:keys [:invoice/vendor :invoice/client :invoice/invoice-number]}]
[(:db/id vendor) (:db/id client) invoice-number]))
set)
existing-rows (set (d-invoices/get-existing-set ))
grouped-rows (group-by
(fn [i]
(cond (seq (:errors i))