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

Uploading invoices now attaches the file.

Browse Source
This commit is contained in:
Bryce Covert
2022-01-12 20:53:12 -08:00
parent 4d6b3b1e2e
commit 30bbf51011
7 changed files with 260 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/clj/auto_ap/background/sysco.clj
View File

@@ -3,23 +3,23 @@
[amazonica.aws.s3 :as s3] [amazonica.aws.s3 :as s3]
[auto-ap.datomic :refer [conn]] [auto-ap.datomic :refer [conn]]
[auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.clients :as d-clients]
[auto-ap.datomic.vendors :as d-vendors] [auto-ap.datomic.invoices :refer [code-invoice]]
[auto-ap.parse :as parse] [auto-ap.parse :as parse]
[auto-ap.time :as t] [auto-ap.time :as t]
[auto-ap.time-utils :refer [next-dom]]
[auto-ap.utils :refer [by]] [auto-ap.utils :refer [by]]
[clj-time.coerce :as coerce] [clj-time.coerce :as coerce]
[clojure.data.csv :as csv] [clojure.data.csv :as csv]
[clojure.java.io :as io] [clojure.java.io :as io]
[clojure.string :as str] [clojure.string :as str]
[clojure.tools.logging :as log] [clojure.tools.logging :as log]
[com.unbounce.dogstatsd.core :as statsd]
[config.core :refer [env]] [config.core :refer [env]]
[datomic.api :as d] [datomic.api :as d]
[unilog.context :as lc]
[clj-time.core :as time]
[mount.core :as mount] [mount.core :as mount]
[yang.scheduler :as scheduler] [unilog.context :as lc]
[com.unbounce.dogstatsd.core :as statsd])) [yang.scheduler :as scheduler])
(:import
(java.util UUID)))
(def bucket-name (:data-bucket env)) (def bucket-name (:data-bucket env))
@@ -76,37 +76,25 @@
tax (Double/parseDouble (summary-row "TotalTaxAmount")) tax (Double/parseDouble (summary-row "TotalTaxAmount"))
date (t/parse date (t/parse
(header-row "InvoiceDate") (header-row "InvoiceDate")
"yyMMdd") "yyMMdd")]
automatically-paid-for (set (map :db/id (:vendor/automatically-paid-when-due sysco-vendor)))
schedule-payment-dom (get (by (comp :db/id :vendor-schedule-payment-dom/client) :vendor-schedule-payment-dom/dom (:vendor/schedule-payment-dom sysco-vendor))
(:db/id matching-client))]
(log/infof "Importing %s for %s" (header-row "InvoiceNumber") (header-row "CustomerName")) (log/infof "Importing %s for %s" (header-row "InvoiceNumber") (header-row "CustomerName"))
[:propose-invoice (cond-> #:invoice {:invoice-number (header-row "InvoiceNumber") (code-invoice #:invoice {:invoice-number (header-row "InvoiceNumber")
:total (+ total tax) :total (+ total tax)
:outstanding-balance (+ total tax) :outstanding-balance (+ total tax)
:date (coerce/to-date date) :location (parse/best-location-match matching-client location-hint location-hint )
:vendor (:db/id sysco-vendor ) :date (coerce/to-date date)
:client (:db/id matching-client) :vendor (:db/id sysco-vendor )
:import-status :import-status/completed :client (:db/id matching-client)
:status :invoice-status/unpaid :import-status :import-status/completed
:client-identifier customer-identifier :status :invoice-status/unpaid
:expense-accounts [#:invoice-expense-account {:account (:db/id (:vendor/default-account sysco-vendor)) :client-identifier customer-identifier})))
:amount (+ total tax)
:location (parse/best-location-match matching-client location-hint location-hint )}]}
(:vendor/terms sysco-vendor) (assoc :invoice/due (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id sysco-vendor (:db/id matching-client))))))
(boolean (automatically-paid-for (:db/id matching-client))) (assoc :invoice/scheduled-payment (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id sysco-vendor (:db/id matching-client))))))
schedule-payment-dom (assoc :invoice/scheduled-payment (coerce/to-date
(next-dom date schedule-payment-dom))))]))
(defn mark-key [k] (defn mark-key [k]
(s3/copy-object {:source-bucket-name bucket-name (s3/copy-object {:source-bucket-name bucket-name
:destination-bucket-name bucket-name :destination-bucket-name bucket-name
:destination-key (str/replace-first k "pending" "imported") :destination-key (str/replace-first k "pending" "imported")
:source-key k}) :source-key k})
(s3/delete-object {:bucket-name bucket-name (s3/delete-object {:bucket-name bucket-name
:key k})) :key k}))
@@ -127,6 +115,7 @@
:prefix "sysco/pending"}) :prefix "sysco/pending"})
:object-summaries :object-summaries
(map :key))] (map :key))]
(statsd/event {:title "Sysco import started" (statsd/event {:title "Sysco import started"
:text (format "Found %d sysco invoice to import: %s" (count keys) (pr-str keys)) :text (format "Found %d sysco invoice to import: %s" (count keys) (pr-str keys))
@@ -134,20 +123,36 @@
nil) nil)
(log/infof "Found %d sysco invoice to import: %s" (count keys) (pr-str keys)) (log/infof "Found %d sysco invoice to import: %s" (count keys) (pr-str keys))
(let [result @(d/transact conn (mapv (fn [k] (let [transaction (->> keys
(try (mapcat (fn [k]
(-> k (try
read-sysco-csv (let [invoice-key (str "invoice-files/" (UUID/randomUUID) ".csv")
(extract-invoice-details clients sysco-vendor)) invoice-url (str "https://" (:data-bucket env) "/" invoice-key)]
(catch Exception e (s3/copy-object {:source-bucket-name (:data-bucket env)
(log/error e) :destination-bucket-name (:data-bucket env)
[]))) :source-key k
keys))] :destination-key invoice-key})
[[:propose-invoice
(-> k
read-sysco-csv
(extract-invoice-details clients sysco-vendor)
(assoc :invoice/source-url invoice-url))]])
(catch Exception e
(log/error (str "Cannot load file " k) e)
(log/info
(s3/copy-object {:source-bucket-name (:data-bucket env)
:destination-bucket-name (:data-bucket env)
:source-key k
:destination-key (doto (str "sysco/error/"
(.getName (io/file k)))
println)}))
[])))))
result @(d/transact conn transaction)]
(log/infof "Imported %d invoices" (/ (count (:tempids result)) 2))) (log/infof "Imported %d invoices" (/ (count (:tempids result)) 2)))
(doseq [k keys] (doseq [k keys]
(mark-key k)) (mark-key k))
(statsd/event {:title "Sysco import ended" (statsd/event {:title "Sysco import ended"
:text "Sysco completed" :text "Sysco completed"
:priority :low} nil)))) :priority :low} nil))))

