Merging master into big-feature

jkgraham · May 31, 2012 · a6218f2 · a6218f2
2 parents f93789e + 6c0c788
commit a6218f2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/somefolder/code.haml b/somefolder/code.haml
@@ -17,8 +17,8 @@
               %th
                 = order.shipping_type.name
               %td
-                - if order.shipping_cost && order.shipping_cost.to_i > 0
-                  = number_to_currency order.shipping_cost.to_i
+                - if order.shipping_cost && order.shipping_cost.to_f > 0
+                  = number_to_currency order.shipping_cost.to_f
                 - else
                   The shipping cost was not specified
           - else