From f8d858e82131f922c8a44926c2e8ab8e7ef89e4c Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 10 Jul 2016 17:15:53 -0400 Subject: [PATCH] format prices with 2 decimal places always --- src/mtgcoll/client/components/cards.cljs | 7 ++++--- src/mtgcoll/client/routes/cards.cljs | 6 +++--- src/mtgcoll/client/utils.cljs | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/mtgcoll/client/components/cards.cljs b/src/mtgcoll/client/components/cards.cljs index 06ce0fc..15502f5 100644 --- a/src/mtgcoll/client/components/cards.cljs +++ b/src/mtgcoll/client/components/cards.cljs @@ -7,7 +7,8 @@ [webtools.reagent.components :refer [raw-html]] [mtgcoll.common :refer [max-search-results]] [mtgcoll.client.components.utils :refer [set-short-label symboled-markup th-sortable]] - [mtgcoll.client.components.inventory :refer [inventory]])) + [mtgcoll.client.components.inventory :refer [inventory]] + [mtgcoll.client.utils :refer [format-currency]])) (defn card-image [card-id & {:keys [width height]}] @@ -86,8 +87,8 @@ (if (or power toughness) (str " (" power "/" toughness ")")))] [:td rarity] - [:td paper_price] - [:td online_price] + [:td (format-currency paper_price true)] + [:td (format-currency online_price true)] [:td [inventory id {:num-owned owned_count :button-size "xsmall" diff --git a/src/mtgcoll/client/routes/cards.cljs b/src/mtgcoll/client/routes/cards.cljs index 101967f..414109b 100644 --- a/src/mtgcoll/client/routes/cards.cljs +++ b/src/mtgcoll/client/routes/cards.cljs @@ -9,7 +9,7 @@ [mtgcoll.client.components.cards :refer [card-image card-link]] [mtgcoll.client.components.utils :refer [symbol-image set-heading set-label symboled-markup]] [mtgcoll.client.components.inventory :refer [inventory]] - [mtgcoll.client.utils :refer [format-date format-datetime]])) + [mtgcoll.client.utils :refer [format-date format-datetime format-currency]])) (defn detail [& components] @@ -178,8 +178,8 @@ ^{:key idx} [:tr [:td source] - [:td paper-price] - [:td online-price] + [:td (format-currency paper-price true)] + [:td (format-currency online-price true)] [:td (format-datetime last-updated)]]))))]]]) (if (and (seq @printings) (> (count @printings) 1)) diff --git a/src/mtgcoll/client/utils.cljs b/src/mtgcoll/client/utils.cljs index 4524023..7b9643d 100644 --- a/src/mtgcoll/client/utils.cljs +++ b/src/mtgcoll/client/utils.cljs @@ -60,6 +60,6 @@ (string/replace (str n) #"\B(?=(\d{3})+(?!\d))" ","))) (defn format-currency - [n] + [n & [number-only?]] (if n - (str "$" (pprint/cl-format nil "~,2f" n)))) + (str (if-not number-only? "$") (pprint/cl-format nil "~,2f" n))))