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

Merge branch 'staging' into add-scheduled-payment-filter

Browse Source
This commit is contained in:
Bryce Covert
2021-01-06 08:17:20 -08:00
parent f0b31fe6d1 e9cc29ad7f
commit 1d05d8abd0
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project.clj
View File

@@ -36,7 +36,7 @@
[vincit/venia "0.2.5"] [vincit/venia "0.2.5"]
[digest "1.4.10"] [digest "1.4.10"]
[clj-http "3.11.0" :exclusions [org.apache.httpcomponents/httpclient org.apache.httpcomponents/httpcore]] [clj-http "3.11.0" :exclusions [org.apache.httpcomponents/httpclient org.apache.httpcomponents/httpcore]]
[clj-pdf "2.5.5"] [clj-pdf "2.2.33"]
[org.clojure/core.async "1.3.610"] [org.clojure/core.async "1.3.610"]
[fogus/ring-edn "0.3.0"] [fogus/ring-edn "0.3.0"]
[buddy/buddy-auth "2.2.0" [buddy/buddy-auth "2.2.0"

16
src/clj/auto_ap/graphql/ledger.clj
View File

@@ -444,12 +444,14 @@
(into #{} (map :db/id (d-clients/get-all)))) (into #{} (map :db/id (d-clients/get-all))))
starting (java.util.Date.)] starting (java.util.Date.)]
(log/info (count clients-needing-refresh) "Clients need their balance cache refreshed.") (log/info (count clients-needing-refresh) "Clients need their balance cache refreshed.")
(reduce (swap! running-balance-cache
(fn [acc client] merge
(log/info "Computing running balance cache for " (:client/code (d/entity (d/db conn) client))) (reduce
(assoc acc client (running-balance-for client))) (fn [acc client]
{} (log/info "Computing running balance cache for " (:client/code (d/entity (d/db conn) client)))
clients-needing-refresh) (assoc acc client (running-balance-for client)))
{}
clients-needing-refresh))
(log/info "Done refreshing " (count clients-needing-refresh) " client caches") (log/info "Done refreshing " (count clients-needing-refresh) " client caches")
(reset! last-run-running-balance starting))) (reset! last-run-running-balance starting)))
@@ -459,7 +461,7 @@
(lc/with-context {:source "running-balance-cache"} (lc/with-context {:source "running-balance-cache"}
(try (try
(log/info "Refreshing running balance cache") (log/info "Refreshing running balance cache")
(reset! running-balance-cache (build-running-balance-cache)) (build-running-balance-cache)
(catch Exception e (catch Exception e
(log/error e))))) (log/error e)))))

16
src/cljs/auto_ap/views/pages/import_invoices.cljs
View File

@@ -22,6 +22,7 @@
[clojure.set :as set] [clojure.set :as set]
[auto-ap.effects.forward :as forward])) [auto-ap.effects.forward :as forward]))
(defn dropzone [] (defn dropzone []
(let [client (re-frame/subscribe [::subs/client]) (let [client (re-frame/subscribe [::subs/client])
token (re-frame/subscribe [::subs/token]) token (re-frame/subscribe [::subs/token])
@@ -31,14 +32,15 @@
:component-did-mount (fn [this] :component-did-mount (fn [this]
(dz. (rdom/dom-node this) (dz. (rdom/dom-node this)
(clj->js {:init (fn [] (clj->js {:init (fn []
(.on (js-this) "addedfiles" (let [^js/Dropzone t (js-this)]
(fn [] (.on t "addedfiles"
(re-frame/dispatch [::status/completed ::import]))) (fn []
(.on (js-this) "success" (fn [_ files] (re-frame/dispatch [::status/completed ::import])))
(re-frame/dispatch [::invalidated]))) (.on t "success" (fn [_ files]
(.on (js-this) "error" (fn [_ error] (re-frame/dispatch [::invalidated])))
(re-frame/dispatch [::status/error ::import [(edn/read-string error)]])))) (.on t "error" (fn [_ error]
(re-frame/dispatch [::status/error ::import [(edn/read-string error)]])))))
:paramName "file" :paramName "file"
:headers {"Authorization" (str "Token " @token)} :headers {"Authorization" (str "Token " @token)}
:url (str "/api/invoices/upload" :url (str "/api/invoices/upload"

2
src/cljs/auto_ap/views/pages/payments.cljs
View File

@@ -41,7 +41,7 @@
:date-range (:date-range params) :date-range (:date-range params)
:amount-gte (:amount-gte (:amount-range params)) :amount-gte (:amount-gte (:amount-range params))
:amount-lte (:amount-lte (:amount-range params)) :amount-lte (:amount-lte (:amount-range params))
:check-number-like (:check-number-like params) :check-number-like (str (:check-number-like params))
:invoice-number (:invoice-number params)} :invoice-number (:invoice-number params)}
[[:payments [:id :status :amount :type :check_number :s3_url [[:payments [:id :status :amount :type :check_number :s3_url
[:bank-account [:name]] [:bank-account [:name]]