fixing vendor sort.

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

View File

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

View File

@@ -163,8 +163,9 @@
[:td (gstring/format "$%.2f" amount )]
[:td status]
[:td
(when (or (= ":pending" status)
(#{":cash" ":debit" :cash :debit} type))
(when (or (= :pending status)
(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]]]])
(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 ) ")")]