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

Fixed minor bugs.

Browse Source
This commit is contained in:
Bryce Covert
2020-08-24 21:20:34 -07:00
parent c6f9eb0979
commit 7f75a3b849
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/clj/auto_ap/parse/templates.clj
View File

@@ -162,7 +162,8 @@
:extract {:date #"DATE : ([0-9]+/[0-9]+/[0-9]+)" :extract {:date #"DATE : ([0-9]+/[0-9]+/[0-9]+)"
:customer-identifier #"(.*?)\s{2,}.*CUSTOMER#" :customer-identifier #"(.*?)\s{2,}.*CUSTOMER#"
:invoice-number #"INVOICE# :\s+([0-9]+)" :invoice-number #"INVOICE# :\s+([0-9]+)"
:total #"TOTAL SALE :\s+([0-9,.]+)"} :total #"TOTAL DUE :\s+\$([0-9,.]+)"
:account-number #"CUSTOMER#\s+:\s+(\d+)"}
:parser {:date [:clj-time "MM/dd/yyyy"] :parser {:date [:clj-time "MM/dd/yyyy"]
:total [:trim-commas nil]}} :total [:trim-commas nil]}}

4
src/cljs/auto_ap/status.cljs
View File

@@ -130,7 +130,9 @@
state (:error state)] state (:error state)]
(do (do
^{:key (:message state)} ^{:key (:message state)}
[:p (:message state)]))]) [:p (or (:message state)
(:error state)
"An unexpected error occured.")]))])
(if (seq info-states) (if (seq info-states)
[:div.notification [:div.notification
(for [state states] (for [state states]

6
src/cljs/auto_ap/views/pages/admin/rules/form.cljs
View File

@@ -177,6 +177,12 @@
(:total data) (:total data)
[])] [])]
(= [:client] field)
[[:accounts] (expense-accounts-field/default-account (:accounts data)
@(re-frame/subscribe [::subs/vendor-default-account (:vendor data) value])
(:total data)
[])]
:else :else
[])))) []))))