diff --git a/src/clj/auto_ap/parse/templates.clj b/src/clj/auto_ap/parse/templates.clj index c36e87dc..09f65c45 100644 --- a/src/clj/auto_ap/parse/templates.clj +++ b/src/clj/auto_ap/parse/templates.clj @@ -124,11 +124,11 @@ ;; CHEF's CHOICE {:vendor "Chef's Choice Produce Co" :keywords [#"2170 MARTIN AVENUE"] - :extract {:date #"([0-9]{10,10})\s+INVOICE" - :customer-identifier #"\n B\s+([A-Za-z ']+)\s+I " - :invoice-number #"([0-9]+)\s+[0-9]{10,10}\s+INVOICE" + :extract {:date #"([0-9/]{10,10})" + :customer-identifier #"\n B\s+([\S ]+?)(?=\s{2,}I) " + :invoice-number #"\n([0-9]+)" :total #"INVOICE\s+([\d\.]+)"} - :parser {:date [:clj-time "MM1dd1yyyy"]} + :parser {:date [:clj-time "MM/dd/yyyy"]} ;; may want to try two approaches [:clj-time ["MM/dd/yyyy" "MM1dd1yyyy"]] :multi #"\n" :multi-match? #"\s+INVOICE\s+"}