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

marks as paid.

Browse Source
This commit is contained in:
Bryce Covert
2018-05-15 09:01:02 -07:00
parent d9994b988c
commit 7b7275f7a4
6 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/routes/checks.clj
View File

@@ -216,6 +216,8 @@
(make-pdfs (map second checks))
(companies/upsert company-id updated-company)
(doseq [{:keys [invoice-id]} invoice-payments]
(invoices/mark-finished-if-complete invoice-id))
{:invoices (mapcat first checks)
:pdf-url (merge-pdfs (map (comp :s3-key second) checks))}))

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

@@ -3,6 +3,7 @@
[auto-ap.db.vendors :as vendors]
[auto-ap.db.invoices :as invoices]
[auto-ap.db.utils :refer [query]]
[auto-ap.utils :refer [by]]
[auto-ap.parse :as parse]
[auto-ap.routes.utils :refer [wrap-secure]]
[compojure.core :refer [GET POST context defroutes
@@ -107,20 +108,10 @@
{{:keys [excel-rows]} :edn-params}
(let [columns [:raw-date :vendor-name :check :location :invoice-number :amount :company :bill-entered :bill-rejected :added-on :exported-on]
all-vendors (reduce
(fn [x y]
(assoc x (:name y) y))
{}
(vendors/get-all))
all-vendors (by :name (vendors/get-all))
all-companies (reduce
(fn [x y]
(-> x
(assoc (:code y) y)
(assoc (:name y) y)))
{}
(companies/get-all))
all-companies (companies/get-all)
all-companies (merge (by :code all-companies) (by :name all-companies))
rows (->> (str/split excel-rows #"\n" )
(map #(str/split % #"\t"))