notid/integreat
1
0
Fork 0
Code Issues Pull Requests 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

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

@@ -22,6 +22,7 @@
[clojure.set :as set]
[auto-ap.effects.forward :as forward]))
(defn dropzone []
(let [client (re-frame/subscribe [::subs/client])
token (re-frame/subscribe [::subs/token])
@@ -31,14 +32,15 @@
:component-did-mount (fn [this]
(dz. (rdom/dom-node this)
(clj->js {:init (fn []
(.on (js-this) "addedfiles"
(fn []
(re-frame/dispatch [::status/completed ::import])))
(.on (js-this) "success" (fn [_ files]
(re-frame/dispatch [::invalidated])))
(.on (js-this) "error" (fn [_ error]
(re-frame/dispatch [::status/error ::import [(edn/read-string error)]]))))
(let [^js/Dropzone t (js-this)]
(.on t "addedfiles"
(fn []
(re-frame/dispatch [::status/completed ::import])))
(.on t "success" (fn [_ files]
(re-frame/dispatch [::invalidated])))
(.on t "error" (fn [_ error]
(re-frame/dispatch [::status/error ::import [(edn/read-string error)]])))))
:paramName "file"
:headers {"Authorization" (str "Token " @token)}
: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)
:amount-gte (:amount-gte (: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)}
[[:payments [:id :status :amount :type :check_number :s3_url
[:bank-account [:name]]