notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fixing vendor sort.

Browse Source
This commit is contained in:
Bryce Covert
2019-01-25 22:53:18 -08:00
parent 1d34dd157a
commit 963fe4373b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/clj/auto_ap/datomic/checks.clj
View File

@@ -59,6 +59,9 @@
(= "client" (:sort-by args)) (= "client" (:sort-by args))
#(-> % :payment/client :client/name) #(-> % :payment/client :client/name)
(= "vendor" (:sort-by args))
#(-> % :payment/vendor :vendor/name (or "") (.toLowerCase ))
:else :else
(keyword "payment" (:sort-by args)))) (keyword "payment" (:sort-by args))))

5
src/cljs/auto_ap/views/pages/checks.cljs
View File

@@ -163,8 +163,9 @@
[:td (gstring/format "$%.2f" amount )] [:td (gstring/format "$%.2f" amount )]
[:td status] [:td status]
[:td [:td
(when (or (= ":pending" status) (when (or (= :pending status)
(#{":cash" ":debit" :cash :debit} type)) (and (#{":cash" ":debit" :cash :debit} type)
(not= :voided status)))
[:button.button.is-warning.is-outlined {:on-click (dispatch-event [::void-check i])} [:span [:span.icon [:i.fa.fa-minus-circle]]]]) [:button.button.is-warning.is-outlined {:on-click (dispatch-event [::void-check i])} [:span [:span.icon [:i.fa.fa-minus-circle]]]])
(if s3-url (if s3-url
[:a.tag {:href s3-url :target "_new"} [:i.fa.fa-money-check] [:span.icon [:i.fa.fa-money]] (str " " check-number " (" (gstring/format "$%.2f" amount ) ")")] [:a.tag {:href s3-url :target "_new"} [:i.fa.fa-money-check] [:span.icon [:i.fa.fa-money]] (str " " check-number " (" (gstring/format "$%.2f" amount ) ")")]