diff --git a/src/clj/auto_ap/ssr/ledger.clj b/src/clj/auto_ap/ssr/ledger.clj index f68d226e..dfb17531 100644 --- a/src/clj/auto_ap/ssr/ledger.clj +++ b/src/clj/auto_ap/ssr/ledger.clj @@ -477,9 +477,7 @@ :hide? (fn [args] (and (= (count (:clients args)) 1) (= 1 (count (:client/locations (:client args)))))) - :render (fn [x] [:div.flex.items-center.gap-2 (-> x :invoice/client :client/name) - (map #(com/pill {:color :primary} (-> % :invoice-expense-account/location)) - (:invoice/expense-accounts x)) ])} + :render (fn [x] [:div.flex.items-center.gap-2 (-> x :journal-entry/client :client/name) ])} {:key "vendor" :name "Vendor" diff --git a/src/clj/auto_ap/ssr/payments.clj b/src/clj/auto_ap/ssr/payments.clj index 2f007fb9..f6471bf1 100644 --- a/src/clj/auto_ap/ssr/payments.clj +++ b/src/clj/auto_ap/ssr/payments.clj @@ -393,11 +393,12 @@ check-number))} {:key "status" :name "Status" + :sort-key "status" :render (fn [{:payment/keys [status]}] (condp = status :payment-status/cleared (com/pill {:color :primary} "cleared") - + :payment-status/pending (com/pill {:color :secondary} "pending") :payment-status/voided @@ -406,10 +407,12 @@ ""))} {:key "date" :name "Date" + :sort-key "date" :show-starting "lg" :render (fn [{:payment/keys [date]}] (some-> date (atime/unparse-local atime/normal-date)))} {:key "amount" + :sort-key "amount" :name "Amount" :render (fn [{:payment/keys [amount]}] (some->> amount (format "$%.2f")))}