48
src/clj/auto_ap/datomic/invoices.clj
View File

@@ -6,7 +6,11 @@
[clj-time.coerce :as c] [clj-time.coerce :as c]
[clojure.set :refer [rename-keys]] [clojure.set :refer [rename-keys]]
[clojure.string :as str] [clojure.string :as str]
[clojure.tools.logging :as log])) [clojure.tools.logging :as log]
[clj-time.coerce :as coerce]
[auto-ap.time-utils :refer [next-dom]]
[clj-time.core :as time]
[auto-ap.datomic.vendors :as d-vendors]))
(def default-read '[* (def default-read '[*
{:invoice/client [:client/name :db/id :client/locations :client/code]} {:invoice/client [:client/name :db/id :client/locations :client/code]}
@@ -246,3 +250,45 @@
(into vendored-results vendorless-results))) (into vendored-results vendorless-results)))
(defn code-invoice [invoice]
(let [db (d/db auto-ap.datomic/conn)
client-id (:invoice/client invoice)
vendor-id (:invoice/vendor invoice)
date (:invoice/date invoice)
vendor (d/pull db '[*] vendor-id)
due (when (:vendor/terms vendor)
(-> date
(coerce/to-date-time)
(time/plus (time/days (d-vendors/terms-for-client-id vendor client-id)))
coerce/to-date))
automatically-paid? (boolean (seq (d/q '[:find [?c ...]
:in $ ?v
:where [?v :vendor/automatically-paid-when-due ?c]]
db
vendor-id
client-id)))
[schedule-payment-dom] (d/q '[:find [?dom ...]
:in $ ?v ?c
:where [?v :vendor/schedule-payment-dom ?sp ]
[?sp :vendor-schedule-payment-dom/client ?c]
[?sp :vendor-schedule-payment-dom/dom ?dom]]
db
vendor-id
client-id)
scheduled-payment (cond automatically-paid?
due
schedule-payment-dom
(-> date
(next-dom schedule-payment-dom)
coerce/to-date)
:else nil)
default-expense-account #:invoice-expense-account {:account (d-vendors/account-for-client-id vendor client-id)
:location (:invoice/location invoice)
:amount (:invoice/total invoice)}]
(cond-> invoice
true (assoc :invoice/expense-accounts [default-expense-account])
due (assoc :invoice/due due)
scheduled-payment (assoc :invoice/scheduled-payment scheduled-payment))))

