From 7f75a3b84926b9c58c298b0ecf2f05a014a94b05 Mon Sep 17 00:00:00 2001
From: Bryce Covert <contact.bryce@brycecovertoperations.com>
Date: Mon, 24 Aug 2020 21:20:34 -0700
Subject: [PATCH] Fixed minor bugs.

---
 src/clj/auto_ap/parse/templates.clj                | 3 ++-
 src/cljs/auto_ap/status.cljs                       | 4 +++-
 src/cljs/auto_ap/views/pages/admin/rules/form.cljs | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/clj/auto_ap/parse/templates.clj b/src/clj/auto_ap/parse/templates.clj
index 7a195271..d4ca7acc 100644
--- a/src/clj/auto_ap/parse/templates.clj
+++ b/src/clj/auto_ap/parse/templates.clj
@@ -162,7 +162,8 @@
     :extract {:date #"DATE : ([0-9]+/[0-9]+/[0-9]+)"
               :customer-identifier #"(.*?)\s{2,}.*CUSTOMER#"
               :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"]
              :total [:trim-commas nil]}}
 
diff --git a/src/cljs/auto_ap/status.cljs b/src/cljs/auto_ap/status.cljs
index 1583a7fc..22fca69b 100644
--- a/src/cljs/auto_ap/status.cljs
+++ b/src/cljs/auto_ap/status.cljs
@@ -130,7 +130,9 @@
               state (:error state)]
           (do 
             ^{:key (:message state)}
-            [:p (:message state)]))])
+            [:p (or (:message state)
+                    (:error state)
+                    "An unexpected error occured.")]))])
      (if (seq info-states)
        [:div.notification
         (for [state states]
diff --git a/src/cljs/auto_ap/views/pages/admin/rules/form.cljs b/src/cljs/auto_ap/views/pages/admin/rules/form.cljs
index f716cb05..ce29b9c4 100644
--- a/src/cljs/auto_ap/views/pages/admin/rules/form.cljs
+++ b/src/cljs/auto_ap/views/pages/admin/rules/form.cljs
@@ -177,6 +177,12 @@
                                                                                      (: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
                                 []))))