diff --git a/src/clj/auto_ap/parse/templates.clj b/src/clj/auto_ap/parse/templates.clj index ff8269c4..b920df85 100644 --- a/src/clj/auto_ap/parse/templates.clj +++ b/src/clj/auto_ap/parse/templates.clj @@ -50,9 +50,9 @@ {:vendor "DVW Commercial" :keywords [#"DVW Commercial"] :extract {:date #"\s*([0-9]+/[0-9]+/[0-9]+)" - :customer-identifier #"Bill To:[^\n]+\n[^\n]*\n\s*([\w ]+) \(" + :customer-identifier #"Ship To:.*?\n.*?\s{2,}(.*)" :invoice-number #"Invoice\s*\n\s*[S]?([\w\./]+)*" - :total #"Total:\s+\$ ([0-9.]+)"} + :total #"Total:\s+\$\s*([0-9.]+)"} :parser {:date [:clj-time "MM/dd/yy"]}} ;; DAYLIGHT FOOD STATEMENT @@ -268,7 +268,8 @@ {:vendor "Youngs Market" :keywords [#"P.O.Box 743564"] :extract {:date #"(?:INVOICE|CREDIT) DATE\n(?:.*?)(\S+)\n" - :customer-identifier #"(?:INVOICE|CREDIT) DATE\n [0-9]+\s+(.*?)\s{2,}" + #_#_:customer-identifier #"(?:INVOICE|CREDIT) DATE\n [0-9]+\s+(.*?)\s{2,}" + :account-number #"Store Number:\s+(\d+)" :invoice-number #"(?:INVOICE|CREDIT) DATE\n(?:.*?)\s{2,}(\d+?)\s+\S+\n" :total #"Net Amount(?:.*\n){4}(?:.*?)([\-]?[0-9\.]+)\n"} :parser {:date [:clj-time "dd-MMM-yy"]