adds location
This commit is contained in:
@@ -179,7 +179,6 @@
|
|||||||
(or (->> client
|
(or (->> client
|
||||||
:client/location-matches
|
:client/location-matches
|
||||||
(mapcat (fn [{:keys [:location-match/location :location-match/matches]}]
|
(mapcat (fn [{:keys [:location-match/location :location-match/matches]}]
|
||||||
|
|
||||||
(map (fn [match] [location match]) matches)))
|
(map (fn [match] [location match]) matches)))
|
||||||
(filter (fn [[_ match]]
|
(filter (fn [[_ match]]
|
||||||
(re-find (re-pattern (str "(?i)" match)) text)) )
|
(re-find (re-pattern (str "(?i)" match)) text)) )
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
:invoice/total
|
:invoice/total
|
||||||
:invoice/outstanding-balance
|
:invoice/outstanding-balance
|
||||||
:invoice/source-url
|
:invoice/source-url
|
||||||
|
:invoice/location
|
||||||
[:invoice/date :xform clj-time.coerce/from-date]
|
[:invoice/date :xform clj-time.coerce/from-date]
|
||||||
[:invoice/due :xform clj-time.coerce/from-date]
|
[:invoice/due :xform clj-time.coerce/from-date]
|
||||||
[:invoice/scheduled-payment :xform clj-time.coerce/from-date]
|
[:invoice/scheduled-payment :xform clj-time.coerce/from-date]
|
||||||
|
|||||||
@@ -487,7 +487,9 @@
|
|||||||
:sort-key "client"
|
:sort-key "client"
|
||||||
:hide? (fn [args]
|
:hide? (fn [args]
|
||||||
(= (count (:clients args)) 1))
|
(= (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"
|
{:key "vendor"
|
||||||
:name "Vendor"
|
:name "Vendor"
|
||||||
:sort-key "vendor"
|
:sort-key "vendor"
|
||||||
|
|||||||
@@ -490,7 +490,9 @@
|
|||||||
:sort-key "client"
|
:sort-key "client"
|
||||||
:hide? (fn [args]
|
:hide? (fn [args]
|
||||||
(= (count (:clients args)) 1))
|
(= (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"
|
{:key "vendor"
|
||||||
:name "Vendor"
|
:name "Vendor"
|
||||||
:sort-key "vendor"
|
:sort-key "vendor"
|
||||||
|
|||||||
Reference in New Issue
Block a user