tons of bug fixes

src/clj/auto_ap/parse/excel.clj

@@ -1,5 +1,6 @@
 (ns auto-ap.parse.excel
   (:require [auto-ap.parse.templates :as t]
+            [auto-ap.parse.util :as u]
             [clojure.string :as str]
             [dk.ative.docjure.spreadsheet :as d])
   (:import (org.apache.poi.ss.util CellAddress)))
@@ -9,7 +10,7 @@
 (defn template-applies? [text {:keys [keywords]}]
   (every? #(re-find % text) keywords))
 
-(defn extract [wb {:keys [extract vendor]}]
+(defn extract [wb {:keys [extract vendor parser]}]
   (if (fn? extract)
     (extract wb vendor)
     [(reduce-kv
@@ -24,11 +25,15 @@
                     (map (fn [cell]
                            (let [address (.getAddress cell)
                                  cell-value (str (d/read-cell (d/select-cell  (.toString (CellAddress. (+ offset-row (.getRow address)) (+ offset-column (.getColumn address)) ))
-                                                                              (first (d/sheet-seq wb)))))] 
-                             (if extract-regex
-                               (second (re-find extract-regex cell-value))
-                               
-                               cell-value))))
+                                                                              (first (d/sheet-seq wb)))))
+                                 raw-result (if extract-regex
+                                              (second (re-find extract-regex cell-value))
+                                              
+                                              cell-value)] 
+                             (if (get parser k)
+                               (u/parse-value (first (get parser k) ) (second (get parser k) ) raw-result)
+                               raw-result
+                               ))))
                     first)))
       {:vendor-code vendor}
       extract)]))

src/clj/auto_ap/parse/templates.clj

@@ -271,7 +271,7 @@
 
    ;; PACIFIC SEAFOOD
    {:vendor "Pacific Seafood"
-    :keywords [#"pacseafood"]
+    :keywords [#"(pacseafood|PACIFIC FRESH)"]
     :extract {:date #"DATE(?:.*\n.*(?=([0-9]+/[0-9]+/[0-9]+)))([0-9]+/[0-9]+/[0-9]+)"
               :customer-identifier #"DELIVER TO:(?:.*\n)(.*?)(?=\s{2})"
               :invoice-number #"INVOICE NO\.\n(?:.*?(?= [0-9]+\n)) ([0-9]+)"
@@ -439,12 +439,15 @@
               :total [#"PAY THIS" -1 0]
               :date [#"INVOICE DATE" 0 1]
               :invoice-number [#"INVOICE NUMBER" 0 1]}}
-   {:vendor "SWO"
+   {:vendor "Southern Glazers"
     :keywords [#"Please note that the total invoice amount may"]
     :extract {:customer-identifier [#"Customer #" 1 0]
-              :total [#"Total Invoice" 0 5]
+              :total [#"Subtotal" 0 16 ]
               :date [#"Date" 0 0 #"Date: (.*)"]
-              :invoice-number [#"Invoice #" 0 0  #"Invoice #: (.*)"]}}
+              :invoice-number [#"Invoice #" 0 0  #"Invoice #: (.*)"]
+              :account-number [#"Customer #" 0 0  #"Customer #: (.*)"]}
+    :parser { :total [:trim-commas-and-remove-dollars nil]
+             :date [:clj-time "MM/dd/yyyy"]}}
    {:vendor "Mama Lu's Foods"
     :keywords [#"Mama Lu's Foods"]
     :extract (fn [wb vendor]

src/clj/auto_ap/parse/util.clj

@@ -13,6 +13,9 @@
   [_ _ value]
   (str/replace value #"," "")
   )
+(defmethod parse-value :trim-commas-and-remove-dollars
+  [_ _ value]
+  (str/replace (str/replace value #"," "") #"\$" ""))
 
 (defmethod parse-value :trim-commas-and-negate
   [_ _ value]