diff --git a/src/clj/auto_ap/parse.clj b/src/clj/auto_ap/parse.clj index c2fdbfae..5283ba39 100644 --- a/src/clj/auto_ap/parse.clj +++ b/src/clj/auto_ap/parse.clj @@ -179,7 +179,6 @@ (or (->> client :client/location-matches (mapcat (fn [{:keys [:location-match/location :location-match/matches]}] - (map (fn [match] [location match]) matches))) (filter (fn [[_ match]] (re-find (re-pattern (str "(?i)" match)) text)) ) diff --git a/src/clj/auto_ap/ssr/invoice/common.clj b/src/clj/auto_ap/ssr/invoice/common.clj index c00e36c8..7bbbaa3e 100644 --- a/src/clj/auto_ap/ssr/invoice/common.clj +++ b/src/clj/auto_ap/ssr/invoice/common.clj @@ -5,6 +5,7 @@ :invoice/total :invoice/outstanding-balance :invoice/source-url + :invoice/location [:invoice/date :xform clj-time.coerce/from-date] [:invoice/due :xform clj-time.coerce/from-date] [:invoice/scheduled-payment :xform clj-time.coerce/from-date] diff --git a/src/clj/auto_ap/ssr/invoice/import.clj b/src/clj/auto_ap/ssr/invoice/import.clj index 88234d4d..b5a63fc9 100644 --- a/src/clj/auto_ap/ssr/invoice/import.clj +++ b/src/clj/auto_ap/ssr/invoice/import.clj @@ -487,7 +487,9 @@ :sort-key "client" :hide? (fn [args] (= (count (:clients args)) 1)) - :render #(-> % :invoice/client :client/name)} + :render (fn [x] [:div.flex.items-center.gap-2 (-> x :invoice/client :client/name) + (com/pill {:color :primary} (-> x :invoice/location)) + ])} {:key "vendor" :name "Vendor" :sort-key "vendor" diff --git a/src/clj/auto_ap/ssr/invoices.clj b/src/clj/auto_ap/ssr/invoices.clj index ed0661a9..bb993696 100644 --- a/src/clj/auto_ap/ssr/invoices.clj +++ b/src/clj/auto_ap/ssr/invoices.clj @@ -490,7 +490,9 @@ :sort-key "client" :hide? (fn [args] (= (count (:clients args)) 1)) - :render #(-> % :invoice/client :client/name)} + :render (fn [x] [:div.flex.items-center.gap-2 (-> x :invoice/client :client/name) + (com/pill {:color :primary} (-> x :invoice/location)) + ])} {:key "vendor" :name "Vendor" :sort-key "vendor"