10
src/clj/auto_ap/datomic/migrate.clj
View File

@@ -471,7 +471,15 @@
:requires [:auto-ap/add-transaction-import2]} :requires [:auto-ap/add-transaction-import2]}
:auto-ap/apply-idents-to-well-known {:txes-fn `apply-idents-to-well-known :auto-ap/apply-idents-to-well-known {:txes-fn `apply-idents-to-well-known
:requires [:auto-ap/add-general-ledger6 :requires [:auto-ap/add-general-ledger6
:auto-ap/add-account-to-vendor]}} :auto-ap/add-account-to-vendor]}
:auto-ap/add-invoice-link {:txes [[{:db/ident :invoice/source-url
:db/doc "An s3 location for the invoice"
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one}
{:db/ident :invoice/location
:db/doc "The location to code the invoice as"
:db/valueType :db.type/string
:db/cardinality :db.cardinality/one}]]}}

1
src/clj/auto_ap/graphql.clj
View File

@@ -412,6 +412,7 @@
:original_id {:type 'Int} :original_id {:type 'Int}
:client_identifier {:type 'String} :client_identifier {:type 'String}
:total {:type 'String} :total {:type 'String}
:source_url {:type 'String}
:outstanding_balance {:type 'String} :outstanding_balance {:type 'String}
:invoice_number {:type 'String} :invoice_number {:type 'String}
:status {:type 'String} :status {:type 'String}

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

@@ -1,20 +1,15 @@
(ns auto-ap.routes.invoices (ns auto-ap.routes.invoices
(:require [auto-ap.datomic :refer [remove-nils uri]] (:require [auto-ap.datomic :refer [remove-nils uri]]
[auto-ap.datomic.accounts :as d-accounts]
[auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.clients :as d-clients]
[auto-ap.datomic.invoices :as d-invoices] [auto-ap.datomic.invoices :as d-invoices]
[auto-ap.datomic.vendors :as d-vendors] [auto-ap.datomic.vendors :as d-vendors]
[auto-ap.graphql.utils :refer [assert-admin assert-can-see-client]] [auto-ap.graphql.utils :refer [assert-admin assert-can-see-client]]
[auto-ap.import.manual :as manual] [auto-ap.import.manual :as manual]
[auto-ap.import.manual.common :as c] [auto-ap.import.manual.common :as c]
[auto-ap.logging :refer [info-event]]
[auto-ap.parse :as parse] [auto-ap.parse :as parse]
[auto-ap.parse.util :as parse-u]
[auto-ap.routes.utils :refer [wrap-secure]] [auto-ap.routes.utils :refer [wrap-secure]]
[auto-ap.time-utils :refer [next-dom]]
[auto-ap.utils :refer [by]] [auto-ap.utils :refer [by]]
[clj-time.coerce :as coerce :refer [to-date]] [clj-time.coerce :as coerce :refer [to-date]]
[clj-time.core :as time]
[clojure.data.csv :as csv] [clojure.data.csv :as csv]
[clojure.java.io :as io] [clojure.java.io :as io]
[clojure.string :as str] [clojure.string :as str]
@@ -22,7 +17,9 @@
[compojure.core :refer [context defroutes POST wrap-routes]] [compojure.core :refer [context defroutes POST wrap-routes]]
[datomic.api :as d] [datomic.api :as d]
[ring.middleware.json :refer [wrap-json-response]] [ring.middleware.json :refer [wrap-json-response]]
[unilog.context :as lc])) [unilog.context :as lc]
[amazonica.aws.s3 :as s3]
[config.core :refer [env]]))
(defn reset-id [i] (defn reset-id [i]
(update i :invoice-number (update i :invoice-number
@@ -97,51 +94,7 @@
rows)) rows))
(defn invoice-rows->transaction [rows]
(->> rows
(mapcat (fn [{:keys [vendor-id total client-id amount date invoice-number default-location account-id check vendor automatically-paid-when-due schedule-payment-dom]}]
(let [invoice (cond->
#:invoice {:db/id (.toString (java.util.UUID/randomUUID))
:vendor vendor-id
:client client-id
:default-location default-location
:import-status :import-status/imported
:automatically-paid-when-due automatically-paid-when-due
#_#_:default-expense-account default-expense-account
:total total
:outstanding-balance (if (= "Cash" check)
0.0
total)
:status (if (= "Cash" check)
:invoice-status/paid
:invoice-status/unpaid)
:invoice-number invoice-number
:date (to-date date)
:expense-accounts [#:invoice-expense-account {:account (or account-id
(:db/id (d-vendors/account-for-client-id vendor client-id)))
:location default-location
:amount total}]}
(:vendor/terms vendor) (assoc :invoice/due (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id vendor client-id)))))
automatically-paid-when-due (assoc :invoice/scheduled-payment (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id vendor client-id)))))
schedule-payment-dom (assoc :invoice/scheduled-payment (coerce/to-date
(next-dom date schedule-payment-dom)
)))
payment (if (= :invoice-status/paid (:invoice/status invoice))
#:invoice-payment {:invoice (:db/id invoice)
:amount (:invoice/total invoice)
:payment (remove-nils #:payment {:db/id (.toString (java.util.UUID/randomUUID))
:vendor (:invoice/vendor invoice)
:client (:invoice/client invoice)
:type :payment-type/cash
:amount (:invoice/total invoice)
:status :payment-status/cleared
:date (:invoice/date invoice)})}
)]
[[:propose-invoice (remove-nils invoice)]
(some-> payment remove-nils)])))
(filter identity)))
(defn match-vendor [vendor-code forced-vendor] (defn match-vendor [vendor-code forced-vendor]
@@ -170,99 +123,125 @@
(throw (ex-info (str "No vendor with the name " vendor-code " was found.") (throw (ex-info (str "No vendor with the name " vendor-code " was found.")
{:vendor-code vendor-code}))))) {:vendor-code vendor-code})))))
(defn import-uploaded-invoice [user client forced-location forced-vendor imports]
(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]} clients]
(let [matching-client (or (and account-number
(parse/best-match clients account-number 0.0))
(and customer-identifier
(parse/best-match clients customer-identifier))
(when client-override
(first (filter (fn [c]
(= (:db/id c) (Long/parseLong client-override)))
clients))))
matching-vendor (match-vendor vendor-code vendor-override)
matching-location (or (when-not (str/blank? location-override)
location-override)
(parse/best-location-match matching-client text full-text))]
(remove-nils #:invoice {:invoice/client (:db/id matching-client)
:invoice/client-identifier customer-identifier
:invoice/vendor (:db/id matching-vendor)
:invoice/source-url source-url
:invoice/invoice-number invoice-number
:invoice/total (Double/parseDouble total)
:invoice/date (to-date date)
:invoice/location matching-location
:invoice/import-status :import-status/pending
:invoice/outstanding-balance (Double/parseDouble total)
:invoice/status :invoice-status/unpaid})))
(defn validate-invoice [invoice user]
(when-not (:invoice/client invoice)
(throw (ex-info (str "Searched clients for '" (:invoice/client-identifier invoice) "'. No client found in file. Select a client first.")
{:invoice-number (:invoice/invoice-number invoice)
:customer-identifier (:invoice/client-identifier invoice)})))
(assert-can-see-client user (:invoice/client invoice))
(doseq [k [:invoice/invoice-number :invoice/client :invoice/vendor :invoice/total :invoice/outstanding-balance :invoice/date]]
(when (not (get invoice k))
(throw (ex-info (str (name k) "not found on invoice " invoice)
invoice))))
invoice)
(defn extant-invoice? [{:invoice/keys [invoice-number vendor client]}]
(try
(->> (d/query
(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]
[?import-status :db/ident ?import-status2]]}
:args [(d/db (d/connect uri)) invoice-number vendor client]}))
first
boolean)
(catch Exception e
(throw (ex-info (str "Failed to find potential matching invoice with"
" invoice " invoice-number
" vendor " vendor
" client " client
". "
(.toString e))
{:invoice-number invoice-number})))))
(defn invoice-rows->transaction [rows user]
(->> rows
(mapcat (fn [{:keys [vendor-id total client-id amount date invoice-number default-location account-id check vendor automatically-paid-when-due schedule-payment-dom]}]
(let [invoice #:invoice {:db/id (.toString (java.util.UUID/randomUUID))
:vendor vendor-id
:client client-id
:default-location default-location
:location default-location
:import-status :import-status/imported
:automatically-paid-when-due automatically-paid-when-due
:total total
:outstanding-balance (if (= "Cash" check)
0.0
total)
:status (if (= "Cash" check)
:invoice-status/paid
:invoice-status/unpaid)
:invoice-number invoice-number
:date (to-date date)}
payment (if (= :invoice-status/paid (:invoice/status invoice))
#:invoice-payment {:invoice (:db/id invoice)
:amount (:invoice/total invoice)
:payment (remove-nils #:payment {:db/id (.toString (java.util.UUID/randomUUID))
:vendor (:invoice/vendor invoice)
:client (:invoice/client invoice)
:type :payment-type/cash
:amount (:invoice/total invoice)
:status :payment-status/cleared
:date (:invoice/date invoice)})}
)]
[[:propose-invoice (d-invoices/code-invoice (validate-invoice (remove-nils invoice)
user))]
(some-> payment remove-nils)])))
(filter identity)))
(defn import-uploaded-invoice [user imports]
(lc/with-context {:area "upload-invoice"} (lc/with-context {:area "upload-invoice"}
(log/info "Number of invoices to import is" (count imports) "sample: " (first imports)) (log/info "Number of invoices to import is" (count imports) "sample: " (first imports))
(let [clients (d-clients/get-all) (let [clients (d-clients/get-all)
transactions (reduce (fn [result {:keys [invoice-number customer-identifier account-number total date vendor-code text full-text]}] potential-invoices (->> imports
(let [ (mapv #(import->invoice % clients))
matching-client (or (and account-number (mapv #(validate-invoice % user))
(parse/best-match clients account-number 0.0)) (filter #(not (extant-invoice? %)))
(and customer-identifier (mapv d-invoices/code-invoice)
(parse/best-match clients customer-identifier)) (mapv (fn [i] [:propose-invoice i])))]
(when client (when-not (seq potential-invoices)
(first (filter (fn [c]
(= (:db/id c) (Long/parseLong client)))
clients))))
_ (assert-can-see-client user (:db/id matching-client))
_ (when-not matching-client
(throw (ex-info (str "Searched clients for '" customer-identifier "'. No client found in file. Select a client first.")
{:invoice-number invoice-number
:customer-identifier customer-identifier
:vendor-code vendor-code})))
matching-vendor (match-vendor vendor-code forced-vendor)
_ (info-event "Found match for invoice" {:invoice-number invoice-number
:vendor (select-keys matching-vendor [:vendor/name :db/id])
:client (select-keys matching-client [:client/name :db/id])})
matching-location (or (when-not (str/blank? forced-location)
forced-location)
(parse/best-location-match matching-client text full-text))
[existing-id existing-outstanding-balance existing-status import-status] (when (and matching-client matching-location)
(try
(->> (d/query
(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]
[?import-status :db/ident ?import-status2]]}
:args [(d/db (d/connect uri)) invoice-number (:db/id matching-vendor) (:db/id matching-client)]}))
first)
(catch Exception e
(throw (ex-info (str "Failed to find potential matching invoice with"
" invoice " invoice-number
" vendor " matching-vendor
" client " (:client/name matching-client)
". "
(.toString e))
{:args [ invoice-number matching-vendor (:db/id matching-client)]})))
))
automatically-paid-for (set (map :db/id (:vendor/automatically-paid-when-due matching-vendor)))
schedule-payment-dom (get (by (comp :db/id :vendor-schedule-payment-dom/client) :vendor-schedule-payment-dom/dom (:vendor/schedule-payment-dom matching-vendor))
(:db/id matching-client))]
(cond
(not (and matching-location matching-client))
result
(= :import-status/imported import-status)
result
:else
(conj result [:propose-invoice (cond-> (remove-nils #:invoice {:invoice/client (:db/id matching-client)
:invoice/client-identifier customer-identifier
:invoice/vendor (:db/id matching-vendor)
:invoice/invoice-number invoice-number
:invoice/total (Double/parseDouble total)
:invoice/date (to-date date)
:invoice/import-status :import-status/pending
:invoice/outstanding-balance (or existing-outstanding-balance (Double/parseDouble total))
:invoice/status (or existing-status :invoice-status/unpaid)
:invoice/expense-accounts (when-not existing-id [#:invoice-expense-account {:account (d-vendors/account-for-client-id matching-vendor (:db/id matching-client))
:location matching-location
:amount (Double/parseDouble total)}])
:db/id existing-id
})
(:vendor/terms matching-vendor) (assoc :invoice/due (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id matching-vendor (:db/id matching-client))))))
(boolean (automatically-paid-for (:db/id matching-client))) (assoc :invoice/scheduled-payment (coerce/to-date
(time/plus date (time/days (d-vendors/terms-for-client-id matching-vendor (:db/id matching-client))))))
schedule-payment-dom (assoc :invoice/scheduled-payment (to-date
(next-dom date schedule-payment-dom))))]))
))
[]
imports)]
(when-not (seq transactions)
(throw (ex-info "No new invoices found." (throw (ex-info "No new invoices found."
{:imports (str imports)}))) {:imports (str (vec imports))})))
(log/info "creating invoice" transactions) (log/info "creating invoice" potential-invoices)
@(d/transact (d/connect uri) (vec (set transactions)))))) @(d/transact (d/connect uri) potential-invoices))))
(defn validate-account-rows [rows code->existing-account] (defn validate-account-rows [rows code->existing-account]
@@ -273,8 +252,7 @@
))))] ))))]
(throw (ex-info (str "You are adding accounts without a valid type" ) (throw (ex-info (str "You are adding accounts without a valid type" )
{:rows bad-types}))) {:rows bad-types})))
(when-let [duplicate-rows (seq (->> rows
(when-let [duplicate-rows (seq (->> rows
(filter (fn [[account]] (filter (fn [[account]]
(not-empty account))) (not-empty account)))
(group-by (fn [[account]] (group-by (fn [[account]]
@@ -426,7 +404,19 @@
{:keys [filename tempfile]} files] {:keys [filename tempfile]} files]
(lc/with-context {:parsing-file filename} (lc/with-context {:parsing-file filename}
(try (try
(import-uploaded-invoice user client location vendor (parse/parse-file (.getPath tempfile) filename)) (let [extension (last (str/split (.getName (io/file filename)) #"\." ))
s3-location (str "invoice-files/" (str (UUID/randomUUID)) "." extension)
_ (s3/put-object :bucket-name (:data-bucket env)
:key s3-location
:input-stream (io/input-stream tempfile)
:metadata {:content-type "application/pdf"})
imports (->> (parse/parse-file (.getPath tempfile) filename)
(map #(assoc %
:client-override client
:location-override location
:vendor-override vendor
:source-url (str "https://" (:data-bucket env) "/" s3-location))))]
(import-uploaded-invoice user imports))
{:status 200 {:status 200
:body (pr-str {}) :body (pr-str {})
:headers {"Content-Type" "application/edn"}} :headers {"Content-Type" "application/edn"}}
@@ -459,7 +449,8 @@
(not= "Cash" (:check %)))) (not= "Cash" (:check %))))
(map :vendor-name) (map :vendor-name)
set) set)
inserted-rows @(d/transact (d/connect uri) (invoice-rows->transaction (:new grouped-rows)))] inserted-rows @(d/transact (d/connect uri) (invoice-rows->transaction (:new grouped-rows)
user))]
{:status 200 {:status 200
:body (pr-str {:imported (count (:new grouped-rows)) :body (pr-str {:imported (count (:new grouped-rows))
:already-imported (count (:exists grouped-rows)) :already-imported (count (:exists grouped-rows))

25
src/cljs/auto_ap/views/components/invoice_table.cljs
View File

@@ -45,7 +45,7 @@
:unpaid-invoices :unpaid :unpaid-invoices :unpaid
:paid-invoices :paid :paid-invoices :paid
:voided-invoices :voided)} :voided-invoices :voided)}
[[:invoices [:id :total :outstanding-balance :invoice-number :date :due :status :client-identifier :scheduled-payment [[:invoices [:id :total :outstanding-balance :invoice-number :date :due :status :client-identifier :scheduled-payment :source-url
[:vendor [:name :id]] [:vendor [:name :id]]
[:expense_accounts [:amount :id :location [:expense_accounts [:amount :id :location
[:account [:id ]]]] [:account [:id ]]]]
@@ -113,7 +113,7 @@
{:db db})) {:db db}))
(defn row [{:keys [invoice check-boxes selected-client overrides checkable? expense-event actions]}] (defn row [{:keys [invoice check-boxes selected-client overrides checkable? expense-event actions]}]
(let [{:keys [client status payments expense-accounts invoice-number date due total outstanding-balance id vendor] :as i} invoice (let [{:keys [client status payments expense-accounts invoice-number date due total outstanding-balance id vendor source-url] :as i} invoice
accounts-by-id @(re-frame/subscribe [::subs/accounts-by-id client]) accounts-by-id @(re-frame/subscribe [::subs/accounts-by-id client])
unautopay-states @(re-frame/subscribe [::status/multi ::unautopay]) unautopay-states @(re-frame/subscribe [::status/multi ::unautopay])
account->name #(:name (accounts-by-id (:id %)))] account->name #(:name (accounts-by-id (:id %)))]
@@ -165,13 +165,16 @@
[:a.dropdown-item.is-primary {:on-click (dispatch-event [::expense-accounts-dialog/show i])} "Change"]])]]]) [:a.dropdown-item.is-primary {:on-click (dispatch-event [::expense-accounts-dialog/show i])} "Change"]])]]])
[:span {:style {:margin-left "1em"}}] [:span {:style {:margin-left "1em"}}]
(when (seq payments) (when (or (seq payments)
source-url
)
[:<> [:<>
[drop-down {:id [::payments id] [drop-down {:id [::payments id]
:is-right? true :is-right? true
:header [buttons/fa-icon {:class "badge" :header [buttons/fa-icon {:class "badge"
:on-click (dispatch-event-with-propagation [::events/toggle-menu [::payments id]]) :on-click (dispatch-event-with-propagation [::events/toggle-menu [::payments id]])
:data-badge (str (clojure.core/count payments)) :data-badge (str (cond-> (clojure.core/count payments)
source-url inc))
:icon "fa-paperclip"}]} :icon "fa-paperclip"}]}
[drop-down-contents [drop-down-contents
[:div.dropdown-item [:div.dropdown-item
@@ -181,8 +184,7 @@
^{:key (:id invoice-payment)} ^{:key (:id invoice-payment)}
[:tr [:tr
[:td [:td
"Payment" "Payment"]
]
[:td (gstring/format "$%.2f" (:amount invoice-payment) )] [:td (gstring/format "$%.2f" (:amount invoice-payment) )]
[:td [:td
(when (= :cleared (:status (:payment invoice-payment))) (when (= :cleared (:status (:payment invoice-payment)))
@@ -193,8 +195,17 @@
[buttons/fa-icon {:icon "fa-external-link" [buttons/fa-icon {:icon "fa-external-link"
:href (str (bidi/path-for routes/routes :payments ) :href (str (bidi/path-for routes/routes :payments )
"?" "?"
(url/map->query {:exact-match-id (:id (:payment invoice-payment))}))}]]])]]]]] (url/map->query {:exact-match-id (:id (:payment invoice-payment))}))}]]])
(when source-url
[:tr
[:td
"File"]
[:td {:colspan 4}
[buttons/fa-icon {:icon "fa-external-link"
:href source-url}]]])]]]]]
[:span {:style {:margin-right "1em"}}]]) [:span {:style {:margin-right "1em"}}]])
(when (and (get actions :edit) (when (and (get actions :edit)
(not= ":voided" (:status i))) (not= ":voided" (:status i)))
[buttons/fa-icon {:icon "fa-pencil" [buttons/fa-icon {:icon "fa-pencil"

2
test/clj/auto_ap/ledger_test.clj
View File

@@ -19,7 +19,7 @@
(t/deftest entity-change->ledger (t/deftest entity-change->ledger
(t/testing "Should code an expected deposit" #_(t/testing "Should code an expected deposit"
(let [{:strs [ed ccp receipts-split client]} (let [{:strs [ed ccp receipts-split client]}
(:tempids @(d/transact conn [#:expected-deposit {:status :expected-deposit-status/pending (:tempids @(d/transact conn [#:expected-deposit {:status :expected-deposit-status/pending
:client {:db/id "client" :client {:db/id "client"